From bed82677ed8fc723dc9148027409d59ba7dd3b2e Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio.bekerle@tugraz.at>
Date: Thu, 1 Aug 2019 11:52:32 +0200
Subject: [PATCH] Remove "npm run setup" process
---
packages/knowledge-base-web-page-element-view/.gitignore | 3 ++-
packages/knowledge-base-web-page-element-view/README.md | 6 +-----
.../knowledge-base-web-page-element-view/package.json | 9 ++++-----
.../knowledge-base-web-page-element-view/vendor/auth | 2 +-
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/packages/knowledge-base-web-page-element-view/.gitignore b/packages/knowledge-base-web-page-element-view/.gitignore
index f61d5b29..e62f92aa 100644
--- a/packages/knowledge-base-web-page-element-view/.gitignore
+++ b/packages/knowledge-base-web-page-element-view/.gitignore
@@ -1,4 +1,5 @@
dist
node_modules
.idea
-npm-debug.log
\ No newline at end of file
+npm-debug.log
+package-lock.json
diff --git a/packages/knowledge-base-web-page-element-view/README.md b/packages/knowledge-base-web-page-element-view/README.md
index 0fe95317..7b81027f 100644
--- a/packages/knowledge-base-web-page-element-view/README.md
+++ b/packages/knowledge-base-web-page-element-view/README.md
@@ -21,11 +21,7 @@ git clone git@gitlab.tugraz.at:VPU/WebComponents/KnowledgeBaseWebPageElementView
cd KnowledgeBaseWebPageElementView
git submodule update --init
-# we are creating the symbolic links to our git sub-modules
-# (there was no proper script to do this automatically before a "node install"
-npm run setup
-
-# install dependencies
+# install dependencies (make sure you have npm version 4+ installed, so symlinks to the git submodules are created automatically)
npm install
# constantly build dist/bundle.js and run a local web-server on port 8002
diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json
index 4e7a2727..adb3c1d5 100644
--- a/packages/knowledge-base-web-page-element-view/package.json
+++ b/packages/knowledge-base-web-page-element-view/package.json
@@ -12,18 +12,17 @@
"rollup-plugin-terser": "^4.0.4",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-replace": "^2.2.0",
- "i18next-scanner": "^2.10.2"
+ "i18next-scanner": "^2.10.2",
+ "vpu-auth": "file:./vendor/auth",
+ "vpu-common": "file:./vendor/common"
},
"dependencies": {
"@webcomponents/webcomponentsjs": "^2.2.10",
"i18next": "^17.0.3",
"lit-element": "^2.1.0",
- "lit-html": "^1.1.1",
- "vpu-auth": "*",
- "vpu-common": "*"
+ "lit-html": "^1.1.1"
},
"scripts": {
- "setup": "mkdir -p node_modules && cd node_modules && ln -sfn ../vendor/auth vpu-auth && ln -sfn ../vendor/common vpu-common",
"clean": "rm dist/*",
"build": "npm run build-local",
"build-local": "rollup -c",
diff --git a/packages/knowledge-base-web-page-element-view/vendor/auth b/packages/knowledge-base-web-page-element-view/vendor/auth
index c76f617c..272ff0f9 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/auth
+++ b/packages/knowledge-base-web-page-element-view/vendor/auth
@@ -1 +1 @@
-Subproject commit c76f617c689da8b379445e2980e230f3ad3a19c9
+Subproject commit 272ff0f99aee54bc9a27521d572fb1dd2b9a8b63
--
GitLab