From 6c0e94eb4c6727077a0b1ecc80f0dc2d3550a8e1 Mon Sep 17 00:00:00 2001
From: wangchun17 <chunn.wang@huawei.com>
Date: Tue, 14 Sep 2021 16:21:02 +0800
Subject: [PATCH] chunn.wang@huawei.com

Signed-off-by: wangchun17 <chunn.wang@huawei.com>
Change-Id: I82c4aacfcc2542f21bab31a333682df91b8ee0b2
---
 ace-loader/webpack.lite.config.js | 12 ++++++++----
 ace-loader/webpack.rich.config.js | 15 +++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ace-loader/webpack.lite.config.js b/ace-loader/webpack.lite.config.js
index 2f903b7..85e9e80 100644
--- a/ace-loader/webpack.lite.config.js
+++ b/ace-loader/webpack.lite.config.js
@@ -107,9 +107,6 @@ const webpackConfig = {
   node: {
     global: false,
   },
-  resolve: {
-    modules: [path.join(__dirname, 'node_modules'), './node_modules'],
-  },
   stats: 'none',
 };
 
@@ -145,7 +142,14 @@ module.exports = (env) => {
     }),
     new ReturnExportsPlugin(),
   ]
-
+  webpackConfig.resolve = {
+    modules: [
+      process.env.projectPath,
+      path.join(process.env.projectPath, '../../../../../'),
+      path.join(__dirname, 'node_modules'),
+      './node_modules'
+    ]
+  }
   if (fs.existsSync(path.resolve(process.env.projectPath, 'i18n'))) {
     webpackConfig.plugins.push(new CopyPlugin({
       patterns: [
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index b0e75f3..c5770b6 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -140,9 +140,6 @@ let config = {
   node: {
     global: false
   },
-  resolve: {
-    modules: [path.join(__dirname, 'node_modules'), './node_modules']
-  },
   stats: 'none'
 }
 
@@ -180,6 +177,14 @@ module.exports = (env) => {
       build: process.env.buildPath
     })
   ]
+  config.resolve = {
+    modules: [
+      process.env.projectPath,
+      path.join(process.env.projectPath, '../../../../../'),
+      path.join(__dirname, 'node_modules'),
+      './node_modules'
+    ]
+  }
   if (fs.existsSync(path.resolve(process.env.projectPath, 'i18n'))) {
     config.plugins.push(new CopyPlugin({
       patterns: [
@@ -226,9 +231,7 @@ module.exports = (env) => {
                 compress: {
                   unused: true
                 },
-                sourceMap: {
-                  content: sourceMap
-                }
+                sourceMap: true
               };
               if (process.env.DEVICE_LEVEL === 'rich' && /\/workers\//.test(Object.keys(file)[0])) {
                 uglifyEsOptions.compress.unused = false;
-- 
Gitee