@cloudbase/lowcode-builder 1.1.5 → 1.1.7

package/lib/builder/core/index.js

@@ -58,9 +58,11 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
                     resourceAppId,
+                    mpAppId: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mpAppId,
                 },
                 buildTypeList,
                 isBrowserMpBuilder,
+                ignoreInstall,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
@@ -81,7 +83,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是代开发的模式，则写入ext.json
             await (0, postProcess_1.postprocessDeployExtraJson)(outDir, deployOptions);
-            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP) {
+            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP && !ignoreInstall) {
                 // 模板拷入的 miniprogram_npm 有问题，直接删除使用重新构建的版本
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));

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

@@ -2,7 +2,7 @@ import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder, }: {
+export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder, ignoreInstall, }: {
     weapps: IWeAppData[];
     projDir: string;
     appId: string;
@@ -15,10 +15,12 @@ export declare function generateWxMp({ weapps, projDir, appId, domain, materials
     isMixMode: boolean;
     options: {
         resourceAppId?: string;
+        mpAppId?: string;
         isCrossAccount: boolean;
     };
     buildTypeList: BuildType[];
     isBrowserMpBuilder: boolean;
+    ignoreInstall: boolean;
 }): Promise<{
     miniprogramRoot: string;
 }>;

package/lib/builder/mp/index.js

@@ -54,7 +54,7 @@ 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({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, ignoreInstall = false, }) {
     var _a;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
@@ -82,7 +82,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
-    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext);
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options === null || options === void 0 ? void 0 : options.mpAppId });
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
         const projectFileData = {
@@ -228,7 +228,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         }
     }));
     if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-        await (0, webpack_1.installDependencies)(miniprogramRoot);
+        await (0, webpack_1.installDependencies)(miniprogramRoot, { ignoreInstall });
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);

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

