@cloudbase/lowcode-builder 1.4.3 → 1.4.5

package/lib/builder/core/index.js

@@ -94,18 +94,16 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
             }
-            const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
                 ...buildContext,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
                 mainAppData: mainAppSerializeData,
                 processCssUnit: ([cals, ...subAppCalsList].find((cals) => {
-                    const FEATURE_MAP = (0, cals_1.parseVersion)(cals.schemaVersion, dependencies);
+                    const FEATURE_MAP = (0, cals_1.parseVersion)(cals.schemaVersion);
                     return !FEATURE_MAP.defaultDynamicCssUnit;
                 })
                     ? 'px'
                     : 'rpx'),
-                enablePageRoot,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

package/lib/builder/h5/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,6 +43,7 @@ const mp_1 = require("../mp");
 const common_2 = require("../../utils/common");
 const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const junk = __importStar(require("../util/junk"));
 async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
@@ -136,10 +160,23 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
                 }
             });
         });
+        const MAINIFAST_FILENAME = 'weda-manifest.json';
+        const preHeatUrls = fs_extra_1.default
+            .readdirSync(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR))
+            .filter((file) => junk.not(file) && file !== MAINIFAST_FILENAME)
+            .map((file) => {
+            return path_1.default.posix.join(publicPath, file);
+        });
         // 普通 web 模式，且非hash模式，根据页面生成多份入口
         if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
-            await Promise.all((cals.items || []).map((page) => fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'))));
+            preHeatUrls.push(path_1.default.posix.join(basename));
+            await Promise.all((cals.items || []).map((page) => {
+                preHeatUrls.push(path_1.default.posix.join(basename, page.id));
+                preHeatUrls.push(path_1.default.posix.join(basename, page.id, '/'));
+                return fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'));
+            }));
         }
+        await fs_extra_1.default.writeFile(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'weda-manifest.json'), JSON.stringify({ preHeatUrls }, undefined, 2));
         return h5BuildDir;
     }
     catch (e) {

package/lib/builder/mp/BuildContext.d.ts

@@ -26,9 +26,4 @@ export interface IBuildContext {
      * 云开发sdk请求，js-sdk or wx.cloud
      */
     endpointType?: 'tcb-api' | 'wechat-service';
-    /**
-     * 是否在页面层面添加节点
-     * 并设置 #page-root-id
-     */
-    enablePageRoot?: boolean;
 }

package/lib/builder/mp/wxml.js

@@ -32,15 +32,13 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         ].concat(createXml(widgets)),
     };
     if (ctx.isPage) {
-        const { enablePageRoot } = ctx;
         const originElements = xmlJson.elements;
         // 登录校验: 向其最外层包裹一层block
         xmlJson.elements = [
             {
                 type: 'element',
-                name: enablePageRoot ? 'view' : 'block',
+                name: 'block',
                 attributes: {
-                    id: 'wd-page-root',
                     ['wx:if']: '{{weDaHasLogin}}',
                     ['data-weui-theme']: 'light',
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,7 +38,7 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.5.12",
+    "@cloudbase/cals": "^0.5.14",
     "@cloudbase/lowcode-generator": "^1.4.0",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -475,7 +475,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.2d3f3e4f3bfd356a2a85.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.39b933e356640041bb42.bundle.js"
     ></script>
   </body>
 </html>