@vue/compiler-sfc 3.5.3 → 3.5.5

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.3
+* @vue/compiler-sfc v3.5.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -7801,15 +7801,24 @@ function processRule(id, rule) {
     return;
   }
   processedRules.add(rule);
+  let deep = false;
+  let parent = rule.parent;
+  while (parent && parent.type !== "root") {
+    if (parent.__deep) {
+      deep = true;
+      break;
+    }
+    parent = parent.parent;
+  }
   rule.selector = selectorParser$2((selectorRoot) => {
     selectorRoot.each((selector) => {
-      rewriteSelector(id, selector, selectorRoot);
+      rewriteSelector(id, rule, selector, selectorRoot, deep);
     });
   }).processSync(rule.selector);
 }
-function rewriteSelector(id, selector, selectorRoot, slotted = false) {
+function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false) {
   let node = null;
-  let shouldInject = true;
+  let shouldInject = !deep;
   selector.each((n) => {
     if (n.type === "combinator" && (n.value === ">>>" || n.value === "/deep/")) {
       n.value = " ";
@@ -7822,6 +7831,7 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
     if (n.type === "pseudo") {
       const { value } = n;
       if (value === ":deep" || value === "::v-deep") {
+        rule.__deep = true;
         if (n.nodes.length) {
           let last = n;
           n.nodes[0].each((ss) => {
@@ -7853,10 +7863,11 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
       if (value === ":slotted" || value === "::v-slotted") {
         rewriteSelector(
           id,
+          rule,
           n.nodes[0],
           selectorRoot,
+          deep,
           true
-          /* slotted */
         );
         let last = n;
         n.nodes[0].each((ss) => {
@@ -7898,11 +7909,22 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
       node = n;
     }
   });
+  if (rule.nodes.some((node2) => node2.type === "rule")) {
+    const deep2 = rule.__deep;
+    if (!deep2) {
+      extractAndWrapNodes(rule);
+      const atruleNodes = rule.nodes.filter((node2) => node2.type === "atrule");
+      for (const atnode of atruleNodes) {
+        extractAndWrapNodes(atnode);
+      }
+    }
+    shouldInject = deep2;
+  }
   if (node) {
     const { type, value } = node;
     if (type === "pseudo" && (value === ":is" || value === ":where")) {
       node.nodes.forEach(
-        (value2) => rewriteSelector(id, value2, selectorRoot, slotted)
+        (value2) => rewriteSelector(id, rule, value2, selectorRoot, deep, slotted)
       );
       shouldInject = false;
     }
@@ -7930,6 +7952,22 @@ function rewriteSelector(id, selector, selectorRoot, 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 = {};
@@ -20856,7 +20894,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.5.3";
+const version = "3.5.5";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

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

@@ -1,13 +1,14 @@
 /**
-* @vue/compiler-sfc v3.5.3
+* @vue/compiler-sfc v3.5.5
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
 /*! #__NO_SIDE_EFFECTS__ */
 // @__NO_SIDE_EFFECTS__
-function makeMap(str, expectsLowerCase) {
-  const set = new Set(str.split(","));
-  return expectsLowerCase ? (val) => set.has(val.toLowerCase()) : (val) => set.has(val);
+function makeMap(str) {
+  const map = /* @__PURE__ */ Object.create(null);
+  for (const key of str.split(",")) map[key] = 1;
+  return (val) => val in map;
 }
 
 const EMPTY_OBJ = Object.freeze({}) ;
@@ -1485,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);
@@ -17292,6 +17293,7 @@ const defaultParserOptions = {
   getNamespace: () => 0,
   isVoidTag: NO,
   isPreTag: NO,
+  isIgnoreNewlineTag: NO,
   isCustomElement: NO,
   onError: defaultOnError,
   onWarn: defaultOnWarn,
@@ -17719,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;
@@ -17730,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--;
@@ -17811,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) {
@@ -18468,10 +18470,8 @@ function createRootCodegen(root, context) {
     }
   } else if (children.length > 1) {
     let patchFlag = 64;
-    let patchFlagText = PatchFlagNames[64];
     if (children.filter((c) => c.type !== 3).length === 1) {
       patchFlag |= 2048;
-      patchFlagText += `, ${PatchFlagNames[2048]}`;
     }
     root.codegenNode = createVNodeCall(
       context,
@@ -23062,10 +23062,8 @@ function createChildrenCodegenNode(branch, keyIndex, context) {
       return vnodeCall;
     } else {
       let patchFlag = 64;
-      let patchFlagText = PatchFlagNames[64];
       if (!branch.isTemplateIf && children.filter((c) => c.type !== 3).length === 1) {
         patchFlag |= 2048;
-        patchFlagText += `, ${PatchFlagNames[2048]}`;
       }
       return createVNodeCall(
         context,
@@ -24811,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") {
@@ -25064,10 +25063,7 @@ const isNonKeyModifier = /* @__PURE__ */ makeMap(
   `stop,prevent,self,ctrl,shift,alt,meta,exact,middle`
 );
 const maybeKeyModifier = /* @__PURE__ */ makeMap("left,right");
-const isKeyboardEvent = /* @__PURE__ */ makeMap(
-  `onkeyup,onkeydown,onkeypress`,
-  true
-);
+const isKeyboardEvent = /* @__PURE__ */ makeMap(`onkeyup,onkeydown,onkeypress`);
 const resolveModifiers = (key, modifiers, context, loc) => {
   const keyModifiers = [];
   const nonKeyModifiers = [];
@@ -25079,7 +25075,7 @@ const resolveModifiers = (key, modifiers, context, loc) => {
     } else {
       if (maybeKeyModifier(modifier)) {
         if (isStaticExp(key)) {
-          if (isKeyboardEvent(key.content)) {
+          if (isKeyboardEvent(key.content.toLowerCase())) {
             keyModifiers.push(modifier);
           } else {
             nonKeyModifiers.push(modifier);
@@ -25132,7 +25128,7 @@ const transformOn = (dir, node, context) => {
       ]);
     }
     if (keyModifiers.length && // if event name is dynamic, always wrap with keys guard
-    (!isStaticExp(key) || isKeyboardEvent(key.content))) {
+    (!isStaticExp(key) || isKeyboardEvent(key.content.toLowerCase()))) {
       handlerExp = createCallExpression(context.helper(V_ON_WITH_KEYS), [
         handlerExp,
         JSON.stringify(keyModifiers)
@@ -25226,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
@@ -25243,9 +25244,9 @@ const stringifyStatic = (children, context, parent) => {
             }
             context.cached.splice(cacheIndex - deleteCount + 1, deleteCount);
           }
-          return deleteCount;
         }
       }
+      return deleteCount;
     }
     return 0;
   };
@@ -34070,7 +34071,7 @@ let Declaration$3 = declaration;
 let Node$1 = node$2;
 let { isClean: isClean$1, my: my$1 } = symbols;
 
-let AtRule$4, parse$4, Root$6, Rule$4;
+let AtRule$4, parse$4, Root$6, Rule$5;
 
 function cleanSource(nodes) {
   return nodes.map(i => {
@@ -34264,7 +34265,7 @@ let Container$7 = class Container extends Node$1 {
       }
       nodes = [new Declaration$3(nodes)];
     } else if (nodes.selector || nodes.selectors) {
-      nodes = [new Rule$4(nodes)];
+      nodes = [new Rule$5(nodes)];
     } else if (nodes.name) {
       nodes = [new AtRule$4(nodes)];
     } else if (nodes.text) {
@@ -34471,7 +34472,7 @@ Container$7.registerParse = dependant => {
 };
 
 Container$7.registerRule = dependant => {
-  Rule$4 = dependant;
+  Rule$5 = dependant;
 };
 
 Container$7.registerAtRule = dependant => {
@@ -34490,7 +34491,7 @@ Container$7.rebuild = node => {
   if (node.type === 'atrule') {
     Object.setPrototypeOf(node, AtRule$4.prototype);
   } else if (node.type === 'rule') {
-    Object.setPrototypeOf(node, Rule$4.prototype);
+    Object.setPrototypeOf(node, Rule$5.prototype);
   } else if (node.type === 'decl') {
     Object.setPrototypeOf(node, Declaration$3.prototype);
   } else if (node.type === 'comment') {
@@ -35098,7 +35099,7 @@ list$2.default = list$2;
 let Container$3 = container$1;
 let list$1 = list_1;
 
-let Rule$3 = class Rule extends Container$3 {
+let Rule$4 = class Rule extends Container$3 {
   constructor(defaults) {
     super(defaults);
     this.type = 'rule';
@@ -35116,10 +35117,10 @@ let Rule$3 = class Rule extends Container$3 {
   }
 };
 
-var rule = Rule$3;
-Rule$3.default = Rule$3;
+var rule = Rule$4;
+Rule$4.default = Rule$4;
 
-Container$3.registerRule(Rule$3);
+Container$3.registerRule(Rule$4);
 
 let AtRule$2 = atRule;
 let Comment$2 = comment$3;
@@ -35127,7 +35128,7 @@ let Declaration$2 = declaration;
 let Input$3 = input;
 let PreviousMap = previousMap;
 let Root$4 = root$2;
-let Rule$2 = rule;
+let Rule$3 = rule;
 
 function fromJSON$1(json, inputs) {
   if (Array.isArray(json)) return json.map(n => fromJSON$1(n))
@@ -35161,7 +35162,7 @@ function fromJSON$1(json, inputs) {
   } else if (defaults.type === 'decl') {
     return new Declaration$2(defaults)
   } else if (defaults.type === 'rule') {
-    return new Rule$2(defaults)
+    return new Rule$3(defaults)
   } else if (defaults.type === 'comment') {
     return new Comment$2(defaults)
   } else if (defaults.type === 'atrule') {
@@ -35545,7 +35546,7 @@ let AtRule$1 = atRule;
 let Comment$1 = comment$3;
 let Declaration$1 = declaration;
 let Root$3 = root$2;
-let Rule$1 = rule;
+let Rule$2 = rule;
 let tokenizer = tokenize$1;
 
 const SAFE_COMMENT_NEIGHBOR = {
@@ -35847,7 +35848,7 @@ let Parser$1 = class Parser {
   }
 
   emptyRule(token) {
-    let node = new Rule$1();
+    let node = new Rule$2();
     this.init(node, token[2]);
     node.selector = '';
     node.raws.between = '';
@@ -36057,7 +36058,7 @@ let Parser$1 = class Parser {
   rule(tokens) {
     tokens.pop();
 
-    let node = new Rule$1();
+    let node = new Rule$2();
     this.init(node, tokens[0][2]);
 
     node.raws.between = this.spacesAndCommentsFromEnd(tokens);
@@ -37047,7 +37048,7 @@ let parse = parse_1;
 let Processor = processor$1;
 let Result = result;
 let Root = root$2;
-let Rule = rule;
+let Rule$1 = rule;
 let stringify = stringify_1;
 let Warning = warning;
 
@@ -37109,7 +37110,7 @@ postcss.list = list;
 postcss.comment = defaults => new Comment(defaults);
 postcss.atRule = defaults => new AtRule(defaults);
 postcss.decl = defaults => new Declaration(defaults);
-postcss.rule = defaults => new Rule(defaults);
+postcss.rule = defaults => new Rule$1(defaults);
 postcss.root = defaults => new Root(defaults);
 postcss.document = defaults => new Document(defaults);
 
@@ -37123,7 +37124,7 @@ postcss.Warning = Warning;
 postcss.AtRule = AtRule;
 postcss.Result = Result;
 postcss.Input = Input;
-postcss.Rule = Rule;
+postcss.Rule = Rule$1;
 postcss.Root = Root;
 postcss.Node = Node;
 
@@ -37157,7 +37158,7 @@ postcss$1.Warning;
 postcss$1.AtRule;
 postcss$1.Result;
 postcss$1.Input;
-postcss$1.Rule;
+const Rule = postcss$1.Rule;
 postcss$1.Root;
 postcss$1.Node;
 
@@ -40640,15 +40641,24 @@ function processRule(id, rule) {
     return;
   }
   processedRules.add(rule);
+  let deep = false;
+  let parent = rule.parent;
+  while (parent && parent.type !== "root") {
+    if (parent.__deep) {
+      deep = true;
+      break;
+    }
+    parent = parent.parent;
+  }
   rule.selector = selectorParser((selectorRoot) => {
     selectorRoot.each((selector) => {
-      rewriteSelector(id, selector, selectorRoot);
+      rewriteSelector(id, rule, selector, selectorRoot, deep);
     });
   }).processSync(rule.selector);
 }
-function rewriteSelector(id, selector, selectorRoot, slotted = false) {
+function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false) {
   let node = null;
-  let shouldInject = true;
+  let shouldInject = !deep;
   selector.each((n) => {
     if (n.type === "combinator" && (n.value === ">>>" || n.value === "/deep/")) {
       n.value = " ";
@@ -40661,6 +40671,7 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
     if (n.type === "pseudo") {
       const { value } = n;
       if (value === ":deep" || value === "::v-deep") {
+        rule.__deep = true;
         if (n.nodes.length) {
           let last = n;
           n.nodes[0].each((ss) => {
@@ -40692,10 +40703,11 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
       if (value === ":slotted" || value === "::v-slotted") {
         rewriteSelector(
           id,
+          rule,
           n.nodes[0],
           selectorRoot,
+          deep,
           true
-          /* slotted */
         );
         let last = n;
         n.nodes[0].each((ss) => {
@@ -40737,11 +40749,22 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
       node = n;
     }
   });
+  if (rule.nodes.some((node2) => node2.type === "rule")) {
+    const deep2 = rule.__deep;
+    if (!deep2) {
+      extractAndWrapNodes(rule);
+      const atruleNodes = rule.nodes.filter((node2) => node2.type === "atrule");
+      for (const atnode of atruleNodes) {
+        extractAndWrapNodes(atnode);
+      }
+    }
+    shouldInject = deep2;
+  }
   if (node) {
     const { type, value } = node;
     if (type === "pseudo" && (value === ":is" || value === ":where")) {
       node.nodes.forEach(
-        (value2) => rewriteSelector(id, value2, selectorRoot, slotted)
+        (value2) => rewriteSelector(id, rule, value2, selectorRoot, deep, slotted)
       );
       shouldInject = false;
     }
@@ -40769,6 +40792,22 @@ function rewriteSelector(id, selector, selectorRoot, 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 = {};
@@ -48891,7 +48930,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.5.3";
+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.3",
+  "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.3",
-    "@vue/compiler-dom": "3.5.3",
-    "@vue/compiler-ssr": "3.5.3",
-    "@vue/shared": "3.5.3"
+    "@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",
@@ -62,6 +62,6 @@
     "postcss-modules": "^6.0.0",
     "postcss-selector-parser": "^6.1.2",
     "pug": "^3.0.3",
-    "sass": "^1.77.8"
+    "sass": "^1.78.0"
   }
 }