@cloudbase/lowcode-builder 1.8.35 → 1.8.36

package/lib/builder/mp/materials.js

@@ -57,7 +57,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 +230,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 = {

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';
-declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
+type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
     name: any;

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