From 2758e0bff2169f6274ef6a92526b91040bc57408 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 7 Jul 2020 12:51:15 +0200
Subject: [PATCH] Fix all packages re hoisted dependencies

---
 package.json                             |  3 ++-
 packages/auth/rollup.config.js           |  1 -
 packages/common/rollup.config.js         | 16 ++--------------
 packages/notification/rollup.config.js   | 12 ++----------
 packages/person-profile/rollup.config.js | 14 +++-----------
 packages/person-select/rollup.config.js  |  2 +-
 6 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index fc9163cc..22b0faf1 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "bootstrap": "lerna bootstrap --hoist --strict",
-    "clean": "lerna clean -y"
+    "clean": "lerna clean -y",
+    "test": "lerna run test"
   },
   "author": "",
   "license": "ISC",
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index 59acb61b..cb3a46fc 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/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';
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 9909b320..ae08e748 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/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';
@@ -7,7 +6,6 @@ import serve from 'rollup-plugin-serve';
 import consts from 'rollup-plugin-consts';
 import del from 'rollup-plugin-delete';
 import json from '@rollup/plugin-json';
-import chai from 'chai';
 
 const pkg = require('./package.json');
 const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
@@ -36,18 +34,8 @@ export default {
         consts({
             environment: build,
         }),
-        resolve({
-          customResolveOptions: {
-            // ignore node_modules from vendored packages
-            moduleDirectory: path.join(process.cwd(), 'node_modules')
-          }
-        }),
-        commonjs({
-            include: 'node_modules/**',
-            namedExports: {
-                'chai': Object.keys(chai),
-            }
-        }),
+        resolve(),
+        commonjs(),
         json(),
         copy({
             targets: [
diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js
index dc74522c..e0b5ff3d 100644
--- a/packages/notification/rollup.config.js
+++ b/packages/notification/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';
@@ -29,15 +28,8 @@ export default {
         consts({
             environment: build,
         }),
-        resolve({
-          customResolveOptions: {
-            // ignore node_modules from vendored packages
-            moduleDirectory: path.join(process.cwd(), 'node_modules')
-          }
-        }),
-        commonjs({
-            include: 'node_modules/**'
-        }),
+        resolve(),
+        commonjs(),
         json(),
         url({
             limit: 0,
diff --git a/packages/person-profile/rollup.config.js b/packages/person-profile/rollup.config.js
index 39291b99..c8af63d0 100644
--- a/packages/person-profile/rollup.config.js
+++ b/packages/person-profile/rollup.config.js
@@ -1,6 +1,5 @@
 
 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';
@@ -37,19 +36,12 @@ export default {
         consts({
             environment: build,
         }),
-        resolve({
-          customResolveOptions: {
-            // ignore node_modules from vendored packages
-            moduleDirectory: path.join(process.cwd(), 'node_modules')
-          }
-        }),
-        commonjs({
-            include: 'node_modules/**'
-        }),
+        resolve(),
+        commonjs(),
         url({
             limit: 0,
             include: [
-                "node_modules/select2/**/*.css",
+                "../../**/node_modules/select2/**/*.css",
             ],
             emitFiles: true,
             fileName: 'shared/[name].[hash][extname]'
diff --git a/packages/person-select/rollup.config.js b/packages/person-select/rollup.config.js
index d74079e8..8580dcbc 100644
--- a/packages/person-select/rollup.config.js
+++ b/packages/person-select/rollup.config.js
@@ -40,7 +40,7 @@ export default {
         url({
             limit: 0,
             include: [
-                "node_modules/select2/**/*.css",
+                "../../**/node_modules/select2/**/*.css",
             ],
             emitFiles: true,
             fileName: 'shared/[name].[hash][extname]'
-- 
GitLab