lizhouze@huawei.com

Signed-off-by: lizhouze <lizhouze@huawei.com>

ace-loader/main.product.js

@@ -213,6 +213,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,
@@ -222,5 +230,6 @@ module.exports = {
   readWorkerFile: readWorkerFile,
   compareCache: compareCache,
   checkMultiResourceBuild: checkMultiResourceBuild,
-  multiResourceBuild: multiResourceBuild
+  multiResourceBuild: multiResourceBuild,
+  parseAbilityName: parseAbilityName
 };

ace-loader/webpack.rich.config.js

@@ -37,7 +37,8 @@ const {
   hashProjectPath,
   readWorkerFile,
   compareCache,
-  checkMultiResourceBuild
+  checkMultiResourceBuild,
+  parseAbilityName
 } = require('./main.product')
 
 const richModule = {
@@ -382,8 +383,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')
       }]