@aiot-toolkit/aiotpack 2.0.6-beta.8 → 2.1.0-prender.1

package/lib/utils/ux/UxLoaderUtils.js

@@ -115,7 +115,12 @@ class UxLoaderUtils {
     const parserResult = await new _parser.UxParser(options, compilerOption, globalVar, collectImageResource).parser();
     // 区分app.ux和一般ux
     // app.ux解析结果中加上manifest.json的内容
-    const manifestJson = `require('./manifest.json')`;
+    const manifestPath = _path.default.join(_path.default.dirname(filePath), 'manifest.json');
+    let manifestContent = '{}';
+    if (_fsExtra.default.existsSync(manifestPath)) {
+      manifestContent = _fsExtra.default.readFileSync(manifestPath, 'utf-8').trim();
+    }
+    const manifestJson = `JSON.parse('${manifestContent.replace(/'/g, "\\'").replace(/\n/g, '')}')`;
     function translateStyleFunc() {
       return `
   var $translateStyle$ = function (value) {
@@ -144,26 +149,25 @@ class UxLoaderUtils {
   `;
     }
     const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
-      const services = compilation['services'];
       const scriptCode = appScriptTree.getText();
       const hasScript = Boolean(scriptCode) && scriptCode !== '""';
-      const relativeFilePath = _path.default.relative(_path.default.join(context.projectPath, compilerOption.sourceRoot), filePath).replace(/\\/g, _path.default.posix.sep);
-      const isService = services?.some(service => relativeFilePath.startsWith(service.path));
+      const isService = UxLoaderUtils.isServiceFile(filePath, {
+        compilation,
+        context,
+        compilerOption
+      });
 
       // script代码放在第三个位置不能变化，影响更新source map
       const createAppWrapper = () => {
-        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`, translateStyleFunc()];
+        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? appScriptTree.getFullText() : 'export default {};'];
       };
       const createComponentWrapper = () => {
-        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
-      };
-      const createServiceWrapper = () => {
-        return ['', '', `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `module.exports = $app_exports$.default;`];
+        return [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? appScriptTree.getFullText() : 'export default {};'];
       };
       if (isAppUx) {
         return createAppWrapper();
       } else if (isService) {
-        return createServiceWrapper();
+        return UxLoaderUtils.createServiceWrapper(appScriptTree);
       } else {
         return createComponentWrapper();
       }
@@ -392,5 +396,13 @@ class UxLoaderUtils {
   static getReturnType(isPageUx) {
     return isPageUx ? `$app_exports$['entry'] =` : 'module.exports = ';
   }
+  static createServiceWrapper(appScriptTree) {
+    return ['', '', `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `module.exports = $app_exports$.default;`];
+  }
+  static isServiceFile(filePath, option) {
+    const services = option.compilation['services'];
+    const relativeFilePath = _path.default.relative(_path.default.join(option.context.projectPath, option.compilerOption.sourceRoot), filePath).replace(/\\/g, _path.default.posix.sep);
+    return services?.some(service => relativeFilePath.startsWith(service.path));
+  }
 }
 var _default = exports.default = UxLoaderUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.8",
+  "version": "2.1.0-prender.1",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.8",
-    "@aiot-toolkit/parser": "2.0.6-beta.8",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.8",
+    "@aiot-toolkit/generator": "2.1.0-prender.1",
+    "@aiot-toolkit/parser": "2.1.0-prender.1",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.1",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
+    "acorn": "^8.16.0",
     "aiot-parse5": "^1.0.2",
+    "astring": "^1.9.0",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.6-beta.8",
+    "file-lane": "2.1.0-prender.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -34,6 +36,7 @@
     "lodash": "^4.17.21",
     "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
+    "vite": "^8.0.14",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
@@ -42,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "b9380b1c748324938f84da01d035345116f8d0ba"
+  "gitHead": "8bb39a59fbe7a7c22c1167e69d44c78024330cec"
 }