@vue/compiler-sfc 3.5.4 → 3.5.5

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.4
+* @vue/compiler-sfc v3.5.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -7911,16 +7911,12 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
   });
   if (rule.nodes.some((node2) => node2.type === "rule")) {
     const deep2 = rule.__deep;
-    const decls = rule.nodes.filter((node2) => node2.type === "decl");
-    if (!deep2 && decls.length) {
-      for (const decl of decls) {
-        rule.removeChild(decl);
+    if (!deep2) {
+      extractAndWrapNodes(rule);
+      const atruleNodes = rule.nodes.filter((node2) => node2.type === "atrule");
+      for (const atnode of atruleNodes) {
+        extractAndWrapNodes(atnode);
       }
-      const hostRule = new require$$0$1.Rule({
-        nodes: decls,
-        selector: "&"
-      });
-      rule.prepend(hostRule);
     }
     shouldInject = deep2;
   }
@@ -7956,6 +7952,22 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
 function isSpaceCombinator(node) {
   return node.type === "combinator" && /^\s+$/.test(node.value);
 }
+function extractAndWrapNodes(parentNode) {
+  if (!parentNode.nodes) return;
+  const nodes = parentNode.nodes.filter(
+    (node) => node.type === "decl" || node.type === "comment"
+  );
+  if (nodes.length) {
+    for (const node of nodes) {
+      parentNode.removeChild(node);
+    }
+    const wrappedRule = new require$$0$1.Rule({
+      nodes,
+      selector: "&"
+    });
+    parentNode.prepend(wrappedRule);
+  }
+}
 scopedPlugin.postcss = true;
 
 var sourceMap$1 = {};
@@ -20882,7 +20894,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.5.4";
+const version = "3.5.5";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

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

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.4
+* @vue/compiler-sfc v3.5.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -1486,7 +1486,7 @@ let Tokenizer$1 = class Tokenizer {
       if (this.currentSequence === Sequences.TitleEnd || this.currentSequence === Sequences.TextareaEnd && !this.inSFCRoot) {
         if (c === 38) {
           this.startEntity();
-        } else if (c === this.delimiterOpen[0]) {
+        } else if (!this.inVPre && c === this.delimiterOpen[0]) {
           this.state = 2;
           this.delimiterIndex = 0;
           this.stateInterpolationOpen(c);
@@ -17293,6 +17293,7 @@ const defaultParserOptions = {
   getNamespace: () => 0,
   isVoidTag: NO,
   isPreTag: NO,
+  isIgnoreNewlineTag: NO,
   isCustomElement: NO,
   onError: defaultOnError,
   onWarn: defaultOnWarn,
@@ -17720,7 +17721,7 @@ function onCloseTag(el, end, isImplied = false) {
       el.innerLoc.end.offset
     );
   }
-  const { tag, ns } = el;
+  const { tag, ns, children } = el;
   if (!inVPre) {
     if (tag === "slot") {
       el.tagType = 2;
@@ -17731,7 +17732,13 @@ function onCloseTag(el, end, isImplied = false) {
     }
   }
   if (!tokenizer$2.inRCDATA) {
-    el.children = condenseWhitespace(el.children, el.tag);
+    el.children = condenseWhitespace(children);
+  }
+  if (ns === 0 && currentOptions.isIgnoreNewlineTag(tag)) {
+    const first = children[0];
+    if (first && first.type === 2) {
+      first.content = first.content.replace(/^\r?\n/, "");
+    }
   }
   if (ns === 0 && currentOptions.isPreTag(tag)) {
     inPre--;
@@ -17812,12 +17819,6 @@ function condenseWhitespace(nodes, tag) {
       }
     }
   }
-  if (inPre && tag && currentOptions.isPreTag(tag)) {
-    const first = nodes[0];
-    if (first && first.type === 2) {
-      first.content = first.content.replace(/^\r?\n/, "");
-    }
-  }
   return removedWhitespace ? nodes.filter(Boolean) : nodes;
 }
 function isAllWhitespace(str) {
@@ -24808,6 +24809,7 @@ const parserOptions = {
   isVoidTag,
   isNativeTag: (tag) => isHTMLTag(tag) || isSVGTag(tag) || isMathMLTag(tag),
   isPreTag: (tag) => tag === "pre",
+  isIgnoreNewlineTag: (tag) => tag === "pre" || tag === "textarea",
   decodeEntities: void 0,
   isBuiltInComponent: (tag) => {
     if (tag === "Transition" || tag === "transition") {
@@ -25220,12 +25222,17 @@ const stringifyStatic = (children, context, parent) => {
         // will insert / hydrate
         String(currentChunk.length)
       ]);
+      const deleteCount = currentChunk.length - 1;
       if (isParentCached) {
-        parent.codegenNode.children.value = createArrayExpression([staticCall]);
+        children.splice(
+          currentIndex - currentChunk.length,
+          currentChunk.length,
+          // @ts-expect-error
+          staticCall
+        );
       } else {
         currentChunk[0].codegenNode.value = staticCall;
         if (currentChunk.length > 1) {
-          const deleteCount = currentChunk.length - 1;
           children.splice(currentIndex - currentChunk.length + 1, deleteCount);
           const cacheIndex = context.cached.indexOf(
             currentChunk[currentChunk.length - 1].codegenNode
@@ -25237,9 +25244,9 @@ const stringifyStatic = (children, context, parent) => {
             }
             context.cached.splice(cacheIndex - deleteCount + 1, deleteCount);
           }
-          return deleteCount;
         }
       }
+      return deleteCount;
     }
     return 0;
   };
@@ -40744,16 +40751,12 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
   });
   if (rule.nodes.some((node2) => node2.type === "rule")) {
     const deep2 = rule.__deep;
-    const decls = rule.nodes.filter((node2) => node2.type === "decl");
-    if (!deep2 && decls.length) {
-      for (const decl of decls) {
-        rule.removeChild(decl);
-      }
-      const hostRule = new Rule({
-        nodes: decls,
-        selector: "&"
-      });
-      rule.prepend(hostRule);
+    if (!deep2) {
+      extractAndWrapNodes(rule);
+      const atruleNodes = rule.nodes.filter((node2) => node2.type === "atrule");
+      for (const atnode of atruleNodes) {
+        extractAndWrapNodes(atnode);
+      }
     }
     shouldInject = deep2;
   }
@@ -40789,6 +40792,22 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
 function isSpaceCombinator(node) {
   return node.type === "combinator" && /^\s+$/.test(node.value);
 }
+function extractAndWrapNodes(parentNode) {
+  if (!parentNode.nodes) return;
+  const nodes = parentNode.nodes.filter(
+    (node) => node.type === "decl" || node.type === "comment"
+  );
+  if (nodes.length) {
+    for (const node of nodes) {
+      parentNode.removeChild(node);
+    }
+    const wrappedRule = new Rule({
+      nodes,
+      selector: "&"
+    });
+    parentNode.prepend(wrappedRule);
+  }
+}
 scopedPlugin.postcss = true;
 
 var sourceMap$1 = {};
@@ -48911,7 +48930,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.5.4";
+const version = "3.5.5";
 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.5.4",
+  "version": "3.5.5",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,10 +47,10 @@
     "magic-string": "^0.30.11",
     "postcss": "^8.4.44",
     "source-map-js": "^1.2.0",
-    "@vue/compiler-core": "3.5.4",
-    "@vue/compiler-dom": "3.5.4",
-    "@vue/compiler-ssr": "3.5.4",
-    "@vue/shared": "3.5.4"
+    "@vue/compiler-core": "3.5.5",
+    "@vue/compiler-dom": "3.5.5",
+    "@vue/shared": "3.5.5",
+    "@vue/compiler-ssr": "3.5.5"
   },
   "devDependencies": {
     "@babel/types": "^7.25.2",