@dcloudio/uni-cli-shared 3.0.0-alpha-5000520260323001 → 3.0.0-alpha-5000720260327001

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/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";

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

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 影响较大";
@@ -51,6 +52,7 @@ export declare const M: {
     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";

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 影响较大";

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 影响较大',

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,