From 9dde6fd6a578dc745183d7caca536483aaea8c8e Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Wed, 17 Aug 2022 16:18:35 +0800
Subject: [PATCH] houhaoyu@huawei.com

extract common module in api9 fa

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I4c120875af94ce93d42f9e37cd9c8c0da1e767a9
---
 compiler/src/compile_info.ts | 2 +-
 compiler/webpack.config.js   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/src/compile_info.ts b/compiler/src/compile_info.ts
index 3370816..5533fc1 100644
--- a/compiler/src/compile_info.ts
+++ b/compiler/src/compile_info.ts
@@ -153,7 +153,7 @@ export class ResultStates {
             `if (commonCachedModule) { return commonCachedModule.exports; }\n` +
             source.replace('// Execute the module function',
               `if (globalThis["__common_module_cache__${projectConfig.hashProjectPath}"]` +
-              ` && moduleId.indexOf("?name=") < 0 && ` +
+              ` && String(moduleId).indexOf("?name=") < 0 && ` +
             `Object.keys(globalThis["__common_module_cache__${projectConfig.hashProjectPath}"])` +
             `.indexOf(moduleId) >= 0) {\n` +
               `  globalThis["__common_module_cache__${projectConfig.hashProjectPath}"]` +
diff --git a/compiler/webpack.config.js b/compiler/webpack.config.js
index 3c6758a..fc18f17 100644
--- a/compiler/webpack.config.js
+++ b/compiler/webpack.config.js
@@ -183,7 +183,12 @@ function setProjectConfig(envArgs) {
 function setReleaseConfig(config) {
   const TerserPlugin = require('terser-webpack-plugin');
   config.mode = 'production';
-  config.optimization = {
+  if (process.env.compileMode !== 'moduleJson' && abilityConfig.abilityType === 'page') {
+    config.optimization = config.optimization;
+  } else {
+    config.optimization = {};
+  }
+  Object.assign(config.optimization, {
     emitOnErrors: true,
     usedExports: false,
     minimize: true,
@@ -200,7 +205,7 @@ function setReleaseConfig(config) {
         }
       }
     })]
-  };
+  });
   config.output.sourceMapFilename = '_releaseMap/[name].js.map';
 }