@dcloudio/uni-cli-shared 3.0.0-alpha-5010320260611001 → 3.0.0-alpha-5010420260626001

package/dist/dom2/index.d.ts

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

package/dist/dom2/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./sharedData"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./fontFamily"), exports);
+__exportStar(require("./rootScrollView"), exports);

package/dist/dom2/rootScrollView.d.ts

@@ -0,0 +1,47 @@
+export interface VueCodePosition {
+    line: number;
+    column: number;
+}
+export interface VueCodeEditRange {
+    start: VueCodePosition;
+    end: VueCodePosition;
+    /**
+     * 调用方替换时建议只移除非换行字符，用于尽量保持错误定位和调试行号不变。
+     */
+    preserveLineBreaks: true;
+    /**
+     * 开始范围包含首个子节点前的缩进，调用方需要保留这段缩进，避免改变子节点格式。
+     */
+    preserveEndIndent?: true;
+}
+export type VueCodeEditRangesResult = Record<string, VueCodeEditRange[]>;
+/**
+ * 批量定位由 `#ifdef APP` 包裹的根 scroll-view 需要移除的范围。
+ * 只返回需要修改的行列号，不修改文件，也不返回修改后的文件内容。
+ */
+export declare function resolveAppRootScrollViewEditRanges(vueFiles: string[], inputDir: string): VueCodeEditRangesResult;
+/**
+ * 蒸汽模式下，页面根节点会自动补一个 scroll-view。
+ * 这里仅用正则做精确匹配：命中范围宁可保守，也不能误报。
+ */
+export declare function hasAppRootScrollViewWrappedByIfdef(code: string): boolean;
+/**
+ * 仅在 dom2 页面整文件预处理时定位需要提示优化建议的根 scroll-view 节点。
+ */
+export declare function resolveDom2RootScrollViewWarnLocation(code: string, filename: string, isVueSubRequest: boolean): {
+    loc: import("@vue/compiler-core").SourceLocation | {
+        start: {
+            line: number;
+            column: number;
+            offset: number;
+        };
+        end: {
+            line: number;
+            column: number;
+            offset: number;
+        };
+    };
+    source: string;
+} | undefined;
+export declare function warnDom2RootScrollView(code: string, filename: string, isVueSubRequest: boolean): void;
+export declare function resolveAppRootScrollViewEditRangesByCode(code: string, filename: string): VueCodeEditRange[];

package/dist/dom2/rootScrollView.js

