From 3a8ec6ee76831825b451cdf831068ea7cb1a4998 Mon Sep 17 00:00:00 2001
From: lizhouze <lizhouze@huawei.com>
Date: Tue, 16 Aug 2022 10:28:59 +0800
Subject: [PATCH] lizhouze@huawei.com

Signed-off-by: lizhouze <lizhouze@huawei.com>
---
 ace-loader/main.product.js        | 11 ++++++++++-
 ace-loader/webpack.rich.config.js |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ace-loader/main.product.js b/ace-loader/main.product.js
index e626f5b..f600d21 100644
--- a/ace-loader/main.product.js
+++ b/ace-loader/main.product.js
@@ -216,6 +216,14 @@ function compareCache(cachePath) {
   }
 }
 
+function parseAbilityName(abilityType, projectPath) {
+  if (abilityType === 'page') {
+    return path.resolve(__dirname, projectPath, 'app.js');
+  } else {
+    return path.resolve(__dirname, projectPath, abilityType + '.js');
+  }
+}
+
 module.exports = {
   deleteFolderRecursive: deleteFolderRecursive,
   readManifest: readManifest,
@@ -226,5 +234,6 @@ module.exports = {
   multiResourceBuild: multiResourceBuild,
   readWorkerFile: readWorkerFile,
   compareCache: compareCache,
-  systemModules: systemModules
+  systemModules: systemModules,
+  parseAbilityName: parseAbilityName
 };
\ No newline at end of file
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index 4c368f3..d2d8d5e 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -35,7 +35,8 @@ const {
   hashProjectPath,
   checkMultiResourceBuild,
   readWorkerFile,
-  compareCache
+  compareCache,
+  parseAbilityName
 } = require('./main.product')
 
 const richModule = {
@@ -376,8 +377,7 @@ module.exports = (env) => {
     })
   } else {
     config.module.rules.unshift({
-      test: new RegExp("(" + (process.env.abilityType === 'page' ?
-        'app' : process.env.abilityType) + "\.js)(\\?[^?]+)?$"),
+      test: parseAbilityName(process.env.abilityType, process.env.projectPath),
       use: [{
         loader: path.resolve(__dirname, './index.js')
       }]