@vue/compiler-core 3.6.0-alpha.3 → 3.6.0-alpha.5

package/dist/compiler-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-core v3.6.0-alpha.3
+* @vue/compiler-core v3.6.0-alpha.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -135,14 +135,6 @@ function registerRuntimeHelpers(helpers) {
   });
 }
 
-const Namespaces = {
-  "HTML": 0,
-  "0": "HTML",
-  "SVG": 1,
-  "1": "SVG",
-  "MATH_ML": 2,
-  "2": "MATH_ML"
-};
 const NodeTypes = {
   "ROOT": 0,
   "0": "ROOT",
@@ -2314,7 +2306,43 @@ function getMemoedVNodeCall(node) {
     return node;
   }
 }
+function filterNonCommentChildren(node) {
+  return node.children.filter((n) => n.type !== 3);
+}
+function hasSingleChild(node) {
+  return filterNonCommentChildren(node).length === 1;
+}
+function isSingleIfBlock(parent) {
+  let hasEncounteredIf = false;
+  for (const c of filterNonCommentChildren(parent)) {
+    if (c.type === 9 || c.type === 1 && findDir(c, "if")) {
+      if (hasEncounteredIf) return false;
+      hasEncounteredIf = true;
+    } else if (
+      // node before v-if
+      !hasEncounteredIf || // non else nodes
+      !(c.type === 1 && findDir(c, /^else(-if)?$/, true))
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
 const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/;
+function isAllWhitespace(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (!isWhitespace(str.charCodeAt(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+function isWhitespaceText(node) {
+  return node.type === 2 && isAllWhitespace(node.content) || node.type === 12 && isWhitespaceText(node.content);
+}
+function isCommentOrWhitespace(node) {
+  return node.type === 3 || isWhitespaceText(node);
+}
 
 const defaultParserOptions = {
   parseMode: "base",
@@ -2934,14 +2962,6 @@ function condenseWhitespace(nodes) {
   }
   return removedWhitespace ? nodes.filter(Boolean) : nodes;
 }
-function isAllWhitespace(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (!isWhitespace(str.charCodeAt(i))) {
-      return false;
-    }
-  }
-  return true;
-}
 function hasNewlineChar(str) {
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i);
@@ -4662,17 +4682,14 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
     knownIds
   );
   const children = [];
-  const isTSNode = TS_NODE_TYPES.includes(ast.type);
   ids.sort((a, b) => a.start - b.start);
   ids.forEach((id, i) => {
     const start = id.start - 1;
     const end = id.end - 1;
     const last = ids[i - 1];
-    if (!(isTSNode && i === 0)) {
-      const leadingText = rawExp.slice(last ? last.end - 1 : 0, start);
-      if (leadingText.length || id.prefix) {
-        children.push(leadingText + (id.prefix || ``));
-      }
+    const leadingText = rawExp.slice(last ? last.end - 1 : 0, start);
+    if (leadingText.length || id.prefix) {
+      children.push(leadingText + (id.prefix || ``));
     }
     const source = rawExp.slice(start, end);
     children.push(
@@ -4687,7 +4704,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         id.isConstant ? 3 : 0
       )
     );
-    if (i === ids.length - 1 && end < rawExp.length && !isTSNode) {
+    if (i === ids.length - 1 && end < rawExp.length) {
       children.push(rawExp.slice(end));
     }
   });
@@ -4784,13 +4801,11 @@ function processIf(node, dir, context, processCodegen) {
     let i = siblings.indexOf(node);
     while (i-- >= -1) {
       const sibling = siblings[i];
-      if (sibling && sibling.type === 3) {
-        context.removeNode(sibling);
-        comments.unshift(sibling);
-        continue;
-      }
-      if (sibling && sibling.type === 2 && !sibling.content.trim().length) {
+      if (sibling && isCommentOrWhitespace(sibling)) {
         context.removeNode(sibling);
+        if (sibling.type === 3) {
+          comments.unshift(sibling);
+        }
         continue;
       }
       if (sibling && sibling.type === 9) {
@@ -5308,7 +5323,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
       let prev;
       while (j--) {
         prev = children[j];
-        if (prev.type !== 3 && isNonWhitespaceContent(prev)) {
+        if (!isCommentOrWhitespace(prev)) {
           break;
         }
       }
@@ -5386,7 +5401,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
     } else if (implicitDefaultChildren.length && // #3766
     // with whitespace: 'preserve', whitespaces between slots will end up in
     // implicitDefaultChildren. Ignore if all implicit children are whitespaces.
-    implicitDefaultChildren.some((node2) => isNonWhitespaceContent(node2))) {
+    !implicitDefaultChildren.every(isWhitespaceText)) {
       if (hasNamedDefaultSlot) {
         context.onError(
           createCompilerError(
@@ -5459,11 +5474,6 @@ function hasForwardedSlots(children) {
   }
   return false;
 }
-function isNonWhitespaceContent(node) {
-  if (node.type !== 2 && node.type !== 12)
-    return true;
-  return node.type === 2 ? !!node.content.trim() : isNonWhitespaceContent(node.content);
-}
 
 const directiveImportMap = /* @__PURE__ */ new WeakMap();
 const transformElement = (node, context) => {
@@ -6490,7 +6500,7 @@ const transformModel = (dir, node, context) => {
   }
   if (dir.modifiers.length && node.tagType === 1) {
     const modifiers = dir.modifiers.map((m) => m.content).map((m) => (isSimpleIdentifier(m) ? m : JSON.stringify(m)) + `: true`).join(`, `);
-    const modifiersKey = arg ? isStaticExp(arg) ? `${arg.content}Modifiers` : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
+    const modifiersKey = arg ? isStaticExp(arg) ? shared.getModifierPropName(arg.content) : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
     props.push(
       createObjectProperty(
         modifiersKey,
@@ -6817,7 +6827,6 @@ exports.MERGE_PROPS = MERGE_PROPS;
 exports.NORMALIZE_CLASS = NORMALIZE_CLASS;
 exports.NORMALIZE_PROPS = NORMALIZE_PROPS;
 exports.NORMALIZE_STYLE = NORMALIZE_STYLE;
-exports.Namespaces = Namespaces;
 exports.NewlineType = NewlineType;
 exports.NodeTypes = NodeTypes;
 exports.OPEN_BLOCK = OPEN_BLOCK;
@@ -6876,6 +6885,7 @@ exports.defaultOnError = defaultOnError;
 exports.defaultOnWarn = defaultOnWarn;
 exports.errorMessages = errorMessages;
 exports.extractIdentifiers = extractIdentifiers;
+exports.filterNonCommentChildren = filterNonCommentChildren;
 exports.findDir = findDir;
 exports.findProp = findProp;
 exports.forAliasRE = forAliasRE;
@@ -6888,8 +6898,11 @@ exports.getVNodeBlockHelper = getVNodeBlockHelper;
 exports.getVNodeHelper = getVNodeHelper;
 exports.hasDynamicKeyVBind = hasDynamicKeyVBind;
 exports.hasScopeRef = hasScopeRef;
+exports.hasSingleChild = hasSingleChild;
 exports.helperNameMap = helperNameMap;
 exports.injectProp = injectProp;
+exports.isAllWhitespace = isAllWhitespace;
+exports.isCommentOrWhitespace = isCommentOrWhitespace;
 exports.isConstantNode = isConstantNode;
 exports.isCoreComponent = isCoreComponent;
 exports.isFnExpression = isFnExpression;
@@ -6904,6 +6917,7 @@ exports.isMemberExpressionBrowser = isMemberExpressionBrowser;
 exports.isMemberExpressionNode = isMemberExpressionNode;
 exports.isReferencedIdentifier = isReferencedIdentifier;
 exports.isSimpleIdentifier = isSimpleIdentifier;
+exports.isSingleIfBlock = isSingleIfBlock;
 exports.isSlotOutlet = isSlotOutlet;
 exports.isStaticArgOf = isStaticArgOf;
 exports.isStaticExp = isStaticExp;
@@ -6914,6 +6928,7 @@ exports.isTemplateNode = isTemplateNode;
 exports.isText = isText$1;
 exports.isVPre = isVPre;
 exports.isVSlot = isVSlot;
+exports.isWhitespaceText = isWhitespaceText;
 exports.locStub = locStub;
 exports.noopDirectiveTransform = noopDirectiveTransform;
 exports.processExpression = processExpression;

package/dist/compiler-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-core v3.6.0-alpha.3
+* @vue/compiler-core v3.6.0-alpha.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -135,14 +135,6 @@ function registerRuntimeHelpers(helpers) {
   });
 }
 
-const Namespaces = {
-  "HTML": 0,
-  "0": "HTML",
-  "SVG": 1,
-  "1": "SVG",
-  "MATH_ML": 2,
-  "2": "MATH_ML"
-};
 const NodeTypes = {
   "ROOT": 0,
   "0": "ROOT",
@@ -2310,7 +2302,43 @@ function getMemoedVNodeCall(node) {
     return node;
   }
 }
+function filterNonCommentChildren(node) {
+  return node.children.filter((n) => n.type !== 3);
+}
+function hasSingleChild(node) {
+  return filterNonCommentChildren(node).length === 1;
+}
+function isSingleIfBlock(parent) {
+  let hasEncounteredIf = false;
+  for (const c of filterNonCommentChildren(parent)) {
+    if (c.type === 9 || c.type === 1 && findDir(c, "if")) {
+      if (hasEncounteredIf) return false;
+      hasEncounteredIf = true;
+    } else if (
+      // node before v-if
+      !hasEncounteredIf || // non else nodes
+      !(c.type === 1 && findDir(c, /^else(-if)?$/, true))
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
 const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/;
+function isAllWhitespace(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (!isWhitespace(str.charCodeAt(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+function isWhitespaceText(node) {
+  return node.type === 2 && isAllWhitespace(node.content) || node.type === 12 && isWhitespaceText(node.content);
+}
+function isCommentOrWhitespace(node) {
+  return node.type === 3 || isWhitespaceText(node);
+}
 
 const defaultParserOptions = {
   parseMode: "base",
@@ -2900,14 +2928,6 @@ function condenseWhitespace(nodes) {
   }
   return removedWhitespace ? nodes.filter(Boolean) : nodes;
 }
-function isAllWhitespace(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (!isWhitespace(str.charCodeAt(i))) {
-      return false;
-    }
-  }
-  return true;
-}
 function hasNewlineChar(str) {
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i);
@@ -4586,17 +4606,14 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
     knownIds
   );
   const children = [];
-  const isTSNode = TS_NODE_TYPES.includes(ast.type);
   ids.sort((a, b) => a.start - b.start);
   ids.forEach((id, i) => {
     const start = id.start - 1;
     const end = id.end - 1;
     const last = ids[i - 1];
-    if (!(isTSNode && i === 0)) {
-      const leadingText = rawExp.slice(last ? last.end - 1 : 0, start);
-      if (leadingText.length || id.prefix) {
-        children.push(leadingText + (id.prefix || ``));
-      }
+    const leadingText = rawExp.slice(last ? last.end - 1 : 0, start);
+    if (leadingText.length || id.prefix) {
+      children.push(leadingText + (id.prefix || ``));
     }
     const source = rawExp.slice(start, end);
     children.push(
@@ -4611,7 +4628,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         id.isConstant ? 3 : 0
       )
     );
-    if (i === ids.length - 1 && end < rawExp.length && !isTSNode) {
+    if (i === ids.length - 1 && end < rawExp.length) {
       children.push(rawExp.slice(end));
     }
   });
@@ -4707,11 +4724,7 @@ function processIf(node, dir, context, processCodegen) {
     let i = siblings.indexOf(node);
     while (i-- >= -1) {
       const sibling = siblings[i];
-      if (sibling && sibling.type === 3) {
-        context.removeNode(sibling);
-        continue;
-      }
-      if (sibling && sibling.type === 2 && !sibling.content.trim().length) {
+      if (sibling && isCommentOrWhitespace(sibling)) {
         context.removeNode(sibling);
         continue;
       }
@@ -5223,7 +5236,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
       let prev;
       while (j--) {
         prev = children[j];
-        if (prev.type !== 3 && isNonWhitespaceContent(prev)) {
+        if (!isCommentOrWhitespace(prev)) {
           break;
         }
       }
@@ -5301,7 +5314,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
     } else if (implicitDefaultChildren.length && // #3766
     // with whitespace: 'preserve', whitespaces between slots will end up in
     // implicitDefaultChildren. Ignore if all implicit children are whitespaces.
-    implicitDefaultChildren.some((node2) => isNonWhitespaceContent(node2))) {
+    !implicitDefaultChildren.every(isWhitespaceText)) {
       if (hasNamedDefaultSlot) {
         context.onError(
           createCompilerError(
@@ -5374,11 +5387,6 @@ function hasForwardedSlots(children) {
   }
   return false;
 }
-function isNonWhitespaceContent(node) {
-  if (node.type !== 2 && node.type !== 12)
-    return true;
-  return node.type === 2 ? !!node.content.trim() : isNonWhitespaceContent(node.content);
-}
 
 const directiveImportMap = /* @__PURE__ */ new WeakMap();
 const transformElement = (node, context) => {
@@ -6372,7 +6380,7 @@ const transformModel = (dir, node, context) => {
   }
   if (dir.modifiers.length && node.tagType === 1) {
     const modifiers = dir.modifiers.map((m) => m.content).map((m) => (isSimpleIdentifier(m) ? m : JSON.stringify(m)) + `: true`).join(`, `);
-    const modifiersKey = arg ? isStaticExp(arg) ? `${arg.content}Modifiers` : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
+    const modifiersKey = arg ? isStaticExp(arg) ? shared.getModifierPropName(arg.content) : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
     props.push(
       createObjectProperty(
         modifiersKey,
@@ -6694,7 +6702,6 @@ exports.MERGE_PROPS = MERGE_PROPS;
 exports.NORMALIZE_CLASS = NORMALIZE_CLASS;
 exports.NORMALIZE_PROPS = NORMALIZE_PROPS;
 exports.NORMALIZE_STYLE = NORMALIZE_STYLE;
-exports.Namespaces = Namespaces;
 exports.NewlineType = NewlineType;
 exports.NodeTypes = NodeTypes;
 exports.OPEN_BLOCK = OPEN_BLOCK;
@@ -6753,6 +6760,7 @@ exports.defaultOnError = defaultOnError;
 exports.defaultOnWarn = defaultOnWarn;
 exports.errorMessages = errorMessages;
 exports.extractIdentifiers = extractIdentifiers;
+exports.filterNonCommentChildren = filterNonCommentChildren;
 exports.findDir = findDir;
 exports.findProp = findProp;
 exports.forAliasRE = forAliasRE;
@@ -6765,8 +6773,11 @@ exports.getVNodeBlockHelper = getVNodeBlockHelper;
 exports.getVNodeHelper = getVNodeHelper;
 exports.hasDynamicKeyVBind = hasDynamicKeyVBind;
 exports.hasScopeRef = hasScopeRef;
+exports.hasSingleChild = hasSingleChild;
 exports.helperNameMap = helperNameMap;
 exports.injectProp = injectProp;
+exports.isAllWhitespace = isAllWhitespace;
+exports.isCommentOrWhitespace = isCommentOrWhitespace;
 exports.isConstantNode = isConstantNode;
 exports.isCoreComponent = isCoreComponent;
 exports.isFnExpression = isFnExpression;
@@ -6781,6 +6792,7 @@ exports.isMemberExpressionBrowser = isMemberExpressionBrowser;
 exports.isMemberExpressionNode = isMemberExpressionNode;
 exports.isReferencedIdentifier = isReferencedIdentifier;
 exports.isSimpleIdentifier = isSimpleIdentifier;
+exports.isSingleIfBlock = isSingleIfBlock;
 exports.isSlotOutlet = isSlotOutlet;
 exports.isStaticArgOf = isStaticArgOf;
 exports.isStaticExp = isStaticExp;
@@ -6791,6 +6803,7 @@ exports.isTemplateNode = isTemplateNode;
 exports.isText = isText$1;
 exports.isVPre = isVPre;
 exports.isVSlot = isVSlot;
+exports.isWhitespaceText = isWhitespaceText;
 exports.locStub = locStub;
 exports.noopDirectiveTransform = noopDirectiveTransform;
 exports.processExpression = processExpression;

package/dist/compiler-core.d.ts

@@ -1,4 +1,4 @@
-import { PatchFlags } from '@vue/shared';
+import { Namespace, PatchFlags, Namespaces } from '@vue/shared';
 export { generateCodeFrame } from '@vue/shared';
 import { Node as Node$1, Identifier, Function, BlockStatement as BlockStatement$1, SwitchCase, Program, ObjectProperty } from '@babel/types';
 import { ParserPlugin } from '@babel/parser';
@@ -83,8 +83,8 @@ interface DirectiveTransformResult {
     ssrTagParts?: TemplateLiteral['elements'];
 }
 export type StructuralDirectiveTransform = (node: ElementNode, dir: DirectiveNode, context: TransformContext) => void | (() => void);
-interface ImportItem {
-    exp: string | ExpressionNode;
+export interface ImportItem {
+    exp: SimpleExpressionNode;
     path: string;
 }
 export interface TransformContext extends Required<Omit<TransformOptions, keyof CompilerCompatOptions>>, CompilerCompatOptions {
@@ -142,12 +142,6 @@ export declare function buildProps(node: ElementNode, context: TransformContext,
 };
 export declare function buildDirectiveArgs(dir: DirectiveNode, context: TransformContext): ArrayExpression;
 
-export type Namespace = number;
-export declare enum Namespaces {
-    HTML = 0,
-    SVG = 1,
-    MATH_ML = 2
-}
 export declare enum NodeTypes {
     ROOT = 0,
     ELEMENT = 1,
@@ -989,7 +983,6 @@ export interface BaseCodegenResult {
 }
 export interface CodegenResult extends BaseCodegenResult {
     ast: RootNode;
-    helpers: Set<symbol>;
 }
 export declare enum NewlineType {
     /** Start with `\n` */
@@ -1060,7 +1053,13 @@ export declare function injectProp(node: VNodeCall | RenderSlotCall, prop: Prope
 export declare function toValidAssetId(name: string, type: 'component' | 'directive' | 'filter'): string;
 export declare function hasScopeRef(node: TemplateChildNode | IfBranchNode | ExpressionNode | CacheExpression | undefined, ids: TransformContext['identifiers']): boolean;
 export declare function getMemoedVNodeCall(node: BlockCodegenNode | MemoExpression): VNodeCall | RenderSlotCall;
+export declare function filterNonCommentChildren(node: ParentNode): TemplateChildNode[];
+export declare function hasSingleChild(node: ParentNode): boolean;
+export declare function isSingleIfBlock(parent: ParentNode): boolean;
 export declare const forAliasRE: RegExp;
+export declare function isAllWhitespace(str: string): boolean;
+export declare function isWhitespaceText(node: TemplateChildNode): boolean;
+export declare function isCommentOrWhitespace(node: TemplateChildNode): boolean;
 
 /**
  * Return value indicates whether the AST walked can be a constant

package/dist/compiler-core.esm-bundler.js

@@ -1,9 +1,9 @@
 /**
-* @vue/compiler-core v3.6.0-alpha.3
+* @vue/compiler-core v3.6.0-alpha.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
-import { isString, NOOP, isObject, extend, NO, isSymbol, PatchFlagNames, isArray, EMPTY_OBJ, capitalize, camelize, makeMap, slotFlagsText, isOn, isBuiltInDirective, isReservedProp, toHandlerKey } from '@vue/shared';
+import { isString, NOOP, isObject, extend, NO, isSymbol, PatchFlagNames, isArray, EMPTY_OBJ, capitalize, camelize, makeMap, slotFlagsText, isOn, isBuiltInDirective, isReservedProp, toHandlerKey, getModifierPropName } from '@vue/shared';
 export { generateCodeFrame } from '@vue/shared';
 
 const FRAGMENT = Symbol(!!(process.env.NODE_ENV !== "production") ? `Fragment` : ``);
@@ -128,14 +128,6 @@ function registerRuntimeHelpers(helpers) {
   });
 }
 
-const Namespaces = {
-  "HTML": 0,
-  "0": "HTML",
-  "SVG": 1,
-  "1": "SVG",
-  "MATH_ML": 2,
-  "2": "MATH_ML"
-};
 const NodeTypes = {
   "ROOT": 0,
   "0": "ROOT",
@@ -1975,7 +1967,43 @@ function getMemoedVNodeCall(node) {
     return node;
   }
 }
+function filterNonCommentChildren(node) {
+  return node.children.filter((n) => n.type !== 3);
+}
+function hasSingleChild(node) {
+  return filterNonCommentChildren(node).length === 1;
+}
+function isSingleIfBlock(parent) {
+  let hasEncounteredIf = false;
+  for (const c of filterNonCommentChildren(parent)) {
+    if (c.type === 9 || c.type === 1 && findDir(c, "if")) {
+      if (hasEncounteredIf) return false;
+      hasEncounteredIf = true;
+    } else if (
+      // node before v-if
+      !hasEncounteredIf || // non else nodes
+      !(c.type === 1 && findDir(c, /^else(-if)?$/, true))
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
 const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/;
+function isAllWhitespace(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (!isWhitespace(str.charCodeAt(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+function isWhitespaceText(node) {
+  return node.type === 2 && isAllWhitespace(node.content) || node.type === 12 && isWhitespaceText(node.content);
+}
+function isCommentOrWhitespace(node) {
+  return node.type === 3 || isWhitespaceText(node);
+}
 
 const defaultParserOptions = {
   parseMode: "base",
@@ -2598,14 +2626,6 @@ function condenseWhitespace(nodes) {
   }
   return removedWhitespace ? nodes.filter(Boolean) : nodes;
 }
-function isAllWhitespace(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (!isWhitespace(str.charCodeAt(i))) {
-      return false;
-    }
-  }
-  return true;
-}
 function hasNewlineChar(str) {
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i);
@@ -4052,13 +4072,11 @@ function processIf(node, dir, context, processCodegen) {
     let i = siblings.indexOf(node);
     while (i-- >= -1) {
       const sibling = siblings[i];
-      if (sibling && sibling.type === 3) {
-        context.removeNode(sibling);
-        !!(process.env.NODE_ENV !== "production") && comments.unshift(sibling);
-        continue;
-      }
-      if (sibling && sibling.type === 2 && !sibling.content.trim().length) {
+      if (sibling && isCommentOrWhitespace(sibling)) {
         context.removeNode(sibling);
+        if (!!(process.env.NODE_ENV !== "production") && sibling.type === 3) {
+          comments.unshift(sibling);
+        }
         continue;
       }
       if (sibling && sibling.type === 9) {
@@ -4530,7 +4548,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
       let prev;
       while (j--) {
         prev = children[j];
-        if (prev.type !== 3 && isNonWhitespaceContent(prev)) {
+        if (!isCommentOrWhitespace(prev)) {
           break;
         }
       }
@@ -4608,7 +4626,7 @@ function buildSlots(node, context, buildSlotFn = buildClientSlotFn) {
     } else if (implicitDefaultChildren.length && // #3766
     // with whitespace: 'preserve', whitespaces between slots will end up in
     // implicitDefaultChildren. Ignore if all implicit children are whitespaces.
-    implicitDefaultChildren.some((node2) => isNonWhitespaceContent(node2))) {
+    !implicitDefaultChildren.every(isWhitespaceText)) {
       if (hasNamedDefaultSlot) {
         context.onError(
           createCompilerError(
@@ -4681,11 +4699,6 @@ function hasForwardedSlots(children) {
   }
   return false;
 }
-function isNonWhitespaceContent(node) {
-  if (node.type !== 2 && node.type !== 12)
-    return true;
-  return node.type === 2 ? !!node.content.trim() : isNonWhitespaceContent(node.content);
-}
 
 const directiveImportMap = /* @__PURE__ */ new WeakMap();
 const transformElement = (node, context) => {
@@ -5582,7 +5595,7 @@ const transformModel = (dir, node, context) => {
   ];
   if (dir.modifiers.length && node.tagType === 1) {
     const modifiers = dir.modifiers.map((m) => m.content).map((m) => (isSimpleIdentifier(m) ? m : JSON.stringify(m)) + `: true`).join(`, `);
-    const modifiersKey = arg ? isStaticExp(arg) ? `${arg.content}Modifiers` : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
+    const modifiersKey = arg ? isStaticExp(arg) ? getModifierPropName(arg.content) : createCompoundExpression([arg, ' + "Modifiers"']) : `modelModifiers`;
     props.push(
       createObjectProperty(
         modifiersKey,
@@ -5880,4 +5893,4 @@ const BindingTypes = {
 
 const noopDirectiveTransform = () => ({ props: [] });
 
-export { BASE_TRANSITION, BindingTypes, CAMELIZE, CAPITALIZE, CREATE_BLOCK, CREATE_COMMENT, CREATE_ELEMENT_BLOCK, CREATE_ELEMENT_VNODE, CREATE_SLOTS, CREATE_STATIC, CREATE_TEXT, CREATE_VNODE, CompilerDeprecationTypes, ConstantTypes, ElementTypes, ErrorCodes, FRAGMENT, GUARD_REACTIVE_PROPS, IS_MEMO_SAME, IS_REF, KEEP_ALIVE, MERGE_PROPS, NORMALIZE_CLASS, NORMALIZE_PROPS, NORMALIZE_STYLE, Namespaces, NewlineType, NodeTypes, OPEN_BLOCK, POP_SCOPE_ID, PUSH_SCOPE_ID, RENDER_LIST, RENDER_SLOT, RESOLVE_COMPONENT, RESOLVE_DIRECTIVE, RESOLVE_DYNAMIC_COMPONENT, RESOLVE_FILTER, SET_BLOCK_TRACKING, SUSPENSE, TELEPORT, TO_DISPLAY_STRING, TO_HANDLERS, TO_HANDLER_KEY, TS_NODE_TYPES, UNREF, WITH_CTX, WITH_DIRECTIVES, WITH_MEMO, advancePositionWithClone, advancePositionWithMutation, assert, baseCompile, baseParse, buildDirectiveArgs, buildProps, buildSlots, checkCompatEnabled, convertToBlock, createArrayExpression, createAssignmentExpression, createBlockStatement, createCacheExpression, createCallExpression, createCompilerError, createCompoundExpression, createConditionalExpression, createForLoopParams, createFunctionExpression, createIfStatement, createInterpolation, createObjectExpression, createObjectProperty, createReturnStatement, createRoot, createSequenceExpression, createSimpleExpression, createStructuralDirectiveTransform, createTemplateLiteral, createTransformContext, createVNodeCall, defaultOnError, defaultOnWarn, errorMessages, extractIdentifiers, findDir, findProp, forAliasRE, generate, getBaseTransformPreset, getConstantType, getMemoedVNodeCall, getSelfName, getVNodeBlockHelper, getVNodeHelper, hasDynamicKeyVBind, hasScopeRef, helperNameMap, injectProp, isConstantNode, isCoreComponent, isFnExpression, isFnExpressionBrowser, isFnExpressionNode, isFunctionType, isInDestructureAssignment, isInNewExpression, isLiteralWhitelisted, isMemberExpression, isMemberExpressionBrowser, isMemberExpressionNode, isReferencedIdentifier, isSimpleIdentifier, isSlotOutlet, isStaticArgOf, isStaticExp, isStaticNode, isStaticProperty, isStaticPropertyKey, isTemplateNode, isText$1 as isText, isVPre, isVSlot, locStub, noopDirectiveTransform, processExpression, processFor, processIf, processSlotOutlet, registerRuntimeHelpers, resolveComponentType, stringifyExpression, toValidAssetId, trackSlotScopes, trackVForSlotScopes, transform, transformBind, transformElement, transformExpression, transformModel, transformOn, transformVBindShorthand, traverseNode, unwrapTSNode, validFirstIdentCharRE, walkBlockDeclarations, walkFunctionParams, walkIdentifiers, warnDeprecation };
+export { BASE_TRANSITION, BindingTypes, CAMELIZE, CAPITALIZE, CREATE_BLOCK, CREATE_COMMENT, CREATE_ELEMENT_BLOCK, CREATE_ELEMENT_VNODE, CREATE_SLOTS, CREATE_STATIC, CREATE_TEXT, CREATE_VNODE, CompilerDeprecationTypes, ConstantTypes, ElementTypes, ErrorCodes, FRAGMENT, GUARD_REACTIVE_PROPS, IS_MEMO_SAME, IS_REF, KEEP_ALIVE, MERGE_PROPS, NORMALIZE_CLASS, NORMALIZE_PROPS, NORMALIZE_STYLE, NewlineType, NodeTypes, OPEN_BLOCK, POP_SCOPE_ID, PUSH_SCOPE_ID, RENDER_LIST, RENDER_SLOT, RESOLVE_COMPONENT, RESOLVE_DIRECTIVE, RESOLVE_DYNAMIC_COMPONENT, RESOLVE_FILTER, SET_BLOCK_TRACKING, SUSPENSE, TELEPORT, TO_DISPLAY_STRING, TO_HANDLERS, TO_HANDLER_KEY, TS_NODE_TYPES, UNREF, WITH_CTX, WITH_DIRECTIVES, WITH_MEMO, advancePositionWithClone, advancePositionWithMutation, assert, baseCompile, baseParse, buildDirectiveArgs, buildProps, buildSlots, checkCompatEnabled, convertToBlock, createArrayExpression, createAssignmentExpression, createBlockStatement, createCacheExpression, createCallExpression, createCompilerError, createCompoundExpression, createConditionalExpression, createForLoopParams, createFunctionExpression, createIfStatement, createInterpolation, createObjectExpression, createObjectProperty, createReturnStatement, createRoot, createSequenceExpression, createSimpleExpression, createStructuralDirectiveTransform, createTemplateLiteral, createTransformContext, createVNodeCall, defaultOnError, defaultOnWarn, errorMessages, extractIdentifiers, filterNonCommentChildren, findDir, findProp, forAliasRE, generate, getBaseTransformPreset, getConstantType, getMemoedVNodeCall, getSelfName, getVNodeBlockHelper, getVNodeHelper, hasDynamicKeyVBind, hasScopeRef, hasSingleChild, helperNameMap, injectProp, isAllWhitespace, isCommentOrWhitespace, isConstantNode, isCoreComponent, isFnExpression, isFnExpressionBrowser, isFnExpressionNode, isFunctionType, isInDestructureAssignment, isInNewExpression, isLiteralWhitelisted, isMemberExpression, isMemberExpressionBrowser, isMemberExpressionNode, isReferencedIdentifier, isSimpleIdentifier, isSingleIfBlock, isSlotOutlet, isStaticArgOf, isStaticExp, isStaticNode, isStaticProperty, isStaticPropertyKey, isTemplateNode, isText$1 as isText, isVPre, isVSlot, isWhitespaceText, locStub, noopDirectiveTransform, processExpression, processFor, processIf, processSlotOutlet, registerRuntimeHelpers, resolveComponentType, stringifyExpression, toValidAssetId, trackSlotScopes, trackVForSlotScopes, transform, transformBind, transformElement, transformExpression, transformModel, transformOn, transformVBindShorthand, traverseNode, unwrapTSNode, validFirstIdentCharRE, walkBlockDeclarations, walkFunctionParams, walkIdentifiers, warnDeprecation };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.6.0-alpha.3",
+  "version": "3.6.0-alpha.5",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -50,7 +50,7 @@
     "entities": "^4.5.0",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.2.1",
-    "@vue/shared": "3.6.0-alpha.3"
+    "@vue/shared": "3.6.0-alpha.5"
   },
   "devDependencies": {
     "@babel/types": "^7.28.5"