@dcloudio/uni-cli-shared 3.0.0-5000420260318001 → 3.0.0-5000520260324002

package/dist/constants.d.ts

@@ -7,6 +7,7 @@ export declare const EXTNAME_VUE_TEMPLATE: string[];
 export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
+export declare const DEFAULT_APPID = "__UNI__uniappx";
 export declare const SPECIAL_CHARS: {
     WARN_BLOCK: string;
     ERROR_BLOCK: string;
@@ -39,6 +40,3 @@ export declare const COMMON_EXCLUDE: RegExp[];
 export declare const KNOWN_ASSET_TYPES: string[];
 export declare const DEFAULT_ASSETS_RE: RegExp;
 export declare const TEXT_STYLE: string[];
-export declare const JS_STYLE_PLACEHOLDER_MARKER = "__js_style_placeholder__";
-export declare const JS_STYLE_PLACEHOLDER_STR: string;
-export declare const JS_STYLE_PLACEHOLDER_RE: RegExp;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JS_STYLE_PLACEHOLDER_RE = exports.JS_STYLE_PLACEHOLDER_STR = exports.JS_STYLE_PLACEHOLDER_MARKER = exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.DEFAULT_APPID = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx', '.uts'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -10,6 +10,7 @@ exports.EXTNAME_VUE_TEMPLATE = ['.vue', '.nvue', '.uvue', '.jsx', '.tsx'];
 exports.EXTNAME_VUE_RE = /\.(vue|nvue|uvue)$/;
 exports.EXTNAME_JS_RE = /\.(js|jsx|ts|uts|tsx|mjs)$/;
 exports.EXTNAME_TS_RE = /\.tsx?$/;
+exports.DEFAULT_APPID = '__UNI__uniappx';
 exports.SPECIAL_CHARS = {
     WARN_BLOCK: '\uFEFF', // 警告块前后标识
     ERROR_BLOCK: '\u2060', // 错误块前后标识
@@ -88,8 +89,3 @@ exports.KNOWN_ASSET_TYPES = [
 ];
 exports.DEFAULT_ASSETS_RE = new RegExp(`\\.(` + exports.KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);
 exports.TEXT_STYLE = ['black', 'white'];
-exports.JS_STYLE_PLACEHOLDER_MARKER = '__js_style_placeholder__';
-exports.JS_STYLE_PLACEHOLDER_STR = JSON.stringify({
-    [exports.JS_STYLE_PLACEHOLDER_MARKER]: 0,
-});
-exports.JS_STYLE_PLACEHOLDER_RE = /\{\s*"__js_style_placeholder__"\s*:\s*0\s*}/g;

package/dist/deps.d.ts

@@ -5,6 +5,7 @@ export declare const API_DEPS_CSS: (isX: boolean) => {
     previewImage: string[];
     openLocation: string[];
     chooseLocation: string[];
+    showLoading: string[];
 };
 export declare const COMPONENT_DEPS_CSS: (isX: boolean) => {
     canvas: string[];

package/dist/deps.js

@@ -6,9 +6,9 @@ const RESIZE_SENSOR_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'resize-senso
 const REFRESHER_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'refresher.css';
 const API_DEPS_CSS = (isX) => {
     const deps_css = {
-        showModal: [`${constants_1.H5_API_STYLE_PATH}modal.css`],
+        showModal: [],
         showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
-        showActionSheet: [`${constants_1.H5_API_STYLE_PATH}action-sheet.css`],
+        showActionSheet: [],
         previewImage: [
             RESIZE_SENSOR_CSS,
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper.css`,
@@ -17,22 +17,31 @@ const API_DEPS_CSS = (isX) => {
             `${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`]),
+        chooseLocation: [],
+        showLoading: [],
+    };
+    if (isX) {
+        deps_css.showModal = [`${constants_1.BASE_COMPONENTS_STYLE_PATH}textarea.css`];
+        deps_css.chooseLocation = [
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/view.css`,
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/text.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`,
-        ],
-    };
-    if (isX) {
-        // @ts-expect-error
+            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/image.css`,
+        ];
         deps_css.showLoading = [`${constants_1.X_BASE_COMPONENTS_STYLE_PATH}loading.css`];
     }
+    else {
+        deps_css.showModal = [`${constants_1.H5_API_STYLE_PATH}modal.css`];
+        deps_css.showActionSheet = [`${constants_1.H5_API_STYLE_PATH}action-sheet.css`];
+        deps_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`,
+        ];
+    }
     return deps_css;
 };
 exports.API_DEPS_CSS = API_DEPS_CSS;

package/dist/dom2/fontFamily.d.ts

@@ -0,0 +1,4 @@
+export declare const JS_STYLE_PLACEHOLDER_MARKER = "__js_style_placeholder__";
+export declare function createJsStylePlaceholder(id: string): string;
+export declare function createJsStylePlaceholderRegExp(id: string): RegExp;
+export declare const ANY_JS_STYLE_PLACEHOLDER_RE: RegExp;

package/dist/dom2/fontFamily.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANY_JS_STYLE_PLACEHOLDER_RE = exports.createJsStylePlaceholderRegExp = exports.createJsStylePlaceholder = exports.JS_STYLE_PLACEHOLDER_MARKER = void 0;
+const hash_sum_1 = __importDefault(require("hash-sum"));
+exports.JS_STYLE_PLACEHOLDER_MARKER = '__js_style_placeholder__';
+function createJsStylePlaceholder(id) {
+    const hashId = (0, hash_sum_1.default)(id);
+    return JSON.stringify({
+        [exports.JS_STYLE_PLACEHOLDER_MARKER]: hashId,
+    });
+}
+exports.createJsStylePlaceholder = createJsStylePlaceholder;
+function createJsStylePlaceholderRegExp(id) {
+    const hashId = (0, hash_sum_1.default)(id);
+    return new RegExp(`\\{\\s*"${exports.JS_STYLE_PLACEHOLDER_MARKER}"\\s*:\\s*"${hashId}"\\s*\\}`, 'g');
+}
+exports.createJsStylePlaceholderRegExp = createJsStylePlaceholderRegExp;
+exports.ANY_JS_STYLE_PLACEHOLDER_RE = new RegExp(`\\{\\s*"${exports.JS_STYLE_PLACEHOLDER_MARKER}"\\s*:\\s*".+?"\\s*\\}`, 'g');

package/dist/dom2/index.d.ts

@@ -1 +1,3 @@
 export * from './sharedData';
+export * from './vue';
+export * from './fontFamily';

package/dist/dom2/index.js

@@ -15,3 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./sharedData"), exports);
+__exportStar(require("./vue"), exports);
+__exportStar(require("./fontFamily"), exports);

package/dist/dom2/sharedData.d.ts

@@ -1,2 +1,6 @@
 import type { Plugin } from 'vite';
 export declare function uniSharedDataPlugin(): Plugin;
+export declare function initSourceFileCallback(): ((sourceFile: import('typescript').SourceFile) => void) | undefined;
+export declare function initUts2jsSharedDataOptions(): {
+    resolveFieldMeta: any;
+} | undefined;

package/dist/dom2/sharedData.js

@@ -1,19 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniSharedDataPlugin = void 0;
+exports.initUts2jsSharedDataOptions = exports.initSourceFileCallback = exports.uniSharedDataPlugin = void 0;
 const uts_1 = require("../uts");
 const pages_1 = require("../json/pages");
 const utils_1 = require("../utils");
 const asset_1 = require("../vite/plugins/vitejs/plugins/asset");
-function uniSharedDataPlugin() {
-    const { USDP } = (0, utils_1.requireUniHelpers)();
+const x_1 = require("../x");
+const manifest_1 = require("../json/uni-x/manifest");
+const manifest_2 = require("../json/manifest");
+function initSharedDataOptions() {
     const compiler = require('@dcloudio/compiler-vapor-dom2');
-    return USDP({
+    const manifest = (0, manifest_2.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+    return {
+        platform: process.env.UNI_UTS_PLATFORM,
         compilerVaporDom2: compiler,
         utsCompiler: (0, uts_1.resolveUTSCompiler)(),
         isUniPageFile: pages_1.isUniPageFile,
         getSharedDataResult: compiler.getSharedDataResult,
         getAssetFilenameById: asset_1.getAssetFilenameById,
-    });
+        uvueScriptEngine: (0, x_1.isUniAppXAndroidNative)() ? 'native' : 'js',
+        compilerVersion: process.env.HX_Version || process.env.UNI_COMPILER_VERSION,
+        androidOptions: (0, x_1.isUniAppXAndroidJsEngine)()
+            ? {
+                package: (0, manifest_1.parseUniXAppAndroidPackage)(manifest.appid),
+            }
+            : undefined,
+    };
+}
+function uniSharedDataPlugin() {
+    return (0, utils_1.requireUniHelpers)().USDP(initSharedDataOptions());
 }
 exports.uniSharedDataPlugin = uniSharedDataPlugin;
+function initSourceFileCallback() {
+    if (process.env.UNI_APP_X_DOM2 === 'true' && (0, x_1.isUniAppXAndroidNative)()) {
+        const { TSDBSF } = (0, utils_1.requireUniHelpers)();
+        const options = initSharedDataOptions();
+        return (sourceFile) => {
+            TSDBSF(sourceFile, options);
+        };
+    }
+}
+exports.initSourceFileCallback = initSourceFileCallback;
+function initUts2jsSharedDataOptions() {
+    if (process.env.UNI_APP_X_DOM2 === 'true') {
+        return {
+            resolveFieldMeta: require('@dcloudio/compiler-vapor-dom2')
+                .resolveSharedDataFieldMeta,
+        };
+    }
+}
+exports.initUts2jsSharedDataOptions = initUts2jsSharedDataOptions;

package/dist/dom2/vue.d.ts

@@ -0,0 +1,15 @@
+import type { CompilerError, SFCDescriptor } from '@vue/compiler-sfc';
+export declare function initVueTemplateCompilerExtraOptions(descriptor: SFCDescriptor): {
+    root: string;
+    platform: keyof UniApp.PagesJsonPagePlatformStyle;
+    componentType: string;
+    filename: string;
+    relativeFilename: string;
+    helper: any;
+    scriptCppBlocks: any;
+    disableStaticStyle: boolean;
+    onVueTemplateCompileLog(type: 'warn' | 'error', error: CompilerError): void;
+    r: any;
+    className: any;
+    inlineRender: boolean;
+};

package/dist/dom2/vue.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initVueTemplateCompilerExtraOptions = void 0;
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("../utils");
+const json_1 = require("../json");
+const vue_1 = require("../vue");
+function initVueTemplateCompilerExtraOptions(descriptor) {
+    const filename = (0, utils_1.normalizePath)(descriptor.filename.split('?')[0]);
+    const relativeFilename = (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename));
+    const isDevX = process.env.UNI_HX_VERSION_DEV === 'true' &&
+        process.env.UNI_APP_X === 'true';
+    let disableStaticStyle = false;
+    if (isDevX && process.env.NODE_ENV === 'development') {
+        if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
+            // 开发版本、开发模式下，非鸿蒙release模式打包
+            disableStaticStyle = process.env.UNI_APP_HARMONY_RUN_MODE !== 'release';
+        }
+    }
+    const helper = (0, utils_1.requireUniHelpers)();
+    return {
+        root: (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR),
+        platform: process.env.UNI_UTS_PLATFORM,
+        componentType: (0, json_1.isUniPageFile)(filename) ? 'page' : 'component',
+        filename: filename,
+        relativeFilename,
+        helper,
+        scriptCppBlocks: descriptor.scriptCppBlocks,
+        disableStaticStyle,
+        onVueTemplateCompileLog(type, error) {
+            return (0, vue_1.onVueTemplateCompileLog)(type, error, descriptor.source, relativeFilename);
+        },
+        r: helper.K,
+        className: helper.GCN(descriptor.filename, process.env.UNI_INPUT_DIR),
+        inlineRender: process.env.UNI_UTS_PLATFORM === 'app-android',
+    };
+}
+exports.initVueTemplateCompilerExtraOptions = initVueTemplateCompilerExtraOptions;

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");
@@ -109,8 +110,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();
@@ -197,6 +198,11 @@ function matchEasycom(tag) {
     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 +261,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 +314,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,55 @@ 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;
+    }
+    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) {
+                const 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');
+            }
+            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, 'src/.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') {
+            const dynamicFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.dynamic');
+            if (fs_1.default.existsSync(dynamicFilename)) {
+                process.env.UNI_APP_X_DOM2_DYNAMIC = 'true';
+            }
         }
     }
     if (process.env.UNI_APP_X_DOM2 === 'true') {

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';

package/dist/index.js

@@ -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);

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,6 @@
 declare const _default: {
     readonly 'app.compiler.version': "Compiler version: {version}";
+    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";
@@ -48,5 +49,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,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     'app.compiler.version': 'Compiler version: {version}',
+    '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',
@@ -50,4 +51,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,6 @@
 export declare const M: {
     readonly 'app.compiler.version': "编译器版本：{version}";
+    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 影响较大";
@@ -48,8 +49,10 @@ 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 '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";
@@ -98,4 +101,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\".";
 };

package/dist/messages/zh_CN.d.ts

@@ -1,5 +1,6 @@
 declare const _default: {
     readonly 'app.compiler.version': "编译器版本：{version}";
+    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 影响较大";
@@ -48,5 +49,6 @@ declare const _default: {
     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 中注册。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     'app.compiler.version': '编译器版本：{version}',
+    'style.isolation.version': '当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html',
     compiling: '正在编译中...',
     'dev.performance': '请注意运行模式下，因日志输出、sourcemap 以及未压缩源码等原因，性能和包体积，均不及发行模式。',
     'dev.performance.nvue': '尤其是 app-nvue 的 sourcemap 影响较大',
@@ -51,4 +52,5 @@ exports.default = {
     'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
     'pages.json.page.notfound': '页面"{pagePath}"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。',
     'pages.json.page.slash': '路径 "{pagePath}" 不能以 "/" 开头',
+    'pages.json.tabbar.page.notfound': 'tabBar 中配置的页面 "{pagePath}" 未在 pages.json 中注册。',
 };

package/dist/uni_modules.cloud.js

@@ -12,6 +12,7 @@ const easycom_1 = require("./easycom");
 const messages_1 = require("./messages");
 const constants_1 = require("./constants");
 const url_1 = require("./url");
+const x_1 = require("./x");
 function genEncryptEasyComModuleIndex(pluginId, platform, components) {
     const isMp = platform.startsWith('mp-');
     const imports = [];
@@ -23,7 +24,7 @@ function genEncryptEasyComModuleIndex(pluginId, platform, components) {
             ids.push(id);
         }
         let instance = '';
-        if (platform === 'app-android') {
+        if ((0, x_1.isUniAppXAndroidNative)(platform)) {
             instance = (0, easycom_1.genUTSComponentPublicInstanceIdent)(component);
             // 类型
             ids.push(instance);
@@ -307,14 +308,15 @@ const KNOWN_ASSET_TYPES = [
     'txt',
 ];
 function findUniModuleFiles(platform, id, inputDir) {
+    const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)(platform);
     return (0, fast_glob_1.sync)(`uni_modules/${id}/**/*`, {
         cwd: inputDir,
         absolute: true,
         ignore: [
             '**/*.md',
-            ...(platform !== 'app-android' // 非 android 平台不需要扫描 assets
-                ? [`**/*.{${KNOWN_ASSET_TYPES.join(',')}}`]
-                : []),
+            ...(useUniAppXAndroidNative // 仅旧版 Android x 需要扫描 assets
+                ? []
+                : [`**/*.{${KNOWN_ASSET_TYPES.join(',')}}`]),
         ],
     });
 }
@@ -367,8 +369,10 @@ function resolveEncryptUniModule(id, platform, isX = true) {
                     }
                 }
             }
-            // 原生平台走旧的uts-proxy
-            return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && platform === 'app-android' ? 'uts-proxy' : 'uni_helpers'}`));
+            // 仅旧版 Android x 原生引擎走 uts-proxy，JS 引擎与其他平台统一走 uni_helpers
+            return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && (0, x_1.isUniAppXAndroidNative)(platform)
+                ? 'uts-proxy'
+                : 'uni_helpers'}`));
         }
     }
 }
@@ -383,15 +387,14 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         return {};
     }
     const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
-    const { zipFile, modules } = packUploadEncryptUniModules(curEncryptUniModules, process.env.UNI_UTS_PLATFORM, inputDir, cacheDir);
+    const { zipFile, modules } = packUploadEncryptUniModules(curEncryptUniModules, params.platform, inputDir, cacheDir);
     if (zipFile) {
         const downloadFile = path_1.default.resolve(cacheDir, 'uni_modules.download.zip');
         const { C, D, R, U } = (0, utils_1.requireUniHelpers)();
         try {
             const isLogin = await C();
-            const tips = process.env.UNI_UTS_PLATFORM !== 'app-android'
-                ? '（此过程耗时较长）'
-                : '';
+            const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)(params.platform);
+            const tips = !useUniAppXAndroidNative ? '（此过程耗时较长）' : '';
             console.log(`正在云编译插件${isLogin ? '' : '（请先登录）'}${tips}：${modules.join(',')}...`);
             let downloadUrl = '';
             try {
@@ -431,8 +434,9 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         }
     }
     else {
-        // android 平台需要在这里初始化
-        if (params.platform === 'app-android') {
+        const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)(params.platform);
+        // 仅旧版 Android x 需要在缓存命中时额外初始化
+        if (useUniAppXAndroidNative) {
             const { R } = (0, utils_1.requireUniHelpers)();
             R({
                 dir: process.env.UNI_INPUT_DIR,

package/dist/uni_modules.js

@@ -7,6 +7,7 @@ exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.par
 // 重要：此文件编译后的js，需同步至 vue2 编译器中 uni-cli-shared/lib/uts/uni_modules.js
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const x_1 = require("./x");
 const extApiProviders = [];
 const extApiPlugins = new Set();
 function getNonTreeShakingPlugins() {
@@ -228,7 +229,7 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
             //   source = `${source}/utssdk/index.uts`
             // }
         }
-        else if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+        else if ((0, x_1.isUniAppXJsEngine)()) {
             if (fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js', 'index.uts'))) {
                 source = `${source}/utssdk/app-js/index.uts`;
             }
@@ -291,7 +292,7 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
                             const appOptions = defineOptions.app;
                             if (isPlainObject(appOptions)) {
                                 // js engine 下且存在 app-js，不检查
-                                const skipCheck = (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js' ||
+                                const skipCheck = ((0, x_1.isUniAppXJsEngine)() ||
                                     process.env.UNI_UTS_PLATFORM === 'app-harmony') &&
                                     source.includes('app-js');
                                 if (!skipCheck) {

package/dist/uts.js

@@ -12,6 +12,8 @@ const unimport_1 = require("unimport");
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
 const uni_modules_1 = require("./uni_modules");
+const preprocess_1 = require("./preprocess");
+const x_1 = require("./x");
 function once(fn, ctx = null) {
     let res;
     return ((...args) => {
@@ -36,7 +38,7 @@ function resolveUTSAppModule(platform, id, importer, includeUTSSDK = true) {
         if (parentDir === 'uni_modules' ||
             (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
-            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if ((0, x_1.isUniAppXJsEngine)()) {
                 // js engine
                 if (parentDir === 'uni_modules') {
                     const appJsIndex = path_1.default.resolve(id, basedir, 'app-js', 'index.uts');
@@ -510,7 +512,7 @@ async function parseUniExtApiAutoImports(uniExtApiAutoImports, extApis, parseSou
                 const filename = `uni_modules/${pluginId}/utssdk/interface.uts`;
                 const interfaceFileName = path_1.default.resolve(process.env.UNI_INPUT_DIR, filename);
                 if (fs_extra_1.default.existsSync(interfaceFileName)) {
-                    const ids = await parseExportIdentifiers(interfaceFileName);
+                    const ids = await parseExportIdentifiers(interfaceFileName, preprocess_1.preUVueJs);
                     ids
                         // 过滤掉 Uni
                         .filter((id) => id !== 'Uni')

package/dist/vite/autoImport.js

@@ -9,6 +9,7 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 const uts_1 = require("../uts");
 const workers_1 = require("../workers");
 const utils_1 = require("../utils");
+const x_1 = require("../x");
 const uniWebLifeCyclePreset = {
     from: '@dcloudio/uni-app',
     imports: [
@@ -284,8 +285,10 @@ const vuePreset = {
 function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
     rewriteAutoImportOnce();
     const autoImport = [vuePreset];
-    // 只有app-ios和app-harmony平台特殊处理
-    if (platform === 'app-ios' || platform === 'app-harmony') {
+    // JS 引擎的 App 平台统一走 vue 生命周期导入
+    if (platform === 'app-ios' ||
+        platform === 'app-harmony' ||
+        (0, x_1.isUniAppXAndroidJsEngine)(platform)) {
         autoImport.push(uniAppLifeCyclePreset);
     }
     else if (platform === 'web') {
@@ -317,8 +320,8 @@ function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
         include: [/\.[u]?ts$/, /\.[u]?vue/],
         exclude,
         imports: imports.concat(
-        // app-android 平台暂不注入其他
-        platform === 'app-android' ? [] : autoImport),
+        // 旧版 Android x 仍由专有编译流程处理，Android Vapor 对齐 iOS 走通用自动导入
+        (0, x_1.isUniAppXAndroidNative)(platform) ? [] : autoImport),
         dts: false,
     };
 }

package/dist/vite/cloud.js

@@ -15,6 +15,8 @@ const uni_modules_1 = require("./plugins/uts/uni_modules");
 const utils_3 = require("./utils");
 const json_1 = require("../json");
 const workers_1 = require("../workers");
+const dom2_1 = require("../dom2");
+const x_1 = require("../x");
 function createEncryptCssUrlReplacer(resolve) {
     return async (url, importer) => {
         if (url.startsWith('/') && !url.startsWith('//')) {
@@ -64,6 +66,7 @@ exports.uniEncryptUniModulesAssetsPlugin = uniEncryptUniModulesAssetsPlugin;
 function uniEncryptUniModulesPlugin() {
     let resolvedConfig;
     const isMp = process.env.UNI_UTS_PLATFORM.startsWith('mp-');
+    const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)();
     const encryptModuleOutputFiles = [];
     return {
         name: 'uni:encrypt-uni-modules',
@@ -92,7 +95,7 @@ function uniEncryptUniModulesPlugin() {
             resolvedConfig = config;
         },
         resolveId(id, importer) {
-            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+            if (!useUniAppXAndroidNative) {
                 if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
                     id = (0, utils_2.normalizePath)(id);
                     if (importer && (id.startsWith('./') || id.startsWith('../'))) {
@@ -106,7 +109,7 @@ function uniEncryptUniModulesPlugin() {
             }
         },
         load(id) {
-            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+            if (!useUniAppXAndroidNative) {
                 if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
                     return {
                         code: `export default ${JSON.stringify(id.replace(/\0/g, ''))}`,
@@ -119,8 +122,8 @@ function uniEncryptUniModulesPlugin() {
             Object.keys(bundle).forEach((fileName) => {
                 if (fileName.endsWith('.module.js')) {
                     const uniModuleId = path_1.default.basename(fileName).replace('.module.js', '');
-                    // app-android 不需要 js
-                    if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+                    // 仅旧版 Android x 不需要 js
+                    if (!useUniAppXAndroidNative) {
                         const newFileName = 'uni_modules/' +
                             fileName.replace('.module.js', '/index.module.js');
                         bundle[newFileName] = bundle[fileName];
@@ -171,12 +174,13 @@ function uniEncryptUniModulesPlugin() {
             }
         },
         async writeBundle() {
-            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
+            if (!useUniAppXAndroidNative) {
                 return;
             }
             const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true'
                 ? (0, uts_1.resolveUTSCompiler)().createUniXKotlinCompilerOnce({
                     resolveWorkers: () => (0, workers_1.getWorkers)(),
+                    sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
                 })
                 : null;
             if (uniXKotlinCompiler) {
@@ -393,7 +397,10 @@ function compileCloudUniModuleWithTsc(platform, pluginDir) {
     const isX = process.env.UNI_APP_X === 'true';
     const resolveWorkers = () => (0, workers_1.getWorkers)();
     return compileUniModuleWithTsc(platform, pluginDir, platform === 'app-android'
-        ? createUniXKotlinCompilerOnce({ resolveWorkers })
+        ? createUniXKotlinCompilerOnce({
+            resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
+        })
         : platform === 'app-harmony'
             ? createUniXArkTSCompilerOnce({ resolveWorkers })
             : createUniXSwiftCompilerOnce({ resolveWorkers }), {

package/dist/vite/extApi.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uniUniModulesExtApiPlugin = void 0;
 const uts_1 = require("../uts");
 const resolve_1 = require("../resolve");
+const x_1 = require("../x");
 function uniUniModulesExtApiPlugin() {
     return {
         name: 'uni:uni-modules_ext-api',
@@ -21,7 +22,9 @@ function uniUniModulesExtApiPlugin() {
                 },
             };
             const build = {};
-            if (['app-ios', 'app-harmony'].includes(process.env.UNI_UTS_PLATFORM)) {
+            if (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
+                process.env.UNI_UTS_PLATFORM === 'app-harmony' ||
+                (0, x_1.isUniAppXAndroidJsEngine)()) {
                 build.rollupOptions = rollupOptions;
             }
             return {

package/dist/vite/plugins/json.js

@@ -9,86 +9,19 @@ const json_1 = require("../../json");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 function uniJsonPlugin() {
-    const UTS_CAST_ARRAY_MARKER = '/*__UTS_CAST_UTSJSON_ARRAY__*/';
-    const UTS_CAST_OBJECT_MARKER = '/*__UTS_CAST_UTSJSON_OBJECT__*/';
-    const IS_UNI_X_ANDROID = process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android';
     return {
         name: 'uni:json',
         enforce: 'pre',
-        generateBundle(options, bundle) {
-            if (IS_UNI_X_ANDROID) {
-                for (const [fileName, file] of Object.entries(bundle)) {
-                    if (fileName.endsWith('.json.ts')) {
-                        if (file.type === 'asset' && file.source) {
-                            const source = file.source.toString();
-                            if (source.includes(UTS_CAST_ARRAY_MARKER) ||
-                                source.includes(UTS_CAST_OBJECT_MARKER)) {
-                                file.source = source
-                                    .replace(new RegExp(UTS_CAST_ARRAY_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject[]')
-                                    .replace(new RegExp(UTS_CAST_OBJECT_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject');
-                            }
-                        }
-                    }
-                }
-            }
-        },
         transform(code, id) {
             // 如果已经被其他插件处理过了，就不再处理，比如 commonjs 插件，ICAPRegistrar.json?commonjs-external
             if (id.startsWith('\0')) {
                 return;
             }
-            const { filename } = (0, utils_1.parseVueRequest)(id);
-            if (path_1.default.extname(filename) !== '.json') {
+            if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
                 return;
             }
-            let codeObj = (0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id);
-            let codeJson = '';
-            if (IS_UNI_X_ANDROID) {
-                if (Array.isArray(codeObj)) {
-                    codeJson +=
-                        'export default JSON.parseArray(`' +
-                            JSON.stringify(codeObj, null, 2) +
-                            '`)' +
-                            UTS_CAST_ARRAY_MARKER +
-                            ';\n';
-                }
-                else {
-                    codeJson +=
-                        'let __jsonObj = JSON.parseObject(`' +
-                            JSON.stringify(codeObj, null, 2) +
-                            '`);\n';
-                    for (const key in codeObj) {
-                        if (!Object.hasOwn(codeObj, key))
-                            continue;
-                        const element = codeObj[key];
-                        if (Array.isArray(element)) {
-                            codeJson += `export const ${key} = __jsonObj?.getArray("${key}")${UTS_CAST_ARRAY_MARKER};\n`;
-                        }
-                        else if (typeof element === 'object' && element !== null) {
-                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
-                        }
-                        else if (typeof element === 'string') {
-                            codeJson += `export const ${key} = __jsonObj?.getString("${key}") ?? '';\n`;
-                        }
-                        else if (typeof element === 'number') {
-                            codeJson += `export const ${key} = __jsonObj?.getNumber("${key}") ?? 0;\n`;
-                        }
-                        else if (typeof element === 'boolean') {
-                            codeJson += `export const ${key} = __jsonObj?.getBoolean("${key}") ?? false;\n`;
-                        }
-                        else {
-                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
-                        }
-                    }
-                    codeJson += `export default __jsonObj;`;
-                }
-            }
-            else {
-                codeJson = JSON.stringify(codeObj, null, 2);
-            }
             return {
-                code: codeJson,
+                code: JSON.stringify((0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id), null, 2),
                 map: {
                     mappings: '',
                 },

package/dist/vite/plugins/stats.js

@@ -13,7 +13,8 @@ function uniStatsPlugin() {
     let resolvedConfig;
     let isManifestChanged = false;
     const shouldTrackManifestChange = process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_PLATFORM === 'app-harmony';
+        (process.env.UNI_PLATFORM === 'app' ||
+            process.env.UNI_PLATFORM === 'app-harmony');
     let isVapor = shouldTrackManifestChange && process.env.UNI_APP_X_DOM2 === 'true';
     return {
         name: 'uni:app-stats',

package/dist/vite/plugins/uts/uni_modules.js

@@ -12,6 +12,7 @@ const uts_1 = require("../../../uts");
 const utils_1 = require("../../utils");
 const uni_modules_1 = require("../../../uni_modules");
 const uni_modules_cloud_1 = require("../../../uni_modules.cloud");
+const x_1 = require("../../../x");
 const utils_2 = require("../../../utils");
 const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
@@ -19,6 +20,7 @@ const context_1 = require("../../../preprocess/context");
 const hbx_1 = require("../../../hbx");
 const console_1 = require("../../../logs/console");
 const workers_1 = require("../../../workers");
+const dom2_1 = require("../../../dom2");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
 function rewriteUniModulesConsoleExpr(fileName, content) {
@@ -242,7 +244,10 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-android' ||
             process.env.UNI_UTS_PLATFORM === 'app')
-        ? createUniXKotlinCompilerOnce({ resolveWorkers })
+        ? createUniXKotlinCompilerOnce({
+            resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
+        })
         : null;
     const uniXSwiftCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
@@ -427,7 +432,7 @@ function uniUTSAppUniModulesPlugin(options = {}) {
         for (const plugin of plugins) {
             const pluginDir = path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin);
             // 如果是 app-js 环境
-            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if ((0, x_1.isUniAppXJsEngine)()) {
                 if (fs_extra_1.default.existsSync(path_1.default.resolve(pluginDir, 'utssdk', 'app-js', 'index.uts'))) {
                     continue;
                 }

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -43,6 +43,7 @@ const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
 const constants_1 = require("../../../../constants");
+const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_3 = require("../../../../utils");
@@ -223,7 +224,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
-    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony';
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
+    const isDom2App = isDom2 && platform.startsWith('app');
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -240,8 +242,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             return {
                 code: modulesCode ||
                     (isJsCode
-                        ? isDom2Harmony
-                            ? `export default ${constants_1.JS_STYLE_PLACEHOLDER_STR}`
+                        ? isDom2App
+                            ? `export default ${(0, fontFamily_1.createJsStylePlaceholder)(id)}`
                             : 'export default {}'
                         : ''),
                 map: { mappings: '' },
@@ -251,7 +253,7 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             };
         },
         async renderChunk(_code, chunk, _opts) {
-            if (isDom2Harmony) {
+            if (isDom2) {
                 // 通过 generateBundle 实现
                 return null;
             }

package/dist/workers.js

@@ -13,6 +13,7 @@ const json_1 = require("./json");
 const uts_1 = require("./uts");
 const uni_modules_1 = require("./vite/plugins/uts/uni_modules");
 const resolve_1 = require("./resolve");
+const dom2_1 = require("./dom2");
 const debugWorkers = (0, debug_1.default)('uni:workers');
 let workersRootDir = null;
 let workersRootDirs = [];
@@ -76,6 +77,7 @@ function uniWorkersPlugin() {
     const uniXKotlinCompiler = platform === 'app-android'
         ? (0, uts_1.resolveUTSCompiler)().createUniXKotlinCompilerOnce({
             resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
         })
         : null;
     const uniXSwiftCompiler = platform === 'app-ios'

package/dist/x.d.ts

@@ -0,0 +1,10 @@
+type AppXPlatform = typeof process.env.UNI_UTS_PLATFORM;
+export declare function isUniAppX(): boolean;
+export declare function isUniAppXAndroid(platform?: AppXPlatform): boolean;
+export declare function isUniAppXIOS(platform?: AppXPlatform): boolean;
+export declare function isUniAppXVapor(): boolean;
+export declare function isUniAppXAndroidVapor(platform?: AppXPlatform): boolean;
+export declare function isUniAppXJsEngine(): boolean;
+export declare function isUniAppXAndroidJsEngine(platform?: AppXPlatform): boolean;
+export declare function isUniAppXAndroidNative(platform?: AppXPlatform): boolean;
+export {};

package/dist/x.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUniAppXAndroidNative = exports.isUniAppXAndroidJsEngine = exports.isUniAppXJsEngine = exports.isUniAppXAndroidVapor = exports.isUniAppXVapor = exports.isUniAppXIOS = exports.isUniAppXAndroid = exports.isUniAppX = void 0;
+function isUniAppX() {
+    return process.env.UNI_APP_X === 'true';
+}
+exports.isUniAppX = isUniAppX;
+function isUniAppXAndroid(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppX() && platform === 'app-android';
+}
+exports.isUniAppXAndroid = isUniAppXAndroid;
+function isUniAppXIOS(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppX() && platform === 'app-ios';
+}
+exports.isUniAppXIOS = isUniAppXIOS;
+function isUniAppXVapor() {
+    return isUniAppX() && process.env.UNI_APP_X_DOM2 === 'true';
+}
+exports.isUniAppXVapor = isUniAppXVapor;
+function isUniAppXAndroidVapor(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppXAndroid(platform) && process.env.UNI_APP_X_DOM2 === 'true';
+}
+exports.isUniAppXAndroidVapor = isUniAppXAndroidVapor;
+function isUniAppXJsEngine() {
+    return isUniAppX() && process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js';
+}
+exports.isUniAppXJsEngine = isUniAppXJsEngine;
+function isUniAppXAndroidJsEngine(platform = process.env.UNI_UTS_PLATFORM) {
+    return (isUniAppXAndroid(platform) &&
+        process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js');
+}
+exports.isUniAppXAndroidJsEngine = isUniAppXAndroidJsEngine;
+function isUniAppXAndroidNative(platform = process.env.UNI_UTS_PLATFORM) {
+    return (isUniAppXAndroid(platform) &&
+        // 非 Vapor 或者 Vapor 但使用 native 引擎
+        (process.env.UNI_APP_X_DOM2 !== 'true' ||
+            process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'native'));
+}
+exports.isUniAppXAndroidNative = isUniAppXAndroidNative;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-5000420260318001",
+  "version": "3.0.0-5000520260324002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -69,9 +69,9 @@
     "unimport": "4.1.1",
     "unplugin-auto-import": "19.1.0",
     "xregexp": "5.1.2",
-    "@dcloudio/uni-i18n": "3.0.0-5000420260318001",
-    "@dcloudio/uni-nvue-styler": "3.0.0-5000420260318001",
-    "@dcloudio/uni-shared": "3.0.0-5000420260318001"
+    "@dcloudio/uni-shared": "3.0.0-5000520260324002",
+    "@dcloudio/uni-nvue-styler": "3.0.0-5000520260324002",
+    "@dcloudio/uni-i18n": "3.0.0-5000520260324002"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
@@ -91,6 +91,6 @@
     "code-frame": "link:@types/@babel/code-frame",
     "postcss": "8.4.45",
     "vue": "3.4.21",
-    "@dcloudio/uni-uts-v1": "3.0.0-5000420260318001"
+    "@dcloudio/uni-uts-v1": "3.0.0-5000520260324002"
   }
 }