[ksc-release-4.1] build: recover @ks-console/shared from extension ex…

…ternals (kubesphere#4277) * build: recover @ks-console/shared from extension externals Signed-off-by: donniean <[email protected]> * chore: rename Signed-off-by: donniean <[email protected]> --------- Signed-off-by: donniean <[email protected]> Co-authored-by: donniean <[email protected]>
Leioy · Jul 15, 2024 · 9a4a387 · 9a4a387
1 parent 17ceb25
commit 9a4a387
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/packages/bootstrap/webpack/config.js b/packages/bootstrap/webpack/config.js
@@ -20,7 +20,7 @@ const config = {
 };
 
 const systemImports = {
-  // '@ks-console/shared': 'core:@kubed/@ks-console/shared',
+  '@ks-console/shared': 'core:@kubed/@ks-console/shared',
   '@kubed/charts': 'core:@kubed/charts',
   '@kubed/code-editor': 'core:@kubed/code-editor',
   '@kubed/components': 'core:@kubed/components',

diff --git a/packages/bootstrap/webpack/webpack.base.conf.js b/packages/bootstrap/webpack/webpack.base.conf.js
@@ -14,8 +14,9 @@ const getCustomTransformers = isDev ? () => ({ before: [styledComponentsTransfor
 
 const { resolve, absResolve } = config;
 
-const configFile = fs.pathExistsSync(resolve('configs/webpack.config.js'));
-const configs = configFile ? require(resolve('configs/webpack.config.js')) : {};
+const customConfigFilePath = resolve('configs/webpack.config.js');
+const configFile = fs.pathExistsSync(customConfigFilePath);
+const configs = configFile ? require(customConfigFilePath) : {};
 
 const webpackBaseConfig = merge(configs, {
   entry: {

diff --git a/packages/bootstrap/webpack/webpack.extension.conf.js b/packages/bootstrap/webpack/webpack.extension.conf.js
@@ -7,8 +7,9 @@ const { config } = require('./config');
 const fs = require('fs-extra');
 const resolve = config.resolve;
 
-const configFile = fs.pathExistsSync(resolve('configs/webpack.config.js'));
-const configs = configFile ? require(resolve('configs/webpack.config.js')) : {};
+const customConfigFilePath = resolve('configs/webpack.extensions.config.js');
+const configFile = fs.pathExistsSync(customConfigFilePath);
+const configs = configFile ? require(customConfigFilePath) : {};
 
 module.exports = merge(
   {
@@ -105,7 +106,7 @@ module.exports = merge(
       },
     ],
     externals: [
-      // '@ks-console/shared',
+      '@ks-console/shared',
       '@kubed/charts',
       '@kubed/code-editor',
       '@kubed/components',

diff --git a/server/configs/systemImports.js b/server/configs/systemImports.js
@@ -1,5 +1,5 @@
 const systemImports = {
-  // '@ks-console/shared': 'core:@kubed/@ks-console/shared',
+  '@ks-console/shared': 'core:@kubed/@ks-console/shared',
   '@kubed/charts': 'core:@kubed/charts',
   '@kubed/code-editor': 'core:@kubed/code-editor',
   '@kubed/components': 'core:@kubed/components',