@dcloudio/uni-cli-shared 3.0.0-5000720260410001 → 3.0.0-5010420260703001

package/dist/easycom.js

@@ -10,6 +10,7 @@ const debug_1 = __importDefault(require("debug"));
 const shared_1 = require("@vue/shared");
 const pluginutils_1 = require("@rollup/pluginutils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const x_1 = require("./x");
 const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
@@ -64,6 +65,9 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             ;
             globalThis.uts2jsSourceCodeMap.initUts2jsEasycom(easycoms);
         }
+        // UTS / customElements 组件是在 initEasycom 之后补充进去的，
+        // 这里补一次状态，避免项目里只有这类组件时被误判为没有 easycom。
+        hasEasycom = !!easycoms.length;
     };
     const initUTSEasycomCustomElements = () => {
         (0, uts_1.initUTSCustomElements)(inputDir, platform).forEach((item) => {
@@ -109,8 +113,8 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
                 clearEasycom();
                 (0, uts_1.clearUTSComponents)();
                 (0, uts_1.clearUTSCustomElements)();
-                initEasycom(easyComOptions);
-                if (isX) {
+                initEasycom(res.easyComOptions);
+                if (supportCustomElements) {
                     initUTSEasycomCustomElements();
                 }
                 initUTSEasycom();
@@ -194,9 +198,21 @@ function matchEasycom(tag) {
         easycomsInvalidCache.add(tag);
         return false;
     }
+    // dom2 不支持旧版 uni-app 兼容模式组件，这里在 easycom 真正命中时再报错，
+    // 避免扫描阶段就对未使用的插件组件产生误报。
+    if (process.env.UNI_APP_X_DOM2 === 'true' && matcher.dom2IncompatibleFile) {
+        throw new Error(messages_1.M['dom2.compatible.component']
+            .replace('{name}', `<${tag}>`)
+            .replace('{file}', matcher.dom2IncompatibleFile));
+    }
     source = tag.replace(matcher.pattern, matcher.replacement);
     easycomsCache.set(tag, source);
     debugEasycom('matchEasycom', tag, source);
+    // 检查 H5 专用组件 ask163203
+    const H5_ONLY_COMPONENTS = ['custom-tab-bar'];
+    if (H5_ONLY_COMPONENTS.includes(tag) && process.env.UNI_PLATFORM !== 'h5') {
+        console.warn(`[uni-app] 组件 <${tag}> 是 H5 平台专用组件，在 ${process.env.UNI_PLATFORM} 平台使用可能导致错误。如果你要引入自定义 tabBar 可重命名为其他名称。`);
+    }
     return source;
 }
 exports.matchEasycom = matchEasycom;
@@ -255,12 +271,7 @@ function initAutoScanEasycom(platform, dir, rootDir, extensions) {
                 easycoms[`^${name}$`] =
                     // mp平台，这里不处理，由uniEntryPlugin处理
                     is_easycom_encrypt_uni_modules && !isMp
-                        ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${
-                        // android 走 proxy
-                        process.env.UNI_APP_X === 'true' &&
-                            process.env.UNI_UTS_PLATFORM === 'app-android'
-                            ? 'uts-proxy'
-                            : 'uni_helpers'}`))
+                        ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${(0, x_1.isUniAppXAndroidNative)() ? 'uts-proxy' : 'uni_helpers'}`))
                         : `${importDir}/${name}${ext}`;
                 break;
             }
@@ -313,7 +324,10 @@ function createImportDeclaration(local, source, imported) {
 }
 const RESOLVE_EASYCOM_IMPORT_CODE = `import { resolveDynamicComponent as __resolveDynamicComponent } from 'vue';import { resolveEasycom } from '@dcloudio/uni-app';`;
 function genResolveEasycomCode(importDeclarations, code, name) {
-    if (process.env.UNI_APP_X_DOM2 === 'true') {
+    if (process.env.UNI_APP_X_DOM2 === 'true' ||
+        // 内部 dev 版本，需要本地开发内置组件，比如web-view，此时需要直接返回本地easycom，不然会找到基座内置的
+        (process.env.UNI_HX_VERSION_DEV === 'true' &&
+            process.env.UNI_APP_X === 'true')) {
         // dom2 模式下，为了性能，不再考虑优先级问题，如果开发者需要区别，可以手动导入为其他名称
         return name;
     }

package/dist/env/define.d.ts

@@ -2,7 +2,6 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     __X_STYLE_ISOLATION__: string | boolean;
     __X_STYLE_ISOLATION_UP_ARROW__: string | boolean;
     'process.env.UNI_APP_X_NEW_STYLE_ISOLATION': string | boolean;
-    __UNI_FEATURE_VIRTUAL_HOST__: boolean;
     'process.env.NODE_ENV': string;
     'process.env.UNI_DEBUG': string | boolean;
     'process.env.UNI_APP_ID': string;

package/dist/env/define.js

@@ -15,17 +15,9 @@ function initDefine(stringifyBoolean = false) {
     const isNewStyleIsolationUpArrow = isNewStyleIsolation && process.env.UNI_PLATFORM === 'mp-weixin';
     const isMP = process.env.UNI_PLATFORM && process.env.UNI_PLATFORM.startsWith('mp-');
     process.env['UNI_APP_ID'] = manifestJson.appid;
-    let mpXDefine = isX && isMP
-        ? {
-            __UNI_FEATURE_VIRTUAL_HOST__: true,
-        }
-        : {
-            __UNI_FEATURE_VIRTUAL_HOST__: false,
-        };
-    if (isX && isMP) {
-        mpXDefine.__UNI_FEATURE_VIRTUAL_HOST__ =
-            platformManifestJson.enableVirtualHost !== false;
-    }
+    const mpXDefine = {
+        __UNI_FEATURE_VIRTUAL_HOST__: isX && isMP && platformManifestJson.enableVirtualHost !== false,
+    };
     const styleIsolation = stringifyBoolean
         ? JSON.stringify(isNewStyleIsolation)
         : isNewStyleIsolation;

package/dist/hbx/alias.js

@@ -1,13 +1,15 @@
 "use strict";
-// 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
+// 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
 const utils_1 = require("./utils");
+const jsonc_parser_1 = require("jsonc-parser");
 const hbxPlugins = {
     typescript: 'compile-typescript/node_modules/typescript',
     less: 'compile-less/node_modules/less',
@@ -19,19 +21,73 @@ function initModuleAlias() {
     const libDir = path_1.default.resolve(__dirname, '../../lib');
     const compilerSfcPath = path_1.default.resolve(libDir, '@vue/compiler-sfc');
     const serverRendererPath = require.resolve('@vue/server-renderer');
+    // 对路径进行兼容
+    if (!process.env.UNI_APP_X_DOM2_CPP_DIR &&
+        process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
+        process.env.UNI_APP_X_DOM2_CPP_DIR =
+            process.env.UNI_APP_HARMONY_DOM2_CPP_DIR;
+    }
+    // TODO 等待正式对外推出后，删除这个兼容逻辑
+    if (process.env.UNI_APP_PLATFORM === 'ios' ||
+        process.env.UNI_APP_PLATFORM === 'android') {
+        if (process.env.UNI_INPUT_DIR) {
+            const manifestJsonFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'manifest.json');
+            if (fs_1.default.existsSync(manifestJsonFilename)) {
+                const manifestJsonStr = fs_1.default.readFileSync(manifestJsonFilename, 'utf-8');
+                const manifestJson = (0, jsonc_parser_1.parse)(manifestJsonStr);
+                if (manifestJson?.['uni-app-x']?.vapor === true) {
+                    const vaporFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.vapor');
+                    if (fs_1.default.existsSync(vaporFilename)) {
+                        process.env.UNI_APP_X_DOM2 = 'true';
+                    }
+                }
+            }
+        }
+    }
     if (process.env.UNI_APP_X_DOM2 === 'true') {
-        if (
-        // 该代码执行较早，不能使用UNI_UTS_PLATFORM
-        process.env.UNI_PLATFORM === 'app-harmony') {
-            if (process.env.UNI_OUTPUT_DIR) {
-                if (!process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
-                    process.env.UNI_APP_HARMONY_DOM2_CPP_DIR = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, 'cpp');
+        if (process.env.UNI_OUTPUT_DIR &&
+            (process.env.UNI_PLATFORM === 'app' ||
+                process.env.UNI_PLATFORM === 'app-plus' ||
+                process.env.UNI_PLATFORM === 'app-harmony')) {
+            if (!process.env.UNI_APP_X_DOM2_CPP_DIR) {
+                let baseDir = '';
+                const isAndroid = process.env.UNI_APP_PLATFORM === 'android';
+                const isIOS = process.env.UNI_APP_PLATFORM === 'ios';
+                if (process.env.NODE_ENV !== 'development' && (isAndroid || isIOS)) {
+                    baseDir = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '.uniappx', isAndroid ? 'android' : 'ios');
+                }
+                else {
+                    baseDir =
+                        process.env.UNI_PLATFORM === 'app-harmony'
+                            ? process.env.UNI_OUTPUT_DIR
+                            : process.env.UNI_APP_X_CACHE_DIR || process.env.UNI_OUTPUT_DIR;
+                }
+                process.env.UNI_APP_X_DOM2_CPP_DIR = path_1.default.resolve(baseDir, 'cpp');
+                process.env.UNI_APP_X_DOM2_SO_DIR = path_1.default.resolve(baseDir, 'so');
+            }
+            if (!process.env.UNI_APP_X_DOM2_KT_DIR) {
+                if (process.env.NODE_ENV !== 'development') {
+                    process.env.UNI_APP_X_DOM2_KT_DIR = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '.uniappx/android', 'src');
+                }
+                else {
+                    process.env.UNI_APP_X_DOM2_KT_DIR = path_1.default.resolve(process.env.UNI_APP_X_CACHE_DIR ||
+                        path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../.cache'), 'src');
                 }
             }
         }
-        else {
-            // 目前仅支持 app-harmony 平台启用 dom2
-            delete process.env.UNI_APP_X_DOM2;
+        if (process.env.UNI_APP_PLATFORM ||
+            process.env.UNI_PLATFORM === 'app-harmony') {
+            if (!process.env.UNI_APP_X_VAPOR_RENDER_TARGET) {
+                // 默认 app 平台使用 bytecode 目标
+                process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
+            }
+            if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET?.includes('bytecode')) {
+                process.env.UNI_APP_X_DOM2_DYNAMIC = 'true';
+            }
+            // 如果是 ext-api 目标，强制使用 nativecode 目标
+            if (process.env.UNI_COMPILE_TARGET === 'ext-api') {
+                delete process.env.UNI_APP_X_DOM2_DYNAMIC;
+            }
         }
     }
     if (process.env.UNI_APP_X_DOM2 === 'true') {

package/dist/hbx/log.js

@@ -10,9 +10,10 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const compiler_core_1 = require("@vue/compiler-core");
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
+const utils_2 = require("./utils");
 const constants_1 = require("../constants");
 const ast_1 = require("../vite/utils/ast");
-const utils_2 = require("../vite/plugins/vitejs/utils");
+const utils_3 = require("../vite/plugins/vitejs/utils");
 const SIGNAL_H5_LOCAL = ' ➜  Local:';
 const SIGNAL_H5_NETWORK = ' ➜  Network:';
 const networkLogs = [];
@@ -29,6 +30,12 @@ function overridedConsole(name, oldFn, char) {
     console[name] = function (...args) {
         oldFn.apply(this, args.map((arg) => {
             let item;
+            if ((0, utils_2.isInHBuilderX)() && typeof arg === 'string' && arg.includes('\n')) {
+                arg = arg
+                    .split('\n')
+                    .map((line) => `${char}${line}${char}`)
+                    .join('\n');
+            }
             if (typeof arg !== 'object') {
                 item = `${char}${arg}${char}`;
             }
@@ -200,7 +207,7 @@ function buildErrorMessage(err, args = [], includeStack = true) {
                     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))));
+                        args.push(picocolors_1.default.yellow(pad((0, utils_3.generateCodeFrame)(scriptLoc.source, err.loc))));
                         // correct error location
                         err.loc.line = scriptLoc.start.line + err.loc.line - 1;
                     }

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export * from './hbx';
 export * from './ssr';
 export * from './vue';
 export * from './uts';
+export * from './x';
 export * from './logs';
 export * from './dom2';
 export * from './i18n';
@@ -25,7 +26,7 @@ export * from './platform';
 export * from './utsUtils';
 export * from './workers';
 export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
-export { getUniModulesEncryptType, parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
+export { copyEncryptUniModulesDom2Bytes, getUniModulesEncryptType, parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
 import type { EncryptPackageJson } from './uni_modules.cloud';
 export type EncryptArtifacts = EncryptPackageJson['uni_modules']['artifacts'];
 export { M } from './messages';

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.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.copyEncryptUniModulesDom2Bytes = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -23,6 +23,7 @@ __exportStar(require("./hbx"), exports);
 __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./uts"), exports);
+__exportStar(require("./x"), exports);
 __exportStar(require("./logs"), exports);
 __exportStar(require("./dom2"), exports);
 __exportStar(require("./i18n"), exports);
@@ -48,6 +49,7 @@ Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
 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, "copyEncryptUniModulesDom2Bytes", { enumerable: true, get: function () { return uni_modules_cloud_1.copyEncryptUniModulesDom2Bytes; } });
 Object.defineProperty(exports, "getUniModulesEncryptType", { enumerable: true, get: function () { return uni_modules_cloud_1.getUniModulesEncryptType; } });
 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; } });

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

@@ -117,7 +117,15 @@ function initUniStatistics(manifestJson) {
     if (!uniStatistics) {
         return;
     }
-    if (uniStatistics.version === 2 || uniStatistics.version === '2') {
+    /**
+     * 判断是否为私有版统计：
+     * - 新配置：type === 'private'
+     * - 旧配置兼容：version === 2
+     */
+    const isPrivateStat = uniStatistics.type === 'private' ||
+        uniStatistics.version === 2 ||
+        uniStatistics.version === '2';
+    if (isPrivateStat) {
         if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) {
             return;
         }

package/dist/json/index.d.ts

@@ -4,5 +4,5 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, parseUniXFlexDirection, parseUniXSplashScreen, isUniXPageFile, getUniXPagePaths, parseUniXAppAndroidPackage, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, parseUniXPageOptions, parseUniXFlexDirection, parseUniXSplashScreen, isUniXPageFile, getUniXPagePaths, parseUniXAppAndroidPackage, } from './uni-x';
 export { checkPagesJson } from './utils';

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.checkPagesJson = exports.parseUniXAppAndroidPackage = exports.getUniXPagePaths = exports.isUniXPageFile = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.checkPagesJson = exports.parseUniXAppAndroidPackage = exports.getUniXPagePaths = exports.isUniXPageFile = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.parseUniXPageOptions = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -24,6 +24,7 @@ __exportStar(require("./theme"), exports);
 var uni_x_1 = require("./uni-x");
 Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppPagesJson; } });
 Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppConfig; } });
+Object.defineProperty(exports, "parseUniXPageOptions", { enumerable: true, get: function () { return uni_x_1.parseUniXPageOptions; } });
 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, "isUniXPageFile", { enumerable: true, get: function () { return uni_x_1.isUniXPageFile; } });

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

