@dcloudio/uni-cli-shared 3.0.0-alpha-5030320261021001 → 3.0.0-alpha-5030620261106001

package/dist/constants.d.ts

@@ -36,6 +36,7 @@ export declare const H5_FRAMEWORK_STYLE_PATH = "@dcloudio/uni-h5/style/framework
 export declare const H5_COMPONENTS_STYLE_PATH = "@dcloudio/uni-h5/style/";
 export declare const BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style/";
 export declare const X_BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style-x/";
+export declare const X_VAPOR_BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style-x-vapor/";
 export declare const COMMON_EXCLUDE: RegExp[];
 export declare const KNOWN_ASSET_TYPES: string[];
 export declare const DEFAULT_ASSETS_RE: RegExp;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.DEFAULT_APPID = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_VAPOR_BASE_COMPONENTS_STYLE_PATH = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.DEFAULT_APPID = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx', '.uts'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -50,6 +50,7 @@ exports.H5_FRAMEWORK_STYLE_PATH = '@dcloudio/uni-h5/style/framework/';
 exports.H5_COMPONENTS_STYLE_PATH = '@dcloudio/uni-h5/style/';
 exports.BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style/';
 exports.X_BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style-x/';
+exports.X_VAPOR_BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style-x-vapor/';
 exports.COMMON_EXCLUDE = [
     /\/pages\.json\.js$/,
     /\/manifest\.json\.js$/,

package/dist/deps.d.ts

@@ -1,3 +1,4 @@
+export declare function resolveWebVaporComponentStyle(name: string): string | undefined;
 export declare const API_DEPS_CSS: (isX: boolean) => {
     showModal: string[];
     showToast: string[];
@@ -8,6 +9,7 @@ export declare const API_DEPS_CSS: (isX: boolean) => {
     showLoading: string[];
 };
 export declare const COMPONENT_DEPS_CSS: (isX: boolean) => {
+    waterflow?: string[] | undefined;
     canvas: string[];
     image: string[];
     'movable-area': string[];

package/dist/deps.js

@@ -1,18 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMPONENT_DEPS_CSS = exports.API_DEPS_CSS = void 0;
+exports.COMPONENT_DEPS_CSS = exports.API_DEPS_CSS = exports.resolveWebVaporComponentStyle = void 0;
 const constants_1 = require("./constants");
+const x_1 = require("./x");
+const uni_shared_1 = require("@dcloudio/uni-shared");
 const RESIZE_SENSOR_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'resize-sensor.css';
 const REFRESHER_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'refresher.css';
+const webVaporStyleComponents = new Set([
+    'input',
+    'textarea',
+    'scroll-view',
+    'video',
+    'web-view',
+    'ad',
+]);
+// Easycom、API 和框架内部组件共用同一份路径选择，避免漏载或同时加载旧版与 Vapor 样式。
+// 同步组件优先：将来接入内网实现后，自动使用其生成样式。
+function resolveWebVaporComponentStyle(name) {
+    if ((0, uni_shared_1.hasWebVaporComponentStyle)(name)) {
+        return constants_1.X_VAPOR_BASE_COMPONENTS_STYLE_PATH + name + '.css';
+    }
+    if (webVaporStyleComponents.has(name)) {
+        return constants_1.H5_COMPONENTS_STYLE_PATH + 'vapor/' + name + '.css';
+    }
+}
+exports.resolveWebVaporComponentStyle = resolveWebVaporComponentStyle;
+function componentCss(name, isWebVapor) {
+    return ((isWebVapor && resolveWebVaporComponentStyle(name)) ||
+        constants_1.BASE_COMPONENTS_STYLE_PATH + name + '.css');
+}
+// 框架内部的 ScrollView 已在框架构建时编译，用户项目的 Easycom 不会再次扫描。
+// Web Vapor 的外层组件或 API 需显式声明其样式，避免发行裁剪时漏载。
+function webVaporScrollViewCss() {
+    return [componentCss('scroll-view', true)];
+}
 const API_DEPS_CSS = (isX) => {
+    // API 内部组件已随框架编译，需在项目使用该 API 时加载对应渲染模式的样式。
+    const isWebVapor = isX && (0, x_1.isUniAppXWebVapor)();
+    const scrollViewCss = isWebVapor ? webVaporScrollViewCss() : [];
     const deps_css = {
         showModal: [],
         showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
-        showActionSheet: [],
+        showActionSheet: scrollViewCss,
         previewImage: [
             RESIZE_SENSOR_CSS,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper.css`,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}swiper-item.css`,
+            componentCss('swiper', isWebVapor),
+            componentCss('swiper-item', isWebVapor),
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-area.css`,
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}movable-view.css`,
         ],
@@ -21,16 +54,27 @@ const API_DEPS_CSS = (isX) => {
         showLoading: [],
     };
     if (isX) {
-        deps_css.showModal = [`${constants_1.BASE_COMPONENTS_STYLE_PATH}textarea.css`];
+        deps_css.showModal = [
+            componentCss('textarea', isWebVapor),
+            ...scrollViewCss,
+        ];
         deps_css.chooseLocation = [
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}/view.css`,
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}/text.css`,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/input.css`,
+            isWebVapor
+                ? componentCss('input', true)
+                : `${constants_1.BASE_COMPONENTS_STYLE_PATH}/input.css`,
             `${constants_1.H5_COMPONENTS_STYLE_PATH}/map.css`,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}/scroll-view.css`,
+            ...(isWebVapor
+                ? scrollViewCss
+                : [`${constants_1.BASE_COMPONENTS_STYLE_PATH}/scroll-view.css`]),
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}/image.css`,
         ];
-        deps_css.showLoading = [`${constants_1.X_BASE_COMPONENTS_STYLE_PATH}loading.css`];
+        deps_css.showLoading = [
+            `${isWebVapor
+                ? constants_1.X_VAPOR_BASE_COMPONENTS_STYLE_PATH
+                : constants_1.X_BASE_COMPONENTS_STYLE_PATH}loading.css`,
+        ];
     }
     else {
         deps_css.showModal = [`${constants_1.H5_API_STYLE_PATH}modal.css`];
@@ -46,22 +90,29 @@ const API_DEPS_CSS = (isX) => {
 };
 exports.API_DEPS_CSS = API_DEPS_CSS;
 const COMPONENT_DEPS_CSS = (isX) => {
+    const isWebVapor = isX && (0, x_1.isUniAppXWebVapor)();
+    const scrollViewCss = isWebVapor ? webVaporScrollViewCss() : [];
     return {
         canvas: [RESIZE_SENSOR_CSS],
         image: [RESIZE_SENSOR_CSS],
         'movable-area': [RESIZE_SENSOR_CSS],
         'picker-view': [RESIZE_SENSOR_CSS],
-        'picker-view-column': [RESIZE_SENSOR_CSS],
+        'picker-view-column': [RESIZE_SENSOR_CSS, ...scrollViewCss],
         'rich-text': [RESIZE_SENSOR_CSS],
         textarea: [RESIZE_SENSOR_CSS],
         'web-view': [RESIZE_SENSOR_CSS],
         picker: [
             RESIZE_SENSOR_CSS,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view.css`,
-            `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view-column.css`,
+            componentCss('picker-view', isWebVapor),
+            componentCss('picker-view-column', isWebVapor),
+            ...scrollViewCss,
+        ],
+        'scroll-view': isWebVapor ? [] : [REFRESHER_CSS],
+        'list-view': [
+            RESIZE_SENSOR_CSS,
+            ...(isWebVapor ? scrollViewCss : [REFRESHER_CSS]),
         ],
-        'scroll-view': [REFRESHER_CSS],
-        'list-view': [RESIZE_SENSOR_CSS, REFRESHER_CSS],
+        ...(isWebVapor ? { waterflow: [RESIZE_SENSOR_CSS, ...scrollViewCss] } : {}),
     };
 };
 exports.COMPONENT_DEPS_CSS = COMPONENT_DEPS_CSS;

package/dist/easycom.js

@@ -254,6 +254,7 @@ function initAutoScanEasycom(platform, dir, rootDir, extensions) {
         if (isDevX) {
             if (has_uts_sdk_dir &&
                 process.env.UNI_UTS_PLATFORM &&
+                process.env.UNI_UTS_PLATFORM !== 'web' &&
                 (0, uni_shared_1.isBuiltInComponent)(name)) {
                 // dev下，如果是内置组件，且存在utssdk目录，则判断utssdk下是否存在当前平台，如果不存在，则跳过
                 const utsSdkPlatformDir = path_1.default.resolve(dir, '../utssdk', process.env.UNI_UTS_PLATFORM);

package/dist/hbx/alias.js

@@ -11,6 +11,9 @@ const module_alias_1 = __importDefault(require("module-alias"));
 const utils_1 = require("./utils");
 const pluginPaths_1 = require("./pluginPaths");
 const hbxPlugins = {
+    // 普通 uni-app 的 SFC 外部类型解析通过此别名加载 TypeScript，按需依赖 compile-typescript。
+    // uni-app x 编译链通过 resolveUniTypeScript 使用 uni-uts-v1 自带的 TypeScript，
+    // 不走此别名，也不依赖 compile-typescript；注册别名本身不会加载该插件。
     typescript: ['compile-typescript', 'node_modules/typescript'],
     less: ['compile-less', 'node_modules/less'],
     sass: ['compile-dart-sass', 'node_modules/sass'],
@@ -117,18 +120,21 @@ function resolveUniCliPlatform() {
     }
     return 'h5';
 }
+// 在归一化前记录外部开关，避免将初始化生成的 DOM2 状态误认为外部配置。
+const externalDom2 = process.env.UNI_APP_X_DOM2 === 'true';
 function normalizeUniAppXVaporEnv() {
-    // App 使用 UNI_APP_X_VAPOR 作为对外开关；Web 仅在项目根目录存在 .vapor 时启用。
+    // App 使用 UNI_APP_X_VAPOR 作为对外开关；Web 还支持 .vapor 和 DOM2 环境变量。
     const utsPlatform = process.env.UNI_UTS_PLATFORM;
     const uniPlatform = process.env.UNI_PLATFORM;
     const cliPlatform = resolveUniCliPlatform();
     const platform = cliPlatform || utsPlatform || uniPlatform;
-    const webVaporConfigured = isWebPlatform(platform) && hasWebVaporConfig();
-    // Web 以项目根目录的 .vapor 作为显式开关。HBuilderX dev 不会预先注入
-    // UNI_APP_X，因此这里需要同步补齐 uni-app x 环境标记。
+    const webVaporConfigured = isWebPlatform(platform) && (externalDom2 || hasWebVaporConfig());
+    // HBuilderX dev 不会预先注入 UNI_APP_X，因此这里需要同步补齐 uni-app x 环境标记。
     const isWebVapor = webVaporConfigured;
     if (isWebVapor) {
         process.env.UNI_APP_X = 'true';
+        // Web Vapor 固定使用新样式隔离，在加载插件前统一首次编译、HMR 和 CSS 处理规则。
+        process.env.UNI_APP_STYLE_ISOLATION_VERSION = '2';
     }
     if (process.env.UNI_APP_X_VAPOR === 'true' || isWebVapor) {
         process.env.UNI_APP_X_DOM2 = 'true';

package/dist/hbx/pluginPaths.js

@@ -21,8 +21,10 @@ const getHBuilderXPluginPaths = (0, uni_shared_1.once)(() => {
 });
 function resolveHBuilderXPluginPath(pluginName, ...subpaths) {
     const pluginPaths = getHBuilderXPluginPaths();
-    const pluginPath = pluginPaths
-        ? pluginPaths[pluginName]
+    const mappedPath = pluginPaths?.[pluginName];
+    // 缺少 key 时使用旧目录；空字符串表示显式未配置，不回退。
+    const pluginPath = mappedPath !== undefined
+        ? mappedPath
         : process.env.UNI_HBUILDERX_PLUGINS
             ? path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, pluginName)
             : undefined;

package/dist/hbx/utils.js

@@ -7,14 +7,16 @@ exports.isInHBuilderX = void 0;
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
 exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
+    // 启动端应在加载编译器前传入工程类型，CLI 工程不能因 IDE 插件路径而使用内置环境。
+    if (process.env.UNI_PROJECT_TYPE === 'cli') {
+        return false;
+    }
+    // 未传工程类型时，沿用引入 HX_PLUGIN_PATHS 之前的识别及根目录初始化逻辑。
     // 自动化测试传入了 HX_APP_ROOT(其实就是UNI_HBUILDERX_PLUGINS)
     if (process.env.HX_APP_ROOT) {
         process.env.UNI_HBUILDERX_PLUGINS = path_1.default.resolve(process.env.HX_APP_ROOT, 'plugins');
         return true;
     }
-    if (process.env.HX_PLUGIN_PATHS && process.env.UNI_HBUILDERX_PLUGINS) {
-        return true;
-    }
     try {
         const { name } = require(path_1.default.resolve(process.cwd(), '../about/package.json'));
         if (name === 'about') {
@@ -25,8 +27,6 @@ exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     catch (e) {
         // console.error(e)
     }
-    if (process.env.HX_PLUGIN_PATHS) {
-        return true;
-    }
-    return false;
+    // 插件路径不代表工程类型；V 的独立插件布局由启动端显式传入 hbuilder。
+    return process.env.UNI_PROJECT_TYPE === 'hbuilder';
 });

package/dist/json/mp/agent.d.ts

@@ -0,0 +1 @@
+export declare function getMiniProgramAIPaths(inputDir?: string, platform?: UniApp.PLATFORM): string[];

package/dist/json/mp/agent.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMiniProgramAIPaths = void 0;
+const shared_1 = require("@vue/shared");
+const manifest_1 = require("../manifest");
+function getMiniProgramAIPaths(inputDir, platform) {
+    if (!inputDir || !platform) {
+        return [];
+    }
+    const manifestJson = (0, manifest_1.parseManifestJsonOnce)(inputDir);
+    const config = manifestJson[platform];
+    if (!config?.agent) {
+        return [];
+    }
+    const agentConfig = config.agent;
+    const paths = [];
+    const instruction = agentConfig.instruction;
+    if (instruction) {
+        paths.push(instruction);
+    }
+    const pageMetadata = agentConfig.pageMetadata;
+    if (pageMetadata) {
+        paths.push(pageMetadata);
+    }
+    const skills = agentConfig.skills;
+    if ((0, shared_1.isArray)(skills) && skills.length > 0) {
+        paths.push(...skills.map((skill) => skill.path).filter(Boolean));
+    }
+    return paths;
+}
+exports.getMiniProgramAIPaths = getMiniProgramAIPaths;

package/dist/json/mp/index.d.ts

@@ -1,4 +1,5 @@
 export * from './jsonFile';
+export { getMiniProgramAIPaths } from './agent';
 export { AppJson, ComponentJson, MiniProgramComponentsType } from './types';
 export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';

package/dist/json/mp/index.js

@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withoutIndependentRoot = exports.withIndependentRootIfNeeded = exports.withIndependentRoot = exports.stringifyIndependentRoots = exports.setIndependentSubPackages = exports.resolveIndependentRoot = exports.parseIndependentVirtualRoot = exports.parseIndependentSubPackages = exports.parseIndependentRoot = exports.parseIndependentMainRoot = exports.normalizeIndependentRoot = exports.isInIndependentRoot = exports.isAppPagesJson = exports.hasIndependentRoot = exports.getIndependentSubPackages = exports.getIndependentRoots = exports.getIndependentRootByFilename = exports.formatIndependentVirtualId = exports.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY = exports.MP_INDEPENDENT_MAIN_PREFIX = exports.MP_INDEPENDENT_ROOT_QUERY = exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
+exports.withoutIndependentRoot = exports.withIndependentRootIfNeeded = exports.withIndependentRoot = exports.stringifyIndependentRoots = exports.setIndependentSubPackages = exports.resolveIndependentRoot = exports.parseIndependentVirtualRoot = exports.parseIndependentSubPackages = exports.parseIndependentRoot = exports.parseIndependentMainRoot = exports.normalizeIndependentRoot = exports.isInIndependentRoot = exports.isAppPagesJson = exports.hasIndependentRoot = exports.getIndependentSubPackages = exports.getIndependentRoots = exports.getIndependentRootByFilename = exports.formatIndependentVirtualId = exports.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY = exports.MP_INDEPENDENT_MAIN_PREFIX = exports.MP_INDEPENDENT_ROOT_QUERY = exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = exports.getMiniProgramAIPaths = void 0;
 __exportStar(require("./jsonFile"), exports);
+var agent_1 = require("./agent");
+Object.defineProperty(exports, "getMiniProgramAIPaths", { enumerable: true, get: function () { return agent_1.getMiniProgramAIPaths; } });
 var pages_1 = require("./pages");
 Object.defineProperty(exports, "mergeMiniProgramAppJson", { enumerable: true, get: function () { return pages_1.mergeMiniProgramAppJson; } });
 Object.defineProperty(exports, "parseMiniProgramPagesJson", { enumerable: true, get: function () { return pages_1.parseMiniProgramPagesJson; } });

package/dist/json/pages.d.ts

@@ -1,4 +1,5 @@
 export declare const pagesCacheSet: Set<string>;
+export declare const windowsCacheSet: Set<string>;
 export declare function isUniPageFile(file: string, inputDir?: string): any;
 export declare function isUniPageSetupAndUts(file: string): boolean;
 export declare function isUniPageSetupAndTs(file: string): boolean;

package/dist/json/pages.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.filterPlatformPages = exports.parseSubpackagesRootOnce = exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = exports.isUniPageSfcFile = exports.isUniPageSetupAndTs = exports.isUniPageSetupAndUts = exports.isUniPageFile = exports.pagesCacheSet = void 0;
+exports.filterPlatformPages = exports.parseSubpackagesRootOnce = exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = exports.isUniPageSfcFile = exports.isUniPageSetupAndTs = exports.isUniPageSetupAndUts = exports.isUniPageFile = exports.windowsCacheSet = exports.pagesCacheSet = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -16,6 +16,8 @@ const constants_1 = require("../constants");
 const theme_1 = require("./theme");
 const manifest_1 = require("./manifest");
 exports.pagesCacheSet = new Set();
+// 窗口名单随 pages.json 一起更新，不并入页面名单，避免影响路由等现有页面判定。
+exports.windowsCacheSet = new Set();
 function isUniPageFile(file, inputDir = process.env.UNI_INPUT_DIR) {
     if (inputDir && path_1.default.isAbsolute(file)) {
         file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file.split('?')[0]));
@@ -133,6 +135,13 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     // 缓存页面列表
     exports.pagesCacheSet.clear();
     pagesJson.pages.forEach((page) => exports.pagesCacheSet.add(page.path));
+    exports.windowsCacheSet.clear();
+    for (const name of ['topWindow', 'leftWindow', 'rightWindow']) {
+        const window = pagesJson[name];
+        if (window?.path) {
+            exports.windowsCacheSet.add((0, utils_1.normalizePath)(path_1.default.normalize(window.path)));
+        }
+    }
     const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
     if (!manifestJsonPlatform.darkmode) {
         const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);

package/dist/messages/en.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
     readonly 'view.render.compiler.target.bytecode': "bytecode";
     readonly 'view.render.compiler.target.nativecode': "nativecode";
     readonly 'vapor.default.script.lang': "Default script lang for current uvue/vue files: {lang}";
+    readonly 'harmony.vapor.script.runtime': "Current script runtime: {runtime}";
     readonly 'style.isolation.version': "Style isolation version: {version}";
     readonly 'style.isolation.version.upgrade': "Style isolation version: {version}. Upgrading to 2.0 is recommended.";
     readonly compiling: "Compiling...";
@@ -20,7 +21,7 @@ declare const _default: {
     readonly 'dev.watching.restart.script.engine': "DONE  Restart required. Script engine changes require restarting to take effect.";
     readonly 'dev.watching.restart.independentSubPackages': "DONE  Restart required. Changing independent subpackage roots requires restarting to take effect.";
     readonly 'dev.watching.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
-    readonly 'harmony.vapor.script.engine': "Invalid Harmony script engine ({engine}) specified, using default.";
+    readonly 'harmony.vapor.script.runtime.invalid': "Invalid script runtime ({runtime}) specified, using default runtime: {defaultRuntime}.";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";

package/dist/messages/en.js

@@ -6,6 +6,7 @@ exports.default = {
     'view.render.compiler.target.bytecode': 'bytecode',
     'view.render.compiler.target.nativecode': 'nativecode',
     'vapor.default.script.lang': 'Default script lang for current uvue/vue files: {lang}',
+    'harmony.vapor.script.runtime': 'Current script runtime: {runtime}',
     'style.isolation.version': 'Style isolation version: {version}',
     'style.isolation.version.upgrade': 'Style isolation version: {version}. Upgrading to 2.0 is recommended.',
     compiling: 'Compiling...',
@@ -22,7 +23,7 @@ exports.default = {
     'dev.watching.restart.script.engine': 'DONE  Restart required. Script engine changes require restarting to take effect.',
     'dev.watching.restart.independentSubPackages': 'DONE  Restart required. Changing independent subpackage roots requires restarting to take effect.',
     'dev.watching.vapor.render.target': 'vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.',
-    'harmony.vapor.script.engine': 'Invalid Harmony script engine ({engine}) specified, using default.',
+    'harmony.vapor.script.runtime.invalid': 'Invalid script runtime ({runtime}) specified, using default runtime: {defaultRuntime}.',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': 'Build failed with errors.',
     'stat.warn.appid': 'The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303',

package/dist/messages/index.d.ts

@@ -4,6 +4,7 @@ export declare const M: {
     readonly 'view.render.compiler.target.bytecode': "字节码";
     readonly 'view.render.compiler.target.nativecode': "机器码";
     readonly 'vapor.default.script.lang': "当前 uvue/vue 文件默认 script lang：{lang}";
+    readonly 'harmony.vapor.script.runtime': "当前页面脚本运行环境：{runtime}";
     readonly 'style.isolation.version': "当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly 'style.isolation.version.upgrade': "当前样式隔离策略：{version}。推荐升级为 2.0。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly compiling: "正在编译中...";
@@ -19,7 +20,7 @@ export declare const M: {
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。";
     readonly 'dev.watching.restart.independentSubPackages': "DONE  Restart required. 独立分包 root 列表变化需要重新运行才能生效。";
     readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
-    readonly 'harmony.vapor.script.engine': "指定的 Harmony 脚本引擎无效（{engine}），使用默认值。";
+    readonly 'harmony.vapor.script.runtime.invalid': "指定的页面脚本运行环境无效（{runtime}），使用默认运行环境：{defaultRuntime}。";
     readonly 'dev.watching.restart.script.engine': "DONE  Restart required. 脚本引擎变化需要重新运行才能生效。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
@@ -68,6 +69,7 @@ export declare const M: {
     readonly 'view.render.compiler.target.bytecode': "bytecode";
     readonly 'view.render.compiler.target.nativecode': "nativecode";
     readonly 'vapor.default.script.lang': "Default script lang for current uvue/vue files: {lang}";
+    readonly 'harmony.vapor.script.runtime': "Current script runtime: {runtime}";
     readonly 'style.isolation.version': "Style isolation version: {version}";
     readonly 'style.isolation.version.upgrade': "Style isolation version: {version}. Upgrading to 2.0 is recommended.";
     readonly compiling: "Compiling...";
@@ -84,7 +86,7 @@ export declare const M: {
     readonly 'dev.watching.restart.script.engine': "DONE  Restart required. Script engine changes require restarting to take effect.";
     readonly 'dev.watching.restart.independentSubPackages': "DONE  Restart required. Changing independent subpackage roots requires restarting to take effect.";
     readonly 'dev.watching.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
-    readonly 'harmony.vapor.script.engine': "Invalid Harmony script engine ({engine}) specified, using default.";
+    readonly 'harmony.vapor.script.runtime.invalid': "Invalid script runtime ({runtime}) specified, using default runtime: {defaultRuntime}.";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";

package/dist/messages/zh_CN.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
     readonly 'view.render.compiler.target.bytecode': "字节码";
     readonly 'view.render.compiler.target.nativecode': "机器码";
     readonly 'vapor.default.script.lang': "当前 uvue/vue 文件默认 script lang：{lang}";
+    readonly 'harmony.vapor.script.runtime': "当前页面脚本运行环境：{runtime}";
     readonly 'style.isolation.version': "当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly 'style.isolation.version.upgrade': "当前样式隔离策略：{version}。推荐升级为 2.0。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html";
     readonly compiling: "正在编译中...";
@@ -19,7 +20,7 @@ declare const _default: {
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。";
     readonly 'dev.watching.restart.independentSubPackages': "DONE  Restart required. 独立分包 root 列表变化需要重新运行才能生效。";
     readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
-    readonly 'harmony.vapor.script.engine': "指定的 Harmony 脚本引擎无效（{engine}），使用默认值。";
+    readonly 'harmony.vapor.script.runtime.invalid': "指定的页面脚本运行环境无效（{runtime}），使用默认运行环境：{defaultRuntime}。";
     readonly 'dev.watching.restart.script.engine': "DONE  Restart required. 脚本引擎变化需要重新运行才能生效。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";

package/dist/messages/zh_CN.js

@@ -6,6 +6,7 @@ exports.default = {
     'view.render.compiler.target.bytecode': '字节码',
     'view.render.compiler.target.nativecode': '机器码',
     'vapor.default.script.lang': '当前 uvue/vue 文件默认 script lang：{lang}',
+    'harmony.vapor.script.runtime': '当前页面脚本运行环境：{runtime}',
     'style.isolation.version': '当前样式隔离策略：{version}。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html',
     'style.isolation.version.upgrade': '当前样式隔离策略：{version}。推荐升级为 2.0。详见：https://doc.dcloud.net.cn/uni-app-x/css/common/style-isolation.html',
     compiling: '正在编译中...',
@@ -21,7 +22,7 @@ exports.default = {
     'dev.watching.restart.vapor': 'DONE  Restart required. 切换蒸汽模式需要重新运行才能生效。',
     'dev.watching.restart.independentSubPackages': 'DONE  Restart required. 独立分包 root 列表变化需要重新运行才能生效。',
     'dev.watching.vapor.render.target': 'manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。',
-    'harmony.vapor.script.engine': '指定的 Harmony 脚本引擎无效（{engine}），使用默认值。',
+    'harmony.vapor.script.runtime.invalid': '指定的页面脚本运行环境无效（{runtime}），使用默认运行环境：{defaultRuntime}。',
     'dev.watching.restart.script.engine': 'DONE  Restart required. 脚本引擎变化需要重新运行才能生效。',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': '编译失败',

package/dist/postcss/plugins/uniapp.js

@@ -9,12 +9,17 @@ const postcss_selector_parser_1 = __importDefault(require("postcss-selector-pars
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const constants_1 = require("./constants");
 const alipayPageBackground_1 = require("./alipayPageBackground");
+const x_1 = require("../../x");
 const defaultUniAppCssProcessorOptions = (0, shared_1.extend)({}, uni_shared_1.defaultRpx2Unit);
-function transform(selector, state, { rewriteTag }) {
+function transform(selector, state, { rewriteTag, vapor }) {
     if (selector.type !== 'tag') {
         return;
     }
     const { value } = selector;
+    if (vapor && value !== 'page') {
+        rewriteVaporTag(selector);
+        return;
+    }
     selector.value = rewriteTag(value);
     if (value === 'page' && selector.value === 'uni-page-body') {
         state.body = true;
@@ -36,6 +41,47 @@ function createBodyRule(origRule) {
         origRule.after(rule({ selector: 'body' }).append(bodyDecls));
     }
 }
+function rewriteVaporTag(selector) {
+    // 显式命名空间属于原生 CSS，不将 svg|image 等当成 uni 组件。
+    if (selector.namespace !== undefined)
+        return;
+    let tag = selector.value.replace(/^v-uni-/, '');
+    if (tag === 'cover-view')
+        tag = 'view';
+    if (tag === 'cover-image')
+        tag = 'image';
+    if (!(0, uni_shared_1.isBuiltInComponent)(tag) && !(0, uni_shared_1.isDom2WebVueComponentTag)(tag))
+        return;
+    let host = 'div';
+    if (tag === 'text')
+        host = 'span';
+    else if (tag === 'image')
+        host = 'img';
+    else if (tag === 'canvas')
+        host = 'canvas';
+    // Button、Navigator 会使用 View 或 Text 根，切换分支后仍须匹配。
+    else if (tag === 'button' || tag === 'navigator')
+        host = ':is(div,span)';
+    // 框架样式及本插件产物可能再次经过此处。统一识别紧邻的纯属性
+    // :where，已有身份时只转换宿主；不推导分支、后代或否定选择器。
+    const marker = `uni-${tag}`;
+    const next = selector.next();
+    const hasMarker = next?.type === 'pseudo' &&
+        next.value === ':where' &&
+        next.nodes.length === 1 &&
+        next.nodes[0].nodes.every((node) => node.type === 'attribute') &&
+        next.nodes[0].nodes.some((node) => node.type === 'attribute' &&
+            node.attribute === marker &&
+            node.namespace === undefined &&
+            !node.operator);
+    // 用 div:where([uni-view]) 而不是 [uni-view]：保留原标签的 (0,0,1)
+    // 优先级，避免属性选择器的 (0,1,0) 改变与 class、scoped 样式的覆盖关系。
+    // :is(div,span) 同样只有标签权重；已有标识直接参与匹配，不排除复合组件根。
+    const nodes = (0, postcss_selector_parser_1.default)().astSync(host + (hasMarker ? '' : `:where([${marker}])`)).first.nodes;
+    nodes[0].spaces.before = selector.spaces.before;
+    nodes[nodes.length - 1].spaces.after = selector.spaces.after;
+    selector.replaceWith(...nodes);
+}
 function walkRules(options) {
     return (rule) => {
         const state = { body: false };
@@ -75,7 +121,6 @@ function rewriteUniH5Tags(tag) {
     if (tag === 'page') {
         return 'uni-page-body';
     }
-    // TODO: Web Vapor 需将 view、text、image 转换为对应的 attribute 宿主选择器。
     if ((0, uni_shared_1.isBuiltInComponent)(tag)) {
         return uni_shared_1.COMPONENT_SELECTOR_PREFIX + tag;
     }
@@ -112,6 +157,7 @@ const uniapp = (opts) => {
                     if (rewriteTag) {
                         root.walkRules(walkRules({
                             rewriteTag,
+                            vapor: (0, x_1.isUniAppXWebVapor)(),
                         }));
                     }
                 },

package/dist/uni_modules.d.ts

@@ -1,4 +1,8 @@
 import type { UTSTargetLanguage } from './uts';
+/**
+ * 解析 app-js 插件入口，保持旧版 UTS 入口优先。
+ */
+export declare function resolveUTSAppJsEntry(appJsDir: string): string | undefined;
 export type DefineOptions = {
     name?: string;
     app?: boolean | {

package/dist/uni_modules.js

@@ -3,11 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApi = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.formatExtApiProviderName = exports.getUniExtApiPlugins = exports.getUniExtApiProviders = exports.isNonTreeShakingPlugin = exports.getNonTreeShakingPlugins = void 0;
+exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApi = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.formatExtApiProviderName = exports.getUniExtApiPlugins = exports.getUniExtApiProviders = exports.isNonTreeShakingPlugin = exports.getNonTreeShakingPlugins = exports.resolveUTSAppJsEntry = void 0;
 // 重要：此文件编译后的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 utsAppJsEntryNames = ['index.uts', 'index.ts', 'index.js'];
+/**
+ * 解析 app-js 插件入口，保持旧版 UTS 入口优先。
+ */
+function resolveUTSAppJsEntry(appJsDir) {
+    for (const entryName of utsAppJsEntryNames) {
+        const entry = path_1.default.resolve(appJsDir, entryName);
+        if (fs_extra_1.default.existsSync(entry)) {
+            return entry;
+        }
+    }
+}
+exports.resolveUTSAppJsEntry = resolveUTSAppJsEntry;
 const extApiProviders = [];
 const extApiPlugins = new Set();
 function getNonTreeShakingPlugins() {
@@ -230,15 +243,16 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
             // }
         }
         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`;
+            const appJsEntry = resolveUTSAppJsEntry(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js'));
+            if (appJsEntry) {
+                source = `${source}/utssdk/app-js/${path_1.default.basename(appJsEntry)}`;
             }
         }
         else if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
             // 出于兼容历史项目考虑，鸿蒙优先使用app-harmony，无app-harmony的情况下再使用app-js
-            if (!fs_extra_1.default.existsSync(platformIndexFileName) &&
-                fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js', 'index.uts'))) {
-                source = `${source}/utssdk/app-js/index.uts`;
+            const appJsEntry = resolveUTSAppJsEntry(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js'));
+            if (!fs_extra_1.default.existsSync(platformIndexFileName) && appJsEntry) {
+                source = `${source}/utssdk/app-js/${path_1.default.basename(appJsEntry)}`;
             }
         }
         for (const key in rootDefines) {

package/dist/utils.d.ts

@@ -44,6 +44,6 @@ export declare function isNormalCompileTarget(): boolean;
  * @returns
  */
 export declare function getEscaper(regex: RegExp, map: Map<number, string>): (data: string) => string;
-export declare function getHarmonyRuntimePackageName(isX: boolean, isDom2: boolean): string;
+export declare function getHarmonyRuntimePackageName(isX: boolean, isVapor: boolean): string;
 export declare const defaultUniAppXHarmonyScriptEngine = "arkts";
 export declare function resolveUniAppXHarmonyScriptEngine(manifestJson: Record<string, any>): any;