@cloudbase/lowcode-builder 1.7.1 → 1.7.2

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

@@ -6,12 +6,12 @@ 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_20230213.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230606.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230213.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/config/index.js

@@ -45,12 +45,12 @@ 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_20230213.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230606.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230213.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

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

@@ -48,7 +48,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -12,7 +12,6 @@ const common_1 = require("../types/common");
 const index_1 = require("../mp/index");
 const types_1 = require("../../types");
 const mixMode_1 = require("../mp/mixMode");
-const index_2 = require("../h5/index");
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const cals_1 = require("@cloudbase/cals");
@@ -182,24 +181,28 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             return outDir;
         }
         else {
-            const h5BuildDir = await (0, index_2.buildH5App)({
-                buildContext: { ...buildContext, isMixMode: false },
-                cals,
-                subAppCalsList,
-                extraData,
-                buildTypeList,
-                mode,
-                devTool,
-                runtime,
-                deployOptions,
-                ignoreInstall,
-                cdnEndpoints,
-            });
-            await (cb === null || cb === void 0 ? void 0 : cb(null, {
-                outDir: h5BuildDir,
-                timeElapsed: Date.now() - startTime,
-            }));
-            return h5BuildDir;
+            // web worker build 构建时注入, H5构建目前不支持web worker，web worker build时过滤掉
+            if (!process.env.IS_WEB_WORKER) {
+                const { buildH5App } = require('../h5/index');
+                const h5BuildDir = await buildH5App({
+                    buildContext: { ...buildContext, isMixMode: false },
+                    cals,
+                    subAppCalsList,
+                    extraData,
+                    buildTypeList,
+                    mode,
+                    devTool,
+                    runtime,
+                    deployOptions,
+                    ignoreInstall,
+                    cdnEndpoints,
+                });
+                await (cb === null || cb === void 0 ? void 0 : cb(null, {
+                    outDir: h5BuildDir,
+                    timeElapsed: Date.now() - startTime,
+                }));
+                return h5BuildDir;
+            }
         }
     }
     catch (err) {

package/lib/builder/h5/index.js

@@ -177,16 +177,16 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
                 return `${url.origin}${path_1.default.posix.join(url.pathname, file)}`;
             }
             catch (e) {
-                return path_1.default.posix.join(publicPath, file);
+                return path_1.default.posix.join(publicPath || '', file);
             }
         })
             .filter((item) => !!item);
         // 普通 web 模式，且非hash模式，根据页面生成多份入口
         if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
-            preHeatUrls.push(path_1.default.posix.join(basename));
+            preHeatUrls.push(path_1.default.posix.join(basename || ''));
             await Promise.all((cals.items || []).map((page) => {
-                preHeatUrls.push(path_1.default.posix.join(basename, page.id));
-                preHeatUrls.push(path_1.default.posix.join(basename, page.id, '/'));
+                preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));
+                preHeatUrls.push(path_1.default.posix.join(basename || '', page.id, '/'));
                 return fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'));
             }));
         }

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;