@dcloudio/uni-cli-shared 3.0.0-4020920240930001 → 3.0.0-4030620241128001

package/dist/deps.d.ts

@@ -1,4 +1,4 @@
-export declare const API_DEPS_CSS: {
+export declare const API_DEPS_CSS: (isX: boolean) => {
     showModal: string[];
     showToast: string[];
     showActionSheet: string[];
@@ -6,7 +6,7 @@ export declare const API_DEPS_CSS: {
     openLocation: string[];
     chooseLocation: string[];
 };
-export declare const COMPONENT_DEPS_CSS: {
+export declare const COMPONENT_DEPS_CSS: (isX: boolean) => {
     canvas: string[];
     image: string[];
     'movable-area': string[];

package/dist/deps.js

@@ -4,39 +4,50 @@ exports.COMPONENT_DEPS_CSS = exports.API_DEPS_CSS = void 0;
 const constants_1 = require("./constants");
 const RESIZE_SENSOR_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'resize-sensor.css';
 const REFRESHER_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'refresher.css';
-exports.API_DEPS_CSS = {
-    showModal: [`${constants_1.H5_API_STYLE_PATH}modal.css`],
-    showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
-    showActionSheet: [`${constants_1.H5_API_STYLE_PATH}action-sheet.css`],
-    previewImage: [
-        RESIZE_SENSOR_CSS,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper-item.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-area.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-view.css`,
-    ],
-    openLocation: [`${constants_1.H5_API_STYLE_PATH}location-view.css`],
-    chooseLocation: [
-        `${constants_1.H5_API_STYLE_PATH}/location-picker.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}/input.css`,
-        `${constants_1.H5_COMPONENTS_STYLE_PATH}/map.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}/scroll-view.css`,
-    ],
+const API_DEPS_CSS = (isX) => {
+    return {
+        showModal: [`${constants_1.H5_API_STYLE_PATH}modal.css`],
+        showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
+        showActionSheet: [`${constants_1.H5_API_STYLE_PATH}action-sheet.css`],
+        previewImage: [
+            RESIZE_SENSOR_CSS,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper-item.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-area.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-view.css`,
+        ],
+        openLocation: [`${constants_1.H5_API_STYLE_PATH}location-view.css`],
+        chooseLocation: [
+            ...(isX
+                ? [
+                    `${constants_1.BASE_COMPONENTS_STYLE_PATH}/view.css`,
+                    `${constants_1.BASE_COMPONENTS_STYLE_PATH}/text.css`,
+                ]
+                : [`${constants_1.H5_API_STYLE_PATH}/location-picker.css`]),
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/input.css`,
+            `${constants_1.H5_COMPONENTS_STYLE_PATH}/map.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/scroll-view.css`,
+        ],
+    };
 };
-exports.COMPONENT_DEPS_CSS = {
-    canvas: [RESIZE_SENSOR_CSS],
-    image: [RESIZE_SENSOR_CSS],
-    'movable-area': [RESIZE_SENSOR_CSS],
-    'picker-view': [RESIZE_SENSOR_CSS],
-    'picker-view-column': [RESIZE_SENSOR_CSS],
-    'rich-text': [RESIZE_SENSOR_CSS],
-    textarea: [RESIZE_SENSOR_CSS],
-    'web-view': [RESIZE_SENSOR_CSS],
-    picker: [
-        RESIZE_SENSOR_CSS,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view.css`,
-        `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view-column.css`,
-    ],
-    'scroll-view': [REFRESHER_CSS],
-    'list-view': [RESIZE_SENSOR_CSS, REFRESHER_CSS],
+exports.API_DEPS_CSS = API_DEPS_CSS;
+const COMPONENT_DEPS_CSS = (isX) => {
+    return {
+        canvas: [RESIZE_SENSOR_CSS],
+        image: [RESIZE_SENSOR_CSS],
+        'movable-area': [RESIZE_SENSOR_CSS],
+        'picker-view': [RESIZE_SENSOR_CSS],
+        'picker-view-column': [RESIZE_SENSOR_CSS],
+        'rich-text': [RESIZE_SENSOR_CSS],
+        textarea: [RESIZE_SENSOR_CSS],
+        'web-view': [RESIZE_SENSOR_CSS],
+        picker: [
+            RESIZE_SENSOR_CSS,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view-column.css`,
+        ],
+        'scroll-view': [REFRESHER_CSS],
+        'list-view': [RESIZE_SENSOR_CSS, REFRESHER_CSS],
+    };
 };
+exports.COMPONENT_DEPS_CSS = COMPONENT_DEPS_CSS;

package/dist/easycom.js

@@ -64,8 +64,11 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             globalThis.uts2jsSourceCodeMap.initUts2jsEasycom(easycoms);
         }
     };
-    initEasycom(options);
-    initUTSEasycom();
+    // ext-api 模式下，不存在 easycom 特性
+    if (process.env.UNI_COMPILE_TARGET !== 'ext-api') {
+        initEasycom(options);
+        initUTSEasycom();
+    }
     const componentExtNames = isX ? 'uvue|vue' : 'vue';
     const res = {
         options,
@@ -79,8 +82,10 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
         }),
         refresh() {
             res.options = initEasycomOptions();
-            initEasycom(res.options);
-            initUTSEasycom();
+            if (process.env.UNI_COMPILE_TARGET !== 'ext-api') {
+                initEasycom(res.options);
+                initUTSEasycom();
+            }
         },
         easycoms,
     };
@@ -186,11 +191,13 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
         return easycoms;
     }
     const is_uni_modules = path_1.default.basename(path_1.default.resolve(dir, '../..')) === 'uni_modules';
-    const is_encrypt_uni_modules = // uni_modules模式不需要此逻辑
+    const is_easycom_encrypt_uni_modules = // uni_modules模式不需要此逻辑
      process.env.UNI_COMPILE_TARGET !== 'uni_modules' &&
         is_uni_modules &&
-        fs_1.default.existsSync(path_1.default.resolve(dir, '../encrypt'));
-    const uni_modules_plugin_id = is_encrypt_uni_modules && path_1.default.basename(path_1.default.resolve(dir, '..'));
+        // 前端加密插件，不能包含utssdk目录
+        fs_1.default.existsSync(path_1.default.resolve(dir, '../encrypt')) &&
+        !fs_1.default.existsSync(path_1.default.resolve(dir, '../utssdk'));
+    const uni_modules_plugin_id = is_easycom_encrypt_uni_modules && path_1.default.basename(path_1.default.resolve(dir, '..'));
     fs_1.default.readdirSync(dir).forEach((name) => {
         const folder = path_1.default.resolve(dir, name);
         if (!isDir(folder)) {
@@ -202,7 +209,7 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
         for (let i = 0; i < extensions.length; i++) {
             const ext = extensions[i];
             if (files.includes(name + ext)) {
-                easycoms[`^${name}$`] = is_encrypt_uni_modules
+                easycoms[`^${name}$`] = is_easycom_encrypt_uni_modules
                     ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${
                     // android 走 proxy
                     process.env.UNI_APP_X === 'true' &&

package/dist/env/define.js

@@ -8,6 +8,7 @@ function initDefine(stringifyBoolean = false) {
     const platformManifestJson = (0, json_1.getPlatformManifestJsonOnce)();
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
     const isDebug = !!manifestJson.debug;
+    process.env['UNI_APP_ID'] = manifestJson.appid;
     return {
         ...initCustomDefine(),
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),

package/dist/hbx/log.d.ts

@@ -4,4 +4,5 @@ export declare function formatAtFilename(filename: string, line?: number, column
 export declare const h5ServeFormatter: Formatter;
 export declare const removeInfoFormatter: Formatter;
 export declare const removeWarnFormatter: Formatter;
+export declare const removeDuplicatePluginFormatter: Formatter;
 export declare const errorFormatter: Formatter<LogErrorOptions>;

package/dist/hbx/log.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.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = exports.formatAtFilename = void 0;
+exports.errorFormatter = exports.removeDuplicatePluginFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = exports.formatAtFilename = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -44,7 +44,10 @@ if (typeof console !== 'undefined') {
     // overridedConsole('error', console.error, ZERO_WIDTH_CHAR.ERROR)
 }
 function formatAtFilename(filename, line, column) {
-    const file = path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0]);
+    filename = filename.replace('\x00', '').split('?')[0];
+    const file = process.env.UNI_INPUT_DIR
+        ? path_1.default.relative(process.env.UNI_INPUT_DIR, filename)
+        : filename;
     return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(file === 'pages-json-uts' ? 'pages.json' : file) +
         ':' +
         (line || 1) +
@@ -100,6 +103,20 @@ exports.removeWarnFormatter = {
         return '';
     },
 };
+exports.removeDuplicatePluginFormatter = {
+    test() {
+        return true;
+    },
+    format(msg) {
+        // [plugin:vite:vue] [plugin vite:vue]
+        // 正则匹配获取第一个插件名称，然后移除 [plugin vite:vue]
+        const pluginName = msg.match(/\[plugin\s([^\]]+)\]/)?.[1];
+        if (pluginName) {
+            return msg.replace(`[plugin ${pluginName}]`, '');
+        }
+        return msg;
+    },
+};
 exports.errorFormatter = {
     test(_, opts) {
         return !!(opts && opts.error);
@@ -110,32 +127,46 @@ exports.errorFormatter = {
 };
 function buildErrorMessage(err, args = [], includeStack = true) {
     if (err.plugin) {
-        const otherMsgs = [];
-        if (err.message.includes(': [plugin ')) {
-            const messages = err.message.split(': [plugin ');
-            err.message = messages[0];
-            messages.slice(1).forEach((msg) => {
-                otherMsgs.push(`[plugin:${msg}`);
-            });
+        // 避免出现这样的错误：[plugin:vite:vue] [plugin vite:vue]
+        if (err.message.startsWith(`[plugin ${err.plugin}]`)) {
+            let msg = err.message.replace(`[plugin ${err.plugin}]`, '');
+            if (err.loc) {
+                // [plugin:vite:vue]  pages/index/index.vue (2:12): v-on="" is not supported
+                const locStr = `(${err.loc.line}:${err.loc.column}):`;
+                if (msg.includes(locStr)) {
+                    msg = msg.split(locStr)[1];
+                }
+            }
+            args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(msg)}`);
         }
-        args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
-        args.push(...otherMsgs);
-        if (err.loc &&
-            err.hook === 'transform' &&
-            err.plugin === 'rollup-plugin-dynamic-import-variables' &&
-            err.id &&
-            constants_1.EXTNAME_VUE_RE.test(err.id)) {
-            try {
-                const ast = (0, ast_1.parseVue)(fs_1.default.readFileSync(err.id, 'utf8'), []);
-                const scriptNode = ast.children.find((node) => node.type === compiler_core_1.NodeTypes.ELEMENT && node.tag === 'script');
-                if (scriptNode) {
-                    const scriptLoc = scriptNode.loc;
-                    args.push(picocolors_1.default.yellow(pad((0, utils_2.generateCodeFrame)(scriptLoc.source, err.loc))));
-                    // correct error location
-                    err.loc.line = scriptLoc.start.line + err.loc.line - 1;
+        else {
+            const otherMsgs = [];
+            if (err.message.includes(': [plugin ')) {
+                const messages = err.message.split(': [plugin ');
+                err.message = messages[0];
+                messages.slice(1).forEach((msg) => {
+                    otherMsgs.push(`[plugin:${msg}`);
+                });
+            }
+            args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
+            args.push(...otherMsgs);
+            if (err.loc &&
+                err.hook === 'transform' &&
+                err.plugin === 'rollup-plugin-dynamic-import-variables' &&
+                err.id &&
+                constants_1.EXTNAME_VUE_RE.test(err.id)) {
+                try {
+                    const ast = (0, ast_1.parseVue)(fs_1.default.readFileSync(err.id, 'utf8'), []);
+                    const scriptNode = ast.children.find((node) => node.type === compiler_core_1.NodeTypes.ELEMENT && node.tag === 'script');
+                    if (scriptNode) {
+                        const scriptLoc = scriptNode.loc;
+                        args.push(picocolors_1.default.yellow(pad((0, utils_2.generateCodeFrame)(scriptLoc.source, err.loc))));
+                        // correct error location
+                        err.loc.line = scriptLoc.start.line + err.loc.line - 1;
+                    }
                 }
+                catch (e) { }
             }
-            catch (e) { }
         }
     }
     else {

package/dist/index.d.ts

@@ -22,7 +22,8 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
-export { parseUniExtApi, parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, formatExtApiProviderName, } from './uni_modules';
+export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
+export { parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = exports.formatExtApiProviderName = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -43,10 +43,11 @@ var uni_modules_1 = require("./uni_modules");
 Object.defineProperty(exports, "parseUniExtApi", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApi; } });
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function () { return uni_modules_1.parseInjects; } });
-Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_1.parseUniModulesArtifacts; } });
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
-Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_1.resolveEncryptUniModule; } });
 Object.defineProperty(exports, "formatExtApiProviderName", { enumerable: true, get: function () { return uni_modules_1.formatExtApiProviderName; } });
