@dcloudio/uni-cli-shared 3.0.0-5010520260709002 → 3.0.0-5020320260806002

package/dist/uts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftModuleWithPluginId = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.hasUTSModulePlatformFile = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftModuleWithPluginId = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 // 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -165,36 +165,6 @@ function resolveUTSModule(id, importer, includeUTSSDK = true) {
     }
 }
 exports.resolveUTSModule = resolveUTSModule;
-function hasUTSModulePlatformFile(pluginDir, platform) {
-    const utssdkDir = path_1.default.resolve(pluginDir, 'utssdk');
-    if (!fs_extra_1.default.existsSync(utssdkDir)) {
-        return false;
-    }
-    // 根目录 index.uts 视为当前平台可复用，和现有 uts 解析逻辑保持一致
-    if (fs_extra_1.default.existsSync(path_1.default.resolve(utssdkDir, 'index.uts'))) {
-        return true;
-    }
-    if (platform === 'app-harmony') {
-        if (fs_extra_1.default.existsSync(path_1.default.resolve(utssdkDir, 'app-js', 'index.uts')) ||
-            resolveUTSFile(path_1.default.resolve(utssdkDir, platform), [
-                '.uts',
-                '.vue',
-                '.uvue',
-            ])) {
-            return true;
-        }
-        return false;
-    }
-    if (platform === 'app-android' || platform === 'app-ios') {
-        return !!resolveUTSFile(path_1.default.resolve(utssdkDir, platform), [
-            '.uts',
-            '.vue',
-            '.uvue',
-        ]);
-    }
-    return !!resolveUTSFile(path_1.default.resolve(utssdkDir, platform));
-}
-exports.hasUTSModulePlatformFile = hasUTSModulePlatformFile;
 function resolveUTSEncryptFile(pluginId, index) {
     if (!pluginId) {
         return;

package/dist/vite/plugins/cssScoped.js

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

package/dist/vite/plugins/easycom.js

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

package/dist/vite/plugins/inject.js

@@ -12,6 +12,7 @@ const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const uts_1 = require("../../uts");
+const x_1 = require("../../x");
 const debugInject = (0, debug_1.default)('uni:inject');
 // const debugInjectTry = debug('uni:inject-try')
 function uniViteInjectPlugin(name, options) {
@@ -131,7 +132,7 @@ function uniViteInjectPlugin(name, options) {
             }
             (0, estree_walker_1.walk)(ast, {
                 enter(node, parent) {
-                    if (sourceMap) {
+                    if (sourceMap && (0, x_1.shouldUseHighResolutionSourceMap)()) {
                         magicString.addSourcemapLocation(node.start);
                         magicString.addSourcemapLocation(node.end);
                     }
@@ -173,7 +174,11 @@ function uniViteInjectPlugin(name, options) {
             magicString.prepend(`${importBlock}\n\n`);
             return {
                 code: magicString.toString(),
-                map: sourceMap ? magicString.generateMap({ hires: true }) : null,
+                map: sourceMap
+                    ? magicString.generateMap({
+                        hires: (0, x_1.shouldUseHighResolutionSourceMap)(),
+                    })
+                    : null,
             };
         },
     };

package/dist/vite/plugins/jsonJs.js

@@ -7,16 +7,19 @@ exports.defineUniManifestJsonPlugin = exports.defineUniPagesJsonPlugin = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("../../constants");
+const subpackage_1 = require("../../json/mp/subpackage");
 const utils_1 = require("../../utils");
 exports.defineUniPagesJsonPlugin = createDefineJsonJsPlugin('pages.json');
 exports.defineUniManifestJsonPlugin = createDefineJsonJsPlugin('manifest.json');
 function createDefineJsonJsPlugin(name) {
     const JSON_JS = constants_1.JSON_JS_MAP[name];
+    // pages-json-js 仅允许独立分包 root query；manifest-json-js 仍保持 app 级。
+    const allowedQuery = name === 'pages.json' ? subpackage_1.MP_INDEPENDENT_ROOT_QUERY : '';
     return function (createVitePlugin) {
         const opts = {
             resolvedConfig: {},
             filter(id) {
-                return id.endsWith(JSON_JS);
+                return !!parseJsonJsRequest(id, JSON_JS, allowedQuery);
             },
         };
         const plugin = createVitePlugin(opts);
@@ -30,8 +33,9 @@ function createDefineJsonJsPlugin(name) {
             if (res) {
                 return res;
             }
-            if (id.endsWith(JSON_JS)) {
-                return jsonJsPath;
+            const jsonJsRequest = parseJsonJsRequest(id, JSON_JS, allowedQuery);
+            if (jsonJsRequest) {
+                return jsonJsPath + jsonJsRequest.query;
             }
         };
         plugin.configResolved = function (config) {
@@ -53,3 +57,37 @@ function createDefineJsonJsPlugin(name) {
         return plugin;
     };
 }
+function parseJsonJsRequest(id, jsonJs, allowedQuery) {
+    const queryIndex = id.indexOf('?');
+    const query = queryIndex === -1 ? '' : id.slice(queryIndex + 1);
+    if (query && !isAllowedJsonJsQuery(query, allowedQuery)) {
+        return;
+    }
+    if (queryIndex !== -1 && !query) {
+        return;
+    }
+    const filename = queryIndex === -1 ? id : id.slice(0, queryIndex);
+    if (!filename.endsWith(jsonJs)) {
+        return;
+    }
+    return {
+        filename,
+        query: queryIndex === -1 ? '' : id.slice(queryIndex),
+    };
+}
+function isAllowedJsonJsQuery(query, allowedQuery) {
+    if (!allowedQuery) {
+        return false;
+    }
+    const items = query.split('&');
+    if (items.length !== 1) {
+        return false;
+    }
+    const item = items[0];
+    const equalIndex = item.indexOf('=');
+    if (equalIndex === -1) {
+        return false;
+    }
+    return (item.slice(0, equalIndex) === allowedQuery &&
+        item.slice(equalIndex + 1).length > 0);
+}

package/dist/vite/plugins/sfc.js

@@ -9,6 +9,7 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const vue_1 = require("../../vue");
 const utils_1 = require("../utils");
 const preprocess_1 = require("../../preprocess");
+const x_1 = require("../../x");
 const SRC_IMPORT_RE = /<(template|script|style)[^>]*src\s*=\s*["']([^"']+)["'][^>]*>/;
 const SRC_IMPORT_VUE_RE = /<(template|script|style)[^>]*src\s*=\s*["'](.*\.uvue|.*\.vue)["'][^>]*>/;
 function isSrcImport(code) {
@@ -120,7 +121,9 @@ function uniViteSfcSrcImportPlugin({ onlyVue } = { onlyVue: true }) {
             }
             return {
                 code: s.toString(),
-                map: sourceMap ? s.generateMap({ hires: true }) : null,
+                map: sourceMap
+                    ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
+                    : null,
             };
         },
     };

package/dist/vite/plugins/vitejs/plugins/asset.js

@@ -37,8 +37,10 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
 const utils_3 = require("../../../../utils");
+const x_1 = require("../../../../x");
 const static_1 = require("./static");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
+const assetUrlMarker = '__VITE_ASSET__';
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 exports.chunkToEmittedAssetsMap = new WeakMap();
@@ -106,6 +108,10 @@ function assetPlugin(config, options) {
             let match;
             let s;
             exports.assetUrlRE.lastIndex = 0;
+            // 部分 chunk 不包含资源占位符，先用低成本字符串查找跳过正则扫描。
+            if (code.indexOf(assetUrlMarker) === -1) {
+                return null;
+            }
             // Urls added with JS using e.g.
             // imgElement.src = "__VITE_ASSET__5aa0ddc0__" are using quotes
             // Urls added in CSS that is imported in JS end up like
@@ -124,7 +130,9 @@ function assetPlugin(config, options) {
             if (s) {
                 return {
                     code: s.toString(),
-                    map: (0, utils_2.withSourcemap)(config) ? s.generateMap({ hires: true }) : null,
+                    map: (0, utils_2.withSourcemap)(config)
+                        ? s.generateMap({ hires: shouldUseAssetHighResolutionSourceMap() })
+                        : null,
                 };
             }
             else {
@@ -134,6 +142,11 @@ function assetPlugin(config, options) {
     };
 }
 exports.assetPlugin = assetPlugin;
+function shouldUseAssetHighResolutionSourceMap() {
+    // Android dom2 的 app-service 后续会与 esbuild map 合并，低精度 asset map
+    // 可能导致原始 .uvue 映射丢失或断点偏移。
+    return (0, x_1.isUniAppXAndroid)() || (0, x_1.shouldUseHighResolutionSourceMap)();
+}
 function parseAssets(config, code) {
     let match;
     let s;

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -42,6 +42,7 @@ const shared_1 = require("@vue/shared");
 const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
+const x_1 = require("../../../../x");
 const constants_1 = require("../../../../constants");
 const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
@@ -223,9 +224,17 @@ function findCssModuleIds(moduleId, includeComponentCss = true, cssModuleIds, se
 function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFilename, chunkCssCode, includeComponentCss, emitFile, }) {
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
+    // 只缓存 cssCode 的 hash，不缓存完整 css，避免用空间换时间。
+    const cssChunkCodeHashCache = new Map();
     let cssChunks;
     const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
     const isDom2App = isDom2 && platform.startsWith('app');
+    // 仅限定鸿蒙 DOM2 开发模式，避免影响其它平台和生产构建。
+    const enableCssIncremental = process.env.NODE_ENV === 'development' &&
+        process.env.UNI_UTS_PLATFORM === 'app-harmony' &&
+        isDom2App &&
+        !!isJsCode &&
+        !!emitFile;
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -339,6 +348,9 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                 });
             }
             if (!cssChunks.size) {
+                if (enableCssIncremental) {
+                    cssChunkCodeHashCache.clear();
+                }
                 return;
             }
             // resolve asset URL placeholders to their built file URLs and perform
@@ -367,8 +379,20 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                     .map((id) => styles.get(id) || '')
                     .join('\n');
             };
+            const currentCssFilenames = enableCssIncremental
+                ? new Set(cssChunks.keys())
+                : undefined;
             for (const filename of cssChunks.keys()) {
                 const cssCode = genCssCode(filename);
+                const cssCodeHash = enableCssIncremental ? (0, utils_3.hash)(cssCode) : '';
+                const hasFontFace = enableCssIncremental && /@font-face\b/i.test(cssCode);
+                // 鸿蒙 DOM2 开发模式下，未变化的样式无需重复 parseCss 和写入原生侧。
+                // @font-face 会在 chunkCssCode 中写入字体缓存，必须保留原有副作用。
+                if (enableCssIncremental &&
+                    !hasFontFace &&
+                    cssChunkCodeHashCache.get(filename) === cssCodeHash) {
+                    continue;
+                }
                 let source = await processChunkCSS(cssCode, {
                     filename: filename,
                     inlined: false,
@@ -386,6 +410,16 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                             source,
                         });
                 }
+                if (enableCssIncremental) {
+                    cssChunkCodeHashCache.set(filename, cssCodeHash);
+                }
+            }
+            if (currentCssFilenames) {
+                cssChunkCodeHashCache.forEach((_, filename) => {
+                    if (!currentCssFilenames.has(filename)) {
+                        cssChunkCodeHashCache.delete(filename);
+                    }
+                });
             }
         },
     };
@@ -1175,7 +1209,7 @@ async function getSource(source, filename, additionalData, enableSourcemap, sep
     const ms = new magic_string_1.default(source);
     ms.appendLeft(0, sep);
     ms.appendLeft(0, additionalData);
-    const map = ms.generateMap({ hires: true });
+    const map = ms.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() });
     map.file = filename;
     map.sources = [filename];
     return {

package/dist/vue/transforms/index.js

@@ -40,7 +40,7 @@ Object.defineProperty(exports, "matchTransformOn", { enumerable: true, get: func
 var vModel_1 = require("./vModel");
 Object.defineProperty(exports, "createTransformModel", { enumerable: true, get: function () { return vModel_1.createTransformModel; } });
 Object.defineProperty(exports, "matchTransformModel", { enumerable: true, get: function () { return vModel_1.defaultMatch; } });
-exports.transformH5BuiltInComponents = (0, transformTag_1.createTransformTag)(uni_shared_1.BUILT_IN_TAG_NAMES.reduce((tags, tag) => ((tags[tag] = uni_shared_1.COMPONENT_PREFIX + tag), tags), {}));
+exports.transformH5BuiltInComponents = (0, transformTag_1.createTransformTag)(uni_shared_1.H5_BUILT_IN_TAG_NAMES.reduce((tags, tag) => ((tags[tag] = uni_shared_1.COMPONENT_PREFIX + tag), tags), {}));
 exports.transformMatchMedia = (0, transformTag_1.createTransformTag)({
     'match-media': 'uni-match-media',
 });

package/dist/x.d.ts

@@ -3,6 +3,7 @@ export declare function isUniAppX(): boolean;
 export declare function isUniAppXAndroid(platform?: AppXPlatform): boolean;
 export declare function isUniAppXIOS(platform?: AppXPlatform): boolean;
 export declare function isUniAppXVapor(): boolean;
+export declare function shouldUseHighResolutionSourceMap(): boolean;
 export declare function isUniAppXAndroidVapor(platform?: AppXPlatform): boolean;
 export declare function isUniAppXJsEngine(): boolean;
 export declare function isUniAppXAndroidJsEngine(platform?: AppXPlatform): boolean;

package/dist/x.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUniAppXAndroidNative = exports.isUniAppXAndroidJsEngine = exports.isUniAppXJsEngine = exports.isUniAppXAndroidVapor = exports.isUniAppXVapor = exports.isUniAppXIOS = exports.isUniAppXAndroid = exports.isUniAppX = void 0;
+exports.isUniAppXAndroidNative = exports.isUniAppXAndroidJsEngine = exports.isUniAppXJsEngine = exports.isUniAppXAndroidVapor = exports.shouldUseHighResolutionSourceMap = exports.isUniAppXVapor = exports.isUniAppXIOS = exports.isUniAppXAndroid = exports.isUniAppX = void 0;
 function isUniAppX() {
     return process.env.UNI_APP_X === 'true';
 }
@@ -17,6 +17,10 @@ function isUniAppXVapor() {
     return isUniAppX() && process.env.UNI_APP_X_DOM2 === 'true';
 }
 exports.isUniAppXVapor = isUniAppXVapor;
+function shouldUseHighResolutionSourceMap() {
+    return !(process.env.NODE_ENV === 'development' && isUniAppXVapor());
+}
+exports.shouldUseHighResolutionSourceMap = shouldUseHighResolutionSourceMap;
 function isUniAppXAndroidVapor(platform = process.env.UNI_UTS_PLATFORM) {
     return isUniAppXAndroid(platform) && process.env.UNI_APP_X_DOM2 === 'true';
 }

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.12
+  * @vue/compiler-core v3.6.0-beta.17
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2633,7 +2633,7 @@ const tokenizer = new Tokenizer(stack, {
 		}
 	},
 	oncdata(start, end) {
-		if (stack[0].ns !== 0) onText(getSlice(start, end), start, end);
+		if ((stack[0] ? stack[0].ns : currentOptions.ns) !== 0) onText(getSlice(start, end), start, end);
 		else emitError(1, start - 9);
 	},
 	onprocessinginstruction(start) {
@@ -3147,7 +3147,7 @@ function getSelfName(filename) {
 }
 function createTransformContext(root, { filename = "", prefixIdentifiers = false, hoistStatic = false, hmr = false, cacheHandlers = false, nodeTransforms = [], directiveTransforms = {}, transformHoist = null, isBuiltInComponent = _vue_shared.NOOP, isCustomElement = _vue_shared.NOOP, isUserComponent = (element) => {
 	return element.tagType === 1;
-}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = _vue_shared.EMPTY_OBJ, inline = false, isTS = false, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
+}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = _vue_shared.EMPTY_OBJ, inline = false, isTS = false, eventDelegation = true, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
 	const context = {
 		filename,
 		selfName: getSelfName(filename),
@@ -3170,6 +3170,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		bindingMetadata,
 		inline,
 		isTS,
+		eventDelegation,
 		onError,
 		onWarn,
 		compatConfig,
@@ -3181,6 +3182,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		imports: [],
 		cached: [],
 		constantCache: /* @__PURE__ */ new WeakMap(),
+		vForMemoKeyedNodes: /* @__PURE__ */ new WeakSet(),
 		temps: 0,
 		identifiers: Object.create(null),
 		identifierScopes: Object.create(null),
@@ -3961,7 +3963,7 @@ const transformExpression = (node, context) => {
 			if (dir.type === 7 && dir.name !== "for") {
 				const exp = dir.exp;
 				const arg = dir.arg;
-				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
+				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && context.vForMemoKeyedNodes.has(node) && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
 				if (arg && arg.type === 4 && !arg.isStatic) dir.arg = processExpression(arg, context);
 			}
 		}
@@ -4219,11 +4221,11 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 		const keyProp = findProp(node, `key`, false, true);
 		const isDirKey = keyProp && keyProp.type === 7;
 		let keyExp = keyProp && (keyProp.type === 6 ? keyProp.value ? createSimpleExpression(keyProp.value.content, true) : void 0 : keyProp.exp);
-		if (memo && keyExp && isDirKey) keyProp.exp = keyExp = processExpression(keyExp, context);
-		const keyProperty = keyProp && keyExp ? createObjectProperty(`key`, keyExp) : null;
-		if (isTemplate) {
-			if (memo) memo.exp = processExpression(memo.exp, context);
-			if (keyProperty && keyProp.type !== 6) keyProperty.value = processExpression(keyProperty.value, context);
+		const keyProperty = keyExp ? createObjectProperty(`key`, keyExp) : null;
+		if (isTemplate && memo) memo.exp = processExpression(memo.exp, context);
+		if ((isTemplate || memo) && keyProperty && isDirKey) {
+			keyExp = keyProp.exp = keyProperty.value = processExpression(keyProperty.value, context);
+			if (memo) context.vForMemoKeyedNodes.add(node);
 		}
 		const isStableFragment = forNode.source.type === 4 && forNode.source.constType > 0;
 		const fragmentFlag = isStableFragment ? 64 : keyProp ? 128 : 256;

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.12
+  * @vue/compiler-core v3.6.0-beta.17
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2629,7 +2629,7 @@ const tokenizer = new Tokenizer(stack, {
 		}
 	},
 	oncdata(start, end) {
-		if (stack[0].ns !== 0) onText(getSlice(start, end), start, end);
+		if ((stack[0] ? stack[0].ns : currentOptions.ns) !== 0) onText(getSlice(start, end), start, end);
 		else emitError(1, start - 9);
 	},
 	onprocessinginstruction(start) {
@@ -3126,7 +3126,7 @@ function getSelfName(filename) {
 }
 function createTransformContext(root, { filename = "", prefixIdentifiers = false, hoistStatic = false, hmr = false, cacheHandlers = false, nodeTransforms = [], directiveTransforms = {}, transformHoist = null, isBuiltInComponent = _vue_shared.NOOP, isCustomElement = _vue_shared.NOOP, isUserComponent = (element) => {
 	return element.tagType === 1;
-}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = _vue_shared.EMPTY_OBJ, inline = false, isTS = false, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
+}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = _vue_shared.EMPTY_OBJ, inline = false, isTS = false, eventDelegation = true, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
 	const context = {
 		filename,
 		selfName: getSelfName(filename),
@@ -3149,6 +3149,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		bindingMetadata,
 		inline,
 		isTS,
+		eventDelegation,
 		onError,
 		onWarn,
 		compatConfig,
@@ -3160,6 +3161,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		imports: [],
 		cached: [],
 		constantCache: /* @__PURE__ */ new WeakMap(),
+		vForMemoKeyedNodes: /* @__PURE__ */ new WeakSet(),
 		temps: 0,
 		identifiers: Object.create(null),
 		identifierScopes: Object.create(null),
@@ -3926,7 +3928,7 @@ const transformExpression = (node, context) => {
 			if (dir.type === 7 && dir.name !== "for") {
 				const exp = dir.exp;
 				const arg = dir.arg;
-				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
+				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && context.vForMemoKeyedNodes.has(node) && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
 				if (arg && arg.type === 4 && !arg.isStatic) dir.arg = processExpression(arg, context);
 			}
 		}
@@ -4177,11 +4179,11 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 		const keyProp = findProp(node, `key`, false, true);
 		const isDirKey = keyProp && keyProp.type === 7;
 		let keyExp = keyProp && (keyProp.type === 6 ? keyProp.value ? createSimpleExpression(keyProp.value.content, true) : void 0 : keyProp.exp);
-		if (memo && keyExp && isDirKey) keyProp.exp = keyExp = processExpression(keyExp, context);
-		const keyProperty = keyProp && keyExp ? createObjectProperty(`key`, keyExp) : null;
-		if (isTemplate) {
-			if (memo) memo.exp = processExpression(memo.exp, context);
-			if (keyProperty && keyProp.type !== 6) keyProperty.value = processExpression(keyProperty.value, context);
+		const keyProperty = keyExp ? createObjectProperty(`key`, keyExp) : null;
+		if (isTemplate && memo) memo.exp = processExpression(memo.exp, context);
+		if ((isTemplate || memo) && keyProperty && isDirKey) {
+			keyExp = keyProp.exp = keyProperty.value = processExpression(keyProperty.value, context);
+			if (memo) context.vForMemoKeyedNodes.add(node);
 		}
 		const isStableFragment = forNode.source.type === 4 && forNode.source.constType > 0;
 		const fragmentFlag = isStableFragment ? 64 : keyProp ? 128 : 256;

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

@@ -137,6 +137,7 @@ export interface TransformContext extends Required<Omit<TransformOptions, keyof
   hoist(exp: string | JSChildNode | ArrayExpression): SimpleExpressionNode;
   cache(exp: JSChildNode, isVNode?: boolean, inVOnce?: boolean): CacheExpression;
   constantCache: WeakMap<TemplateChildNode, ConstantTypes>;
+  vForMemoKeyedNodes: WeakSet<ElementNode>;
   filters?: Set<string>;
 }
 export declare function getSelfName(filename: string): string | null;
@@ -161,6 +162,7 @@ export declare function createTransformContext(root: RootNode, {
   bindingMetadata,
   inline,
   isTS,
+  eventDelegation,
   onError,
   onWarn,
   compatConfig
@@ -262,6 +264,10 @@ export interface BaseElementNode extends Node {
   children: TemplateChildNode[];
   isSelfClosing?: boolean;
   innerLoc?: SourceLocation;
+  /**
+  * fixed by uts DOM2 编译期 flatten 静态值。
+  */
+  flatten?: boolean;
 }
 export interface PlainElementNode extends BaseElementNode {
   tagType: ElementTypes.ELEMENT;
@@ -951,6 +957,12 @@ export interface TransformOptions extends SharedTransformCodegenOptions, ErrorHa
   * correctly, e.g. #6938, #7138
   */
   hmr?: boolean;
+  /**
+  * Vapor only: control whether eligible static DOM events are compiled to
+  * document-level delegated events.
+  * @default true
+  */
+  eventDelegation?: boolean;
 }
 export interface CodegenOptions extends SharedTransformCodegenOptions {
   /**
@@ -1005,7 +1017,7 @@ export type CompilerOptions = ParserOptions & TransformOptions & CodegenOptions;
 *
 * Since TS 5.3, dts generation starts to strangely include broken triple slash
 * references for source-map-js, so we are inlining all source map related types
-* here to to workaround that.
+* here to workaround that.
 */
 export interface CodegenSourceMapGenerator {
   setSourceContent(sourceFile: string, sourceContent: string): void;

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.12
+  * @vue/compiler-core v3.6.0-beta.17
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1980,7 +1980,7 @@ const tokenizer = new Tokenizer(stack, {
 		}
 	},
 	oncdata(start, end) {
-		if (stack[0].ns !== 0) onText(getSlice(start, end), start, end);
+		if ((stack[0] ? stack[0].ns : currentOptions.ns) !== 0) onText(getSlice(start, end), start, end);
 		else emitError(1, start - 9);
 	},
 	onprocessinginstruction(start) {
@@ -2485,7 +2485,7 @@ function getSelfName(filename) {
 }
 function createTransformContext(root, { filename = "", prefixIdentifiers = false, hoistStatic = false, hmr = false, cacheHandlers = false, nodeTransforms = [], directiveTransforms = {}, transformHoist = null, isBuiltInComponent = NOOP, isCustomElement = NOOP, isUserComponent = (element) => {
 	return element.tagType === 1;
-}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = EMPTY_OBJ, inline = false, isTS = false, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
+}, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = EMPTY_OBJ, inline = false, isTS = false, eventDelegation = true, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
 	const context = {
 		filename,
 		selfName: getSelfName(filename),
@@ -2508,6 +2508,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		bindingMetadata,
 		inline,
 		isTS,
+		eventDelegation,
 		onError,
 		onWarn,
 		compatConfig,
@@ -2519,6 +2520,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		imports: [],
 		cached: [],
 		constantCache: /* @__PURE__ */ new WeakMap(),
+		vForMemoKeyedNodes: /* @__PURE__ */ new WeakSet(),
 		temps: 0,
 		identifiers: Object.create(null),
 		identifierScopes: Object.create(null),
@@ -3165,7 +3167,7 @@ const transformExpression = (node, context) => {
 			if (dir.type === 7 && dir.name !== "for") {
 				const exp = dir.exp;
 				const arg = dir.arg;
-				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
+				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && context.vForMemoKeyedNodes.has(node) && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
 				if (arg && arg.type === 4 && !arg.isStatic) dir.arg = processExpression(arg, context);
 			}
 		}
@@ -3311,10 +3313,9 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 		const isTemplate = isTemplateNode(node);
 		const memo = findDir(node, "memo");
 		const keyProp = findProp(node, `key`, false, true);
-		const isDirKey = keyProp && keyProp.type === 7;
+		keyProp && keyProp.type;
 		let keyExp = keyProp && (keyProp.type === 6 ? keyProp.value ? createSimpleExpression(keyProp.value.content, true) : void 0 : keyProp.exp);
-		if (memo && keyExp && isDirKey) {}
-		const keyProperty = keyProp && keyExp ? createObjectProperty(`key`, keyExp) : null;
+		const keyProperty = keyExp ? createObjectProperty(`key`, keyExp) : null;
 		const isStableFragment = forNode.source.type === 4 && forNode.source.constType > 0;
 		const fragmentFlag = isStableFragment ? 64 : keyProp ? 128 : 256;
 		forNode.codegenNode = createVNodeCall(context, helper(FRAGMENT), void 0, renderExp, fragmentFlag, void 0, void 0, true, !isStableFragment, false, node.loc);

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

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

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

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