diff --git a/BUILD.gn b/BUILD.gn
index 0c82c7bdfec5659d96c4731893dd148eccb4eb7f..1ec0156dfaaf5cbe1eab28989b0f33c51065192a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -86,3 +86,15 @@ ohos_copy("ace_loader_library") {
   module_install_name = ""
   license_file = "//third_party/weex-loader/NOTICE"
 }
+
+# copy previewer
+ohos_copy("previewer_copy") {
+  if (host_os == "mac") {
+    sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer" ]
+  } else {
+    sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer" ]
+  }
+  outputs = [ target_out_dir + "/previewer/{{source_file_part}}" ]
+  module_source_dir = target_out_dir + "/previewer"
+  module_install_name = ""
+}
diff --git a/ace-loader/main.product.js b/ace-loader/main.product.js
index 12ec990086f5f970b8f674be1921931466052810..77cd134d2a40bddeb722974566074861b63d2799 100644
--- a/ace-loader/main.product.js
+++ b/ace-loader/main.product.js
@@ -60,11 +60,8 @@ function loadEntryObj(projectPath, device_level, abilityType, manifestFilePath)
         entryObj['./app'] = projectPath + '/app.js?entry';
       }
       break;
-    case 'data':
-      entryObj['./data'] = projectPath + '/data.js?entry';
-      break
-    case 'service':
-      entryObj['./service'] = projectPath + '/service.js?entry';
+    default:
+      entryObj[`./${abilityType}`] = projectPath + `/${abilityType}.js?entry`;
       break
   }
   return entryObj;
diff --git a/ace-loader/npm-install.js b/ace-loader/npm-install.js
index 46947632489941f1c570f099fadb34161b5c1c4f..e0392766cceccdb2af54515de24a74eb39c620c8 100644
--- a/ace-loader/npm-install.js
+++ b/ace-loader/npm-install.js
@@ -26,11 +26,11 @@ if (!fs.existsSync(arkDir)) {
 var isWin = !1;
 var isMac = !1;
 
-if (fs.existsSync(path.join(arkDir, "build"))) {
+if (fs.existsSync(path.join(arkDir, "build-win"))) {
     isWin = !0;
-} else if (fs.existsSync(path.join(arkDir, "build-win"))) {
+} else if (fs.existsSync(path.join(arkDir, "build-mac"))) {
     isMac = !0;
-} else if (!fs.existsSync(path.join(arkDir, "build-mac"))) {
+} else if (!fs.existsSync(path.join(arkDir, "build"))) {
     throw Error("Error: find build fail").message;
 }
 
@@ -48,4 +48,4 @@ exec("npm install", { cwd: cwd }, function (err, stdout, stderr) {
     if (err != null) {
         throw Error(`npm install filed: ${err}`).message;
     }
-});
\ No newline at end of file
+});
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index 7230f1b8fba45e37e43e60c99ea2502bb507e966..746fb6d7ab3d4582d1c36afc273e16f57fd2167d 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -176,6 +176,13 @@ function setConfigs(env) {
 module.exports = (env) => {
   setConfigs(env)
   deleteFolderRecursive(process.env.buildPath);
+  config.module.rules.push({
+    test: new RegExp("(" + (process.env.abilityType === 'page' ?
+      'app' : process.env.abilityType) + "\.js)(\\?[^?]+)?$"),
+    use: [{
+      loader: path.resolve(__dirname, './index.js')
+    }]
+  })
   config.entry = loadEntryObj(process.env.projectPath, process.env.DEVICE_LEVEL, process.env.abilityType, process.env.aceManifestPath)
   config.output.path = path.resolve(__dirname, process.env.buildPath)
   config.plugins = [