From eff0564ca2d221adcce59d46bae50c2e4e3d89f5 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Fri, 19 Aug 2022 13:39:48 +0800
Subject: [PATCH] houhaoyu@huawei.com

release fa common

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: Ic90f65899189258f21c2796c85b08279aad9634b
---
 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 dfbfcf9..8d6a8d9 100644
--- a/ace-loader/src/compile-plugin.js
+++ b/ace-loader/src/compile-plugin.js
@@ -154,7 +154,7 @@ class ResultStates {
             `if (commonCachedModule) { return commonCachedModule.exports; }\n` +
             source.replace('// Execute the module function',
             `if (globalThis["__common_module_cache__${process.env.hashProjectPath}"]` +
-            ` && moduleId.indexOf("?name=") < 0 && ` +
+            ` && String(moduleId).indexOf("?name=") < 0 && ` +
             `Object.keys(globalThis["__common_module_cache__${process.env.hashProjectPath}"])` +
             `.indexOf(moduleId) >= 0) {\n` +
               `  globalThis["__common_module_cache__${process.env.hashProjectPath}"]` +
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index 6afb176..6940b3c 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -347,7 +347,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({
@@ -368,7 +373,7 @@ module.exports = (env) => {
             },
           })
         ]
-      }
+      })
       config.output.sourceMapFilename = '_releaseMap/[name].js.map'
     }
   }