@cloudbase/lowcode-builder 1.1.7 → 1.1.9

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

@@ -6,7 +6,7 @@ export declare const materialsDirName = "materials";
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20220810.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20221202.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/config/index.js

@@ -44,7 +44,7 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20220810.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20221202.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/core/index.js

@@ -73,6 +73,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     generateMpPath: appBuildDir,
                     miniprogramRoot: result.miniprogramRoot,
                     plugins,
+                    ignoreInstall,
                 });
             }
             const outDir = appBuildDir;

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

@@ -1,9 +1,10 @@
 import { IWeAppData, IPlugin, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IAppUsedComp } from '../types/common';
-export declare function handleMixMode({ apps, generateMpPath, miniprogramRoot, plugins, }: {
+export declare function handleMixMode({ apps, generateMpPath, miniprogramRoot, plugins, ignoreInstall, }: {
     apps: IWeAppData[];
     generateMpPath: string;
     miniprogramRoot: string;
     plugins: IPlugin[];
+    ignoreInstall: boolean;
 }): Promise<void>;
 export declare function handleMixMaterials(projDir: string, apps: IWeAppData[], appUsedComps: IAppUsedComp[], compositedLibs: IMaterialItem[]): Promise<void[]>;

package/lib/builder/mp/mixMode.js

@@ -36,13 +36,13 @@ const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
 const webpack_1 = require("../service/webpack");
 // 将 BUILD 目录往混合模式移动
-async function handleMixMode({ apps = [], generateMpPath, miniprogramRoot, plugins = [], }) {
+async function handleMixMode({ apps = [], generateMpPath, miniprogramRoot, plugins = [], ignoreInstall, }) {
     // await handleMainApp()
     // await handleAppPages()
     await handleSubApps();
     // await handleAppJson()
     // await handlePkgJson()
-    await (0, webpack_1.installDependencies)(miniprogramRoot);
+    await (0, webpack_1.installDependencies)(miniprogramRoot, { ignoreInstall });
     await handlePlugins();
     // 复制框架公用内容
     async function handleMainApp() {

package/lib/builder/mp/util.js

@@ -99,7 +99,7 @@ function generateDataBindMeta(bind) {
                 }
                 else {
                     expr = value
-                        .replace(/^\w+./, `${isGlobal ? 'app' : '$page'}.${PREFIX_MAP[type]}.`)
+                        .replace(/^\w+([.[])/, (_, $1) => `${isGlobal ? 'app' : '$page'}.${PREFIX_MAP[type]}${$1}`)
                         .replace(/^comp-\w+/, `$comp.${PREFIX_MAP[type]}`)
                         .replace(/^\$comp_\w+/, `$comp.${PREFIX_MAP[type]}`);
                 }

package/lib/builder/service/webpack.js

@@ -462,7 +462,7 @@ async function installDependencies(targetDir, options = {}) {
      * 否则认为文件发生了更改，应该忽略参数强制安装
      */
     const cacheMeta = generateFiles_1.generatedFileContents[packageJsonPath];
-    const isPkgModify = !cacheMeta || cacheMeta.once ? false : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
+    const isPkgModify = !cacheMeta || cacheMeta.once ? false : cacheMeta.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;
@@ -503,6 +503,9 @@ async function installDependencies(targetDir, options = {}) {
     else {
         installProcess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
     }
+    if (installProcess.status) {
+        throw new Error(`安装依赖失败 ${installProcess.error || ''}`);
+    }
     fixNodeModules(targetDir);
     try {
         await fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'package-lock.json')));

package/lib/builder/types/common.d.ts

@@ -1,6 +1,6 @@
 export { BuildType, GenerateMpType, WebpackModeType, WebpackBuildCallBack, IPackageJson, buildAsWebByBuildType, buildAsAdminPortalByBuildType, buildAsXPageByBuildType, IAppUsedComp, IUsedComps, ISyncProp, IComponentInputProps, IFileCodeMap, } from '@cloudbase/lowcode-generator/lib/generator/types/common';
 import { IComponentMeta, ICompositedComponent } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export declare type IComponentsInfoMap = {
+export type IComponentsInfoMap = {
     [componentSourceKey: string]: ({
         meta: IComponentMeta;
     } & {

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

@@ -1,7 +1,7 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
-export declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
+export type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
     name: any;