@cloudbase/lowcode-builder 1.8.55 → 1.8.57

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.file.myqcloud.com/lcap-builder/template.1.8.55-alpha.0.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.57.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.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.43.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.57.zip";
 export declare const systemSubpackageMiniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.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.file.myqcloud.com/lcap-builder/template.1.8.55-alpha.0.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.57.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.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.43.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.57.zip';
 exports.systemSubpackageMiniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到

package/lib/builder/core/index.js

@@ -61,7 +61,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, }, cb) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
         return;
@@ -141,7 +141,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
             }
-            const { enablePageRoot, enableAsyncMaterials } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
+            const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
                 ...buildContext,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
@@ -154,7 +154,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     : 'rpx'),
                 enablePageRoot,
                 enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
-                enableAsyncMaterials,
+                enableAsyncMaterials: (_f = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _f === void 0 ? void 0 : _f.enableAsyncMaterials,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

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

@@ -12,7 +12,7 @@ export declare function generateHTML({ buildContext, appId, envId, description,
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
-enableLoading, }: {
+enableLoading, publicPath, }: {
     buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
     appId: string;
     envId: string;
@@ -25,6 +25,7 @@ enableLoading, }: {
     buildTypeList: BuildType[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
     enableLoading?: boolean;
+    publicPath?: string;
 }): Promise<void>;
 export declare function handleAssets({ appBuildDir, buildTypeList, assets, }: {
     appBuildDir: string;

package/lib/builder/h5/generate.js

@@ -31,7 +31,7 @@ async function generateHTML({ buildContext, appId, envId, description = '', appB
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
-enableLoading = undefined, }) {
+enableLoading = undefined, publicPath = '/', }) {
     const { materialLibs, uin } = buildContext;
     const officialLib = materialLibs.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
@@ -51,6 +51,21 @@ enableLoading = undefined, }) {
             }
         }
     }
+    let wedaPrivateConfigEndpoint = '';
+    /**
+     * 如果 public path 为 domain，
+     * 则文件要制定从静态托管桶加载
+     * 加载位置和webpack publicpath html规则一致
+     */
+    if (/^https?:/.test(publicPath)) {
+        try {
+            const url = new URL(publicPath);
+            if (url.origin) {
+                wedaPrivateConfigEndpoint = url.origin;
+            }
+        }
+        catch (e) { }
+    }
     await fs_extra_1.default.writeFile(dstFilePath, (0, lodash_1.template)(packageTpl)({
         appId,
         title: '',
@@ -62,6 +77,7 @@ enableLoading = undefined, }) {
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
         cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+        wedaPrivateConfigEndpoint,
         ext3: [envId, uin, index_1.version, officialLib === null || officialLib === void 0 ? void 0 : officialLib.version, '' /* mpappId */].join('|'),
         /**
          * @deprecated

package/lib/builder/h5/webpack.js

@@ -36,6 +36,7 @@ async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList,
         isBuildApp: buildTypeList.includes(common_1.BuildType.APP),
         buildTypeList,
         cdnEndpoints,
+        publicPath,
     });
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
         if (mode !== common_1.WebpackModeType.PRODUCTION) {