From 068479b22a8a3e3c29a10790febc8e77c01e349b Mon Sep 17 00:00:00 2001 From: Dmitry Krupenya Date: Wed, 20 May 2020 18:26:41 +0300 Subject: [PATCH] chore: remove common libraries from peerDependencies --- webapp/.eslintrc.js | 4 +- webapp/packages/_plugin-template/package.json | 12 ++---- webapp/packages/administration/package.json | 12 ++---- webapp/packages/ag-grid-plugin/package.json | 12 ++---- webapp/packages/authentication/package.json | 12 ++---- .../basic-connection-plugin/package.json | 12 ++---- .../packages/builder/configs/rollup.config.js | 39 +++++++++++++------ webapp/packages/core/package.json | 26 ++++--------- .../custom-connection-plugin/package.json | 12 ++---- .../packages/data-export-plugin/package.json | 14 ++----- .../packages/data-viewer-plugin/package.json | 10 +---- .../packages/ddl-viewer-plugin/package.json | 10 +---- .../object-viewer-plugin/package.json | 10 +---- webapp/packages/sql-editor/package.json | 10 +---- 14 files changed, 68 insertions(+), 127 deletions(-) diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js index 6ea94b8645..dc2abd4303 100644 --- a/webapp/.eslintrc.js +++ b/webapp/.eslintrc.js @@ -106,7 +106,9 @@ module.exports = { 'import/export': 'off', 'import/extensions': 'off', 'import/no-unresolved': 'off', - 'import/no-extraneous-dependencies': 'warn', + // import/no-extraneous-dependencies off because peer dependencies are moved to builder + // todo probably there is a way to tune this (see packageDir option in documentation) + 'import/no-extraneous-dependencies': 'off', 'import/prefer-default-export': 'off', 'import/no-cycle': 'off', 'import-helpers/order-imports': [ diff --git a/webapp/packages/_plugin-template/package.json b/webapp/packages/_plugin-template/package.json index 9be06fb3cd..6959e39aa3 100644 --- a/webapp/packages/_plugin-template/package.json +++ b/webapp/packages/_plugin-template/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/administration/package.json b/webapp/packages/administration/package.json index ed5bf95113..3ed34d6fc2 100644 --- a/webapp/packages/administration/package.json +++ b/webapp/packages/administration/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/ag-grid-plugin/package.json b/webapp/packages/ag-grid-plugin/package.json index 419a2b1d94..d986af2961 100644 --- a/webapp/packages/ag-grid-plugin/package.json +++ b/webapp/packages/ag-grid-plugin/package.json @@ -18,16 +18,10 @@ "ag-grid-react": "^23.0.3" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/authentication/package.json b/webapp/packages/authentication/package.json index 702239de26..79086ac2f4 100644 --- a/webapp/packages/authentication/package.json +++ b/webapp/packages/authentication/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.76", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/basic-connection-plugin/package.json b/webapp/packages/basic-connection-plugin/package.json index 0d3b334c20..6e46802c31 100644 --- a/webapp/packages/basic-connection-plugin/package.json +++ b/webapp/packages/basic-connection-plugin/package.json @@ -13,16 +13,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/builder/configs/rollup.config.js b/webapp/packages/builder/configs/rollup.config.js index 0c05d134ae..77f7ad7cd3 100644 --- a/webapp/packages/builder/configs/rollup.config.js +++ b/webapp/packages/builder/configs/rollup.config.js @@ -11,9 +11,7 @@ const reshadowLoader = require('./reshadow-loader'); const includePathOptions = { include: {}, paths: ['src'], - external: [ - - ], + external: [], extensions: ['.ts', '.tsx', '.js'] }; @@ -24,15 +22,31 @@ const defaultBuilderOptions = { function configBuilder(options = defaultBuilderOptions) { - return { + return { input: 'src/index.ts', output: { - dir: 'dist', - format: 'esm', - sourcemap: true, - }, + dir: 'dist', + format: 'esm', + sourcemap: true, + }, external: [ - // externals beyond peer dependencies + // externals beyond peer dependencies - common dependencies of the whole application + 'mobx', + // todo check that @dbeaver/core/blocks provide wrapper for go-split + // todo add go-split to @dbeaver/core dependencies and remove it from here + 'go-split', + 'mobx-react', + 'react', + 'react-dom', + // todo add reakit to @dbeaver/core dependencies and remove it from here + // todo be sure that @dbeaver/core provides all necessary wrappers around reakit + 'reakit', + // todo magic. It nested dependency of reakit and should not be mentioned here + // todo but by unknown reasons without this build fails + // todo should be removed when reakit will be incorporated into @dbeaver/core + 'body-scroll-lock', + 'reshadow', + 'rxjs', ], onwarn(warning, warn) { // hides some warning drom ag-grid-plugin todo to investigate later @@ -46,6 +60,9 @@ function configBuilder(options = defaultBuilderOptions) { }), commonjs({ sourceMap: false, + exclude: [ + 'node_modules/@reshadow/**' + ], }), typescriptPlugin({ tsconfig: 'tsconfig.json', @@ -76,9 +93,9 @@ function configBuilder(options = defaultBuilderOptions) { } ], ], - loaders: [ reshadowLoader ], + loaders: [reshadowLoader], plugins: [ - require('postcss-preset-env')({ stage: 0 }), + require('postcss-preset-env')({stage: 0}), require('postcss-discard-comments'), ] }), diff --git a/webapp/packages/core/package.json b/webapp/packages/core/package.json index 4deb03d8a8..e8754254bf 100644 --- a/webapp/packages/core/package.json +++ b/webapp/packages/core/package.json @@ -17,33 +17,21 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { + "go-split": "^1.3.2", "graphql-request": "^1.8.2", "inversify": "^5.0.1", - "react-sanitized-html": "^2.0.0", - "reflect-metadata": "^0.1.13", - "sanitize-html": "^1.23.0", - "uuid": "^7.0.3" - }, - "devDependencies": { "@material/button": "^4.0.0", "@material/elevation": "^4.0.0", "@material/radio": "^4.0.0", "@material/ripple": "^4.0.0", "@material/theme": "^4.0.0", "@material/typography": "^4.0.0", - "@types/uuid": "^7.0.2", - "graphql-request": "^1.8.2" + "react-sanitized-html": "^2.0.0", + "sanitize-html": "^1.23.0", + "uuid": "^7.0.3" }, - "peerDependencies": { - "go-split": "^1.3.2", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "devDependencies": { + "@types/uuid": "^7.0.2" }, - "buildVersion": "0.13.0", - "dbeaverPlugins": [] + "buildVersion": "0.13.0" } diff --git a/webapp/packages/custom-connection-plugin/package.json b/webapp/packages/custom-connection-plugin/package.json index 26feb5bc6c..ae5cc7f814 100644 --- a/webapp/packages/custom-connection-plugin/package.json +++ b/webapp/packages/custom-connection-plugin/package.json @@ -13,16 +13,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/data-export-plugin/package.json b/webapp/packages/data-export-plugin/package.json index 156b75e8b4..241987ab89 100644 --- a/webapp/packages/data-export-plugin/package.json +++ b/webapp/packages/data-export-plugin/package.json @@ -12,18 +12,12 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/data-viewer-plugin": "^0.1.0", - "@dbeaver/core": "^0.1.0" + "@dbeaver/builder": "^0.1.0", + "@dbeaver/core": "^0.1.0", + "@dbeaver/data-viewer-plugin": "^0.1.0" }, "peerDependencies": { - "@dbeaver/data-viewer-plugin": "^0.1.0", "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/data-viewer-plugin": "^0.1.0" } } diff --git a/webapp/packages/data-viewer-plugin/package.json b/webapp/packages/data-viewer-plugin/package.json index 71d033192f..d5a3f37fd3 100644 --- a/webapp/packages/data-viewer-plugin/package.json +++ b/webapp/packages/data-viewer-plugin/package.json @@ -12,6 +12,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/ag-grid-plugin": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", "@dbeaver/core": "^0.1.0" @@ -19,13 +20,6 @@ "peerDependencies": { "@dbeaver/ag-grid-plugin": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/ddl-viewer-plugin/package.json b/webapp/packages/ddl-viewer-plugin/package.json index 2cfac8e2d2..51f64fd378 100644 --- a/webapp/packages/ddl-viewer-plugin/package.json +++ b/webapp/packages/ddl-viewer-plugin/package.json @@ -12,6 +12,7 @@ "tsc": "tsc" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", "@dbeaver/sql-editor": "^0.1.0" @@ -19,13 +20,6 @@ "peerDependencies": { "@dbeaver/core": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", - "@dbeaver/sql-editor": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/sql-editor": "^0.1.0" } } diff --git a/webapp/packages/object-viewer-plugin/package.json b/webapp/packages/object-viewer-plugin/package.json index 22661caf01..04c40da6b9 100644 --- a/webapp/packages/object-viewer-plugin/package.json +++ b/webapp/packages/object-viewer-plugin/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/sql-editor/package.json b/webapp/packages/sql-editor/package.json index b121c87637..e0e849c6e9 100644 --- a/webapp/packages/sql-editor/package.json +++ b/webapp/packages/sql-editor/package.json @@ -16,19 +16,13 @@ "react-codemirror2": "^7.1.0" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0", "@dbeaver/data-viewer-plugin": "^0.1.0", "@types/codemirror": "^0.0.91" }, "peerDependencies": { "@dbeaver/core": "^0.1.0", - "@dbeaver/data-viewer-plugin": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/data-viewer-plugin": "^0.1.0" } }