@vue/compiler-sfc 3.6.0-beta.2 → 3.6.0-beta.3

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.6.0-beta.2
+* @vue/compiler-sfc v3.6.0-beta.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -21817,7 +21817,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
   return generator.toJSON();
 }
 
-const version = "3.6.0-beta.2";
+const version = "3.6.0-beta.3";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.6.0-beta.2
+* @vue/compiler-sfc v3.6.0-beta.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -32201,7 +32201,29 @@ const newBlock = (node) => ({
 });
 function wrapTemplate(node, dirs) {
   if (node.tagType === 3) {
-    return node;
+    const otherStructuralDirs = ["if", "else-if", "else", "for"];
+    const hasOtherStructuralDir = node.props.some(
+      (prop) => prop.type === 7 && otherStructuralDirs.includes(prop.name) && !dirs.includes(prop.name)
+    );
+    if (!hasOtherStructuralDir) {
+      return node;
+    }
+    const reserved2 = [];
+    const pass2 = [];
+    node.props.forEach((prop) => {
+      if (prop.type === 7 && dirs.includes(prop.name)) {
+        reserved2.push(prop);
+      } else {
+        pass2.push(prop);
+      }
+    });
+    return extend({}, node, {
+      type: 1,
+      tag: "template",
+      props: reserved2,
+      tagType: 3,
+      children: [extend({}, node, { props: pass2 })]
+    });
   }
   const reserved = [];
   const pass = [];
@@ -32280,10 +32302,6 @@ function getLiteralExpressionValue(exp, excludeNumber) {
   }
   return exp.isStatic ? exp.content : null;
 }
-function isInTransition(context) {
-  const parentNode = context.parent && context.parent.node;
-  return !!(parentNode && isTransitionNode(parentNode));
-}
 function isTransitionNode(node) {
   return node.type === 1 && isTransitionTag(node.tag);
 }
