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

package/dist/messages/zh_CN.d.ts

@@ -1,5 +1,9 @@
 declare const _default: {
     readonly 'app.compiler.version': "编译器版本：{version}";
+    readonly 'view.render.compiler.target': "当前视图层编译目标：{target}";
+    readonly 'view.render.compiler.target.bytecode': "字节码";
+    readonly 'view.render.compiler.target.nativecode': "机器码";
+    readonly 'style.isolation.version': "当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly compiling: "正在编译中...";
     readonly 'dev.performance': "请注意运行模式下，因日志输出、sourcemap 以及未压缩源码等原因，性能和包体积，均不及发行模式。";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
@@ -11,14 +15,17 @@ declare const _default: {
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。";
+    readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
+    readonly 'stat.warn.version': "当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "已开启uni 统计 2.0{type}";
     readonly 'i18n.fallbackLocale.default': "当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}";
     readonly 'i18n.fallbackLocale.missing': "当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件";
     readonly 'easycom.conflict': "easycom组件冲突：";
+    readonly 'dom2.compatible.component': "蒸汽模式不支持 uni-app 兼容模式组件 {name}，检测到其实现文件为 {file}。请改用标准模式的UTS组件实现来实现。";
+    readonly 'dom2.root.scroll.view': "蒸汽模式下页面可滚动，建议移除根节点 scroll-view，以避免嵌套滚动。详情: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "{0}的第一个参数必须为静态字符串";
     readonly 'mp.component.args[1]': "{0}需要两个参数";
     readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
@@ -48,5 +55,6 @@ declare const _default: {
     readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
     readonly 'pages.json.page.notfound': "页面\"{pagePath}\"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。";
     readonly 'pages.json.page.slash': "路径 \"{pagePath}\" 不能以 \"/\" 开头";
+    readonly 'pages.json.tabbar.page.notfound': "tabBar 中配置的页面 \"{pagePath}\" 未在 pages.json 中注册。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     'app.compiler.version': '编译器版本：{version}',
+    'view.render.compiler.target': '当前视图层编译目标：{target}',
+    'view.render.compiler.target.bytecode': '字节码',
+    'view.render.compiler.target.nativecode': '机器码',
+    '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 影响较大',
@@ -13,14 +17,17 @@ exports.default = {
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
     'dev.watching.restart.vapor': 'DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。',
+    'dev.watching.vapor.render.target': 'manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': '编译失败',
     'stat.warn.appid': '当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303',
-    'stat.warn.version': '当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat',
-    'stat.warn.tip': '已开启 uni统计{version} 版本',
+    'stat.warn.version': '当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat',
+    'stat.warn.tip': '已开启uni 统计 2.0{type}',
     'i18n.fallbackLocale.default': '当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}',
     'i18n.fallbackLocale.missing': '当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件',
     'easycom.conflict': 'easycom组件冲突：',
+    'dom2.compatible.component': '蒸汽模式不支持 uni-app 兼容模式组件 {name}，检测到其实现文件为 {file}。请改用标准模式的UTS组件实现来实现。',
+    'dom2.root.scroll.view': '蒸汽模式下页面可滚动，建议移除根节点 scroll-view，以避免嵌套滚动。详情: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll',
     'mp.component.args[0]': '{0}的第一个参数必须为静态字符串',
     'mp.component.args[1]': '{0}需要两个参数',
     'mp.360.unsupported': 'vue3暂不支持360小程序',
@@ -51,4 +58,5 @@ exports.default = {
     'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
     'pages.json.page.notfound': '页面"{pagePath}"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。',
     'pages.json.page.slash': '路径 "{pagePath}" 不能以 "/" 开头',
+    'pages.json.tabbar.page.notfound': 'tabBar 中配置的页面 "{pagePath}" 未在 pages.json 中注册。',
 };

package/dist/mp/style.js

@@ -4,6 +4,7 @@ exports.transformPartSelector = exports.transformScopedCss = void 0;
 const tags_1 = require("./tags");
 const logs_1 = require("../logs");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const HTML_TAG_SELECTOR_RE = new RegExp(`/\\*[\\s\\S]*?(?:\\*/|$)|[\\s,}](${Object.keys(tags_1.HTML_TO_MINI_PROGRAM_TAGS).join('|')})\\s*(?=,|\\{)`, 'g');
 function transformScopedCss(cssCode) {
     checkHtmlTagSelector(cssCode);
     return cssCode.replace(/\[(data-v-[a-f0-9]{8})\]/gi, (_, scopedId) => {
@@ -18,8 +19,11 @@ function transformPartSelector(cssCode) {
 }
 exports.transformPartSelector = transformPartSelector;
 function checkHtmlTagSelector(cssCode) {
-    for (const tag in tags_1.HTML_TO_MINI_PROGRAM_TAGS) {
-        if (new RegExp(`( |\n|\t|,|})${tag}( *)(,|{)`, 'g').test(cssCode)) {
+    HTML_TAG_SELECTOR_RE.lastIndex = 0;
+    let match;
+    while ((match = HTML_TAG_SELECTOR_RE.exec(cssCode))) {
+        const tag = match[1];
+        if (tag) {
             (0, logs_1.output)('warn', `小程序端 style 暂不支持 ${tag} 标签选择器，推荐使用 class 选择器，详情参考：https://uniapp.dcloud.net.cn/tutorial/migration-to-vue3.html#style`);
             break;
         }

package/dist/postcss/plugins/stylePluginExternal.d.ts

@@ -1,17 +1,16 @@
 import type { PluginCreator } from 'postcss';
 /**
- * PostCSS plugin to boost specificity for page CSS based on externalClasses usage
+ * 基于页面 externalClasses 使用情况提升页面样式优先级
  *
- * For mini-program platforms (mp-*):
- *   - If page has no externalClasses usage: no transformation
- *   - If page has dynamic externalClasses: all selectors get page prefix
- *     .a -> page .a
- *   - If page has only static externalClasses: only matching selectors get page prefix
- *     .foo -> page .foo (if "foo" is in staticClasses)
- *     .bar -> .bar (unchanged, if "bar" is not in staticClasses)
+ * 小程序平台（mp-*）：
+ *   - 页面没有使用 externalClasses：不做转换
+ *   - 页面存在动态 externalClasses：选择器最后一个 class 追加 [class]
+ *     .a -> .a[class]
+ *   - 页面只有静态 externalClasses：仅命中静态 class 的选择器追加 [class]
+ *     .foo -> .foo[class]（foo 在 staticClasses 中）
+ *     .bar -> .bar（bar 不在 staticClasses 中）
  *
- * This ensures page styles have higher specificity than component styles
- * while minimizing unnecessary transformations for performance
+ * 追加 [class] 可以提升 class 选择器优先级，同时避免原先插入 page 带来的结构影响。
  */
 declare const externalPlugin: PluginCreator<void>;
 export default externalPlugin;

package/dist/postcss/plugins/stylePluginExternal.js

@@ -7,18 +7,17 @@ const postcss_selector_parser_1 = __importDefault(require("postcss-selector-pars
 const pages_1 = require("../../json/pages");
 const externalClasses_1 = require("../../mp/externalClasses");
 /**
- * PostCSS plugin to boost specificity for page CSS based on externalClasses usage
+ * 基于页面 externalClasses 使用情况提升页面样式优先级
  *
- * For mini-program platforms (mp-*):
- *   - If page has no externalClasses usage: no transformation
- *   - If page has dynamic externalClasses: all selectors get page prefix
- *     .a -> page .a
- *   - If page has only static externalClasses: only matching selectors get page prefix
- *     .foo -> page .foo (if "foo" is in staticClasses)
- *     .bar -> .bar (unchanged, if "bar" is not in staticClasses)
+ * 小程序平台（mp-*）：
+ *   - 页面没有使用 externalClasses：不做转换
+ *   - 页面存在动态 externalClasses：选择器最后一个 class 追加 [class]
+ *     .a -> .a[class]
+ *   - 页面只有静态 externalClasses：仅命中静态 class 的选择器追加 [class]
+ *     .foo -> .foo[class]（foo 在 staticClasses 中）
+ *     .bar -> .bar（bar 不在 staticClasses 中）
  *
- * This ensures page styles have higher specificity than component styles
- * while minimizing unnecessary transformations for performance
+ * 追加 [class] 可以提升 class 选择器优先级，同时避免原先插入 page 带来的结构影响。
  */
 const externalPlugin = () => {
     return {
@@ -27,21 +26,21 @@ const externalPlugin = () => {
             const processedRules = new WeakSet();
             return {
                 OnceExit(root) {
-                    // Only mini-program platforms need page selector prepend
+                    // 只有小程序平台需要处理 externalClasses 的样式优先级
                     const platform = process.env.UNI_PLATFORM || '';
                     if (!platform.startsWith('mp-')) {
                         return;
                     }
-                    // Get file path from postcss source
+                    // 从 postcss source 中获取当前样式所属文件
                     const filePath = root.source?.input?.file;
                     if (!filePath) {
                         return;
                     }
-                    // Only process page files
+                    // 只处理页面文件，组件文件保持原样
                     if (!(0, pages_1.isUniPageFile)(filePath)) {
                         return;
                     }
-                    // Get page's externalClasses info
+                    // 获取页面中收集到的 externalClasses 使用信息
                     const externalClassesInfo = (0, externalClasses_1.findPageExternalClasses)(filePath);
                     let staticClasses = new Set();
                     let hasDynamic = false;
@@ -55,7 +54,7 @@ const externalPlugin = () => {
                             hasDynamic = true;
                         }
                     }
-                    // If no static classes and no dynamic, skip processing
+                    // 没有静态 class，也没有动态绑定时，直接跳过，避免无意义遍历
                     if (staticClasses.size === 0 && !hasDynamic) {
                         return;
                     }
@@ -68,60 +67,67 @@ const externalPlugin = () => {
     };
 };
 function processRule(rule, processedRules, staticClasses, hasDynamic) {
-    // Skip already processed rules
+    // 同一个 Rule 只处理一次，避免被重复追加 [class]
     if (processedRules.has(rule)) {
         return;
     }
-    // Skip keyframes rules
+    // keyframes 内部的 from/to 不是普通选择器，不能处理
     if (rule.parent &&
         rule.parent.type === 'atrule' &&
         /-?keyframes$/.test(rule.parent.name)) {
         return;
     }
     processedRules.add(rule);
-    // Process selector based on externalClasses info
+    // 根据 externalClasses 情况处理选择器
     rule.selector = (0, postcss_selector_parser_1.default)((selectorRoot) => {
         selectorRoot.each((selector) => {
+            let classNode;
             if (hasDynamic) {
-                // Dynamic externalClasses: prepend page to all selectors
-                prependPageSelector(selector);
+                // 动态绑定无法提前知道具体 class，所有包含 class 的选择器都提升优先级
+                classNode = findLastClassNode(selector);
             }
             else {
-                // Static only: only prepend page if selector contains any staticClasses
-                if (selectorContainsClasses(selector, staticClasses)) {
-                    prependPageSelector(selector);
-                }
+                // 静态绑定只处理命中 staticClasses 的选择器，减少无关 CSS 变更
+                classNode = findLastClassNode(selector, staticClasses);
+            }
+            if (classNode) {
+                appendClassAttribute(selector, classNode);
             }
         });
     }).processSync(rule.selector);
 }
 /**
- * Check if selector contains any of the specified classes
+ * 找到选择器最右侧的 class 节点。
+ * 传入 classes 时，仅在选择器包含目标 class 后才返回最右侧 class，
+ * 这样 .a .b 在命中 .a 时也能输出 .a .b[class]，符合整体提权预期。
  */
-function selectorContainsClasses(selector, classes) {
-    let found = false;
-    selector.walk((node) => {
-        if (node.type === 'class' && classes.has(node.value)) {
-            found = true;
-            return false; // stop walking
+function findLastClassNode(selector, classes) {
+    let lastClassNode;
+    for (let i = selector.nodes.length - 1; i >= 0; i--) {
+        const node = selector.nodes[i];
+        if (node.type !== 'class') {
+            continue;
+        }
+        if (!lastClassNode) {
+            lastClassNode = node;
+        }
+        if (!classes || classes.has(node.value)) {
+            return lastClassNode;
         }
-    });
-    return found;
+    }
 }
 /**
- * Prepend 'page' selector for mini-program platforms
- * .a -> page .a
- * .b .c -> page .b .c
+ * 在 class 后追加 [class] 提升优先级。
+ * .a -> .a[class]
+ * .a[class] -> .a[class][class]
+ * .a .b -> .a .b[class]
  */
-function prependPageSelector(selector) {
-    // Skip if selector already starts with 'page'
-    const firstNode = selector.first;
-    if (firstNode && firstNode.type === 'tag' && firstNode.value === 'page') {
-        return;
-    }
-    // Insert 'page' tag and a combinator (space) at the beginning
-    selector.prepend(postcss_selector_parser_1.default.combinator({ value: ' ' }));
-    selector.prepend(postcss_selector_parser_1.default.tag({ value: 'page' }));
+function appendClassAttribute(selector, classNode) {
+    selector.insertAfter(classNode, postcss_selector_parser_1.default.attribute({
+        attribute: 'class',
+        value: undefined,
+        raws: {},
+    }));
 }
 externalPlugin.postcss = true;
 exports.default = externalPlugin;

package/dist/uni_modules.cloud.d.ts

@@ -32,6 +32,7 @@ export interface EncryptPackageJson {
         dependencies: string[];
         artifacts: {
             env: {
+                vapor: boolean;
                 compilerVersion: string;
             } & Record<string, any>;
             apis: string[];
@@ -45,9 +46,10 @@ export interface EncryptPackageJson {
         };
     };
 }
-export declare function initCheckEnv(): Record<string, string>;
+export declare function initCheckEnv(): Record<string, unknown>;
 export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
 type CloudCompileSdkType = 'utssdk' | 'easycom' | 'all';
+type VaporRenderTarget = 'bytecode' | 'nativecode';
 export interface CloudCompileParams {
     mode: 'development' | 'production';
     packType: 'debug' | 'release';
@@ -56,8 +58,11 @@ export interface CloudCompileParams {
     appname: string;
     platform: typeof process.env.UNI_UTS_PLATFORM;
     'uni-app-x': boolean;
+    vapor: boolean;
+    vaporRenderTarget?: VaporRenderTarget;
     env: Record<string, string>;
 }
+export declare function validateCloudCompileAppInfo(params: Pick<CloudCompileParams, 'appid' | 'appname'>): string;
 export declare function checkEncryptUniModules(inputDir: string, params: CloudCompileParams, sdkType?: CloudCompileSdkType): Promise<{} | undefined>;
 export declare function getUniModulesEncryptType(pluginId: string): "" | "utssdk" | "easycom" | undefined;
 export declare function parseUniModulesArtifacts(): {
@@ -66,5 +71,6 @@ export declare function parseUniModulesArtifacts(): {
     scopedSlots: string[];
     declaration: string;
 }[];
+export declare function copyEncryptUniModulesDom2Bytes(): boolean | Promise<boolean>;
 export declare function virtualComponentPath(filepath: string): string;
 export {};

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 {