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

package/dist/uni_modules.cloud.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.virtualComponentPath = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findCloudEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptUTSModuleCode = exports.genEncryptEasyComModuleCode = void 0;
+exports.virtualComponentPath = exports.copyEncryptUniModulesDom2Bytes = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.checkEncryptUniModules = exports.validateCloudCompileAppInfo = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findCloudEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptUTSModuleCode = exports.genEncryptEasyComModuleCode = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const fast_glob_1 = require("fast-glob");
@@ -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,20 +308,22 @@ 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(',')}}`]),
         ],
     });
 }
 function initCheckEnv() {
     return {
         // 云端编译的版本号不带日期及小版本
+        vapor: process.env.UNI_APP_X_DOM2 === 'true',
         compilerVersion: process.env.UNI_COMPILER_VERSION,
     };
 }
@@ -334,6 +337,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 +373,62 @@ 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;
+function validateCloudCompileAppInfo(params) {
+    const missingFields = [];
+    if (!String(params.appid || '').trim()) {
+        missingFields.push('appid');
+    }
+    if (!String(params.appname || '').trim()) {
+        missingFields.push('name');
+    }
+    if (missingFields.length) {
+        return `云编译插件失败：manifest.json 缺少 ${missingFields.join('、')}，请先配置后重新编译。`;
+    }
+    return '';
+}
+exports.validateCloudCompileAppInfo = validateCloudCompileAppInfo;
 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 needsCloudCompile = Object.keys(curEncryptUniModules).some((uniModuleId) => !curEncryptUniModules[uniModuleId]);
+    if (params.vapor && needsCloudCompile) {
+        const validateAppInfoError = validateCloudCompileAppInfo(params);
+        if (validateAppInfoError) {
+            console.error(validateAppInfoError);
+            return process.exit(0);
+        }
+    }
+    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 {
@@ -414,6 +451,7 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
             const AdmZip = require('adm-zip');
             const zip = new AdmZip(downloadFile);
             zip.extractAllTo(cacheDir, true);
+            await Promise.resolve(copyEncryptUniModulesDom2Bytes());
             fs_extra_1.default.unlinkSync(zipFile);
             fs_extra_1.default.unlinkSync(downloadFile);
             R({
@@ -431,8 +469,10 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         }
     }
     else {
-        // android 平台需要在这里初始化
-        if (params.platform === 'app-android') {
+        await Promise.resolve(copyEncryptUniModulesDom2Bytes());
+        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 +481,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) {
@@ -464,6 +504,83 @@ function parseUniModulesArtifacts() {
     return res;
 }
 exports.parseUniModulesArtifacts = parseUniModulesArtifacts;
+function copyEncryptUniModulesDom2Bytes() {
+    if (process.env.UNI_APP_X_DOM2 !== 'true') {
+        return false;
+    }
+    if (!['app-android', 'app-ios', 'app-harmony'].includes(process.env.UNI_UTS_PLATFORM)) {
+        return false;
+    }
+    const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
+    const outputDir = process.env.UNI_OUTPUT_DIR;
+    if (!cacheDir || !outputDir) {
+        return false;
+    }
+    if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET === 'bytecode') {
+        return copyEncryptUniModulesDom2BytesTarget(cacheDir, outputDir);
+    }
+    if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET === 'nativecode') {
+        return copyEncryptUniModulesDom2CppTarget(cacheDir, outputDir);
+    }
+    return false;
+}
+exports.copyEncryptUniModulesDom2Bytes = copyEncryptUniModulesDom2Bytes;
+function copyEncryptUniModulesDom2BytesTarget(cacheDir, outputDir) {
+    // 只依赖编译环境变量定位缓存目录和输出目录，避免拼接具体 unpackage/dist 路径。
+    const sourceBytesDir = path_1.default.resolve(cacheDir, 'bytes');
+    if (!fs_extra_1.default.existsSync(sourceBytesDir) ||
+        !fs_extra_1.default.statSync(sourceBytesDir).isDirectory()) {
+        return false;
+    }
+    const outputBytesDir = path_1.default.resolve(outputDir, 'bytes');
+    // 云编译产出的 bytecode 在缓存目录中，这里只合并复制到当前编译输出目录。
+    fs_extra_1.default.copySync(sourceBytesDir, outputBytesDir, { overwrite: true });
+    return true;
+}
+async function copyEncryptUniModulesDom2CppTarget(cacheDir, outputDir) {
+    const sourceCppDir = path_1.default.resolve(cacheDir, 'cpp');
+    if (!fs_extra_1.default.existsSync(sourceCppDir) ||
+        !fs_extra_1.default.statSync(sourceCppDir).isDirectory()) {
+        return false;
+    }
+    const outputCppDir = process.env.UNI_APP_X_DOM2_CPP_DIR || path_1.default.resolve(outputDir, 'cpp');
+    // nativecode 的 cpp/h 暂时不走 DUM 解密，直接复制云端产物。
+    // const cppFiles = sync('**/*.{cpp,h}', {
+    //   absolute: false,
+    //   cwd: sourceCppDir,
+    //   onlyFiles: true,
+    // }).filter((file) => !isIgnoreDom2CppFile(file))
+    // if (cppFiles.length) {
+    //   const files = cppFiles.reduce((files, file) => {
+    //     files[path.resolve(sourceCppDir, file)] = path.resolve(outputCppDir, file)
+    //     return files
+    //   }, {} as Record<string, string>)
+    //   const { DUM } = requireUniHelpers()
+    //   const errMsg = await DUM(path.basename(sourceCppDir), files)
+    //   if (errMsg) {
+    //     console.error(errMsg)
+    //     process.exit(0)
+    //   }
+    // }
+    // cpp 目录保持原目录结构直接复制，shared_data_init.h 由当前编译流程生成，不复制云端缓存版本。
+    fs_extra_1.default.copySync(sourceCppDir, outputCppDir, {
+        filter(src) {
+            if (fs_extra_1.default.statSync(src).isDirectory()) {
+                return true;
+            }
+            // shared_data_init.h 由当前编译生成，不能复制云端缓存里的旧文件覆盖本地结果。
+            if (isIgnoreDom2CppFile(src)) {
+                return false;
+            }
+            return true;
+        },
+        overwrite: true,
+    });
+    return true;
+}
+function isIgnoreDom2CppFile(filename) {
+    return path_1.default.basename(filename) === 'shared_data_init.h';
+}
 const uniComponentPrefix = 'uniComponent://';
 function virtualComponentPath(filepath) {
     return uniComponentPrefix + (0, url_1.encodeBase64Url)(filepath);

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/utils.js

@@ -175,6 +175,11 @@ function enableSourceMap() {
     if (process.env.UNI_APP_SOURCEMAP === 'false') {
         return false;
     }
+    if (process.env.NODE_ENV === 'development' &&
+        process.env.UNI_PLATFORM === 'app' &&
+        process.env.UNI_APP_X !== 'true') {
+        return false;
+    }
     return process.env.NODE_ENV === 'development' && isNormalCompileTarget();
 }
 exports.enableSourceMap = enableSourceMap;

package/dist/uts.d.ts

@@ -11,6 +11,7 @@ import type { EasycomMatcher } from './easycom';
  */
 export declare function resolveUTSAppModule(platform: typeof process.env.UNI_UTS_PLATFORM, id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
 export declare function resolveUTSModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
+export declare function hasUTSModulePlatformFile(pluginDir: string, platform: typeof process.env.UNI_UTS_PLATFORM): boolean;
 export declare function resolveUTSCompiler(throwError?: boolean): typeof UTSCompiler;
 export declare function resolveUTSCompilerVersion(): string;
 interface UTSComponentMeta {

package/dist/uts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftModuleWithPluginId = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftModuleWithPluginId = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.hasUTSModulePlatformFile = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 // 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -11,7 +11,10 @@ const fast_glob_1 = __importDefault(require("fast-glob"));
 const unimport_1 = require("unimport");
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
+const messages_1 = require("./messages");
 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 +39,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');
@@ -74,21 +77,64 @@ function resolveUTSAppModule(platform, id, importer, includeUTSSDK = true) {
             };
             const extname = ['.uts', '.vue', '.uvue'];
             if (platform === 'app-harmony') {
-                if (resolveUTSFile(resolvePlatformDir(platform), extname)) {
+                const indexFile = resolveUTSFile(resolvePlatformDir(platform), extname);
+                // dom2 下，如果平台入口直接是 utssdk/平台/index.vue，
+                // 说明该插件仍然使用旧版 uni-app 兼容模式组件实现，需要提前给出明确提示。
+                if (isDom2CompatibleVueComponent(indexFile)) {
+                    throw createDom2CompatibleComponentError(path_1.default.basename(id), indexFile);
+                }
+                if (indexFile) {
                     return id;
                 }
                 return;
             }
-            if (resolveUTSFile(resolvePlatformDir('app-android'), extname)) {
+            const appAndroidIndexFile = resolveUTSFile(resolvePlatformDir('app-android'), extname);
+            // Android / iOS 保持与现有解析顺序一致，只在命中旧版兼容模式入口时中断。
+            if (isDom2CompatibleVueComponent(appAndroidIndexFile)) {
+                throw createDom2CompatibleComponentError(path_1.default.basename(id), appAndroidIndexFile);
+            }
+            if (appAndroidIndexFile) {
                 return id;
             }
-            if (resolveUTSFile(resolvePlatformDir('app-ios'), extname)) {
+            const appIOSIndexFile = resolveUTSFile(resolvePlatformDir('app-ios'), extname);
+            if (isDom2CompatibleVueComponent(appIOSIndexFile)) {
+                throw createDom2CompatibleComponentError(path_1.default.basename(id), appIOSIndexFile);
+            }
+            if (appIOSIndexFile) {
                 return id;
             }
         }
     }
 }
 exports.resolveUTSAppModule = resolveUTSAppModule;
+function isDom2CompatibleVueComponent(file) {
+    if (!file || process.env.UNI_APP_X_DOM2 !== 'true') {
+        return false;
+    }
+    // 这里按目录层级做结构化判断：
+    // uni_modules/插件名/utssdk/平台/index.vue
+    const normalizedFile = (0, utils_1.normalizePath)(file);
+    const relativeFile = (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR || process.cwd(), normalizedFile));
+    const segments = relativeFile.split('/');
+    const uniModulesIndex = segments.lastIndexOf('uni_modules');
+    if (uniModulesIndex < 0) {
+        return false;
+    }
+    const pluginName = segments[uniModulesIndex + 1];
+    const utssdkDir = segments[uniModulesIndex + 2];
+    const platformDir = segments[uniModulesIndex + 3];
+    const entryFile = segments[uniModulesIndex + 4];
+    return (!!pluginName &&
+        utssdkDir === 'utssdk' &&
+        !!platformDir &&
+        entryFile === 'index.vue' &&
+        uniModulesIndex + 5 === segments.length);
+}
+function createDom2CompatibleComponentError(name, file) {
+    return new Error(messages_1.M['dom2.compatible.component']
+        .replace('{name}', `[${name}]`)
+        .replace('{file}', (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR || process.cwd(), file))));
+}
 // 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
 function resolveUTSModule(id, importer, includeUTSSDK = true) {
     if (process.env.UNI_PLATFORM === 'app' ||
@@ -119,6 +165,36 @@ function resolveUTSModule(id, importer, includeUTSSDK = true) {
     }
 }
 exports.resolveUTSModule = resolveUTSModule;
+function hasUTSModulePlatformFile(pluginDir, platform) {
+    const utssdkDir = path_1.default.resolve(pluginDir, 'utssdk');
+    if (!fs_extra_1.default.existsSync(utssdkDir)) {
+        return false;
+    }
+    // 根目录 index.uts 视为当前平台可复用，和现有 uts 解析逻辑保持一致
+    if (fs_extra_1.default.existsSync(path_1.default.resolve(utssdkDir, 'index.uts'))) {
+        return true;
+    }
+    if (platform === 'app-harmony') {
+        if (fs_extra_1.default.existsSync(path_1.default.resolve(utssdkDir, 'app-js', 'index.uts')) ||
+            resolveUTSFile(path_1.default.resolve(utssdkDir, platform), [
+                '.uts',
+                '.vue',
+                '.uvue',
+            ])) {
+            return true;
+        }
+        return false;
+    }
+    if (platform === 'app-android' || platform === 'app-ios') {
+        return !!resolveUTSFile(path_1.default.resolve(utssdkDir, platform), [
+            '.uts',
+            '.vue',
+            '.uvue',
+        ]);
+    }
+    return !!resolveUTSFile(path_1.default.resolve(utssdkDir, platform));
+}
+exports.hasUTSModulePlatformFile = hasUTSModulePlatformFile;
 function resolveUTSEncryptFile(pluginId, index) {
     if (!pluginId) {
         return;
@@ -335,12 +411,18 @@ function initUTSComponents(inputDir, platform) {
                     const kotlinPackage = parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk);
                     const swiftModule = parseSwiftModuleWithPluginId(pluginId, is_uni_modules_utssdk);
                     const swiftNamespace = parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk);
+                    // App 平台依旧沿用 uts-proxy 机制，这里只补充兼容性标记，不改变现有导入方式。
                     easycomsObj[`^${name}$`] = {
                         source: isApp ? `${source}?uts-proxy` : source,
                         kotlinPackage: kotlinPackage,
                         swiftModule: swiftModule,
                         kotlinNamespace: kotlinPackage,
                         swiftNamespace: swiftNamespace,
+                        // 仅记录命中的旧版兼容模式文件，真正报错放到 easycom / resolve 阶段，
+                        // 这样既能复用已有扫描结果，也不会影响非 dom2 场景。
+                        dom2IncompatibleFile: isDom2CompatibleVueComponent(file)
+                            ? (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file))
+                            : undefined,
                     };
                 }
             });
@@ -353,6 +435,8 @@ function initUTSComponents(inputDir, platform) {
             name: componentName,
             pattern: new RegExp(name),
             replacement: obj.source,
+            // 透传给 easycom 匹配逻辑，便于在模板中引用组件时直接给出更准确的错误信息。
+            dom2IncompatibleFile: obj.dom2IncompatibleFile,
         });
         utsComponents.set(componentName, {
             source: obj.source,
@@ -510,7 +594,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/cssScoped.js

@@ -14,8 +14,17 @@ const utils_2 = require("../../vue/utils");
 const debugScoped = (0, debug_1.default)('uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
 function addScoped(code) {
-    return code.replace(/(<style\b[^><]*)>/gi, (str, $1) => {
-        if ($1.includes('scoped')) {
+    const blockRanges = [];
+    code.replace(/<(script|template)\b[^>]*>[\s\S]*?<\/\1\s*>/gi, (block, _tag, offset) => {
+        blockRanges.push({
+            start: offset,
+            end: offset + block.length,
+        });
+        return block;
+    });
+    return code.replace(/(<style\b[^><]*)>/gi, (str, $1, offset) => {
+        if ($1.includes('scoped') ||
+            blockRanges.some((range) => offset > range.start && offset < range.end)) {
             return str;
         }
         return `${$1} scoped>`;

package/dist/vite/plugins/easycom.js

@@ -48,7 +48,9 @@ function uniEasycomPlugin(options) {
                         }
                     }
                     if (process.env.UNI_APP_X === 'true') {
-                        if ((0, uni_shared_1.isAppUVueBuiltInEasyComponent)(name)) {
+                        if (process.env.UNI_APP_X_DOM2 === 'true'
+                            ? (0, uni_shared_1.isDom2AppVueComponentTag)(name)
+                            : (0, uni_shared_1.isAppUVueBuiltInEasyComponent)(name)) {
                             // 内置easycom组件不传入self参数
                             return str.replace(', true)', ')');
                         }