Merge branch 'one-workspaces-package' into 'master'

Make the toolkit-showcase package part of the main workspace package

See merge request !46

.gitlab-ci.yml

@@ -28,9 +28,6 @@ linting:
   script:
     - yarn install
     - yarn run lint
-    - cd toolkit-showcase
-    - yarn install
-    - yarn run lint
 
 publish:
   stage: deploy

package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "private": true,
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "toolkit-showcase"
   ],
   "scripts": {
     "test": "lerna run test",

toolkit-showcase/package.json

@@ -4,10 +4,6 @@
   "main": "src/toolkit-showcase.js",
   "license": "LGPL-2.1-or-later",
   "private": true,
-  "workspaces": [
-    "../packages/*",
-    "."
-  ],
   "devDependencies": {
     "@babel/core": "^7.10.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -74,8 +70,6 @@
     "watch-local": "yarn run watch",
     "watch-full": "rollup -c --watch --environment FORCE_FULL",
     "watch-bs": "rollup -c --watch --environment APP_ENV:bs",
-    "test": "rollup -c --environment APP_ENV:test && karma start --singleRun",
-    "test-full": "rollup -c --environment FORCE_FULL,APP_ENV:test && karma start --singleRun",
     "lint": "eslint ."
   }
 }

toolkit-showcase/rollup.config.js

@@ -110,7 +110,6 @@ export default (async () => {
           }
         }),
         resolve({
-          moduleDirectories: [path.join(process.cwd(), 'node_modules')],
           browser: true,
           preferBuiltins: true
         }),
@@ -131,9 +130,7 @@ Dependencies:
             },
           },
         }),
-        commonjs({
-            include: 'node_modules/**',
-        }),
+        commonjs(),
         json(),
         md({
             include: ["../../**/*.md"],
@@ -146,9 +143,8 @@ Dependencies:
         urlPlugin({
           limit: 0,
           include: [
-            "node_modules/suggestions/**/*.css",
-            "node_modules/select2/**/*.css",
-            "node_modules/highlight.js/**/*.css",
+            await getPackagePath('select2', '**/*.css'),
+            await getPackagePath('highlight.js', '**/*.css'),
           ],
           emitFiles: true,
           fileName: 'shared/[name].[hash][extname]'