+var uni_modules_cloud_1 = require("./uni_modules.cloud");
+Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_cloud_1.parseUniModulesArtifacts; } });
+Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_cloud_1.resolveEncryptUniModule; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/app/manifest/defaultManifestJson.js

@@ -26,7 +26,7 @@ const defaultManifestJson = `{
     "permissions": {},
     "plus": {
         "useragent": {
-            "value": "uni-app appservice",
+            "value": "",
             "concatenate": true
         },
         "splashscreen": {
@@ -37,5 +37,11 @@ const defaultManifestJson = `{
         },
         "popGesture": "close",
         "launchwebview": {}
+    },
+    "app-harmony": {
+        "useragent": {
+            "value": "",
+            "concatenate": true
+        }
     }
-  }`;
+}`;

package/dist/json/app/manifest/launchwebview.js

@@ -14,7 +14,28 @@ function initLaunchwebview(manifestJson, pagesJson) {
         }
         catch (e) { }
     }
-    manifestJson.plus.useragent.value = 'uni-app';
+    if (manifestJson.plus.useragent.concatenate) {
+        if (manifestJson.plus.useragent.value) {
+            manifestJson.plus.useragent.value = [
+                'uni-app',
+                manifestJson.plus.useragent.value,
+            ].join(' ');
+        }
+        else {
+            manifestJson.plus.useragent.value = 'uni-app';
+        }
+    }
+    if (manifestJson['app-harmony'].useragent.concatenate) {
+        if (manifestJson['app-harmony'].useragent.value) {
+            manifestJson['app-harmony'].useragent.value = [
+                'uni-app',
+                manifestJson['app-harmony'].useragent.value,
+            ].join(' ');
+        }
+        else {
+            manifestJson['app-harmony'].useragent.value = 'uni-app';
+        }
+    }
     (0, shared_1.extend)(manifestJson.plus.launchwebview, {
         id: '1',
         kernel: 'WKWebview',

package/dist/json/app/manifest/merge.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initRecursiveMerge = void 0;
 const merge_1 = require("merge");
 function initRecursiveMerge(manifestJson, userManifestJson) {
+    const platformConfig = {
+        plus: userManifestJson['app-plus'],
+    };
+    platformConfig['app-harmony'] = userManifestJson['app-harmony'];
     return (0, merge_1.recursive)(true, manifestJson, {
         id: userManifestJson.appid || '',
         name: userManifestJson.name || '',
@@ -13,6 +17,6 @@ function initRecursiveMerge(manifestJson, userManifestJson) {
         },
         locale: userManifestJson.locale,
         uniStatistics: userManifestJson.uniStatistics,
-    }, { plus: userManifestJson['app-plus'] });
+    }, platformConfig);
 }
 exports.initRecursiveMerge = initRecursiveMerge;

