From 595ac2118d692ddbb445cb83263672be23bfcb54 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Thu, 18 Aug 2022 16:16:47 +0800
Subject: [PATCH] fixed fa479c7 from
 https://gitee.com/houhaoyu/developtools_ace-js2bundle/pulls/349
 houhaoyu@huawei.com

release fa common

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: Ic25b0f3e57c7a3977c40da8f12a26486f1f44606
---
 ace-loader/src/compile-plugin.js  | 2 +-
 ace-loader/webpack.rich.config.js | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ace-loader/src/compile-plugin.js b/ace-loader/src/compile-plugin.js
index dd0f0e0..5ff87fb 100644
--- a/ace-loader/src/compile-plugin.js
+++ b/ace-loader/src/compile-plugin.js
@@ -163,7 +163,7 @@ class ResultStates {
               return undefined;
             }\n` +
             `if (globalThis["__common_module_cache__${process.env.hashProjectPath}"]` +
-            ` && moduleId.indexOf("?name=") < 0 && isCommonModue(moduleId)) {\n` +
+            ` && String(moduleId).indexOf("?name=") < 0 && isCommonModue(moduleId)) {\n` +
               `  globalThis["__common_module_cache__${process.env.hashProjectPath}"]` +
               `[moduleId] = module;\n}`) : source;
         });
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index 4c368f3..cae34e4 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -341,7 +341,12 @@ module.exports = (env) => {
     }
     if (env.buildMode === 'release') {
       config.mode = 'production'
-      config.optimization = {
+      if (process.env.compileMode !== 'moduleJson' && process.env.abilityType === 'page') {
+        config.optimization = config.optimization;
+      } else {
+        config.optimization = {};
+      }
+      Object.assign(config.optimization, {
         minimize: true,
         minimizer: [
           new TerserPlugin({
@@ -362,7 +367,7 @@ module.exports = (env) => {
             },
           })
         ]
-      }
+      })
       config.output.sourceMapFilename = '_releaseMap/[name].js.map'
     }
   }