From 27c62d9f5acc9db86235b3223060434f85b37cb5 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 1 Aug 2019 11:43:37 +0200
Subject: [PATCH] Include vendored packages in package.json directly
---
packages/person-select/.gitlab-ci.yml | 1 -
packages/person-select/README.md | 6 +-----
packages/person-select/package.json | 8 ++++----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/packages/person-select/.gitlab-ci.yml b/packages/person-select/.gitlab-ci.yml
index 39843120..e7b6c123 100644
--- a/packages/person-select/.gitlab-ci.yml
+++ b/packages/person-select/.gitlab-ci.yml
@@ -15,6 +15,5 @@ test:
script:
- apt update
- apt install -y npm
- - npm run setup
- npm install
- npm run build
diff --git a/packages/person-select/README.md b/packages/person-select/README.md
index 57c9b209..59d83e9c 100644
--- a/packages/person-select/README.md
+++ b/packages/person-select/README.md
@@ -10,11 +10,7 @@ git clone git@gitlab.tugraz.at:VPU/WebComponents/PersonSelect.git
cd PersonSelect
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/person-select/package.json b/packages/person-select/package.json
index 09af4581..8dea463f 100644
--- a/packages/person-select/package.json
+++ b/packages/person-select/package.json
@@ -13,16 +13,16 @@
"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",
"jquery": "^3.4.1",
"lit-element": "^2.1.0",
- "select2": "^4.0.7",
- "vpu-auth": "*",
- "vpu-common": "*"
+ "select2": "^4.0.7"
},
"scripts": {
"setup": "mkdir -p node_modules && cd node_modules && ln -sfn ../vendor/common vpu-common && ln -sfn ../vendor/auth vpu-auth",
--
GitLab