@cloudbase/lowcode-builder 1.8.35 → 1.8.37

package/lib/builder/core/index.js

@@ -122,6 +122,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             const mainAppSerializeData = (0, common_2.processCals2WeappsData)(processRepeaterDisplay(cals), dependencies);
             const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(processRepeaterDisplay(item), dependencies))) || [];
             const apps = [mainAppSerializeData, ...subAppSerializeDataList];
+            const calses = [cals, ...subAppCalsList];
             if (isBrowserMpBuilder) {
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
@@ -131,7 +132,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 ...buildContext,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
                 mainAppData: mainAppSerializeData,
-                processCssUnit: ([cals, ...subAppCalsList].find((cals) => {
+                processCssUnit: (calses.find((cals) => {
                     const FEATURE_MAP = (0, cals_1.parseVersion)(cals.schemaVersion, dependencies);
                     return !FEATURE_MAP.defaultDynamicCssUnit;
                 })
@@ -142,6 +143,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
+                calses,
                 buildContext: mpBuildContext,
                 plugins,
                 deployOptions,

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

@@ -1,10 +1,12 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
+import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall, }: {
+export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
+    calses: IPlatformApp[];
     plugins: IPlugin[];
     deployOptions: Required<IBuildWedaApp>['deployOptions'];
     options: {

package/lib/builder/mp/index.js

@@ -54,18 +54,30 @@ const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, }) {
+function patchBuildContext(ctx, calses, weapps) {
+    var _a, _b, _c;
+    const { mainAppData } = ctx;
+    if ((_b = (_a = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _a === void 0 ? void 0 : _a.templates) === null || _b === void 0 ? void 0 : _b.length) {
+        ctx.materialLibs = [...ctx.materialLibs, (0, cals_1.processTemplatesToDependiencies)((_c = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _c === void 0 ? void 0 : _c.templates)];
+    }
+    const { allAppUsedComps } = handleUsedComponents({ buildContext: ctx, weapps });
+    /**
+     * 修改 buildContext 进行 miniprogramPlugins 精简
+     */
+    ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
+    return { allAppUsedComps };
+}
+async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, }) {
     var _a;
-    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
-    console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
-    const { allAppUsedComps } = handleUsedComponents({ buildContext, weapps });
+    console.log(`Generating ${em('Wexin MiniProgram')} to ${buildContext.projDir}`);
     /**
-     * 修改 buildContext 进行 miniprogramPlugins 精简
-     * 应该提前处理，不应该修改 buildContext
+     * 此函数具有副作用，用于补充修正小程序特殊的buildContext
+     * 注意一定在入口进行处理，应当尽可能提前，后续逻辑不应该更新buildContext
      */
-    buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
+    const { allAppUsedComps } = patchBuildContext(buildContext, calses, weapps);
+    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(buildContext, projDir, allAppUsedComps, weapps);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
@@ -164,7 +176,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
             'package.json': {
                 appId,
                 importJSSDK: endpointType === 'tcb-api',
-                extraDeps: resolveNpmDeps(),
+                extraDeps: resolveNpmDeps(weapps, materials),
             },
         };
     }
@@ -216,7 +228,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
                     'package.json': {
                         appId,
                         importJSSDK: endpointType === 'tcb-api',
-                        extraDeps: resolveNpmDeps(),
+                        extraDeps: resolveNpmDeps(weapps, materials),
                     },
                 }, templateDir, subpackageRootPath);
             }
@@ -234,45 +246,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
     !isBrowserMpBuilder && cleanProj(weapps, miniprogramRoot);
     !isBrowserMpBuilder && cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
     return { miniprogramRoot };
-    function resolveNpmDeps(extra = {}) {
-        var _a;
-        const deps = [
-            {
-                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || {},
-                name: '主包',
-            },
-        ];
-        deps.push(...weapps
-            .filter((app) => !!app.rootPath)
-            .map((app) => ({
-            deps: app.npmDependencies,
-            name: `子包：${app.rootPath}`,
-        })));
-        deps.push(...materials
-            .filter((lib) => lib.isComposite && lib.compLibCommonResource)
-            .map((lib) => {
-            var _a;
-            return ({
-                deps: ((_a = lib.compLibCommonResource) === null || _a === void 0 ? void 0 : _a.npm) || {},
-                name: `组件库级别${lib.name}`,
-            });
-        }));
-        deps.push(...materials.map((lib) => ({
-            deps: lib.dependencies || {},
-            name: `组件库${lib.name}`,
-        })));
-        return deps.reduce((result, cur) => {
-            Object.keys(cur.deps || {}).map((npmPkgName) => {
-                if (!result[npmPkgName]) {
-                    result[npmPkgName] = cur.deps[npmPkgName];
-                }
-                else if (result[npmPkgName] != cur.deps[npmPkgName]) {
-                    console.error(error(`${cur.name}的Npm依赖${npmPkgName}已在其他地方定义，将被忽略`));
-                }
-            });
-            return result;
-        }, extra);
-    }
     // SDK 插件
     async function handleMpPlugins() {
         // 编译后置原生小程序类的安装
@@ -281,6 +254,45 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
     }
 }
 exports.generateWxMp = generateWxMp;
