Skip to content
Snippets Groups Projects
Commit 353d81c0 authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Make the toolkit-showcase package part of the main workspace

It's confusing that there are two lock files in this repo and two
overlapping workspaces. Ideally everything should be in sync.
parent 4764f26b
No related branches found
No related tags found
No related merge requests found
Pipeline #25355 passed
...@@ -28,9 +28,6 @@ linting: ...@@ -28,9 +28,6 @@ linting:
script: script:
- yarn install - yarn install
- yarn run lint - yarn run lint
- cd toolkit-showcase
- yarn install
- yarn run lint
publish: publish:
stage: deploy stage: deploy
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
"main": "index.js", "main": "index.js",
"private": true, "private": true,
"workspaces": [ "workspaces": [
"packages/*" "packages/*",
"toolkit-showcase"
], ],
"scripts": { "scripts": {
"test": "lerna run test", "test": "lerna run test",
......
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
"main": "src/toolkit-showcase.js", "main": "src/toolkit-showcase.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"workspaces": [
"../packages/*",
"."
],
"devDependencies": { "devDependencies": {
"@babel/core": "^7.10.3", "@babel/core": "^7.10.3",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
...@@ -74,8 +70,6 @@ ...@@ -74,8 +70,6 @@
"watch-local": "yarn run watch", "watch-local": "yarn run watch",
"watch-full": "rollup -c --watch --environment FORCE_FULL", "watch-full": "rollup -c --watch --environment FORCE_FULL",
"watch-bs": "rollup -c --watch --environment APP_ENV:bs", "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 ." "lint": "eslint ."
} }
} }
...@@ -110,7 +110,6 @@ export default (async () => { ...@@ -110,7 +110,6 @@ export default (async () => {
} }
}), }),
resolve({ resolve({
moduleDirectories: [path.join(process.cwd(), 'node_modules')],
browser: true, browser: true,
preferBuiltins: true preferBuiltins: true
}), }),
...@@ -131,9 +130,7 @@ Dependencies: ...@@ -131,9 +130,7 @@ Dependencies:
}, },
}, },
}), }),
commonjs({ commonjs(),
include: 'node_modules/**',
}),
json(), json(),
md({ md({
include: ["../../**/*.md"], include: ["../../**/*.md"],
...@@ -146,9 +143,8 @@ Dependencies: ...@@ -146,9 +143,8 @@ Dependencies:
urlPlugin({ urlPlugin({
limit: 0, limit: 0,
include: [ include: [
"node_modules/suggestions/**/*.css", await getPackagePath('select2', '**/*.css'),
"node_modules/select2/**/*.css", await getPackagePath('highlight.js', '**/*.css'),
"node_modules/highlight.js/**/*.css",
], ],
emitFiles: true, emitFiles: true,
fileName: 'shared/[name].[hash][extname]' fileName: 'shared/[name].[hash][extname]'
......
This diff is collapsed.
Source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment