From 86865321d11c6b55ae349877af05fd25364b99fa Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 7 Jul 2020 14:09:02 +0200
Subject: [PATCH] app-shell: Integrate into lerna
---
package-lock.json | 13 +++++++++
packages/app-shell/package.json | 34 +++++++++++------------
packages/app-shell/rollup.config.js | 12 ++------
packages/app-shell/vendor/auth | 1 -
packages/app-shell/vendor/common | 1 -
packages/app-shell/vendor/language-select | 1 -
packages/app-shell/vendor/notification | 1 -
packages/app-shell/vendor/person-profile | 1 -
8 files changed, 32 insertions(+), 32 deletions(-)
delete mode 160000 packages/app-shell/vendor/auth
delete mode 160000 packages/app-shell/vendor/common
delete mode 160000 packages/app-shell/vendor/language-select
delete mode 160000 packages/app-shell/vendor/notification
delete mode 160000 packages/app-shell/vendor/person-profile
diff --git a/package-lock.json b/package-lock.json
index 1ff28056..d44190e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8631,6 +8631,11 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
},
+ "path-to-regexp": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
+ "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
+ },
"path-type": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -11676,6 +11681,14 @@
"through2-filter": "^3.0.0"
}
},
+ "universal-router": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/universal-router/-/universal-router-9.0.1.tgz",
+ "integrity": "sha512-cDKiUa0/XuEXVlbvngqW1gYaolq6/+hNakR291PostYaN5G7w6VOKfk3nIucHlX5MxFnvmSs9KsRgD+6pYwwzg==",
+ "requires": {
+ "path-to-regexp": "^6.1.0"
+ }
+ },
"universal-user-agent": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json
index d5124726..ad7d875f 100644
--- a/packages/app-shell/package.json
+++ b/packages/app-shell/package.json
@@ -5,35 +5,35 @@
"license": "LGPL-2.1-or-later",
"devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0",
- "@rollup/plugin-json": "^4.0.2",
+ "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"babel-eslint": "^10.1.0",
"chai": "^4.2.0",
- "eslint": "^7.4.0",
- "eslint-plugin-jsdoc": "^28.6.1",
+ "eslint": "^7.3.1",
+ "eslint-plugin-jsdoc": "^28.5.1",
"glob": "^7.1.6",
- "karma": "^5.0.1",
- "karma-chrome-launcher": "^3.1.0",
+ "karma": "^5.1.0",
+ "karma-chrome-launcher": "^3.0.0",
"karma-firefox-launcher": "^1.3.0",
- "karma-mocha": "^2.0.0",
+ "karma-mocha": "^2.0.1",
"mocha": "^8.0.1",
"puppeteer": "^2.1.1",
- "rollup": "^2.6.1",
+ "rollup": "^2.19.0",
"rollup-plugin-consts": "^1.0.1",
- "rollup-plugin-copy": "^3.3.0",
+ "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-serve": "^1.0.1",
- "vpu-auth": "file:./vendor/auth",
- "vpu-common": "file:./vendor/common",
- "vpu-language-select": "file:./vendor/language-select",
- "vpu-notification": "file:./vendor/notification",
- "vpu-person-profile": "file:./vendor/person-profile"
+ "vpu-auth": "^1.0.0",
+ "vpu-common": "^1.0.0",
+ "vpu-language-select": "^1.0.0",
+ "vpu-notification": "^1.0.0",
+ "vpu-person-profile": "^1.0.0"
},
"dependencies": {
- "@open-wc/scoped-elements": "^1.0.8",
- "i18next": "^19.4.1",
- "lit-element": "^2.2.1",
- "lit-html": "^1.1.2",
+ "@open-wc/scoped-elements": "^1.1.1",
+ "i18next": "^19.5.3",
+ "lit-element": "^2.3.1",
+ "lit-html": "^1.1.1",
"universal-router": "^9.0.1"
},
"scripts": {
diff --git a/packages/app-shell/rollup.config.js b/packages/app-shell/rollup.config.js
index 8b1af25b..2c854509 100644
--- a/packages/app-shell/rollup.config.js
+++ b/packages/app-shell/rollup.config.js
@@ -1,4 +1,3 @@
-import path from 'path';
import glob from 'glob';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
@@ -58,15 +57,8 @@ export default {
environment: build,
buildinfo: getBuildInfo(),
}),
- resolve({
- customResolveOptions: {
- // ignore node_modules from vendored packages
- moduleDirectory: path.join(process.cwd(), 'node_modules')
- }
- }),
- commonjs({
- include: 'node_modules/**'
- }),
+ resolve(),
+ commonjs(),
json(),
copy({
targets: [
diff --git a/packages/app-shell/vendor/auth b/packages/app-shell/vendor/auth
deleted file mode 160000
index 39d0e356..00000000
--- a/packages/app-shell/vendor/auth
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5
diff --git a/packages/app-shell/vendor/common b/packages/app-shell/vendor/common
deleted file mode 160000
index 63b49c3a..00000000
--- a/packages/app-shell/vendor/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
diff --git a/packages/app-shell/vendor/language-select b/packages/app-shell/vendor/language-select
deleted file mode 160000
index 10ee5193..00000000
--- a/packages/app-shell/vendor/language-select
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 10ee5193fbdb68adb61f7ed355c994125ece1469
diff --git a/packages/app-shell/vendor/notification b/packages/app-shell/vendor/notification
deleted file mode 160000
index 8ea107fa..00000000
--- a/packages/app-shell/vendor/notification
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ea107fa88d3db299b9f035f4125d31164d696b7
diff --git a/packages/app-shell/vendor/person-profile b/packages/app-shell/vendor/person-profile
deleted file mode 160000
index 5da8a23d..00000000
--- a/packages/app-shell/vendor/person-profile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5da8a23dfc0f4707b7a6098cbcd3a33851946259
--
GitLab