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

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -6,6 +6,10 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class UxAfterCompile {
     static compileJavascript: FollowWork<IJavascriptCompileOption>;
     static protobuf: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 预渲染：在 VM 沙箱中执行编译后的模板函数，生成 .template.json + .css.json
+     */
+    static prerender: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
     static toRpk: FollowWork<IJavascriptCompileOption>;
     /**

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -9,7 +9,7 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _CompileMode = _interopRequireDefault(require("../../compiler/enum/CompileMode"));
-var _JavascriptCompiler = _interopRequireDefault(require("../../compiler/javascript/JavascriptCompiler"));
+var _ViteCompiler = _interopRequireDefault(require("../../compiler/javascript/ViteCompiler"));
 var _JavascriptDefaultCompileOption = _interopRequireDefault(require("../../compiler/javascript/JavascriptDefaultCompileOption"));
 var _Jsc = _interopRequireDefault(require("../../compiler/javascript/vela/utils/Jsc"));
 var _ZipUtil = _interopRequireDefault(require("../../compiler/javascript/vela/utils/ZipUtil"));
@@ -18,6 +18,8 @@ var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/Fi
 var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
 var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
 var _LiteCard = _interopRequireDefault(require("../../compiler/javascript/vela/utils/LiteCard"));
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
+var _prerender = require("../../prerender");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -31,7 +33,7 @@ class UxAfterCompile {
       compilerOption,
       onLog
     } = params;
-    return new _JavascriptCompiler.default(context, onLog).compile({
+    return new _ViteCompiler.default(context, onLog).compile({
       projectPath: _path.default.join(context.projectPath, context.output),
       mode: _CompileMode.default.DEVELOPMENT,
       devtool: false,
@@ -88,6 +90,70 @@ class UxAfterCompile {
       BinaryPlugin.createBinFiles();
     }
   };
+
+  /**
+   * 预渲染：在 VM 沙箱中执行编译后的模板函数，生成 .template.json + .css.json
+   */
+  static prerender = async params => {
+    const {
+      compilerOption,
+      onLog,
+      compilation
+    } = params;
+    if (!compilerOption || compilerOption.enablePrerender === false) {
+      return;
+    }
+
+    // In watch mode, clear prerender caches for changed pages
+    if (compilation && compilation.trigger !== _FileLaneTriggerType.default.START) {
+      const {
+        sourceRoot
+      } = compilerOption;
+      const srcPath = _path.default.join(compilerOption.projectPath, sourceRoot);
+      const changedPages = (compilation.changedFiles || []).filter(f => compilation.entries?.includes(f)).map(f => {
+        const rel = _path.default.relative(srcPath, f).replace(/\\/g, '/');
+        return rel.replace(/\.[^.]+$/, '');
+      });
+      (0, _prerender.watchChange)(changedPages.length > 0 ? changedPages : undefined);
+    }
+    const {
+      projectPath,
+      outputPath,
+      sourceRoot
+    } = compilerOption;
+    const buildPath = _path.default.join(projectPath, outputPath);
+    const manifestPath = _path.default.join(projectPath, sourceRoot, 'manifest.json');
+    if (!_fsExtra.default.existsSync(manifestPath)) {
+      return;
+    }
+    const excludeList = compilerOption.prerenderExclude || [];
+    const manifest = _fsExtra.default.readJSONSync(manifestPath);
+    const pages = Object.keys(manifest.router?.pages || {}).filter(pageName => {
+      if (excludeList.some(pattern => pageName.startsWith(pattern))) {
+        onLog?.([{
+          level: _sharedUtils.Loglevel.INFO,
+          message: [`prerender: skip excluded ${pageName}`]
+        }]);
+        return false;
+      }
+      return true;
+    }).map(pageName => {
+      const pageConf = manifest.router.pages[pageName];
+      const component = pageConf.component || 'index';
+      return `${pageName}/${component}`;
+    });
+    if (!pages.length) {
+      return;
+    }
+    const deviceTypes = manifest.deviceTypeList?.length ? manifest.deviceTypeList : ['default'];
+    await (0, _prerender.prerender)({
+      buildPath,
+      sourcePath: _path.default.join(projectPath, sourceRoot),
+      pages,
+      prerenderSubComp: compilerOption.prerenderSubComp !== false,
+      deviceTypes
+    }, onLog);
+  };
   static jsc = async params => {
     const {
       context,
@@ -239,6 +305,28 @@ class UxAfterCompile {
           });
         }
       }
