Merge pull request #52 from dbeaver/fix-source-mapping

fix: source mapping

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"

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",

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/**/*"

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",

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"

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",

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/**/*"

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",

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/**/*"

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: '',
   },

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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",

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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",

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"
 }

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",

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/**/*"

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",

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/**/*"

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",

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/**/*"

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"

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",

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"

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",

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"

webapp/tsconfig.json

@@ -20,6 +20,7 @@
     "types": ["reflect-metadata", "node"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "declarationMap": true,
     "baseUrl": "."
   }
 }