@@ -6,7 +6,9 @@ import { IBuildContext } from './BuildContext';
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext): {
+export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options?: {
+    mpAppId?: string;
+}): {
     appConfig: any;
     projConfig: any;
     pageConfigs: {}[];

package/lib/builder/mp/mp_config.js

@@ -40,7 +40,7 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-function generateMpConfig(weapps, ctx) {
+function generateMpConfig(weapps, ctx, options) {
     var _a;
     const appConfig = {
         useExtendedLib: { weui: true },
@@ -48,6 +48,7 @@ function generateMpConfig(weapps, ctx) {
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
         projectname: (ctx.mainAppData && ctx.mainAppData.label) || `WeDa-${ctx.appId}`,
+        appid: (options === null || options === void 0 ? void 0 : options.mpAppId) || mp_1.defaultProjConfig.appid,
     });
     const pageConfigs = weapps.map((app) => {
         var _a;

package/lib/builder/service/webpack.js

@@ -456,7 +456,14 @@ async function installDependencies(targetDir, options = {}) {
         }
     }
     catch (e) { }
-    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
+    const packageJsonPath = path_1.default.resolve(targetDir, 'package.json');
+    /**
+     * 无 cacheMeta 或 cacheMeta.once 时 遵循 options?.ignoreInstall 配置
+     * 否则认为文件发生了更改，应该忽略参数强制安装
+     */
+    const cacheMeta = generateFiles_1.generatedFileContents[packageJsonPath];
+    const isPkgModify = !cacheMeta || cacheMeta.once ? false : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
+    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules')) && !isPkgModify) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;
     }

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

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { IBuildContext } from '../mp/BuildContext';
 import { OutputType } from 'jszip';
+export declare const generatedFileContents: {};
 export default function generateFiles(appFileData: any, srcDir: string, dstDir: string, ctx: IBuildContext): Promise<string[]>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;

package/lib/builder/util/generateFiles.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = void 0;
+exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = exports.generatedFileContents = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = require("lodash");
@@ -34,7 +34,7 @@ const junk = __importStar(require("../util/junk"));
 const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
-const generatedFileContents = {}; // generated files for incrmental build
+exports.generatedFileContents = {}; // generated files for incrmental build
 async function generateFiles(appFileData, srcDir, dstDir, ctx) {
     const filesGenerated = [];
     // Generating file by template and data
@@ -67,22 +67,32 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
-    const generated = generatedFileContents[outFile];
+    if (!exports.generatedFileContents[outFile]) {
+        exports.generatedFileContents[outFile] = {
+            once: true,
+        };
+    }
+    else {
+        exports.generatedFileContents[outFile].once = false;
+    }
+    const meta = exports.generatedFileContents[outFile];
+    const generated = meta.content;
     if (generated === content && fs_extra_1.default.existsSync(outFile)) {
+        exports.generatedFileContents[outFile].modify = false;
         return false;
     }
     // console.log(outFile);
     await fs_extra_1.default.ensureFile(outFile);
     await fs_extra_1.default.writeFile(outFile, content);
-    generatedFileContents[outFile] = content;
+    exports.generatedFileContents[outFile] = { ...meta, content, modify: true };
     return true;
 }
 exports.writeFile = writeFile;
 function removeFile(file) {
     console.log(`Removing ${file}`);
-    Object.keys(generatedFileContents).map((cachedFile) => {
+    Object.keys(exports.generatedFileContents).map((cachedFile) => {
         if (cachedFile.indexOf(file) === 0) {
-            delete generatedFileContents[cachedFile];
+            delete exports.generatedFileContents[cachedFile];
         }
     });
     return fs_extra_1.default.removeSync(file);

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

@@ -1,2 +1,3 @@
 export declare const is: (filename: any) => boolean;
 export declare const not: (filename: any) => boolean;
+export declare const isFilePath: (filename: any) => boolean;

package/lib/builder/util/junk.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.not = exports.is = void 0;
+exports.isFilePath = exports.not = exports.is = void 0;
 const ignoreList = [
     // # All
     '^npm-debug\\.log$',
@@ -25,8 +25,14 @@ const ignoreList = [
     '^readme.md$',
     '^README.md$',
 ];
+const filePathIgnoreList = [
+    '__MACOSX', // 路径有__MACOSX就过滤
+];
 const regex = new RegExp(ignoreList.join('|'));
+const filePathRegex = new RegExp(filePathIgnoreList.join('|'));
 const is = (filename) => regex.test(filename);
 exports.is = is;
 const not = (filename) => !(0, exports.is)(filename);
 exports.not = not;
+const isFilePath = (filename) => filePathRegex.test(filename);
+exports.isFilePath = isFilePath;

package/lib/builder/util/net.js

@@ -34,6 +34,7 @@ const compressing_1 = __importDefault(require("compressing"));
 const jszip_1 = __importDefault(require("jszip"));
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
+const junk_1 = require("../util/junk");
 async function downloadFile(url, filePath) {
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
     const res = await axios_1.default.get(url, { responseType: 'stream' });
@@ -91,6 +92,9 @@ async function saveFiles(files, dstDir) {
     try {
         for (const fileName of Object.keys(files)) {
             const dest = path.join(dstDir, fileName);
+            if ((0, junk_1.isFilePath)(dest)) {
+                continue;
+            }
             if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
                 fs_extra_1.default.mkdirSync(dest, {
                     recursive: true

package/package.json

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

package/template/mp/app/common.js

@@ -1,5 +1,5 @@
 <% mods.forEach((mod) => {%>
-import * as <%= mod %> from '../lowcode/common/<%= mod %>'<%}) %>
+import * as $$<%= mod %> from '../lowcode/common/<%= mod %>'<%}) %>
 
 const _weapps_app_common = {}
 
@@ -18,7 +18,7 @@ Object.defineProperties(_weapps_app_common, {
   <% mods.forEach((mod) => {%>
   <%= mod %>: {
       get() {
-        return getDefaultModule(<%= mod %>)
+        return getDefaultModule($$<%= mod %>)
       }
     },<%}) %>
 })

package/template/mp/app/handlers.js

@@ -7,7 +7,7 @@
 
 
   <% pageModules.forEach(({id: pageId, lowCodes}) => { %>
-    export const <%=pageId %> = {
+    export const $$<%=pageId %> = {
       <% lowCodes.filter(mod => mod.type === 'handler-fn' && mod.name !== '____index____').forEach(mod => {%>
         ['<%= mod.name%>']: <%= pageId%>_<%= mod.name%>,
       <% }) %>

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "0.2.25",
+		"@cloudbase/weda-client": "0.2.30",
 		"@cloudbase/weda-cloud-sdk": "1.0.19",
 		"@cloudbase/oauth": "0.1.1-alpha.5",
 		"mobx": "^5.15.4",

package/template/mp/page/index.js

@@ -2,7 +2,7 @@ import { observable } from 'mobx';
 import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
 import { app } from '<%= subLevelPath %>../../app/weapps-api'
-import { <%= pageName %> as handlers } from '../../app/handlers'
+import { $$<%= pageName %> as handlers } from '../../app/handlers'
 <%= importor.lifecycle? `import lifecyle from '../../lowcode/${pageName}/lifecycle'` : "const lifecyle = {}" %>
 <%= importor.state? `import state from '../../lowcode/${pageName}/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../../lowcode/${pageName}/computed'` : "const computed = {}" %>