package/dist/json/app/manifest/plus.js

@@ -95,6 +95,7 @@ function initUniStatistics(manifestJson) {
     // 根节点配置了统计
     if (manifestJson.uniStatistics) {
         manifestJson.plus.uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson.plus.uniStatistics);
+        manifestJson['app-harmony'].uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson['app-harmony'].uniStatistics);
         delete manifestJson.uniStatistics;
     }
     if (!process.env.UNI_CLOUD_PROVIDER) {

package/dist/json/app/manifest/safearea.js

@@ -12,6 +12,14 @@ function initSafearea(manifestJson, pagesJson) {
                 },
             };
         }
+        if (!manifestJson['app-harmony'].safearea) {
+            manifestJson['app-harmony'].safearea = {
+                background: pagesJson.tabBar.backgroundColor || '#FFFFFF',
+                bottom: {
+                    offset: 'auto',
+                },
+            };
+        }
     }
     else {
         if (!manifestJson.plus.launchwebview) {

package/dist/json/app/pages/uniConfig.js

@@ -36,6 +36,8 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         locales: (0, i18n_1.initLocales)(path_1.default.join(process.env.UNI_INPUT_DIR, 'locale')),
         darkmode: platformConfig.darkmode || false,
         themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),
+        // @ts-expect-error
+        qqMapKey: platformConfig?.distribute?.sdkConfigs?.maps?.tencent?.key,
     };
     // TODO 待支持分包
     return JSON.stringify(config);

