From 8a3e760a1156756513f393529f4d91ec6ac1ebf5 Mon Sep 17 00:00:00 2001 From: Wroud Date: Sun, 24 May 2020 21:27:20 +0300 Subject: [PATCH] fix: source mapping --- webapp/packages/_plugin-template/tsconfig.json | 4 ++-- webapp/packages/administration/package.json | 3 +-- webapp/packages/administration/tsconfig.json | 4 ++-- webapp/packages/ag-grid-plugin/package.json | 3 +-- webapp/packages/ag-grid-plugin/tsconfig.json | 4 ++-- webapp/packages/authentication/package.json | 3 +-- webapp/packages/authentication/tsconfig.json | 4 ++-- webapp/packages/basic-connection-plugin/package.json | 3 +-- webapp/packages/basic-connection-plugin/tsconfig.json | 4 ++-- webapp/packages/builder/configs/webpack-build-config.js | 2 +- webapp/packages/core/app/package.json | 5 ++--- webapp/packages/core/blocks/package.json | 5 ++--- webapp/packages/core/di/package.json | 5 ++--- webapp/packages/core/dialogs/package.json | 5 ++--- webapp/packages/core/eventsLog/package.json | 5 ++--- webapp/packages/core/extensions/package.json | 5 ++--- webapp/packages/core/localization/package.json | 5 ++--- webapp/packages/core/package.json | 5 ++--- webapp/packages/core/plugin/package.json | 5 ++--- webapp/packages/core/product/package.json | 5 ++--- webapp/packages/core/root/package.json | 5 ++--- webapp/packages/core/sdk/package.json | 5 ++--- webapp/packages/core/settings/package.json | 5 ++--- webapp/packages/core/theming/package.json | 5 ++--- webapp/packages/core/tsconfig.json | 4 ++-- webapp/packages/core/utils/package.json | 5 ++--- webapp/packages/custom-connection-plugin/package.json | 5 ++--- webapp/packages/custom-connection-plugin/tsconfig.json | 4 ++-- webapp/packages/data-export-plugin/package.json | 3 +-- webapp/packages/data-export-plugin/tsconfig.json | 4 ++-- webapp/packages/data-viewer-plugin/package.json | 3 +-- webapp/packages/data-viewer-plugin/tsconfig.json | 4 ++-- webapp/packages/ddl-viewer-plugin/tsconfig.json | 4 ++-- webapp/packages/object-viewer-plugin/package.json | 3 +-- webapp/packages/object-viewer-plugin/tsconfig.json | 4 ++-- webapp/packages/sql-editor/package.json | 3 +-- webapp/packages/sql-editor/tsconfig.json | 4 ++-- webapp/tsconfig.json | 1 + 38 files changed, 66 insertions(+), 89 deletions(-) diff --git a/webapp/packages/_plugin-template/tsconfig.json b/webapp/packages/_plugin-template/tsconfig.json index e1afdcc3c5..26d254ccf5 100644 --- a/webapp/packages/_plugin-template/tsconfig.json +++ b/webapp/packages/_plugin-template/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src" diff --git a/webapp/packages/administration/package.json b/webapp/packages/administration/package.json index 873dcf8619..b76e961d9c 100644 --- a/webapp/packages/administration/package.json +++ b/webapp/packages/administration/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/administration/tsconfig.json b/webapp/packages/administration/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/administration/tsconfig.json +++ b/webapp/packages/administration/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/ag-grid-plugin/package.json b/webapp/packages/ag-grid-plugin/package.json index 4347649478..597fafc248 100644 --- a/webapp/packages/ag-grid-plugin/package.json +++ b/webapp/packages/ag-grid-plugin/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/ag-grid-plugin/tsconfig.json b/webapp/packages/ag-grid-plugin/tsconfig.json index e1afdcc3c5..26d254ccf5 100644 --- a/webapp/packages/ag-grid-plugin/tsconfig.json +++ b/webapp/packages/ag-grid-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src" diff --git a/webapp/packages/authentication/package.json b/webapp/packages/authentication/package.json index bbb32ddcb6..59d0cf7148 100644 --- a/webapp/packages/authentication/package.json +++ b/webapp/packages/authentication/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/authentication/tsconfig.json b/webapp/packages/authentication/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/authentication/tsconfig.json +++ b/webapp/packages/authentication/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/basic-connection-plugin/package.json b/webapp/packages/basic-connection-plugin/package.json index e4402acc62..8e62f74284 100644 --- a/webapp/packages/basic-connection-plugin/package.json +++ b/webapp/packages/basic-connection-plugin/package.json @@ -4,8 +4,7 @@ "description": "", "license": "Apache-2.0", "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/types", + "module": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/basic-connection-plugin/tsconfig.json b/webapp/packages/basic-connection-plugin/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/basic-connection-plugin/tsconfig.json +++ b/webapp/packages/basic-connection-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/builder/configs/webpack-build-config.js b/webapp/packages/builder/configs/webpack-build-config.js index 02327a3187..e49d3c4a56 100644 --- a/webapp/packages/builder/configs/webpack-build-config.js +++ b/webapp/packages/builder/configs/webpack-build-config.js @@ -8,7 +8,7 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), { mode: argv.mode, entry: './index.js', output: { - filename: 'js/bundle.[hash].js', + filename: 'bundle.[hash].js', path: path.resolve(argv.currentDir, './dist'), publicPath: '', }, diff --git a/webapp/packages/core/app/package.json b/webapp/packages/core/app/package.json index f3a04286c0..9b05f71c06 100644 --- a/webapp/packages/core/app/package.json +++ b/webapp/packages/core/app/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/app", "private": true, "sideEffects": false, - "main": "../dist/app", - "module": "../dist/app", - "types": "../dist/types/app" + "main": "../dist/app/index.js", + "module": "../dist/app/index.js" } diff --git a/webapp/packages/core/blocks/package.json b/webapp/packages/core/blocks/package.json index e7db6716f4..712075b0f6 100644 --- a/webapp/packages/core/blocks/package.json +++ b/webapp/packages/core/blocks/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/blocks", "private": true, "sideEffects": false, - "main": "../dist/blocks", - "module": "../dist/blocks", - "types": "../dist/types/blocks" + "main": "../dist/blocks/index.js", + "module": "../dist/blocks/index.js" } diff --git a/webapp/packages/core/di/package.json b/webapp/packages/core/di/package.json index 2a18d283c7..329cbe7ad9 100644 --- a/webapp/packages/core/di/package.json +++ b/webapp/packages/core/di/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/di", "private": true, "sideEffects": false, - "main": "../dist/di", - "module": "../dist/di", - "types": "../dist/types/di" + "main": "../dist/di/index.js", + "module": "../dist/di/index.js" } diff --git a/webapp/packages/core/dialogs/package.json b/webapp/packages/core/dialogs/package.json index 0bf658bdde..f419333f64 100644 --- a/webapp/packages/core/dialogs/package.json +++ b/webapp/packages/core/dialogs/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/dialogs", "private": true, "sideEffects": false, - "main": "../dist/dialogs", - "module": "../dist/dialogs", - "types": "../dist/types/dialogs" + "main": "../dist/dialogs/index.js", + "module": "../dist/dialogs/index.js" } diff --git a/webapp/packages/core/eventsLog/package.json b/webapp/packages/core/eventsLog/package.json index 88834ce30c..87d8921447 100644 --- a/webapp/packages/core/eventsLog/package.json +++ b/webapp/packages/core/eventsLog/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/eventsLog", "private": true, "sideEffects": false, - "main": "../dist/eventsLog", - "module": "../dist/eventsLog", - "types": "../dist/types/eventsLog" + "main": "../dist/eventsLog/index.js", + "module": "../dist/eventsLog/index.js" } diff --git a/webapp/packages/core/extensions/package.json b/webapp/packages/core/extensions/package.json index 3b62caed89..127065b303 100644 --- a/webapp/packages/core/extensions/package.json +++ b/webapp/packages/core/extensions/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/extensions", "private": true, "sideEffects": false, - "main": "../dist/extensions", - "module": "../dist/extensions", - "types": "../dist/types/extensions" + "main": "../dist/extensions/index.js", + "module": "../dist/extensions/index.js" } diff --git a/webapp/packages/core/localization/package.json b/webapp/packages/core/localization/package.json index e728c544cf..ad7136d3a7 100644 --- a/webapp/packages/core/localization/package.json +++ b/webapp/packages/core/localization/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/localization", "private": true, "sideEffects": false, - "main": "../dist/localization", - "module": "../dist/localization", - "types": "../dist/types/localization" + "main": "../dist/localization/index.js", + "module": "../dist/localization/index.js" } diff --git a/webapp/packages/core/package.json b/webapp/packages/core/package.json index a6de7fbccd..e83a25f723 100644 --- a/webapp/packages/core/package.json +++ b/webapp/packages/core/package.json @@ -3,9 +3,8 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", + "module": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/core/plugin/package.json b/webapp/packages/core/plugin/package.json index 238a43f949..5f98f0b0d3 100644 --- a/webapp/packages/core/plugin/package.json +++ b/webapp/packages/core/plugin/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/plugin", "private": true, "sideEffects": false, - "main": "../dist/plugin", - "module": "../dist/plugin", - "types": "../dist/types/plugin" + "main": "../dist/plugin/index.js", + "module": "../dist/plugin/index.js" } diff --git a/webapp/packages/core/product/package.json b/webapp/packages/core/product/package.json index 333f59dd0a..e295ad03f4 100644 --- a/webapp/packages/core/product/package.json +++ b/webapp/packages/core/product/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/product", "private": true, "sideEffects": false, - "main": "../dist/product", - "module": "../dist/product", - "types": "../dist/types/product" + "main": "../dist/product/index.js", + "module": "../dist/product/index.js" } diff --git a/webapp/packages/core/root/package.json b/webapp/packages/core/root/package.json index 293bca0321..2fcbe6c392 100644 --- a/webapp/packages/core/root/package.json +++ b/webapp/packages/core/root/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/root", "private": true, "sideEffects": false, - "main": "../dist/root", - "module": "../dist/root", - "types": "../dist/types/root" + "main": "../dist/root/index.js", + "module": "../dist/root/index.js" } diff --git a/webapp/packages/core/sdk/package.json b/webapp/packages/core/sdk/package.json index 3d923a23c6..311d9bde41 100644 --- a/webapp/packages/core/sdk/package.json +++ b/webapp/packages/core/sdk/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/sdk", "private": true, "sideEffects": false, - "main": "../dist/sdk", - "module": "../dist/sdk", - "types": "../dist/types/sdk" + "main": "../dist/sdk/index.js", + "module": "../dist/sdk/index.js" } diff --git a/webapp/packages/core/settings/package.json b/webapp/packages/core/settings/package.json index 1fa3906d6a..fd8201afef 100644 --- a/webapp/packages/core/settings/package.json +++ b/webapp/packages/core/settings/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/settings", "private": true, "sideEffects": false, - "main": "../dist/settings", - "module": "../dist/settings", - "types": "../dist/types/settings" + "main": "../dist/settings/index.js", + "module": "../dist/settings/index.js" } diff --git a/webapp/packages/core/theming/package.json b/webapp/packages/core/theming/package.json index 1fab528238..b2f6aec659 100644 --- a/webapp/packages/core/theming/package.json +++ b/webapp/packages/core/theming/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/theming", "private": true, "sideEffects": false, - "main": "../dist/theming", - "module": "../dist/theming", - "types": "../dist/types/theming" + "main": "../dist/theming/index.js", + "module": "../dist/theming/index.js" } diff --git a/webapp/packages/core/tsconfig.json b/webapp/packages/core/tsconfig.json index 638b1b0be3..d2a85dac2a 100644 --- a/webapp/packages/core/tsconfig.json +++ b/webapp/packages/core/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "exclude": [ "node_modules", diff --git a/webapp/packages/core/utils/package.json b/webapp/packages/core/utils/package.json index 9b19ca67e0..0e1fcf922a 100644 --- a/webapp/packages/core/utils/package.json +++ b/webapp/packages/core/utils/package.json @@ -2,7 +2,6 @@ "name": "@dbeaver/core/utils", "private": true, "sideEffects": false, - "main": "../dist/utils", - "module": ".../dist/utils", - "types": "../dist/types/utils" + "main": "../dist/utils/index.js", + "module": ".../dist/utils/index.js" } diff --git a/webapp/packages/custom-connection-plugin/package.json b/webapp/packages/custom-connection-plugin/package.json index 1f8cc830b5..0114356bc2 100644 --- a/webapp/packages/custom-connection-plugin/package.json +++ b/webapp/packages/custom-connection-plugin/package.json @@ -3,9 +3,8 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "module": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", + "module": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/custom-connection-plugin/tsconfig.json b/webapp/packages/custom-connection-plugin/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/custom-connection-plugin/tsconfig.json +++ b/webapp/packages/custom-connection-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/data-export-plugin/package.json b/webapp/packages/data-export-plugin/package.json index bff4cce20f..88098f7716 100644 --- a/webapp/packages/data-export-plugin/package.json +++ b/webapp/packages/data-export-plugin/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/data-export-plugin/tsconfig.json b/webapp/packages/data-export-plugin/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/data-export-plugin/tsconfig.json +++ b/webapp/packages/data-export-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/data-viewer-plugin/package.json b/webapp/packages/data-viewer-plugin/package.json index de1a1d0c41..24de724868 100644 --- a/webapp/packages/data-viewer-plugin/package.json +++ b/webapp/packages/data-viewer-plugin/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/data-viewer-plugin/tsconfig.json b/webapp/packages/data-viewer-plugin/tsconfig.json index 206277ba09..3ab6d3aadc 100644 --- a/webapp/packages/data-viewer-plugin/tsconfig.json +++ b/webapp/packages/data-viewer-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src/**/*" diff --git a/webapp/packages/ddl-viewer-plugin/tsconfig.json b/webapp/packages/ddl-viewer-plugin/tsconfig.json index e1afdcc3c5..26d254ccf5 100644 --- a/webapp/packages/ddl-viewer-plugin/tsconfig.json +++ b/webapp/packages/ddl-viewer-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src" diff --git a/webapp/packages/object-viewer-plugin/package.json b/webapp/packages/object-viewer-plugin/package.json index 037c3c0f3d..5b613ac87e 100644 --- a/webapp/packages/object-viewer-plugin/package.json +++ b/webapp/packages/object-viewer-plugin/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/object-viewer-plugin/tsconfig.json b/webapp/packages/object-viewer-plugin/tsconfig.json index e1afdcc3c5..26d254ccf5 100644 --- a/webapp/packages/object-viewer-plugin/tsconfig.json +++ b/webapp/packages/object-viewer-plugin/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src" diff --git a/webapp/packages/sql-editor/package.json b/webapp/packages/sql-editor/package.json index a5d6d18d7d..aa457f63b7 100644 --- a/webapp/packages/sql-editor/package.json +++ b/webapp/packages/sql-editor/package.json @@ -3,8 +3,7 @@ "version": "0.1.0", "description": "", "license": "Apache-2.0", - "main": "dist/index.js", - "types": "dist/types", + "main": "./dist/index.js", "scripts": { "build": "yarn run clean-dist && builder build-plugin", "serve-plugin": "builder serve-plugin", diff --git a/webapp/packages/sql-editor/tsconfig.json b/webapp/packages/sql-editor/tsconfig.json index e1afdcc3c5..26d254ccf5 100644 --- a/webapp/packages/sql-editor/tsconfig.json +++ b/webapp/packages/sql-editor/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "declarationDir": "dist/types", - "outDir": "dist/js" + "declarationDir": "dist", + "outDir": "dist" }, "include": [ "src" diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json index a515195b72..aed3df133a 100644 --- a/webapp/tsconfig.json +++ b/webapp/tsconfig.json @@ -20,6 +20,7 @@ "types": ["reflect-metadata", "node"], "experimentalDecorators": true, "emitDecoratorMetadata": true, + "declarationMap": true, "baseUrl": "." } }