+function resolveNpmDeps(weapps, materials, extra = {}) {
+    var _a;
+    const deps = [
+        {
+            deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || {},
+            name: '主包',
+        },
+    ];
+    deps.push(...weapps
+        .filter((app) => !!app.rootPath)
+        .map((app) => ({
+        deps: app.npmDependencies,
+        name: `子包：${app.rootPath}`,
+    })));
+    deps.push(...materials
+        .filter((lib) => lib.isComposite && lib.compLibCommonResource)
+        .map((lib) => {
+        var _a;
+        return ({
+            deps: ((_a = lib.compLibCommonResource) === null || _a === void 0 ? void 0 : _a.npm) || {},
+            name: `组件库级别${lib.name}`,
+        });
+    }));
+    deps.push(...materials.map((lib) => ({
+        deps: lib.dependencies || {},
+        name: `组件库${lib.name}`,
+    })));
+    return deps.reduce((result, cur) => {
+        Object.keys(cur.deps || {}).map((npmPkgName) => {
+            if (!result[npmPkgName]) {
+                result[npmPkgName] = cur.deps[npmPkgName];
+            }
+            else if (result[npmPkgName] != cur.deps[npmPkgName]) {
+                console.error(error(`${cur.name}的Npm依赖${npmPkgName}已在其他地方定义，将被忽略`));
+            }
+        });
+        return result;
+    }, extra);
+}
 async function generateConfig(data, root) {
     const { domain = '', isPrivateMode = false, endpointType = '' } = data;
     await (0, generateFiles_1.default)({

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

@@ -11,13 +11,6 @@ export declare function installMaterials(ctx: IBuildContext, projDir: string, us
  */
 export declare function filterMaterial(src: any, dest: any): boolean;
 export declare function extractUsedCompsRecursively(comps: IUsedComps, checkedComps: ICompositedComponent[], compositedLibs: IMaterialItem[], outputComps?: IUsedComps): IUsedComps;
-/**
- * {
- * gsd: {
- * input: 'input'
- * }
- * }
- */
 export declare function getWxmlTag(ctx: IBuildContext, cmp: Required<IWeAppComponentInstance>['xComponent'], nameMangler?: NameMangler): {
     tagName: string;
     path?: undefined;

package/lib/builder/mp/materials.js

@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWxmlTag = exports.extractUsedCompsRecursively = exports.filterMaterial = exports.installMaterials = void 0;
 const path = __importStar(require("path"));
@@ -36,6 +39,7 @@ const wxml_1 = require("./wxml");
 const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
 const net_1 = require("../util/net");
+const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib/generator/util/name-mangler"));
 const junk = __importStar(require("../util/junk"));
 const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
@@ -57,7 +61,8 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
         }
         else {
             materialsSrcDir = path.join(config_1.sharedMaterialsDir, `${name}-mp@${version}`);
-            await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder);
+            const noCache = mpPkgUrl.indexOf('127.0.0.1') >= 0;
+            await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder, noCache);
         }
         function libUpdated(libDir, version) {
             const meta = (0, util_2.readComponentLibMata)(libDir);
@@ -229,10 +234,10 @@ function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, output
     return usedComps;
 }
 exports.extractUsedCompsRecursively = extractUsedCompsRecursively;
-async function downloadMaterial(zipUrl, dstFolder, isBrowser = false) {
-    if (fs.existsSync(path.join(dstFolder, 'meta.json')))
+async function downloadMaterial(zipUrl, dstFolder, isBrowser = false, noCache = false) {
+    if (!noCache && fs.existsSync(path.join(dstFolder, 'meta.json')))
         return;
-    await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser);
+    await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser, noCache);
 }
 async function generateCompositeComponent(ctx, compositedComp, compLibCommonResource) {
     const compositeCtx = {
@@ -352,6 +357,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
  * }
  * }
  */
+const NAME_MANAGER = new name_mangler_1.default({ blackList: mp_1.builtinMpTags });
 function getWxmlTag(ctx, cmp, nameMangler) {
     var _a, _b, _c, _d, _e, _f;
     const { moduleName, name } = cmp;
@@ -382,7 +388,7 @@ function getWxmlTag(ctx, cmp, nameMangler) {
                     ? compPath
                     : path.posix.join(
                     /* ctx.isMixMode ? '/' + rootPath : */ '', `/${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
-            tagName = `${moduleName}-${name}`;
+            tagName = `${/^\$/.test(moduleName) ? NAME_MANAGER.mangle(moduleName) : moduleName}-${name}`;
             if (nameMangler) {
                 tagName = nameMangler.mangle(tagName);
             }
@@ -390,7 +396,7 @@ function getWxmlTag(ctx, cmp, nameMangler) {
     }
     else {
         compPath = `plugin://${miniprogramPlugin === null || miniprogramPlugin === void 0 ? void 0 : miniprogramPlugin.name}/${name}`;
-        tagName = `${moduleName}-${name}`;
+        tagName = `${/^\$/.test(moduleName) ? NAME_MANAGER.mangle(moduleName) : moduleName}-${name}`;
         if (nameMangler) {
             tagName = nameMangler.mangle(tagName);
         }

package/lib/builder/util/net.d.ts

@@ -4,7 +4,7 @@ export declare function downloadFile(url: string, filePath: string): Promise<voi
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-export declare function downloadZip(url: string, dstDir: string, isBrowser?: boolean): Promise<void>;
+export declare function downloadZip(url: string, dstDir: string, isBrowser?: boolean, noCache?: boolean): Promise<void>;
 /**
  * node中下载和保存zip文件
  * @param url 下载的url
@@ -17,7 +17,7 @@ export declare function downloadZipInNode(url: string, dstDir: string): Promise<
  * @param dstDir 存放文件夹
  * @returns
  */
-export declare function downloadZipInBrowser(url: string, dstDir: string): Promise<void>;
+export declare function downloadZipInBrowser(url: string, dstDir: string, noCache: boolean): Promise<void>;
 /**
  * 微信IDE builder需要下载template文件和miniprogram_npm
  * miniprogram_npm待微信提供端能力

package/lib/builder/util/net.js

@@ -46,10 +46,10 @@ exports.downloadFile = downloadFile;
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-async function downloadZip(url, dstDir, isBrowser = false) {
+async function downloadZip(url, dstDir, isBrowser = false, noCache = false) {
     // TODO 待加上平台判断
     if (isBrowser) {
-        await downloadZipInBrowser(url, dstDir);
+        await downloadZipInBrowser(url, dstDir, noCache);
         return;
     }
     await downloadZipInNode(url, dstDir);
@@ -72,9 +72,9 @@ exports.downloadZipInNode = downloadZipInNode;
  * @param dstDir 存放文件夹
  * @returns
  */
-async function downloadZipInBrowser(url, dstDir) {
+async function downloadZipInBrowser(url, dstDir, noCache) {
     // IMPORTANT 防止保存的时候保存
-    if (fs_extra_1.default.existsSync(dstDir)) {
+    if (!noCache && fs_extra_1.default.existsSync(dstDir)) {
         return;
     }
     fs_extra_1.default.ensureDirSync(dstDir);
@@ -96,9 +96,11 @@ async function saveFiles(files, dstDir) {
                 continue;
             }
             if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
-                fs_extra_1.default.mkdirSync(dest, {
-                    recursive: true
-                });
+                if (!fs_extra_1.default.pathExistsSync(dest)) {
+                    fs_extra_1.default.mkdirSync(dest, {
+                        recursive: true
+                    });
+                }
             }
             else {
                 const ret = await files[fileName].async('nodebuffer'); // 由于这里有await，不能用forEach

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.35",
+  "version": "1.8.37",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -29,9 +29,9 @@
     "develop": "tsc -w",
     "clean": "rm -rf lib && rm -rf dist",
     "build": "tsc",
-    "test": "jest",
     "test:build": "ts-node ./__tests__/build.ts",
-    "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
+    "dev:web:serve": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
+    "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
     "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
     "build:template": "./scripts/buildTemplate.sh"
   },
@@ -41,8 +41,8 @@
   "dependencies": {
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
-    "@cloudbase/cals": "^1.0.23",
-    "@cloudbase/lowcode-generator": "^1.8.12",
+    "@cloudbase/cals": "^1.0.25",
+    "@cloudbase/lowcode-generator": "^1.8.13",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -540,7 +540,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.1a8d700051f7a14000ad.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.6f7cc6eededb826a73c7.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/weapp-page.js

@@ -296,11 +296,11 @@ export function createPage({
           const params = Array.isArray(_params)
             ? _params.reduce((map, meta) => {
                 let { key, value } = meta;
-                if (key.startsWith('$page.')) {
+                if (key?.startsWith?.('$page.')) {
                   key = key.replace(/^\$page\./, '');
                 }
                 if(key?.trim?.()){
-                  map[key] = value;
+                  map[key?.trim?.()] = value;
                 }
                 return map;
               }, {})

package/template/mp/package.json

@@ -6,7 +6,7 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.7",
+    "@cloudbase/weda-client": "1.0.8",
     "@cloudbase/weda-cloud-sdk": "1.0.45",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",