package/dist/json/index.d.ts

@@ -4,4 +4,4 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, parseUniXUniStatistics, } from './uni-x';

package/dist/json/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.parseUniXUniStatistics = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -27,3 +27,4 @@ Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true,
 Object.defineProperty(exports, "checkPagesJson", { enumerable: true, get: function () { return uni_x_1.checkPagesJson; } });
 Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return uni_x_1.parseUniXFlexDirection; } });
 Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return uni_x_1.parseUniXSplashScreen; } });
+Object.defineProperty(exports, "parseUniXUniStatistics", { enumerable: true, get: function () { return uni_x_1.parseUniXUniStatistics; } });

package/dist/json/manifest.js

@@ -9,10 +9,11 @@ const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const json_1 = require("./json");
+const utils_1 = require("../utils");
 const parseManifestJson = (inputDir) => {
     const manifestFilename = path_1.default.join(inputDir, 'manifest.json');
     if (!fs_1.default.existsSync(manifestFilename)) {
-        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        if (!(0, utils_1.isNormalCompileTarget)()) {
             return {};
         }
     }

package/dist/json/mp/pages.d.ts

@@ -13,5 +13,5 @@ export declare function parseMiniProgramPagesJson(jsonStr: string, platform: Uni
     pageJsons: Record<string, PageWindowOptions>;
     nvuePages: string[];
 };
-export declare function mergeMiniProgramAppJson(appJson: Record<string, any>, platformJson?: Record<string, any>): void;
+export declare function mergeMiniProgramAppJson(appJson: Record<string, any>, platformJson?: Record<string, any>, source?: Record<string, any>): void;
 export {};

package/dist/json/mp/pages.js

@@ -14,7 +14,12 @@ const utils_2 = require("../../utils");
 const project_1 = require("./project");
 const manifest_1 = require("../manifest");
 const theme_1 = require("../theme");
+const uni_x_1 = require("../uni-x");
 function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: false }) {
+    if (process.env.UNI_APP_X === 'true') {
+        // 目前仅对x开放
+        (0, uni_x_1.checkPagesJson)(jsonStr, process.env.UNI_INPUT_DIR);
+    }
     return parsePagesJson(jsonStr, platform, options);
 }
 exports.parseMiniProgramPagesJson = parseMiniProgramPagesJson;
