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

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

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
1 merge request!46Make the toolkit-showcase package part of the main workspace package
Pipeline #25357 passed
This commit is part of merge request !46. Comments created here will be created in the context of that merge request.
......@@ -28,9 +28,6 @@ linting:
script:
- yarn install
- yarn run lint
- cd toolkit-showcase
- yarn install
- yarn run lint
publish:
stage: deploy
......
......@@ -5,7 +5,8 @@
"main": "index.js",
"private": true,
"workspaces": [
"packages/*"
"packages/*",
"toolkit-showcase"
],
"scripts": {
"test": "lerna run test",
......
......@@ -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 ."
}
}
......@@ -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]'
......
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