@cloudbase/lowcode-builder 1.9.3 → 1.9.5

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

@@ -1,6 +1,6 @@
 export declare function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }: {
-    importJSSDK: boolean;
     mode: 'lib' | string;
+    importJSSDK?: boolean;
     officialLibVersion?: string;
     uin?: string;
 }): {
@@ -9,3 +9,11 @@ export declare function generatePackageDependencies({ importJSSDK, mode, officia
     'lodash.get': string;
     'lodash.set': string;
 };
+export declare function generateLibDependencies(mode: 'mp' | 'h5', officialLibVersion?: any): {};
+export declare function generateSystemPackageDependencies({ importJSSDK }: {
+    importJSSDK: any;
+}): {
+    '@cloudbase/adapter-wx_mp': string;
+    '@cloudbase/auth': string;
+    '@cloudbase/ai': string;
+};

package/lib/builder/config/dependencies.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePackageDependencies = void 0;
+exports.generateSystemPackageDependencies = exports.generateLibDependencies = exports.generatePackageDependencies = void 0;
 const cals_1 = require("@cloudbase/cals");
+const CLOUDBASE_VERSION = '2.8.15-beta.0';
 const BASE_DEPS = {
     'miniprogram-gesture': '^1.0.6',
     mobx: '^5',
@@ -12,28 +13,24 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/oauth': '0.1.1-alpha.15',
     '@cloudbase/weda-client': '1.1.6',
-    '@cloudbase/weda-cloud-sdk': '1.0.76',
+    '@cloudbase/weda-cloud-sdk': '1.0.86',
+};
+const COMPONENT_DEPS = {
+    '@cloudbase/lowcode-render': '^1.1.4',
+};
+const SYS_CLOUDBASE_DEPS = {
+    '@cloudbase/adapter-wx_mp': '^1.0.3',
+    '@cloudbase/auth': CLOUDBASE_VERSION,
+    '@cloudbase/ai': CLOUDBASE_VERSION,
 };
 function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }) {
     const deps = {};
-    if (importJSSDK) {
-        deps['@cloudbase/js-sdk'] = '2.5.47-beta.0';
-    }
-    const mod = uin ? Number(uin) % 10 : undefined;
     if (mode === 'lib') {
-        // eslint-disable-next-line no-restricted-syntax
-        for (const key in CLOUDBASE_DEPS) {
-            const version = CLOUDBASE_DEPS[key];
-            /**
-             * lib 模式下采用松散的引用
-             */
-            deps[key] = /^\d/.test(version) ? `^${version}` : version;
-        }
-        if (officialLibVersion) {
-            deps[cals_1.OFFICIAL_LIB_MP_NPM_PACKAGENAME] = officialLibVersion;
+        if (importJSSDK) {
+            deps['@cloudbase/js-sdk'] = CLOUDBASE_VERSION;
         }
+        Object.assign(deps, generateLibDependencies('mp', officialLibVersion));
     }
     else {
         for (const key in CLOUDBASE_DEPS) {
@@ -46,3 +43,28 @@ function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, ui
     };
 }
 exports.generatePackageDependencies = generatePackageDependencies;
+function generateLibDependencies(mode, officialLibVersion) {
+    const deps = {};
+    const modeDeps = mode === 'mp' ? { ...CLOUDBASE_DEPS, ...SYS_CLOUDBASE_DEPS } : COMPONENT_DEPS;
+    for (const key in modeDeps) {
+        const version = modeDeps[key];
+        deps[key] = /^\d/.test(version) ? `^${version}` : version;
+    }
+    if (officialLibVersion) {
+        const officialLibPackageName = mode === 'mp' ? cals_1.OFFICIAL_LIB_MP_NPM_PACKAGENAME : cals_1.OFFICIAL_LIB_NPM_PACKAGENAME;
+        deps[officialLibPackageName] = officialLibVersion;
+    }
+    return deps;
+}
+exports.generateLibDependencies = generateLibDependencies;
+function generateSystemPackageDependencies({ importJSSDK }) {
+    const deps = {};
+    if (importJSSDK) {
+        deps['@cloudbase/js-sdk'] = CLOUDBASE_VERSION;
+    }
+    return {
+        ...deps,
+        ...SYS_CLOUDBASE_DEPS,
+    };
+}
+exports.generateSystemPackageDependencies = generateSystemPackageDependencies;

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

@@ -1,5 +1,5 @@
 export { REPLACE_SIGN, MP_CONFIG_MODULE_NAME, KBONE_PAGE_KEYS, npmRegistry, remConfig, rpxConfig, OFFICIAL_LIB_KEY, } from '@cloudbase/lowcode-generator/lib/generator/config/index';
-export { generatePackageDependencies } from './dependencies';
+export { generatePackageDependencies, generateLibDependencies, generateSystemPackageDependencies, } from './dependencies';
 export declare const sharedMaterialsDir: string;
 export declare const appTemplateDir: string;
 export declare const materialsDirName = "materials";

package/lib/builder/config/index.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.getPrivatelinkJsUrl = exports.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.systemSubpackageMiniprogramDir = exports.cloudbaseMiniprogramDir = exports.miniprogramDir = exports.RUNTIME_CONFIG_URL = exports.systemSubpackageMiniprogramURL = exports.cloudbaseMiniprogramURL = exports.miniprogramURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.generatePackageDependencies = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.getPrivatelinkJsUrl = exports.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.systemSubpackageMiniprogramDir = exports.cloudbaseMiniprogramDir = exports.miniprogramDir = exports.RUNTIME_CONFIG_URL = exports.systemSubpackageMiniprogramURL = exports.cloudbaseMiniprogramURL = exports.miniprogramURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.generateSystemPackageDependencies = exports.generateLibDependencies = exports.generatePackageDependencies = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 const index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -40,6 +40,8 @@ Object.defineProperty(exports, "rpxConfig", { enumerable: true, get: function ()
 Object.defineProperty(exports, "OFFICIAL_LIB_KEY", { enumerable: true, get: function () { return index_2.OFFICIAL_LIB_KEY; } });
 var dependencies_1 = require("./dependencies");
 Object.defineProperty(exports, "generatePackageDependencies", { enumerable: true, get: function () { return dependencies_1.generatePackageDependencies; } });
+Object.defineProperty(exports, "generateLibDependencies", { enumerable: true, get: function () { return dependencies_1.generateLibDependencies; } });
+Object.defineProperty(exports, "generateSystemPackageDependencies", { enumerable: true, get: function () { return dependencies_1.generateSystemPackageDependencies; } });
 exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
 exports.appTemplateDir = path.resolve(__dirname, '../../../template');
 exports.materialsDirName = 'materials'; // materials diretory of current project
@@ -48,8 +50,8 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-replace-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
 const COMP_PUBLIC_DOMAIN = 'comp-public-replace-1303824488-cos.weda.tencent.com';
-exports.miniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/miniprogram_npm.1.8.107.zip`;
-exports.cloudbaseMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/cloudbase_miniprogram_npm.1.8.107.zip`;
+exports.miniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/miniprogram_npm.1.9.5.zip`;
+exports.cloudbaseMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/cloudbase_miniprogram_npm.1.9.5.zip`;
 exports.systemSubpackageMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/wd_system_miniprogram_npm.zip`;
 exports.RUNTIME_CONFIG_URL = `https://${COMP_PUBLIC_DOMAIN}/release_config/runtime/exp_runtime.json`;
 /**

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

@@ -4,6 +4,7 @@ import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { ICommonBuildContext } from '../mp/BuildContext';
+export { buildBlock } from '../h5/block2component';
 interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];

package/lib/builder/core/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildComposite = exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = exports.buildWedaConfig = void 0;
+exports.buildComposite = exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = exports.buildWedaConfig = exports.buildBlock = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("../util");
@@ -18,6 +18,8 @@ const config_1 = require("../config");
 const axios_1 = __importDefault(require("axios"));
 const materials_1 = require("../mp/materials");
 const common_3 = require("@cloudbase/lowcode-generator/lib/generator/types/common");
+var block2component_1 = require("../h5/block2component");
+Object.defineProperty(exports, "buildBlock", { enumerable: true, get: function () { return block2component_1.buildBlock; } });
 const pkg = require('../../../package.json');
 async function buildWedaConfig({ output, domain = undefined, isPrivateMode = undefined, endpointType = undefined, buildTypeList = [common_1.BuildType.WEB], }) {
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
@@ -486,25 +488,10 @@ async function patchMpComponentNPM({ packageDir, name, version, packageMiniprogr
         version: version || packageJSON.version || '0.0.1',
         miniprogram: `./${packageMiniprogramEntry}`,
         keywords: ['微搭', '小程序', '区块组件', 'cloudbase', 'cloudbase-module', 'cloudbase-component'],
-        scripts: {
-            ...packageJSON.scripts,
-            postinstall: 'node scripts/fixCloudSdk.js',
-        },
         dependencies: {
             ...packageJSON.peerDependencies,
             ...BASE_DEPS,
         },
     };
-    await Promise.all([
-        fs_extra_1.default.writeFile(path_1.default.join(packageDir, 'scripts', 'fixCloudSdk.js'), `try {
-const cloudIndex = require.resolve('@cloudbase/weda-cloud-sdk') || '';
-const cloudFixPath = cloudIndex.replace(/@cloudbase\\/weda-cloud-sdk\\/.*$/, '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js');
-const fix = require(cloudFixPath);
-fix()
-} catch(e) {
-  console.log('run scripts error', e)
-}
-`),
-        fs_extra_1.default.writeFile(packageJsonPath, JSON.stringify(packageJSON, undefined, 2)),
-    ]);
+    await Promise.all([fs_extra_1.default.writeFile(packageJsonPath, JSON.stringify(packageJSON, undefined, 2))]);
 }

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

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

package/lib/builder/h5/block2component.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildBlock = void 0;
+const cals_1 = require("@cloudbase/cals");
+const util_1 = require("../util");
+const types_1 = require("../../types");
+const material_1 = require("./material");
+const config_1 = require("../config");
+const generate_1 = require("./generate");
+async function buildBlock(buildDir, dependencies, runtime = types_1.RUNTIME.NONE) {
+    var _a, _b;
+    const { materialsDir } = (0, util_1.getCompileDirs)();
+    let usedComps;
+    const composite = dependencies.find((lib) => lib.isComposite);
+    if (composite) {
+        let id = 0;
+        const cals = {
+            items: [
+                {
+                    id: '$page',
+                    type: 'PAGE',
+                    items: ((_b = (_a = composite.components) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, (component) => {
+                        id += 1;
+                        return {
+                            id: `id${id}`,
+                            module: composite.name,
+                            component: component.name,
+                            attributes: {},
+                        };
+                    })) || [],
+                },
+            ],
+        };
+        usedComps = (0, cals_1.getUsedComps)([cals], dependencies, { streamline: true, withAction: true });
+    }
+    let processedDependencies = await (0, material_1.runHandleMaterial)(buildDir, dependencies.filter((lib) => {
+        var _a, _b;
+        // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
+        return lib.name !== config_1.OFFICIAL_LIB_KEY && !!(((_a = usedComps.component) === null || _a === void 0 ? void 0 : _a[lib.name]) || ((_b = usedComps.action) === null || _b === void 0 ? void 0 : _b[lib.name]));
+    }), 
+    // [dependence, ...dependencies],
+    materialsDir, runtime);
+    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);
+    try {
+        await (0, generate_1.generateBlockFiles)({
+            dependencies: processedDependencies,
+            appBuildDir: buildDir,
+            componentDeps,
+        });
+    }
+    catch (error) {
+        throw error;
+    }
+    return buildDir;
+}
+exports.buildBlock = buildBlock;

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

@@ -7,6 +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 generateHTML({ buildContext, appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在

package/lib/builder/h5/generate.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateThemeVarsFile = exports.handleAssets = exports.generateHTML = exports.generateProjectFiles = void 0;
+exports.generateThemeVarsFile = exports.handleAssets = exports.generateHTML = exports.generateBlockFiles = exports.generateProjectFiles = void 0;
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const generateFiles_1 = require("../util/generateFiles");
 const path_1 = __importDefault(require("path"));
@@ -26,6 +26,20 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
+async function generateBlockFiles(buildData) {
+    const { dependencies, appBuildDir, componentDeps } = buildData;
+    const fileCodeMap = {};
+    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);
+        }));
+    }
+    catch (error) {
+        throw error;
+    }
+}
+exports.generateBlockFiles = generateBlockFiles;
 async function generateHTML({ buildContext, appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在

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

@@ -1,3 +1,3 @@
 import { IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { RUNTIME } from '../../types';
-export declare function runHandleMaterial(appBuildDir: string, dependencies: IMaterialItem[] | undefined, materialsDir: string, runtime?: RUNTIME, ignoreInstall?: boolean): Promise<any[]>;
+export declare function runHandleMaterial(appBuildDir: string, dependencies: IMaterialItem[] | undefined, materialsDir: string, runtime?: RUNTIME, ignoreInstall?: boolean): Promise<IMaterialItem[]>;

package/lib/builder/h5/material.js

@@ -48,7 +48,7 @@ async function runHandleMaterial(appBuildDir, dependencies = [], materialsDir, r
         runtime,
         ignoreInstall,
     });
-    return allMaterials.concat(compositeDependencies);
+    return compositeDependencies.concat(allMaterials);
     // TODO: 确认这里是否需要生成复合组件
     // await handleCompositeComponent({ dependencies, appBuildDir });
 }

package/lib/builder/mp/index.js

@@ -213,7 +213,6 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appId,
                 extraDeps: {
                     ...(0, index_1.generatePackageDependencies)({
-                        importJSSDK: endpointType === 'tcb-api',
                         mode: 'app',
                         uin: buildContext.uin,
                     }),
@@ -259,8 +258,16 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         // 生成上报 & 系统子包模块模块
         const subpackageRootPath = path_1.default.join(localWedaRoot, 'packages', '$wd_system');
         const sysSubpackageFileData = {
-            'package.json': { cdnEndpoints, privatelink: !!buildContext.privatelinkConfig },
-            'index.js.tpl': { cdnEndpoints, privatelink: !!buildContext.privatelinkConfig },
+            'package.json': {
+                cdnEndpoints,
+                privatelink: !!buildContext.privatelinkConfig,
+                extraDeps: (0, index_1.generateSystemPackageDependencies)({ importJSSDK: endpointType === 'tcb-api' }),
+            },
+            'index.js.tpl': {
+                cdnEndpoints,
+                privatelink: !!buildContext.privatelinkConfig,
+                importJSSDK: endpointType === 'tcb-api',
+            },
         };
         console.log(`Generating ${em('system subpackage')} files`);
         function copyFilterTplRecursiveSync(src, dest, options) {
@@ -388,7 +395,6 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                         appId,
                         extraDeps: {
                             ...(0, index_1.generatePackageDependencies)({
-                                importJSSDK: endpointType === 'tcb-api',
                                 mode: 'app',
                                 uin: buildContext.uin,
                             }),
@@ -428,7 +434,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             else {
                 await (0, webpack_1.installDependencies)(meta.path, {
                     ignoreInstall,
-                    fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
+                    fixNodeModulesMap: {
+                        mobx: true,
+                    },
                 });
             }
         }

package/lib/builder/mp/util.js

@@ -219,7 +219,7 @@ function createTemplateQuery(ctx, query = {}) {
         map[key] = {
             ...rest,
             handler: item.type === cals_1.EQueryType.GeneralFunc
-                ? `(__data__,__params__) => (${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')})({params:__params__,data:__data__})`
+                ? `(__data__,__params__) => (\n${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')}\n)({params:__params__,data:__data__})`
                 : `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,

package/lib/builder/service/webpack.d.ts

@@ -51,7 +51,7 @@ export declare function getMainAppDataByList(allAppDataList: IWebRuntimeAppData[
 export declare function getHomePageInstance(pageInstanceList: any): any;
 export declare function getPageName(name: string): string;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;
-export declare function downloadDependencies(targetDir: string, srcZipUrl: string): Promise<void>;
+export declare function downloadDependencies(targetDir: string, srcZipUrl: string, useBash?: boolean): Promise<void>;
 /**
  *
  * @param targetDir 目标目录

package/lib/builder/service/webpack.js

@@ -54,6 +54,7 @@ async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBui
             : mode !== common_1.WebpackModeType.PRODUCTION
                 ? 'eval'
                 : false,
+        vueVersion,
     }, null, 2);
     const webpackConfigContent = `params = ${paramsString};\nmodule.exports = require('./web.prod.js')(params);`;
     await (0, generateFiles_1.writeFile)(webpackConfigPath, webpackConfigContent);
@@ -140,7 +141,7 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
         }
         // 如果需要下载素材
         if (!(await fs_extra_1.default.pathExists(targetDir))) {
-            const matched = srcZipUrl.match(/\/(cg-.*?)\//);
+            const matched = srcZipUrl === null || srcZipUrl === void 0 ? void 0 : srcZipUrl.match(/\/(cg-.*?)\//);
             const { appBuildDir } = (0, util_1.getCompileDirs)('app');
             if ((matched === null || matched === void 0 ? void 0 : matched[1]) && fs_extra_1.default.existsSync(path_1.default.resolve(appBuildDir, `.component_cache/web/${matched[1]}@${version}`))) {
                 console.log(`link ${name}@${version} ...`);
@@ -161,7 +162,7 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
             }
             else {
                 console.log(`下载${name}@${version} ...`);
-                await downloadDependencies(targetDir, srcZipUrl);
+                await downloadDependencies(targetDir, srcZipUrl, /^cloudbase-/.test(process.env.CCI_CURRENT_TEAM || ''));
             }
         }
         // 同步依赖
@@ -170,57 +171,54 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
         // );
         // item.dependencies = packageJson.dependencies || {};
     }));
-    await Promise.all(dependencies.map(async (item) => {
-        const { name, version, srcZipUrl } = item;
-        const materialNameVersion = `${name}@${version}`;
-        const targetDir = path_1.default.join(materialsDir, materialNameVersion);
-        console.log(`处理${name}@${version}依赖 ...`);
-        await installDependencies(targetDir, {
-            ...installOptions,
-            isDependence: true,
-            ignoreInstall: (0, common_2.isOfficialComponentLib)(name, version) || (installOptions === null || installOptions === void 0 ? void 0 : installOptions.ignoreInstall),
-            dependenceMeta: {
-                name,
-                version,
-                downloadUrl: srcZipUrl,
-            },
-        });
-    }));
+    if (!process.env.IS_WEB_WORKER) {
+        await Promise.all(dependencies.map(async (item) => {
+            const { name, version, srcZipUrl } = item;
+            const materialNameVersion = `${name}@${version}`;
+            const targetDir = path_1.default.join(materialsDir, materialNameVersion);
+            console.log(`处理${name}@${version}依赖 ...`);
+            await installDependencies(targetDir, {
+                ...installOptions,
+                isDependence: true,
+                ignoreInstall: (0, common_2.isOfficialComponentLib)(name, version) || (installOptions === null || installOptions === void 0 ? void 0 : installOptions.ignoreInstall),
+                dependenceMeta: {
+                    name,
+                    version,
+                    downloadUrl: srcZipUrl,
+                },
+            });
+        }));
+    }
 }
 exports.downloadAndInstallDependencies = downloadAndInstallDependencies;
-async function downloadDependencies(targetDir, srcZipUrl) {
+async function downloadDependencies(targetDir, srcZipUrl, useBash = false) {
     const isExist = fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'package.json'));
     if (isExist || !srcZipUrl) {
         return;
     }
     try {
-        let response = await (0, axios_1.default)({
-            url: srcZipUrl,
-            responseType: 'stream',
-            // proxy: false
-        });
-        await fs_extra_1.default.ensureDir(targetDir);
-        // let download = spawn(
-        //   'curl',
-        //   ['-fsSL', srcZipUrl, '-o', `${targetDir}.zip`],
-        //   {
-        //     stdio: 'inherit',
-        //   }
-        // );
-        // await promisifyProcess(download);
-        const tag = `uncompress ${srcZipUrl}`;
-        console.time(tag);
-        await compressing_1.default.zip.uncompress(response.data, targetDir);
-        // let unzip = spawn(
-        //   'unzip',
-        //   ['-q', '-o', `${targetDir}.zip`, '-d', targetDir],
-        //   {
-        //     stdio: 'inherit',
-        //   }
-        // );
-        // await promisifyProcess(unzip);
-        // await fs.remove(`${targetDir}.zip`);
-        console.timeEnd(tag);
+        if (useBash) {
+            const tag = `bash ${srcZipUrl}`;
+            console.time(tag);
+            await fs_extra_1.default.ensureDir(targetDir);
+            await spawnPromise(`wget -qO- ${srcZipUrl} | tar xvz -C ${targetDir}`, [], {
+                cwd: process.cwd(),
+                stdio: undefined,
+            });
+            console.timeEnd(tag);
+        }
+        else {
+            let response = await (0, axios_1.default)({
+                url: srcZipUrl,
+                responseType: 'stream',
+                // proxy: false
+            });
+            const tag = `uncompress ${srcZipUrl}`;
+            await fs_extra_1.default.ensureDir(targetDir);
+            console.time(tag);
+            await compressing_1.default.zip.uncompress(response.data, targetDir);
+            console.timeEnd(tag);
+        }
     }
     catch (e) {
         console.error(`Fail to download weapps material package ${srcZipUrl}`, e);
@@ -313,13 +311,6 @@ function fixNodeModules(projDir, options = { mobx: false, '@cloudbase/js-sdk': f
             }
         }
     }
-    if (jsSDK) {
-        const scriptPath = path_1.default.resolve(projDir, 'node_modules', '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js');
-        if (fs_extra_1.default.existsSync(scriptPath)) {
-            const fix = require(scriptPath);
-            fix();
-        }
-    }
 }
 function getMaterialNodeModulesPathList(dependencies = [], materialsDir, base) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
@@ -370,3 +361,22 @@ async function downloadAssets(targetDir, assetUrl) {
     });
 }
 exports.downloadAssets = downloadAssets;
+async function spawnPromise(command, args, options) {
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const cm = (0, cross_spawn_1.default)(command, args, Object.assign({
+            shell: true,
+            stdio: 'inherit',
+        }, options));
+        let stdout = '';
+        (_a = cm.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            stdout += data;
+        });
+        let stderr = '';
+        (_b = cm.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+            stderr += data;
+        });
+        cm.on('error', reject);
+        cm.on('close', (code) => (code === 0 ? resolve(stdout) : reject(stderr)));
+    });
+}