@@ -0,0 +1,283 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAppRootScrollViewEditRangesByCode = exports.warnDom2RootScrollView = exports.resolveDom2RootScrollViewWarnLocation = exports.hasAppRootScrollViewWrappedByIfdef = exports.resolveAppRootScrollViewEditRanges = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const compiler_sfc_1 = require("@vue/compiler-sfc");
+const json_1 = require("../json");
+const logs_1 = require("../logs");
+const messages_1 = require("../messages");
+const utils_1 = require("../utils");
+const utils_2 = require("../vite/plugins/vitejs/utils");
+const { preprocess: preprocessHtml } = require('../../lib/preprocess');
+const TEMPLATE_BLOCK_RE = /<template\b[^>]*>([\s\S]*?)<\/template>/i;
+const ROOT_SCROLL_VIEW_ATTR_RE = /^\s+style\s*=\s*(["'])\s*flex\s*:\s*1\s*;?\s*\1\s*$/;
+const APP_ROOT_SCROLL_VIEW_RE = /^\s*<!--\s*#ifdef APP\s*-->\s*<scroll-view([^>]*)>[\s\S]*<\/scroll-view>\s*<!--\s*#endif\s*-->\s*$/;
+const SPLIT_APP_ROOT_SCROLL_VIEW_RE = /^\s*<!--\s*#ifdef APP\s*-->\s*<scroll-view([^>]*)>\s*<!--\s*#endif\s*-->[\s\S]*<!--\s*#ifdef APP\s*-->\s*<\/scroll-view>\s*<!--\s*#endif\s*-->\s*$/;
+/**
+ * 批量定位由 `#ifdef APP` 包裹的根 scroll-view 需要移除的范围。
+ * 只返回需要修改的行列号，不修改文件，也不返回修改后的文件内容。
+ */
+function resolveAppRootScrollViewEditRanges(vueFiles, inputDir) {
+    const result = {};
+    vueFiles.forEach((file) => {
+        const filename = resolveVueFilename(inputDir, file);
+        if (!(0, fs_extra_1.existsSync)(filename)) {
+            return;
+        }
+        const content = (0, fs_extra_1.readFileSync)(filename, 'utf8');
+        const ranges = resolveAppRootScrollViewEditRangesByCode(content, filename);
+        if (ranges.length) {
+            result[file] = ranges;
+        }
+    });
+    return result;
+}
+exports.resolveAppRootScrollViewEditRanges = resolveAppRootScrollViewEditRanges;
+/**
+ * 蒸汽模式下，页面根节点会自动补一个 scroll-view。
+ * 这里仅用正则做精确匹配：命中范围宁可保守，也不能误报。
+ */
+function hasAppRootScrollViewWrappedByIfdef(code) {
+    const templateContent = getTemplateContent(code);
+    if (!templateContent) {
+        return false;
+    }
+    return (matchesAppRootScrollViewTemplate(templateContent, APP_ROOT_SCROLL_VIEW_RE) ||
+        matchesAppRootScrollViewTemplate(templateContent, SPLIT_APP_ROOT_SCROLL_VIEW_RE));
+}
+exports.hasAppRootScrollViewWrappedByIfdef = hasAppRootScrollViewWrappedByIfdef;
+/**
+ * 仅在 dom2 页面整文件预处理时定位需要提示优化建议的根 scroll-view 节点。
+ */
+function resolveDom2RootScrollViewWarnLocation(code, filename, isVueSubRequest) {
+    if (process.env.UNI_PLATFORM !== 'app' ||
+        process.env.UNI_APP_X_DOM2 !== 'true' ||
+        isVueSubRequest ||
+        !(0, json_1.parseUniXPageOptions)(filename) ||
+        !code.includes('scroll-view') ||
+        !code.includes('#ifdef APP')) {
+        return;
+    }
+    if (!hasAppRootScrollViewWrappedByIfdef(code)) {
+        return;
+    }
+    return resolveAppRootScrollViewNodeLocByCode(code, filename);
+}
+exports.resolveDom2RootScrollViewWarnLocation = resolveDom2RootScrollViewWarnLocation;
+function warnDom2RootScrollView(code, filename, isVueSubRequest) {
+    const location = resolveDom2RootScrollViewWarnLocation(code, filename, isVueSubRequest);
+    if (!location) {
+        return;
+    }
+    (0, logs_1.onCompileLog)('warn', {
+        message: messages_1.M['dom2.root.scroll.view'],
+        name: 'Warn',
+        loc: location.loc,
+    }, createWarnCodeFrameSource(location), (0, utils_1.normalizePath)((0, path_1.relative)(process.env.UNI_INPUT_DIR, filename)));
+}
+exports.warnDom2RootScrollView = warnDom2RootScrollView;
+function resolveVueFilename(inputDir, file) {
+    if ((0, path_1.isAbsolute)(file)) {
+        const root = (0, path_1.parse)(file).root;
+        // HBuilderX/uni-app 里页面路径可能写成 `/pages/a/b.uvue`，
+        // 这种是项目内绝对路径，不是磁盘绝对路径，需要仍然基于 inputDir 解析。
+        if (root === '/' || root === '\\') {
+            return (0, path_1.resolve)(inputDir, removeLeadingRootSlash(file));
+        }
+        return file;
+    }
+    return (0, path_1.resolve)(inputDir, file);
+}
+function removeLeadingRootSlash(file) {
+    let index = 0;
+    while (file.charAt(index) === '/' || file.charAt(index) === '\\') {
+        index++;
+    }
+    return file.slice(index);
+}
+function getTemplateContent(code) {
+    return code.match(TEMPLATE_BLOCK_RE)?.[1];
+}
+function matchesAppRootScrollViewTemplate(template, regex) {
+    const match = template.match(regex);
+    return !!match && ROOT_SCROLL_VIEW_ATTR_RE.test(match[1]);
+}
+function resolveAppRootScrollViewNodeLocByCode(code, filename) {
+    const template = parseSfcTemplate(code, filename);
+    if (!template) {
+        return;
+    }
+    const children = template.ast.children;
+    if (children.length !== 3) {
+        return;
+    }
+    const [, scrollViewNode] = children;
+    if (!isRootScrollView(scrollViewNode)) {
+        return;
+    }
+    return {
+        loc: createStartTagLoc(code, scrollViewNode),
+        source: resolveStartTagSource(scrollViewNode),
+    };
+}
+function createStartTagLoc(code, node) {
+    const source = node.loc.source || '';
+    const endOffsetInSource = source.indexOf('>');
+    if (endOffsetInSource === -1) {
+        return {
+            start: node.loc.start,
+            end: node.loc.end,
+        };
+    }
+    return (0, utils_2.offsetToStartAndEnd)(code, node.loc.start.offset, node.loc.start.offset + endOffsetInSource + 1);
+}
+function resolveStartTagSource(node) {
+    const source = node.loc.source || '';
+    const endOffsetInSource = source.indexOf('>');
+    if (endOffsetInSource === -1) {
+        return source;
+    }
+    return source.slice(0, endOffsetInSource + 1);
+}
+function createWarnCodeFrameSource(location) {
+    return `${'\n'.repeat(Math.max(location.loc.start.line - 1, 0))}${location.source}`;
+}
+function resolveAppRootScrollViewEditRangesByCode(code, filename) {
+    const template = parseSfcTemplate(code, filename);
+    if (!template) {
+        return [];
+    }
+    const children = template.ast.children;
+    if (children.length !== 3) {
+        return [];
+    }
+    const [ifdefNode, scrollViewNode, endifNode] = children;
+    if (!isAppIfdefComment(ifdefNode) ||
+        !isRootScrollView(scrollViewNode) ||
+        !isEndifComment(endifNode)) {
+        return [];
+    }
+    // 使用项目既有的条件编译实现先跑一遍，再交给 Vue 编译器确认 APP 分支根节点。
+    if (!isPreprocessedRootScrollView(template.content, filename)) {
+        return [];
+    }
+    return createRootScrollViewEditRanges(ifdefNode, scrollViewNode, endifNode);
+}
+exports.resolveAppRootScrollViewEditRangesByCode = resolveAppRootScrollViewEditRangesByCode;
+function parseSfcTemplate(code, filename) {
+    const { descriptor, errors } = (0, compiler_sfc_1.parse)(code, {
+        filename,
+        sourceMap: false,
+    });
+    if (errors.length || !descriptor.template?.ast) {
+        return;
+    }
+    return {
+        content: descriptor.template.content,
+        ast: descriptor.template.ast,
+    };
+}
+function isPreprocessedRootScrollView(content, filename) {
+    try {
+        const preprocessed = preprocessHtml(content, createAppPreContext(), {
+            type: 'html',
+        });
+        const template = parseSfcTemplate(`<template>${preprocessed}</template>`, filename);
+        const root = template?.ast.children[0];
+        return (!!root && template.ast.children.length === 1 && root.tag === 'scroll-view');
+    }
+    catch (e) {
+        return false;
+    }
+}
+function createAppPreContext() {
+    // 这里只声明本函数需要的 APP/UVue 上下文，避免改动全局条件编译上下文。
+    return {
+        APP: true,
+        APP_UVUE: true,
+        UNI_APP_X: true,
+        VUE3: true,
+        VUE3_VAPOR: true,
+    };
+}
+function isAppIfdefComment(node) {
+    return (node.type === 3 /* NodeTypes.COMMENT */ && node.content?.trim() === '#ifdef APP');
+}
+function isEndifComment(node) {
+    return node.type === 3 /* NodeTypes.COMMENT */ && node.content?.trim() === '#endif';
+}
+function isRootScrollView(node) {
+    return (node.type === 1 /* NodeTypes.ELEMENT */ &&
+        node.tag === 'scroll-view' &&
+        hasOnlyFlexStyle(node));
+}
+function hasOnlyFlexStyle(node) {
+    if (!node.props || node.props.length !== 1) {
+        return false;
+    }
+    const style = node.props[0];
+    return (style.type === 6 /* NodeTypes.ATTRIBUTE */ &&
+        style.name === 'style' &&
+        !!style.value &&
+        normalizeFlexStyle(style.value.content) === 'flex:1');
+}
+function normalizeFlexStyle(style) {
+    let normalized = '';
+    for (let i = 0; i < style.length; i++) {
+        const char = style.charAt(i);
+        if (char !== ' ' && char !== '\t' && char !== '\n' && char !== '\r') {
+            normalized += char;
+        }
+    }
+    if (normalized.endsWith(';')) {
+        return normalized.slice(0, -1);
+    }
+    return normalized;
+}
+function createRootScrollViewEditRanges(ifdefNode, scrollViewNode, endifNode) {
+    const children = scrollViewNode.children || [];
+    if (!children.length) {
+        return [createEditRange(ifdefNode, endifNode)];
+    }
+    const firstChild = children[0];
+    const lastChild = children[children.length - 1];
+    // 兼容如下写法：条件编译分别包裹 scroll-view 的开始标签和结束标签。
+    // <!-- #ifdef APP -->
+    // <scroll-view style="flex:1">
+    // <!-- #endif -->
+    //   ...
+    // <!-- #ifdef APP -->
+    // </scroll-view>
+    // <!-- #endif -->
+    if (isEndifComment(firstChild) && isAppIfdefComment(lastChild)) {
+        return [
+            createEditRangeByLoc(ifdefNode.loc.start, firstChild.loc.end),
+            createEditRangeByLoc(lastChild.loc.start, endifNode.loc.end),
+        ];
+    }
+    return [
+        createEditRangeByLoc(ifdefNode.loc.start, firstChild.loc.start, true),
+        createEditRangeByLoc(lastChild.loc.end, endifNode.loc.end),
+    ];
+}
+function createEditRange(startNode, endNode) {
+    return createEditRangeByLoc(startNode.loc.start, endNode.loc.end);
+}
+function createEditRangeByLoc(start, end, preserveEndIndent = false) {
+    const range = {
+        start: toPosition(start),
+        end: toPosition(end),
+        preserveLineBreaks: true,
+    };
+    if (preserveEndIndent) {
+        range.preserveEndIndent = true;
+    }
+    return range;
+}
+function toPosition(loc) {
+    return {
+        line: loc.line,
+        column: loc.column,
+    };
+}

package/dist/messages/en.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";
     readonly 'dom2.compatible.component': "Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.";
+    readonly 'dom2.root.scroll.view': "Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "The first parameter of {0} must be a static string";
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";

package/dist/messages/en.js

@@ -27,6 +27,7 @@ exports.default = {
     'i18n.fallbackLocale.missing': './local/{locale}.json is missing',
     'easycom.conflict': 'easycom component conflict: ',
     'dom2.compatible.component': 'Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.',
+    'dom2.root.scroll.view': 'Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll',
     'mp.component.args[0]': 'The first parameter of {0} must be a static string',
     'mp.component.args[1]': '{0} requires two parameters',
     'mp.360.unsupported': '360 is unsupported',

package/dist/messages/index.d.ts

@@ -25,6 +25,7 @@ export declare const M: {
     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小程序";
@@ -82,6 +83,7 @@ export declare const M: {
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";
     readonly 'dom2.compatible.component': "Vapor mode does not support the uni-app compatibility component {name}. The implementation file {file} was detected. Please use the standard UTS component implementation for this purpose.";
+    readonly 'dom2.root.scroll.view': "Pages are scrollable in Vapor mode. Remove the root scroll-view to avoid nested scrolling. Details: https://doc.dcloud.net.cn/uni-app-x/page.html#disablescroll";
     readonly 'mp.component.args[0]': "The first parameter of {0} must be a static string";
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";

package/dist/messages/zh_CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     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小程序";

package/dist/messages/zh_CN.js

@@ -27,6 +27,7 @@ exports.default = {
     '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小程序',

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

@@ -62,6 +62,7 @@ export interface CloudCompileParams {
     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(): {

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.copyEncryptUniModulesDom2Bytes = 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");
@@ -381,6 +381,20 @@ function resolveEncryptUniModule(id, platform, isX = true) {
     }
 }
 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 类型的加密插件
@@ -399,6 +413,14 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         return {};
     }
     const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
+    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');

package/dist/vite/plugins/pre.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const constants_1 = require("../../constants");
+const dom2_1 = require("../../dom2");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 const debugPreJs = (0, debug_1.default)('uni:pre-js');
@@ -41,6 +42,7 @@ function uniPrePlugin(config, options) {
             if (!hasEndif) {
                 return;
             }
+            (0, dom2_1.warnDom2RootScrollView)(code, filename, !!query.vue);
             // 因为完整的 vue 会先条件编译，而 vue&type=template 等会再次条件编译，如果走error模式会报两次错误，且第二次错误没有正确的位置映射
             const unbalanced = query.vue ? 'skip' : 'error';
             if (isHtml) {