@@ -28,7 +33,12 @@ const NON_APP_JSON_KEYS = [
     'mergeVirtualHostAttributes',
     'styleIsolation',
 ];
-function mergeMiniProgramAppJson(appJson, platformJson = {}) {
+function mergeMiniProgramAppJson(appJson, platformJson = {}, source = {}) {
+    Object.keys(source).forEach((key) => {
+        if (!project_1.projectKeys.includes(key)) {
+            project_1.projectKeys.push(key);
+        }
+    });
     Object.keys(platformJson).forEach((name) => {
         if (!(0, project_1.isMiniProgramProjectJsonKey)(name) &&
             !NON_APP_JSON_KEYS.includes(name)) {

package/dist/json/mp/project.d.ts

@@ -9,6 +9,7 @@ interface ProjectConfig {
         miniprogram?: UniApp.PagesJson['condition'];
     };
 }
+export declare const projectKeys: string[];
 export declare function isMiniProgramProjectJsonKey(name: string): boolean;
 export declare function parseMiniProgramProjectJson(jsonStr: string, platform: UniApp.PLATFORM, { template, pagesJson }: ParseMiniProgramProjectJsonOptions): ProjectConfig;
 export {};

package/dist/json/mp/project.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = void 0;
+exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = exports.projectKeys = void 0;
 const shared_1 = require("@vue/shared");
 const merge_1 = require("merge");
 const json_1 = require("../json");
-const projectKeys = [
+exports.projectKeys = [
     'appid',
     'setting',
     'miniprogramRoot',
@@ -20,7 +20,7 @@ const projectKeys = [
     'cloudbaseRoot',
 ];
 function isMiniProgramProjectJsonKey(name) {
-    return projectKeys.includes(name);
+    return exports.projectKeys.includes(name);
 }
 exports.isMiniProgramProjectJsonKey = isMiniProgramProjectJsonKey;
 function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson }) {
@@ -28,9 +28,10 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
     const manifestJson = (0, json_1.parseJson)(jsonStr);
     if (manifestJson) {
         projectJson.projectname = manifestJson.name;
+        // 用户的平台配置
         const platformConfig = manifestJson[platform];
         if (platformConfig) {
-            projectKeys.forEach((name) => {
+            const setProjectJson = (name) => {
                 if ((0, shared_1.hasOwn)(platformConfig, name)) {
                     if ((0, shared_1.isPlainObject)(platformConfig[name]) &&
                         (0, shared_1.isPlainObject)(projectJson[name])) {
@@ -42,6 +43,16 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
                         projectJson[name] = platformConfig[name];
                     }
                 }
+            };
+            // 读取 template 中的配置
+            Object.keys(template).forEach((name) => {
+                if (!exports.projectKeys.includes(name)) {
+                    exports.projectKeys.push(name);
+                }
+            });
+            // common mp config
+            exports.projectKeys.forEach((name) => {
+                setProjectJson(name);
             });
             // 使用了微信小程序手势系统，自动开启 ES6=>ES5
             platform === 'mp-weixin' &&
@@ -57,6 +68,7 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
         }
         projectJson.condition.miniprogram = miniprogram;
     }
+    // appid
     if (!projectJson.appid) {
         projectJson.appid = 'touristappid';
     }

package/dist/json/pages.js

@@ -45,7 +45,7 @@ exports.isUniPageSfcFile = isUniPageSfcFile;
 const parsePagesJson = (inputDir, platform, normalize = true) => {
     const pagesFilename = path_1.default.join(inputDir, 'pages.json');
     if (!fs_1.default.existsSync(pagesFilename)) {
-        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        if (!(0, utils_1.isNormalCompileTarget)()) {
             return {
                 pages: [],
                 globalStyle: { navigationBar: {} },

package/dist/json/uni-x/index.d.ts

@@ -1,4 +1,4 @@
-export { parseUniXFlexDirection, parseUniXSplashScreen } from './manifest';
+export * from './manifest';
 export declare function checkPagesJson(jsonStr: string, inputDir: string): boolean;
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 /**

package/dist/json/uni-x/index.js

@@ -1,9 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -15,9 +29,7 @@ const uniRoutes_1 = require("../app/pages/uniRoutes");
 const uniConfig_1 = require("./uniConfig");
 const utils_2 = require("../../vite/plugins/vitejs/utils");
 const preprocess_1 = require("../../preprocess");
-var manifest_1 = require("./manifest");
-Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
-Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
+__exportStar(require("./manifest"), exports);
 function checkPagesJson(jsonStr, inputDir) {
     if (!inputDir) {
         return false;
@@ -217,7 +229,12 @@ function normalizePageStyle(pageStyle) {
  * @returns
  */
 function normalizeUniAppXAppConfig(pagesJson, manifestJson) {
-    return `const __uniConfig = ${(0, uniConfig_1.normalizeAppXUniConfig)(pagesJson, manifestJson)};
+    const uniConfig = (0, uniConfig_1.normalizeAppXUniConfig)(pagesJson, manifestJson);
+    const tabBar = uniConfig.tabBar;
+    delete uniConfig.tabBar;
+    return `const __uniConfig = ${JSON.stringify(uniConfig)};
+__uniConfig.getTabBarConfig = () =>  {return ${tabBar ? JSON.stringify(tabBar) : 'undefined'}};
+__uniConfig.tabBar = __uniConfig.getTabBarConfig();
 const __uniRoutes = ${(0, uniRoutes_1.normalizeAppUniRoutes)(pagesJson)}.map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
 
 `;