@vue/compiler-sfc 3.5.4 → 3.5.6

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.4
+* @vue/compiler-sfc v3.5.6
 * (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 = {};
@@ -15711,20 +15723,26 @@ ${shared.generateCodeFrame(
     const block = scriptSetup ? this.descriptor.scriptSetup : this.descriptor.script;
     return block.content.slice(node.start, node.end);
   }
+  warn(msg, node, scope) {
+    warn(generateError(msg, node, this, scope));
+  }
   error(msg, node, scope) {
-    const offset = scope ? scope.offset : this.startOffset;
     throw new Error(
-      `[@vue/compiler-sfc] ${msg}
-
-${(scope || this.descriptor).filename}
-${shared.generateCodeFrame(
-        (scope || this.descriptor).source,
-        node.start + offset,
-        node.end + offset
-      )}`
+      `[@vue/compiler-sfc] ${generateError(msg, node, this, scope)}`
     );
   }
 }
+function generateError(msg, node, ctx, scope) {
+  const offset = scope ? scope.offset : ctx.startOffset;
+  return `${msg}
+
+${(scope || ctx.descriptor).filename}
+${shared.generateCodeFrame(
+    (scope || ctx.descriptor).source,
+    node.start + offset,
+    node.end + offset
+  )}`;
+}
 function resolveParserPlugins(lang, userPlugins, dts = false) {
   const plugins = [];
   if (!userPlugins || !userPlugins.some(
@@ -19456,7 +19474,7 @@ function genModelProps(ctx) {
 
 const DEFINE_PROPS = "defineProps";
 const WITH_DEFAULTS = "withDefaults";
-function processDefineProps(ctx, node, declId) {
+function processDefineProps(ctx, node, declId, isWithDefaults = false) {
   if (!isCallOf(node, DEFINE_PROPS)) {
     return processWithDefaults(ctx, node, declId);
   }
@@ -19481,7 +19499,7 @@ function processDefineProps(ctx, node, declId) {
     }
     ctx.propsTypeDecl = node.typeParameters.params[0];
   }
-  if (declId && declId.type === "ObjectPattern") {
+  if (!isWithDefaults && declId && declId.type === "ObjectPattern") {
     processPropsDestructure(ctx, declId);
   }
   ctx.propsCall = node;
@@ -19492,7 +19510,12 @@ function processWithDefaults(ctx, node, declId) {
   if (!isCallOf(node, WITH_DEFAULTS)) {
     return false;
   }
-  if (!processDefineProps(ctx, node.arguments[0], declId)) {
+  if (!processDefineProps(
+    ctx,
+    node.arguments[0],
+    declId,
+    true
+  )) {
     ctx.error(
       `${WITH_DEFAULTS}' first argument must be a ${DEFINE_PROPS} call.`,
       node.arguments[0] || node
@@ -19504,10 +19527,11 @@ function processWithDefaults(ctx, node, declId) {
       node
     );
   }
-  if (ctx.propsDestructureDecl) {
-    ctx.error(
+  if (declId && declId.type === "ObjectPattern") {
+    ctx.warn(
       `${WITH_DEFAULTS}() is unnecessary when using destructure with ${DEFINE_PROPS}().
-Prefer using destructure default values, e.g. const { foo = 1 } = defineProps(...).`,
+Reactive destructure will be disabled when using withDefaults().
+Prefer using destructure default values, e.g. const { foo = 1 } = defineProps(...). `,
       node.callee
     );
   }
@@ -20882,7 +20906,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.5.4";
+const version = "3.5.6";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.d.ts

@@ -395,6 +395,7 @@ export declare class ScriptCompileContext {
     fs?: NonNullable<SFCScriptCompileOptions['fs']>;
     constructor(descriptor: SFCDescriptor, options: Partial<SFCScriptCompileOptions>);
     getString(node: Node, scriptSetup?: boolean): string;
+    warn(msg: string, node: Node, scope?: TypeScope): void;
     error(msg: string, node: Node, scope?: TypeScope): never;
 }