+
+      // e2e
+      if (compilerOption.e2eConfigPath && compilerOption.enableE2e) {
+        const testConfig = _UxUtil.default.getE2eConfig({
+          projectPath: compilerOption.projectPath,
+          e2eConfigPath: compilerOption.e2eConfigPath
+        });
+        const testPagePath = _path.default.parse(_path.default.relative(_path.default.join(compilerOption.projectPath, sourceRoot), _path.default.join(testConfig.dir, testConfig.entry.path)).replaceAll(_path.default.sep, _path.default.posix.sep));
+        // 1. 修改entry
+        const entryName = testPagePath.dir;
+        const launchMode = testConfig.entry?.launchMode;
+        if (entryName) {
+          content.router.entry = entryName;
+        }
+        // 2. 添加测试页到router.pages
+        if (content.router.pages) {
+          content.router.pages[entryName] = {
+            component: testPagePath.name,
+            launchMode
+          };
+        }
+      }
       _fsExtra.default.writeJSONSync(_path.default.join(projectPath, outputPath, _UxFileUtils.default.CONFIG_FILE_NAME), content, {
         spaces: 2
       });

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -135,12 +135,16 @@ class JavascriptCompiler {
     let result = {
       context: projectPath,
       mode,
-      devtool: devtool,
+      devtool: devtool || false,
       output: {
-        globalObject: 'window',
+        globalObject: 'global',
         filename: '[name].js',
         publicPath: './',
-        path: buildPath
+        path: buildPath,
+        iife: false,
+        library: {
+          type: 'commonjs2'
+        }
       },
       module: {
         rules: [{
@@ -178,7 +182,10 @@ class JavascriptCompiler {
       },
       optimization: {
         minimize: true,
-        minimizer: [this.createMinimizerRspackPlugin(param)]
+        minimizer: [this.createMinimizerRspackPlugin(param)],
+        splitChunks: false,
+        runtimeChunk: false,
+        concatenateModules: true
       },
       resolve: {
         extensions: ['.js', '.ts', '.ux']

package/lib/compiler/javascript/TemplateCompiler.d.ts

@@ -0,0 +1,29 @@
+declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, styleSheet?: any, importMap?: Record<string, string>, pageDir?: string): any;
+/**
+ * Normalize a media query condition text from CSS Level 4 syntax to Level 3.
+ *
+ * Level 4 → Level 3:
+ *   `(width <= 30)`              → `(max-width: 30)`
+ *   `(width >= 80)`              → `(min-width: 80)`
+ *   `(400 <= width <= 700)`      → `(min-width: 400) and (max-width: 700)`
+ *   `(width < 30)`               → `(max-width: 29)`   // strict → off-by-one
+ *   Same for height/aspect-ratio. Other features pass through.
+ *
+ * `screen and ` is preserved; `not` / `only` are preserved as-is.
+ */
+declare function normalizeMediaQuery(condition: string): string;
+/**
+ * Parse compiled $app_style$ array. Each rule is either:
+ *   [selectors, props]                          — base rule
+ *   [{condition: "<media-query>"}, selectors, props] — conditional rule (@media or @import with query)
+ *
+ * Returns a flat map: selectors → props for base rules, plus
+ * `"@media <normalizedConditionText>"` keys whose values are the per-condition
+ * `{selector: props}` map. The condition text is normalized to Level 3 so
+ * runtime only needs a Level-3 matcher.
+ */
+declare function parseStyleArray(code: string): Record<string, any>;
+/** Convert CSS text to css.json format */
+export { uxToTemplateJson, parseStyleArray, normalizeMediaQuery };
+/** Compute styleObjectId hash from a string (same algorithm as blueos-pack) */
+export declare function getStyleObjectId(name: string): number;