From e5e56b7e98c3676dc6e1bc52645a5e03fcc4c746 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Fri, 11 Sep 2020 00:46:41 +0300
Subject: [PATCH] fix(config): module resolution

---
 webapp/configs/webpack.config.js              |  4 ++--
 webapp/configs/webpack.product.config.js      |  1 -
 webapp/configs/webpack.product.dev.config.js  |  4 +++-
 webapp/configs/webpack.product.utils.js       | 20 +++++++++----------
 .../src/DataViewerTabService.ts               |  1 -
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/webapp/configs/webpack.config.js b/webapp/configs/webpack.config.js
index 0a9baf3eaa..39368c3035 100644
--- a/webapp/configs/webpack.config.js
+++ b/webapp/configs/webpack.config.js
@@ -67,7 +67,7 @@ module.exports = (env, argv) => {
           sourceMap: true,
           sassOptions: {
             implementation: require('node-sass'),
-            includePaths: [resolve('node_modules'), join(__dirname, '../node_modules')]
+            includePaths: [resolve('node_modules'), resolve('../../node_modules')]
           },
         }
       }
@@ -88,7 +88,7 @@ module.exports = (env, argv) => {
     mode: argv.mode || 'development',
     resolve: {
       extensions: ['.ts', '.tsx', '.js'],
-      modules: [resolve('node_modules'), join(__dirname, '../node_modules')],
+      modules: [resolve('node_modules'), resolve('../../node_modules')],
       alias: {
         react: 'preact/compat',
         react$: 'preact/compat',
diff --git a/webapp/configs/webpack.product.config.js b/webapp/configs/webpack.product.config.js
index df1e90a737..568e141b74 100644
--- a/webapp/configs/webpack.product.config.js
+++ b/webapp/configs/webpack.product.config.js
@@ -37,6 +37,5 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
             version: JSON.stringify(package.buildVersion),
         }),
         new HtmlWebpackPlugin({ template: resolve('src/index.html.ejs'), }),
-        new webpack.NamedModulesPlugin(),
     ],
 });
diff --git a/webapp/configs/webpack.product.dev.config.js b/webapp/configs/webpack.product.dev.config.js
index c0b54a71f2..0d291c2a1b 100644
--- a/webapp/configs/webpack.product.dev.config.js
+++ b/webapp/configs/webpack.product.dev.config.js
@@ -23,6 +23,9 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
         }
     },
     devtool: 'cheap-module-eval-source-map',
+    optimization: {
+        namedModules: true,
+    },
     plugins: [
         new CopyWebpackPlugin({
             patterns: getAssets(package, '')
@@ -32,7 +35,6 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
         }),
         new HtmlWebpackPlugin({ template: resolve('src/index.html.ejs'), }),
         new webpack.HotModuleReplacementPlugin(), // enable HMR globally
-        new webpack.NamedModulesPlugin(),
         // new BundleAnalyzerPlugin()
     ],
 });
diff --git a/webapp/configs/webpack.product.utils.js b/webapp/configs/webpack.product.utils.js
index 579c08ee27..d6dd1b73cd 100644
--- a/webapp/configs/webpack.product.utils.js
+++ b/webapp/configs/webpack.product.utils.js
@@ -1,13 +1,13 @@
 const fs = require('fs');
-const { join } = require('path');
+const { resolve } = require('path');
 
 function getCloudbeaverDeps(package) {
   if (!package.dependencies) {
-      return [];
+    return [];
   }
 
   return Object.keys(package.dependencies)
-      .filter(dependency => /@cloudbeaver\/(.*?)/.test(dependency))
+    .filter(dependency => /@cloudbeaver\/(.*?)/.test(dependency))
 }
 
 function scanCloudbeaverDeps(package) {
@@ -15,13 +15,13 @@ function scanCloudbeaverDeps(package) {
   const list = getCloudbeaverDeps(package);
 
   while (list.length) {
-      const dependency = list.shift();
+    const dependency = list.shift();
 
-      if (!deps.has(dependency)) {
-          list.push(...getCloudbeaverDeps(require(join(__dirname, '../node_modules', dependency, 'package.json'))))
-      }
+    if (!deps.has(dependency)) {
+      list.push(...getCloudbeaverDeps(require(resolve('../../node_modules', dependency, 'package.json'))))
+    }
 
-      deps.add(dependency);
+    deps.add(dependency);
   }
 
   return Array.from(deps.keys())
@@ -29,8 +29,8 @@ function scanCloudbeaverDeps(package) {
 
 module.exports = function getAssets(package, to) {
   const patterns = scanCloudbeaverDeps(package)
-      .map(dependency => ({ from: join(__dirname, '../node_modules', dependency, 'public'), to, force: true }))
-      .reverse();
+    .map(dependency => ({ from: resolve('../../node_modules', dependency, 'public'), to, force: true }))
+    .reverse();
 
   patterns.push({ from: './public', to, force: true });
 
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
index 89cc2b92fc..9d90f9e4c0 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
@@ -10,7 +10,6 @@ import {
   NavNodeManagerService,
   INodeNavigationData,
   ITab,
-  NavigationType,
   NodeManagerUtils,
 } from '@cloudbeaver/core-app';
 import { injectable } from '@cloudbeaver/core-di';