@@ -32734,14 +32752,12 @@ const IRNodeTypes = {
   "12": "SLOT_OUTLET_NODE",
   "DIRECTIVE": 13,
   "13": "DIRECTIVE",
-  "DECLARE_OLD_REF": 14,
-  "14": "DECLARE_OLD_REF",
-  "IF": 15,
-  "15": "IF",
-  "FOR": 16,
-  "16": "FOR",
-  "GET_TEXT_CHILD": 17,
-  "17": "GET_TEXT_CHILD"
+  "IF": 14,
+  "14": "IF",
+  "FOR": 15,
+  "15": "FOR",
+  "GET_TEXT_CHILD": 16,
+  "16": "GET_TEXT_CHILD"
 };
 const DynamicFlag = {
   "NONE": 0,
@@ -32755,7 +32771,7 @@ const DynamicFlag = {
 };
 function isBlockOperation(op) {
   const type = op.type;
-  return type === 11 || type === 12 || type === 15 || type === 16;
+  return type === 11 || type === 12 || type === 14 || type === 15;
 }
 
 function genInsertNode({ parent, elements, anchor }, { helper }) {
@@ -33906,21 +33922,16 @@ function genSetTemplateRef(oper, context) {
   const [refValue, refKey] = genRefValue(oper.value, context);
   return [
     NEWLINE,
-    oper.effect && `r${oper.element} = `,
     ...genCall(
       setTemplateRefIdent,
       // will be generated in root scope
       `n${oper.element}`,
       refValue,
-      oper.effect ? `r${oper.element}` : oper.refFor ? "void 0" : void 0,
       oper.refFor && "true",
       refKey
     )
   ];
 }
-function genDeclareOldRef(oper) {
-  return [NEWLINE, `let r${oper.id}`];
-}
 function genRefValue(value, context) {
   if (value && context.options.inline) {
     const binding = context.options.bindingMetadata[value.content];
@@ -34308,15 +34319,7 @@ function genDynamicProps(props, context) {
         }
       } else {
         expr = genExpression(p.value, context);
-        if (p.handler)
-          expr = genCall(
-            helper("toHandlers"),
-            expr,
-            `false`,
-            // preserveCaseIfNecessary: false, not needed for component
-            `true`
-            // wrap handler values in functions
-          );
+        if (p.handler) expr = genCall(helper("toHandlers"), expr);
       }
     }
     frags.push(["() => (", ...expr, ")"]);
@@ -34510,10 +34513,10 @@ function hasComponentOrSlotInDynamic(dynamic) {
     if (type === 11 || type === 12) {
       return true;
     }
-    if (type === 15) {
+    if (type === 14) {
       if (hasComponentOrSlotInIf(dynamic.operation)) return true;
     }
-    if (type === 16) {
+    if (type === 15) {
       if (hasComponentOrSlotInBlock(dynamic.operation.render))
         return true;
     }
@@ -34529,10 +34532,10 @@ function hasComponentOrSlotInOperations(operations) {
       case 11:
       case 12:
         return true;
-      case 15:
+      case 14:
         if (hasComponentOrSlotInIf(op)) return true;
         break;
-      case 16:
+      case 15:
         if (hasComponentOrSlotInBlock(op.render)) return true;
         break;
     }
@@ -34612,19 +34615,17 @@ function genOperation(oper, context) {
       return genInsertNode(oper, context);
     case 10:
       return genPrependNode(oper, context);
-    case 15:
+    case 14:
       return genIf(oper, context);
-    case 16:
+    case 15:
       return genFor(oper, context);
     case 11:
       return genCreateComponent(oper, context);
-    case 14:
-      return genDeclareOldRef(oper);
     case 12:
       return genSlotOutlet(oper, context);
     case 13:
       return genBuiltinDirective(oper, context);
-    case 17:
+    case 16:
       return genGetTextChild(oper, context);
     default:
       const exhaustiveCheck = oper;
@@ -34825,7 +34826,7 @@ function genBlock(oper, context, args = [], root) {
 }
 function genBlockContent(block, context, root, genEffectsExtraFrag) {
   const [frag, push] = buildCodeFragment();
-  const { dynamic, effect, operation, returns, key } = block;
+  const { dynamic, effect, operation, returns } = block;
   const resetBlock = context.enterBlock(block);
   if (root) {
     for (let name of context.ir.component) {
@@ -34858,12 +34859,6 @@ function genBlockContent(block, context, root, genEffectsExtraFrag) {
   if (root && context.ir.hasDeferredVShow) {
     push(NEWLINE, `deferredApplyVShows.forEach(fn => fn())`);
   }
-  if (dynamic.needsKey) {
-    for (const child of dynamic.children) {
-      const keyValue = key ? genExpression(key, context) : JSON.stringify(child.id);
-      push(NEWLINE, `n${child.id}.$key = `, ...keyValue);
-    }
-  }
   push(NEWLINE, `return `);
   const returnNodes = returns.map((n) => `n${n}`);
   const returnsCode = returnNodes.length > 1 ? genMulti(DELIMITERS_ARRAY, ...returnNodes) : [returnNodes[0] || "null"];
@@ -35576,7 +35571,7 @@ const transformVText = (dir, node, context) => {
     const isComponent = node.tagType === 1;
     if (!isComponent) {
       context.registerOperation({
-        type: 17,
+        type: 16,
         parent: context.reference()
       });
     }
@@ -35753,10 +35748,6 @@ const transformTemplateRef = (node, context) => {
   return () => {
     const id = context.reference();
     const effect = !isConstantExpression(value);
-    effect && context.registerOperation({
-      type: 14,
-      id
-    });
     context.registerEffect([value], {
       type: 8,
       element: id,
@@ -35841,7 +35832,7 @@ function processTextContainer(children, context) {
   } else {
     context.childrenTemplate = [" "];
     context.registerOperation({
-      type: 17,
+      type: 16,
       parent: context.reference()
     });
     context.registerEffect(values, {
@@ -36030,7 +36021,7 @@ function processIf(node, dir, context) {
     return () => {
       onExit();
       context.dynamic.operation = {
-        type: 15,
+        type: 14,
         id,
         condition: dir.exp,
         positive: branch,
@@ -36045,7 +36036,7 @@ function processIf(node, dir, context) {
     if (siblings) {
       let i = siblings.length;
       while (i--) {
-        if (siblings[i].operation && siblings[i].operation.type === 15) {
+        if (siblings[i].operation && siblings[i].operation.type === 14) {
           lastIfNode = siblings[i].operation;
           break;
         }
@@ -36054,14 +36045,14 @@ function processIf(node, dir, context) {
     if (
       // check if v-if is the sibling node
       !siblingIf || // check if IfNode is the last operation and get the root IfNode
-      !lastIfNode || lastIfNode.type !== 15
+      !lastIfNode || lastIfNode.type !== 14
     ) {
       context.options.onError(
         createCompilerError(30, node.loc)
       );
       return;
     }
-    while (lastIfNode.negative && lastIfNode.negative.type === 15) {
+    while (lastIfNode.negative && lastIfNode.negative.type === 14) {
       lastIfNode = lastIfNode.negative;
     }
     if (dir.name === "else-if" && lastIfNode.negative) {
@@ -36081,7 +36072,7 @@ function processIf(node, dir, context) {
       lastIfNode.negative = branch;
     } else {
       lastIfNode.negative = {
-        type: 15,
+        type: 14,
         id: -1,
         condition: dir.exp,
         positive: branch,
@@ -36096,7 +36087,6 @@ function createIfBranch(node, context) {
   const branch = newBlock(node);
   const exitBlock = context.enterBlock(branch);
   context.reference();
-  branch.dynamic.needsKey = isInTransition(context);
   return [branch, exitBlock];
 }
 
@@ -36134,7 +36124,7 @@ function processFor(node, dir, context) {
     const { parent } = context;
     const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.length === 1;
     context.dynamic.operation = {
-      type: 16,
+      type: 15,
       id,
       source,
       value,
@@ -36295,10 +36285,10 @@ function transformComponentSlot(node, dir, context) {
       markNonTemplate(n, context);
     });
   }
-  let slotKey;
+  const [block, onExit] = createSlotBlock(node, dir, context);
   if (isTransitionNode(node) && nonSlotTemplateChildren.length) {
     const nonCommentChild = nonSlotTemplateChildren.find(
-      (n) => n.type !== 3
+      (n) => !isCommentOrWhitespace(n)
     );
     if (nonCommentChild) {
       const keyProp = findProp(
@@ -36306,11 +36296,10 @@ function transformComponentSlot(node, dir, context) {
         "key"
       );
       if (keyProp) {
-        slotKey = keyProp.exp;
+        block.key = keyProp.exp;
       }
     }
   }
-  const [block, onExit] = createSlotBlock(node, dir, context, slotKey);
   const { slots } = context;
   return () => {
     onExit();
@@ -36444,13 +36433,9 @@ function hasStaticSlot(slots, name) {
     if (slot.slotType === 0) return !!slot.slots[name];
   });
 }
-function createSlotBlock(slotNode, dir, context, key = void 0) {
+function createSlotBlock(slotNode, dir, context) {
   const block = newBlock(slotNode);
   block.props = dir && dir.exp;
-  if (key) {
-    block.key = key;
-    block.dynamic.needsKey = true;
-  }
   const exitBlock = context.enterBlock(block);
   return [block, exitBlock];
 }
@@ -55402,7 +55387,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.6.0-beta.2";
+const version = "3.6.0-beta.3";
 const parseCache = parseCache$1;
 const errorMessages = __spreadValues(__spreadValues({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.6.0-beta.2",
+  "version": "3.6.0-beta.3",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,11 +47,11 @@
     "magic-string": "^0.30.21",
     "postcss": "^8.5.6",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-beta.2",
-    "@vue/compiler-core": "3.6.0-beta.2",
-    "@vue/compiler-ssr": "3.6.0-beta.2",
-    "@vue/shared": "3.6.0-beta.2",
-    "@vue/compiler-vapor": "3.6.0-beta.2"
+    "@vue/compiler-core": "3.6.0-beta.3",
+    "@vue/compiler-ssr": "3.6.0-beta.3",
+    "@vue/compiler-vapor": "3.6.0-beta.3",
+    "@vue/compiler-dom": "3.6.0-beta.3",
+    "@vue/shared": "3.6.0-beta.3"
   },
   "devDependencies": {
     "@babel/types": "^7.28.5",