From 57d79be95748e6e9143b36cd0187820e26a94572 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 14 Jul 2020 12:55:35 +0200
Subject: [PATCH] Integrate file-handling
---
packages/file-handling/.gitmodules | 3 ---
packages/file-handling/package.json | 3 ++-
packages/file-handling/rollup.config.js | 16 ++++------------
packages/file-handling/vendor/common | 1 -
yarn.lock | 16 ++++++++--------
5 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 packages/file-handling/.gitmodules
delete mode 160000 packages/file-handling/vendor/common
diff --git a/packages/file-handling/.gitmodules b/packages/file-handling/.gitmodules
deleted file mode 100644
index d423707d..00000000
--- a/packages/file-handling/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/common"]
- path = vendor/common
- url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git
diff --git a/packages/file-handling/package.json b/packages/file-handling/package.json
index 4dbd2140..73190c10 100644
--- a/packages/file-handling/package.json
+++ b/packages/file-handling/package.json
@@ -3,6 +3,7 @@
"version": "1.0.0",
"main": "src/index.js",
"license": "LGPL-2.1-or-later",
+ "private": true,
"devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-json": "^4.0.2",
@@ -22,7 +23,7 @@
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0",
- "vpu-common": "file:./vendor/common"
+ "vpu-common": "^1.0.0"
},
"dependencies": {
"@open-wc/scoped-elements": "^1.0.8",
diff --git a/packages/file-handling/rollup.config.js b/packages/file-handling/rollup.config.js
index 74113493..ee06dafd 100644
--- a/packages/file-handling/rollup.config.js
+++ b/packages/file-handling/rollup.config.js
@@ -1,5 +1,4 @@
import glob from 'glob';
-import path from 'path';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import copy from 'rollup-plugin-copy';
@@ -33,23 +32,16 @@ export default {
nextcloudBaseURL: nextcloudBaseURL,
nextcloudFileURL: nextcloudFileURL,
}),
- resolve({
- customResolveOptions: {
- // ignore node_modules from vendored packages
- moduleDirectory: path.join(process.cwd(), 'node_modules')
- }
- }),
- commonjs({
- include: 'node_modules/**'
- }),
+ resolve(),
+ commonjs(),
json(),
(build !== 'local' && build !== 'test') ? terser() : false,
copy({
targets: [
{src: 'assets/index.html', dest: 'dist'},
{src: 'assets/favicon.ico', dest: 'dist'},
- {src: 'node_modules/material-design-icons-svg/paths/*.json', dest: 'dist/local/vpu-common/icons'},
- {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/vpu-file-source/tabulator-tables'},
+ {src: '../../node_modules/material-design-icons-svg/paths/*.json', dest: 'dist/local/vpu-common/icons'},
+ {src: '../../node_modules/tabulator-tables/dist/css', dest: 'dist/local/vpu-file-source/tabulator-tables'},
],
}),
(process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
diff --git a/packages/file-handling/vendor/common b/packages/file-handling/vendor/common
deleted file mode 160000
index 63b49c3a..00000000
--- a/packages/file-handling/vendor/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
diff --git a/yarn.lock b/yarn.lock
index dd151d09..22f093a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1008,7 +1008,7 @@
resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.2.18.tgz#2a86672fb3558fe2a2e1c5587dbaa0b485567ef1"
integrity sha512-1HpblP5edeENi0SKms7B+PKYdxHMBIQpaf0nAgTVsZeYgM9OJ3r9nrK/0MOUBZODAOZ1quvO3wlpuljq2hZPWA==
-"@open-wc/scoped-elements@^1.1.1":
+"@open-wc/scoped-elements@^1.0.8", "@open-wc/scoped-elements@^1.1.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-1.1.2.tgz#1cdcf52769437d8245227d31faaced8c2fd8fee0"
integrity sha512-2aZ8Ibfxhn1+ipBTvL8l84JTzptmGOd5NiLqlojn4QJQnJ/mEQXf9+g/Jj991ga+3nt1R+vRlO4JSrgqkCiyIQ==
@@ -1029,7 +1029,7 @@
magic-string "^0.25.2"
resolve "^1.11.0"
-"@rollup/plugin-json@^4.1.0":
+"@rollup/plugin-json@^4.0.2", "@rollup/plugin-json@^4.1.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
@@ -4249,7 +4249,7 @@ i18next-scanner@^2.10.2:
vinyl "^2.2.0"
vinyl-fs "^3.0.1"
-i18next@*, i18next@^19.5.3:
+i18next@*, i18next@^19.4.2, i18next@^19.5.3:
version "19.6.0"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.6.0.tgz#3881b8e476e494dcdadcc8983e594080417fd82e"
integrity sha512-t+pA7iN2WtwS1UQc4PFKHDIO4HYZIl2Wo8UC8gqt70Q1qY50FflAF5vV4IbQEqy4DuK3I9wv3BL1PMvkk238WA==
@@ -4980,7 +4980,7 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
-jszip@^3.2.2:
+jszip@^3.2.2, jszip@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6"
integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==
@@ -5009,14 +5009,14 @@ karma-firefox-launcher@^1.3.0:
dependencies:
is-wsl "^2.1.0"
-karma-mocha@^2.0.1:
+karma-mocha@^2.0.0, karma-mocha@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d"
integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==
dependencies:
minimist "^1.2.3"
-karma@^5.1.0:
+karma@^5.0.1, karma@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/karma/-/karma-5.1.0.tgz#deaa5f3939f75d7d78ded33283fa5f9bb67e9a05"
integrity sha512-I3aPbkuIbwuBo6wSog97P5WnnhCgUTsWTu/bEw1vZVQFbXmKO3PK+cfFhZioOgVtJAuQxoyauGNjnwXNHMCxbw==
@@ -5136,7 +5136,7 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-lit-element@^2.3.1:
+lit-element@^2.1.0, lit-element@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.3.1.tgz#73343b978fa1e73d60526c6bb6ad60f53a16c343"
integrity sha512-tOcUAmeO3BzwiQ7FGWdsshNvC0HVHcTFYw/TLIImmKwXYoV0E7zCBASa8IJ7DiP4cen/Yoj454gS0qqTnIGsFA==
@@ -7508,7 +7508,7 @@ rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1,
dependencies:
estree-walker "^0.6.1"
-rollup@^2.19.0:
+rollup@^2.18.0, rollup@^2.19.0:
version "2.21.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.21.0.tgz#d2e114533812043d5c9b7b0a83f1b2a242e4e1d6"
integrity sha512-BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ==
--
GitLab