@cloudbase/lowcode-builder 1.8.103 → 1.8.105

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

@@ -91,8 +91,9 @@ interface InormalizeOutput extends INormalizeInput {
 }
 export declare function normalizeInputs(inputs: INormalizeInput, { envId, getWebRootPath, }: {
     envId: string;
-    getWebRootPath?: ({ appId, deployOptions }: {
-        appId: any;
+    getWebRootPath?: ({ appId, name, deployOptions, }: {
+        appId: string;
+        name: string;
         deployOptions: any;
     }) => string;
 }): InormalizeOutput;

package/lib/builder/core/index.js

@@ -326,6 +326,16 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
             inputs.deployOptions.targetMpAppId = inputs.deployOptions.mpAppId;
         }
     }
+    else {
+        // web 构建
+        const { deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW } } = inputs;
+        if (deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
+            inputs.deployOptions = {
+                ...deployOptions,
+                mode: types_1.DEPLOY_MODE.PREVIEW,
+            };
+        }
+    }
     if (extraData.isComposite) {
         Object.keys(extraData.compProps.events).forEach((eName) => {
             extraData.compProps.events[eName] = `$$EVENT_${eName}$$`;
@@ -356,7 +366,7 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
         }
         let { appConfig = {} } = cals.extra;
         let { window = {} } = appConfig;
-        let path = getWebRootPath({ appId, deployOptions });
+        let path = getWebRootPath({ appId, name: cals.name, deployOptions });
         cals.extra.appConfig = {
             ...appConfig,
             window: {
@@ -375,8 +385,9 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
     }
     return cals;
 }
-function _getWebRootPath({ appId, deployOptions }) {
-    return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD ? `/${appId}/production/` : `/${appId}/preview/`;
+function _getWebRootPath({ appId, name, deployOptions }) {
+    const key = name || appId;
+    return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD ? `/${key}/production/` : `/${key}/preview/`;
 }
 async function buildComposite({ dependencies, output, isBrowserMpBuilder, }) {
     var _a, _b;

package/lib/builder/h5/index.js

@@ -53,7 +53,7 @@ if (!process.env.IS_WEB_WORKER) {
 async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c, _d, _e, _f;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, } = buildContext;
-    if (!deployOptions.mode) {
+    if (!deployOptions.mode || deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
     try {
@@ -124,7 +124,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             buildTypeList,
             isSandbox: false,
             runtime,
-            deployOptions,
+            deployOptions: deployOptions,
             _indexPage,
             isPrivateMode,
             expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,

package/lib/builder/mp/index.js

@@ -249,6 +249,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
+                deployMode: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode,
                 clientID: ((_g = mainAppData.extra) === null || _g === void 0 ? void 0 : _g.enableLoginStatusShare)
                     ? mainAppData.envId
                     : (_h = mainAppData.extra) === null || _h === void 0 ? void 0 : _h.clientId,
@@ -692,7 +693,6 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                         label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
                         version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
                         envId: appData.envId,
-                        envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
                         basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList

package/lib/builder/mp/lowcode.js

@@ -25,7 +25,7 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode, ex
             // Generate app lowcode
             const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
-            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(`packages/${ctx.rootPath}`, '')}/` : '';
+            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.posix.relative(`packages/${ctx.rootPath}`, '')}/` : '';
             let weappsApiPrefix = externalAPIImport
                 ? importFromClientSDK(pageId === 'global')
                 : [`import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`]; // windows compatibility