@cloudbase/lowcode-builder 1.9.5 → 1.9.7

package/lib/builder/config/dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSystemPackageDependencies = exports.generateLibDependencies = exports.generatePackageDependencies = void 0;
 const cals_1 = require("@cloudbase/cals");
-const CLOUDBASE_VERSION = '2.8.15-beta.0';
+const CLOUDBASE_VERSION = '2.8.16-beta.0';
 const BASE_DEPS = {
     'miniprogram-gesture': '^1.0.6',
     mobx: '^5',
@@ -13,7 +13,7 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/weda-client': '1.1.6',
+    '@cloudbase/weda-client': '1.1.8',
     '@cloudbase/weda-cloud-sdk': '1.0.86',
 };
 const COMPONENT_DEPS = {

package/lib/builder/h5/block2component.d.ts

@@ -1,2 +1,5 @@
 import { RUNTIME } from '../../types';
-export declare function buildBlock(buildDir: any, dependencies: any, runtime?: RUNTIME): Promise<any>;
+export declare function buildBlock(buildDir: any, dependencies: any, runtime?: RUNTIME): Promise<{
+    buildDir: any;
+    componentsList: any;
+}>;

package/lib/builder/h5/block2component.js

@@ -43,8 +43,9 @@ async function buildBlock(buildDir, dependencies, runtime = types_1.RUNTIME.NONE
     const officialDependence = dependencies.find((lib) => lib.name === config_1.OFFICIAL_LIB_KEY);
     const componentDeps = (0, config_1.generateLibDependencies)('h5', officialDependence === null || officialDependence === void 0 ? void 0 : officialDependence.version);
     processedDependencies.push(officialDependence);
+    let componentsList;
     try {
-        await (0, generate_1.generateBlockFiles)({
+        componentsList = await (0, generate_1.generateBlockFiles)({
             dependencies: processedDependencies,
             appBuildDir: buildDir,
             componentDeps,
@@ -53,6 +54,6 @@ async function buildBlock(buildDir, dependencies, runtime = types_1.RUNTIME.NONE
     catch (error) {
         throw error;
     }
-    return buildDir;
+    return { buildDir, componentsList };
 }
 exports.buildBlock = buildBlock;

package/lib/builder/h5/generate.d.ts

@@ -7,7 +7,7 @@ import { ICommonBuildContext } from '../mp/BuildContext';
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateBlockFiles(buildData: any): Promise<void>;
+export declare function generateBlockFiles(buildData: any): Promise<string[]>;
 export declare function generateHTML({ buildContext, appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在

package/lib/builder/h5/generate.js

@@ -29,7 +29,7 @@ exports.generateProjectFiles = generateProjectFiles;
 async function generateBlockFiles(buildData) {
     const { dependencies, appBuildDir, componentDeps } = buildData;
     const fileCodeMap = {};
-    await (0, lowcode_generator_1.generateCompositeComponent)(dependencies, './', fileCodeMap, componentDeps);
+    const componentsList = await (0, lowcode_generator_1.generateCompositeComponent)(dependencies, './', fileCodeMap, componentDeps);
     try {
         await Promise.all(Object.keys(fileCodeMap).map(async (filePath) => {
             await (0, generateFiles_1.writeFile)(path_1.default.join(appBuildDir || '', filePath), fileCodeMap[filePath].code);
@@ -38,6 +38,7 @@ async function generateBlockFiles(buildData) {
     catch (error) {
         throw error;
     }
+    return componentsList;
 }
 exports.generateBlockFiles = generateBlockFiles;
 async function generateHTML({ buildContext, appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 

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

@@ -3,7 +3,7 @@ import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 import NameMangler from '@cloudbase/lowcode-generator/lib/generator/util/name-mangler';
 import { IUsedComps } from '../types/common';
 export declare function normalizeCompositeDependienciesForBuild(lib: any): any;
-export declare type TInstallMaterialsType = 'lib' | 'inline';
+export type TInstallMaterialsType = 'lib' | 'inline';
 export declare function installMaterials(ctx: IMpCommonBuildContext, outDir: string, usedMeta?: {
     component: IUsedComps;
     action: IUsedComps;

package/lib/builder/service/webpack.js

@@ -201,7 +201,7 @@ async function downloadDependencies(targetDir, srcZipUrl, useBash = false) {
             const tag = `bash ${srcZipUrl}`;
             console.time(tag);
             await fs_extra_1.default.ensureDir(targetDir);
-            await spawnPromise(`wget -qO- ${srcZipUrl} | tar xvz -C ${targetDir}`, [], {
+            await spawnPromise(`temp_dir=$(mktemp -d) && wget -O "$temp_dir/file.zip" "${srcZipUrl}" && unzip "$temp_dir/file.zip" -d ${targetDir} && rm -rf "$temp_dir"`, [], {
                 cwd: process.cwd(),
                 stdio: undefined,
             });

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, 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;