@@ -1,5 +1,11 @@
 export * from './manifest';
+export interface UniXPageOptions {
+    disableScroll?: boolean;
+    enablePullDownRefresh?: boolean;
+    scrollIndicator?: 'none';
+}
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
+export declare function parseUniXPageOptions(filename: string): UniXPageOptions | undefined;
 /**
  * TODO 应该闭包，通过globalThis赋值？
  * @param pagesJson

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

@@ -17,7 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniXPagePaths = exports.isUniXPageFile = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.getUniXPagePaths = exports.isUniXPageFile = exports.normalizeUniAppXAppConfig = exports.parseUniXPageOptions = exports.normalizeUniAppXAppPagesJson = void 0;
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const json_1 = require("../json");
@@ -28,6 +29,7 @@ const uniConfig_1 = require("./uniConfig");
 const preprocess_1 = require("../../preprocess");
 const utils_2 = require("../utils");
 __exportStar(require("./manifest"), exports);
+const uniXPageOptionsCache = new Map();
 function normalizeUniAppXAppPagesJson(jsonStr) {
     // 先条件编译
     jsonStr = (0, preprocess_1.preUVueJson)(jsonStr, 'pages.json');
@@ -77,9 +79,60 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
     // 缓存页面列表
     pages_1.pagesCacheSet.clear();
     pagesJson.pages.forEach((page) => pages_1.pagesCacheSet.add(page.path));
+    updateUniXPageOptions(pagesJson);
     return pagesJson;
 }
 exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;
+function updateUniXPageOptions(pagesJson) {
+    const inputDir = getUniXInputDir();
+    if (!inputDir) {
+        return;
+    }
+    const pageOptions = new Map();
+    pagesJson.pages.forEach((page) => {
+        pageOptions.set(page.path, normalizeRootPageOptions(page.style));
+    });
+    uniXPageOptionsCache.set(inputDir, pageOptions);
+}
+function normalizeRootPageOptions(pageStyle) {
+    if (!pageStyle) {
+        return {};
+    }
+    return {
+        disableScroll: pageStyle.disableScroll === true || undefined,
+        enablePullDownRefresh: isEnablePullDownRefresh(pageStyle) || undefined,
+        scrollIndicator: pageStyle.scrollIndicator,
+    };
+}
+function initUniXPageOptions() {
+    const inputDir = getUniXInputDir();
+    if (!inputDir || uniXPageOptionsCache.has(inputDir)) {
+        return;
+    }
+    const filename = path_1.default.resolve(inputDir, 'pages.json');
+    if (!fs_1.default.existsSync(filename)) {
+        return;
+    }
+    normalizeUniAppXAppPagesJson(fs_1.default.readFileSync(filename, 'utf8'));
+}
+function isEnablePullDownRefresh(pageStyle) {
+    return pageStyle.enablePullDownRefresh || pageStyle.pullToRefresh?.support;
+}
+function parseUniXPageOptions(filename) {
+    initUniXPageOptions();
+    const inputDir = getUniXInputDir();
+    if (!inputDir) {
+        return;
+    }
+    const pagePath = (0, utils_1.removeExt)((0, utils_1.normalizePath)(path_1.default.relative(inputDir, filename.split('?')[0])));
+    return uniXPageOptionsCache.get(inputDir)?.get(pagePath);
+}
+exports.parseUniXPageOptions = parseUniXPageOptions;
+function getUniXInputDir() {
+    return process.env.UNI_INPUT_DIR
+        ? (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR)
+        : undefined;
+}
 function normalizeSubPackages(subPackages) {
     const pages = [];
     if ((0, shared_1.isArray)(subPackages)) {

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

@@ -1,3 +1,3 @@
 export declare function parseUniXFlexDirection(manifestJson: Record<string, any>): any;
 export declare function parseUniXSplashScreen(platform: 'app-android' | 'app-ios' | 'app-harmony', manifestJson: Record<string, any>): false | object;
-export declare function parseUniXAppAndroidPackage(appid: string): string;
+export declare function parseUniXAppAndroidPackage(appid?: string): string;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUniXAppAndroidPackage = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
 const shared_1 = require("@vue/shared");
+const constants_1 = require("../../constants");
 const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
 function parseUniXFlexDirection(manifestJson) {
     const flexDir = manifestJson?.['uni-app-x']?.['flex-direction'];
@@ -20,6 +21,6 @@ function parseUniXSplashScreen(platform, manifestJson) {
 }
 exports.parseUniXSplashScreen = parseUniXSplashScreen;
 function parseUniXAppAndroidPackage(appid) {
-    return 'uni.' + appid.replace(/_/g, '');
+    return 'uni.' + (appid || constants_1.DEFAULT_APPID).replace(/_/g, '');
 }
 exports.parseUniXAppAndroidPackage = parseUniXAppAndroidPackage;

package/dist/json/utils.js

@@ -64,6 +64,30 @@ function checkPagesJson(jsonStr, inputDir) {
             });
         }
     });
+    const tabBarNode = root.children?.find((child) => child.type === 'property' &&
+        child.children?.length === 2 &&
+        child.children[0].value === 'tabBar');
+    if (process.env.UNI_APP_X_DOM2 !== 'true' && tabBarNode) {
+        // dom2下不支持tabBar配置项，这里先不校验
+        let allPages = []; // 收集全部页面,包含分包页面
+        let tabBarPages = []; // 收集 tabBar 页面
+        allPages.push(...pagePathNodes.map((node) => node.value));
+        findRootNode(tabBarNode.children[1], ['list']).forEach((node) => {
+            const pagePathNode = node.type === 'object' &&
+                node.children?.find((child) => child.type === 'property' &&
+                    child.children?.length === 2 &&
+                    child.children[0].value === 'pagePath');
+            if (pagePathNode) {
+                const pagePathValueNode = pagePathNode.children[1];
+                const pagePath = pagePathValueNode.value;
+                tabBarPages.push(pagePath);
+                if (!allPages.includes(pagePath) &&
+                    !allPages.includes(pagePath.substring(1))) {
+                    throwCompilerError(jsonStr, pagePathValueNode, messages_1.M['pages.json.tabbar.page.notfound'].replace('{pagePath}', pagePath));
+                }
+            }
+        });
+    }
     for (const node of pagePathNodes) {
         const pagePath = node.value ?? '';
         if (!pageExistsWithCaseSync(path_1.default.join(inputDir, pagePath))) {

package/dist/messages/en.d.ts

@@ -1,5 +1,9 @@
 declare const _default: {
     readonly 'app.compiler.version': "Compiler version: {version}";
+    readonly 'view.render.compiler.target': "Current view.render compile target: {target}";
+    readonly 'view.render.compiler.target.bytecode': "bytecode";
+    readonly 'view.render.compiler.target.nativecode': "nativecode";
+    readonly 'style.isolation.version': "Style isolation version: {version}";
     readonly compiling: "Compiling...";
     readonly 'dev.performance': "Please note that in running mode, due to log output, sourcemap, and uncompressed source code, the performance and package size are not as good as release mode.";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
@@ -11,14 +15,17 @@ declare const _default: {
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. Switching vapor mode requires restarting to take effect.";
+    readonly 'dev.watching.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "uni statistics version: {version}";
+    readonly 'stat.warn.version': "The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "uni statistics enabled: {type}";
     readonly 'i18n.fallbackLocale.default': "fallbackLocale is missing in manifest.json, use: {locale}";
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";
+    readonly 'dom2.compatible.component': "Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.";
+    readonly 'dom2.root.scroll.view': "Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "The first parameter of {0} must be a static string";
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";
@@ -48,5 +55,6 @@ declare const _default: {
     readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
     readonly 'pages.json.page.notfound': "The page \"{pagePath}\" does not exist.";
     readonly 'pages.json.page.slash': "The Path \"{pagePath}\" cannot start with \"/\"";
+    readonly 'pages.json.tabbar.page.notfound': "The tabBar page \"{pagePath}\" is not declared in \"pages.json\".";
 };
 export default _default;

package/dist/messages/en.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     'app.compiler.version': 'Compiler version: {version}',
+    'view.render.compiler.target': 'Current view.render compile target: {target}',
+    'view.render.compiler.target.bytecode': 'bytecode',
+    'view.render.compiler.target.nativecode': 'nativecode',
+    'style.isolation.version': 'Style isolation version: {version}',
     compiling: 'Compiling...',
     'dev.performance': 'Please note that in running mode, due to log output, sourcemap, and uncompressed source code, the performance and package size are not as good as release mode.',
     'dev.performance.nvue': 'Especially the sourcemap of app-nvue has a greater impact',
@@ -13,14 +17,17 @@ exports.default = {
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
     'dev.watching.restart.vapor': 'DONE  Restart required. Switching vapor mode requires restarting to take effect.',
+    'dev.watching.vapor.render.target': 'vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': 'Build failed with errors.',
     'stat.warn.appid': 'The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303',
-    'stat.warn.version': 'The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat',
-    'stat.warn.tip': 'uni statistics version: {version}',
+    'stat.warn.version': 'The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat',
+    'stat.warn.tip': 'uni statistics enabled: {type}',
     'i18n.fallbackLocale.default': 'fallbackLocale is missing in manifest.json, use: {locale}',
     'i18n.fallbackLocale.missing': './local/{locale}.json is missing',
     'easycom.conflict': 'easycom component conflict: ',
+    'dom2.compatible.component': 'Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.',
+    'dom2.root.scroll.view': 'Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll',
     'mp.component.args[0]': 'The first parameter of {0} must be a static string',
     'mp.component.args[1]': '{0} requires two parameters',
     'mp.360.unsupported': '360 is unsupported',
@@ -50,4 +57,5 @@ exports.default = {
     'uni_modules.import': 'Plug-in [{0}] only supports @/uni_modules/{1}.',
     'pages.json.page.notfound': 'The page "{pagePath}" does not exist.',
     'pages.json.page.slash': 'The Path "{pagePath}" cannot start with "/"',
+    'pages.json.tabbar.page.notfound': 'The tabBar page "{pagePath}" is not declared in "pages.json".',
 };

package/dist/messages/index.d.ts

@@ -1,5 +1,9 @@
 export declare const M: {
     readonly 'app.compiler.version': "编译器版本：{version}";
+    readonly 'view.render.compiler.target': "当前视图层编译目标：{target}";
+    readonly 'view.render.compiler.target.bytecode': "字节码";
+    readonly 'view.render.compiler.target.nativecode': "机器码";
+    readonly 'style.isolation.version': "当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly compiling: "正在编译中...";
     readonly 'dev.performance': "请注意运行模式下，因日志输出、sourcemap 以及未压缩源码等原因，性能和包体积，均不及发行模式。";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
@@ -11,14 +15,17 @@ export declare const M: {
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。";
+    readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
+    readonly 'stat.warn.version': "当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "已开启uni 统计 2.0{type}";
     readonly 'i18n.fallbackLocale.default': "当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}";
     readonly 'i18n.fallbackLocale.missing': "当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件";
     readonly 'easycom.conflict': "easycom组件冲突：";
+    readonly 'dom2.compatible.component': "蒸汽模式不支持 uni-app 兼容模式组件 {name}，检测到其实现文件为 {file}。请改用标准模式的UTS组件实现来实现。";
+    readonly 'dom2.root.scroll.view': "蒸汽模式下页面可滚动，建议移除根节点 scroll-view，以避免嵌套滚动。详情: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "{0}的第一个参数必须为静态字符串";
     readonly 'mp.component.args[1]': "{0}需要两个参数";
     readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
@@ -48,8 +55,13 @@ export declare const M: {
     readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
     readonly 'pages.json.page.notfound': "页面\"{pagePath}\"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。";
     readonly 'pages.json.page.slash': "路径 \"{pagePath}\" 不能以 \"/\" 开头";
+    readonly 'pages.json.tabbar.page.notfound': "tabBar 中配置的页面 \"{pagePath}\" 未在 pages.json 中注册。";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
+    readonly 'view.render.compiler.target': "Current view.render compile target: {target}";
+    readonly 'view.render.compiler.target.bytecode': "bytecode";
+    readonly 'view.render.compiler.target.nativecode': "nativecode";
+    readonly 'style.isolation.version': "Style isolation version: {version}";
     readonly compiling: "Compiling...";
     readonly 'dev.performance': "Please note that in running mode, due to log output, sourcemap, and uncompressed source code, the performance and package size are not as good as release mode.";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
@@ -61,14 +73,17 @@ export declare const M: {
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. Switching vapor mode requires restarting to take effect.";
+    readonly 'dev.watching.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "uni statistics version: {version}";
+    readonly 'stat.warn.version': "The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "uni statistics enabled: {type}";
     readonly 'i18n.fallbackLocale.default': "fallbackLocale is missing in manifest.json, use: {locale}";
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";
+    readonly 'dom2.compatible.component': "Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.";
+    readonly 'dom2.root.scroll.view': "Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "The first parameter of {0} must be a static string";
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";
@@ -98,4 +113,5 @@ export declare const M: {
     readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
     readonly 'pages.json.page.notfound': "The page \"{pagePath}\" does not exist.";
     readonly 'pages.json.page.slash': "The Path \"{pagePath}\" cannot start with \"/\"";
+    readonly 'pages.json.tabbar.page.notfound': "The tabBar page \"{pagePath}\" is not declared in \"pages.json\".";
 };