Merge branch 'devel' into feat/cb-3456/form-template

dbeaver · Sep 22, 2023 · c3e0034 · c3e0034
2 parents 5fa14cd + 63c7c6f
commit c3e0034
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,31 +4,32 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Debug CE",
+      "name": "Chrome",
       "url": "http://127.0.0.1:3100",
-      "webRoot": "${workspaceFolder}/webapp/packages/product-default"
+      "webRoot": "${workspaceFolder}/..",
+      "sourceMaps": true
     },
     {
       "type": "java",
       "name": "CloudBeaver CE",
       "cwd": "${workspaceFolder}/../opt/cbce",
       "request": "launch",
       "mainClass": "org.eclipse.equinox.launcher.Main",
-      "classPaths": [
-        "${env:DBEAVER_DEVEL_ECLIPSE_PATH}/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar"
-      ],
       "windows": {
         "type": "java",
         "name": "CloudBeaver CE",
         "request": "launch",
         "mainClass": "org.eclipse.equinox.launcher.Main",
+        "classPaths": [
+          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar"
+        ],
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",
           "-configuration",
-          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
           "-dev",
-          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
           "-os",
           "win32",
           "-ws",
@@ -54,13 +55,16 @@
         "name": "CloudBeaver CE",
         "request": "launch",
         "mainClass": "org.eclipse.equinox.launcher.Main",
+        "classPaths": [
+          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar"
+        ],
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",
           "-configuration",
-          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
           "-dev",
-          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
           "-os",
           "macosx",
           "-ws",

diff --git a/webapp/packages/core-cli/configs/webpack.config.js b/webapp/packages/core-cli/configs/webpack.config.js
@@ -242,6 +242,7 @@ module.exports = (env, argv) => {
     plugins: [
       new ForkTsCheckerWebpackPlugin({
         typescript: {
+          configFile: resolve('tsconfig.json'),
           configOverwrite: {
             include: ['**/src/**/*.ts', '**/src/**/*.tsx'],
           },

diff --git a/webapp/packages/core-cli/configs/webpack.product.dev.config.js b/webapp/packages/core-cli/configs/webpack.product.dev.config.js
@@ -40,6 +40,7 @@ module.exports = (env, argv) => {
 
   return merge(commonConfig(env, argv), {
     mode: 'development',
+    context: resolve(__dirname, '../../../../../'),
     entry: {
       main,
       sso,