@aiot-toolkit/aiotpack 2.1.0-prender.1 → 2.1.0-prender.11

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

@@ -6,10 +6,6 @@ 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

@@ -19,7 +19,6 @@ var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/li
 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');
 
@@ -45,11 +44,16 @@ class UxAfterCompile {
         level: _sharedUtils.Loglevel.SUCCESS,
         message: ['javascript compile success']
       }]);
-    }).catch(_ref => {
-      let {
-        errors,
-        warnings
-      } = _ref;
+    }).catch(err => {
+      const errors = err?.errors;
+      const warnings = err?.warnings;
+      if (!errors?.length && !warnings?.length) {
+        onLog?.([{
+          level: _sharedUtils.Loglevel.THROW,
+          message: [`javascript compile failed: ${err?.message ?? err}`]
+        }]);
+        throw err instanceof Error ? err : new Error(String(err));
+      }
       const errorLength = errors?.length || 0;
       const messages = [`webpack error:\r\n`];
       if (errors?.length) {
@@ -90,70 +94,6 @@ 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,

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

@@ -12,16 +12,6 @@ declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, sty
  * `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 };