@dcloudio/uni-cli-shared 3.0.0-alpha-5000720260416001 → 3.0.0-alpha-5000820260420001

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(',')}}`]),
         ],
     });
 }
@@ -334,6 +336,9 @@ function findLastIndex(array, predicate) {
     return -1;
 }
 let encryptUniModules = {};
+function refreshEncryptUniModules(platform, inputDir) {
+    encryptUniModules = findCloudEncryptUniModules(platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR, 'all');
+}
 function resolveEncryptUniModule(id, platform, isX = true) {
     id = id.split('?', 2)[0];
     const parts = id.split('/');
@@ -367,31 +372,40 @@ 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'}`));
         }
     }
 }
 exports.resolveEncryptUniModule = resolveEncryptUniModule;
 async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
+    const isHarmonySplitCompile = params.platform === 'app-harmony' && sdkType !== 'all';
     // 初始化指定 sdk 类型的加密插件
     const curEncryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR, sdkType);
     if (!Object.keys(curEncryptUniModules).length) {
+        // 鸿蒙会按 utssdk/easycom 分两次扫描，这里回填一次全量状态，避免子集扫描把插件类型覆盖掉
+        if (isHarmonySplitCompile) {
+            refreshEncryptUniModules(params.platform, inputDir);
+        }
         return {};
     }
     if (!process.env.UNI_HBUILDERX_PLUGINS) {
+        if (isHarmonySplitCompile) {
+            refreshEncryptUniModules(params.platform, inputDir);
+        }
         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 +445,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,
@@ -441,7 +456,7 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         }
     }
     // 初始化所有
-    encryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR, 'all');
+    refreshEncryptUniModules(params.platform, inputDir);
 }
 exports.checkEncryptUniModules = checkEncryptUniModules;
 function getUniModulesEncryptType(pluginId) {

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/lib/dom2/app/@vitejs/plugin-vue/dist/index.cjs

@@ -320,13 +320,6 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
-  if (extraOptions.helper) {
-    extraOptions.className = extraOptions.helper.GCN(
-      descriptor.filename,
-      process.env.UNI_INPUT_DIR
-    );
-    extraOptions.r = extraOptions.helper.K;
-  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out

package/lib/dom2/app/@vitejs/plugin-vue/dist/index.mjs

@@ -307,13 +307,6 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
-  if (extraOptions.helper) {
-    extraOptions.className = extraOptions.helper.GCN(
-      descriptor.filename,
-      process.env.UNI_INPUT_DIR
-    );
-    extraOptions.r = extraOptions.helper.K;
-  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.5
+  * @vue/compiler-core v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.5
+  * @vue/compiler-core v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.d.ts

@@ -348,6 +348,7 @@ export interface SimpleExpressionNode extends Node {
   */
   sharedData?: {
     ident?: string;
+    classRef?: string;
     vModel?: {
       eventIdent: string;
     };

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.5
+  * @vue/compiler-core v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-browser.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.5
+  * @vue/compiler-dom v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/