@vue/compiler-sfc 3.4.20 → 3.4.22

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.4.20
+* @vue/compiler-sfc v3.4.22
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -1783,6 +1783,8 @@ function resolveTemplateUsedIdentifiers(sfc) {
               extractIdentifiers(ids, prop.forParseResult.source);
             } else if (prop.exp) {
               extractIdentifiers(ids, prop.exp);
+            } else if (prop.name === "bind" && !prop.exp) {
+              ids.add(prop.arg.content);
             }
           }
           if (prop.type === 6 && prop.name === "ref" && ((_a = prop.value) == null ? void 0 : _a.content)) {
@@ -2040,7 +2042,6 @@ function generateSourceMap(filename, source, generated, sourceRoot, lineOffset,
             generatedLine,
             generatedColumn: i,
             source: filename,
-            // @ts-expect-error
             name: null
           });
         }
@@ -7940,7 +7941,29 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
         return false;
       }
     }
-    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where")) {
+    if (n.type === "universal") {
+      const prev = selector.at(selector.index(n) - 1);
+      const next = selector.at(selector.index(n) + 1);
+      if (!prev) {
+        if (next) {
+          if (next.type === "combinator" && next.value === " ") {
+            selector.removeChild(next);
+          }
+          selector.removeChild(n);
+          return;
+        } else {
+          node = selectorParser$2.combinator({
+            value: ""
+          });
+          selector.insertBefore(n, node);
+          selector.removeChild(n);
+          return false;
+        }
+      }
+      if (node)
+        return;
+    }
+    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
       node = n;
     }
   });
@@ -16525,6 +16548,9 @@ class AST {
             _glob: glob,
         });
     }
+    get options() {
+        return this.#options;
+    }
     // returns the string match, the regexp source, whether there's magic
     // in the regexp (so a regular expression is required) and whether or
     // not the uflag is needed for the regular expression (for posix classes)
@@ -17120,6 +17146,7 @@ class Minimatch {
             globParts = this.levelOneOptimize(globParts);
         }
         else {
+            // just collapse multiple ** portions into one
             globParts = this.adjascentGlobstarOptimize(globParts);
         }
         return globParts;
@@ -17609,7 +17636,11 @@ class Minimatch {
             fastTest = dotStarTest;
         }
         const re = AST.fromGlob(pattern, this.options).toMMPattern();
-        return fastTest ? Object.assign(re, { test: fastTest }) : re;
+        if (fastTest && typeof re === 'object') {
+            // Avoids overriding in frozen environments
+            Reflect.defineProperty(re, 'test', { value: fastTest });
+        }
+        return re;
     }
     makeRe() {
         if (this.regexp || this.regexp === false)
@@ -18432,7 +18463,7 @@ function resolveExt(filename, fs) {
     if (fs.fileExists(filename2))
       return filename2;
   };
-  return tryResolve(filename) || tryResolve(filename + `.ts`) || tryResolve(filename + `.d.ts`) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.d.ts`));
+  return tryResolve(filename) || tryResolve(filename + `.ts`) || tryResolve(filename + `.tsx`) || tryResolve(filename + `.d.ts`) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.tsx`)) || tryResolve(joinPaths(filename, `index.d.ts`));
 }
 const tsConfigCache = createCache();
 const tsConfigRefMap = /* @__PURE__ */ new Map();
@@ -19167,13 +19198,14 @@ function genModelProps(ctx) {
     let skipCheck = false;
     let runtimeTypes = type && inferRuntimeType(ctx, type);
     if (runtimeTypes) {
+      const hasBoolean = runtimeTypes.includes("Boolean");
       const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE);
-      runtimeTypes = runtimeTypes.filter((el) => {
-        if (el === UNKNOWN_TYPE)
-          return false;
-        return isProd ? el === "Boolean" || el === "Function" && options : true;
-      });
-      skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      if (isProd || hasUnknownType) {
+        runtimeTypes = runtimeTypes.filter(
+          (t) => t === "Boolean" || hasBoolean && t === "String" || t === "Function" && options
+        );
+        skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      }
     }
     let runtimeType = runtimeTypes && runtimeTypes.length > 0 && toRuntimeTypeString(runtimeTypes) || void 0;
     const codegenOptions = concatStrings([
@@ -19827,7 +19859,7 @@ function processAwait(ctx, node, needSemi, isStatement) {
 }
 
 function compileScript(sfc, options) {
-  var _a;
+  var _a, _b, _c;
   if (!options.id) {
     warnOnce(
       `compileScript now requires passing the \`id\` option.
@@ -20431,8 +20463,10 @@ ${exposeCall}`
     }
   }
   if (ctx.helperImports.size > 0) {
+    const runtimeModuleName = (_c = (_b = options.templateOptions) == null ? void 0 : _b.compilerOptions) == null ? void 0 : _c.runtimeModuleName;
+    const importSrc = runtimeModuleName ? JSON.stringify(runtimeModuleName) : `'vue'`;
     ctx.s.prepend(
-      `import { ${[...ctx.helperImports].map((h) => `${h} as _${h}`).join(", ")} } from 'vue'
+      `import { ${[...ctx.helperImports].map((h) => `${h} as _${h}`).join(", ")} } from ${importSrc}
 `
     );
   }
@@ -20607,7 +20641,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.20";
+const version = "3.4.22";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.d.ts

@@ -1,8 +1,7 @@
 import * as _babel_types from '@babel/types';
 import { Statement, Expression, TSType, Node, Program, CallExpression, ObjectPattern, TSModuleDeclaration, TSPropertySignature, TSMethodSignature, TSCallSignatureDeclaration, TSFunctionType } from '@babel/types';
-import { RootNode, CompilerOptions, CodegenResult, ParserOptions, CompilerError, SourceLocation, BindingMetadata as BindingMetadata$1 } from '@vue/compiler-core';
+import { RootNode, CompilerOptions, CodegenResult, ParserOptions, CompilerError, RawSourceMap, SourceLocation, BindingMetadata as BindingMetadata$1 } from '@vue/compiler-core';
 export { BindingMetadata, CompilerError, CompilerOptions, extractIdentifiers, generateCodeFrame, isInDestructureAssignment, isStaticProperty, walkIdentifiers } from '@vue/compiler-core';
-import { RawSourceMap } from 'source-map-js';
 import { ParserPlugin } from '@babel/parser';
 export { parse as babelParse } from '@babel/parser';
 import { Result, LazyResult } from 'postcss';

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

@@ -1,8 +1,10 @@
 /**
-* @vue/compiler-sfc v3.4.20
+* @vue/compiler-sfc v3.4.22
 * (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);
@@ -15,8 +17,8 @@ const NO = () => false;
 const isOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // uppercase letter
 (key.charCodeAt(2) > 122 || key.charCodeAt(2) < 97);
 const extend = Object.assign;
-const hasOwnProperty$3 = Object.prototype.hasOwnProperty;
-const hasOwn = (val, key) => hasOwnProperty$3.call(val, key);
+const hasOwnProperty$4 = Object.prototype.hasOwnProperty;
+const hasOwn = (val, key) => hasOwnProperty$4.call(val, key);
 const isArray$3 = Array.isArray;
 const isMap = (val) => toTypeString(val) === "[object Map]";
 const isSet = (val) => toTypeString(val) === "[object Set]";
@@ -299,7 +301,11 @@ const replacer = (_key, val) => {
 };
 const stringifySymbol = (v, i = "") => {
   var _a;
-  return isSymbol$1(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v;
+  return (
+    // Symbol.description in es2019+ so we need to cast here to pass
+    // the lib: es2016 check
+    isSymbol$1(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v
+  );
 };
 
 const FRAGMENT = Symbol(`Fragment` );
@@ -9353,7 +9359,7 @@ class TypeScriptScopeHandler extends ScopeHandler {
     super.checkLocalExport(id);
   }
 }
-const getOwn$1 = (object, key) => Object.hasOwnProperty.call(object, key) && object[key];
+const getOwn$1 = (object, key) => hasOwnProperty.call(object, key) && object[key];
 const unwrapParenthesizedExpression = node => {
   return node.type === "ParenthesizedExpression" ? unwrapParenthesizedExpression(node.expression) : node;
 };
@@ -9732,7 +9738,7 @@ class LValParser extends NodeUtils {
     return true;
   }
 }
-const getOwn = (object, key) => Object.hasOwnProperty.call(object, key) && object[key];
+const getOwn = (object, key) => hasOwnProperty.call(object, key) && object[key];
 function nonNull(x) {
   if (x == null) {
     throw new Error(`Unexpected ${x} value.`);
@@ -9962,7 +9968,7 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
         modified[modifier] = true;
         enforceOrder(startLoc, modifier, "in", "out");
       } else {
-        if (Object.hasOwnProperty.call(modified, modifier)) {
+        if (hasOwnProperty.call(modified, modifier)) {
           this.raise(TSErrors.DuplicateModifier, startLoc, {
             modifier
           });
@@ -10060,6 +10066,16 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
       this.raise(TSErrors.UnsupportedImportTypeArgument, this.state.startLoc);
     }
     node.argument = super.parseExprAtom();
+    if (this.hasPlugin("importAttributes") || this.hasPlugin("importAssertions")) {
+      node.options = null;
+    }
+    if (this.eat(12)) {
+      this.expectImportAttributesPlugin();
+      if (!this.match(11)) {
+        node.options = super.parseMaybeAssignAllowIn();
+        this.eat(12);
+      }
+    }
     this.expect(11);
     if (this.eat(16)) {
       node.qualifier = this.tsParseEntityName();
@@ -17559,7 +17575,7 @@ function onCloseTag(el, end, isImplied = false) {
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
-    setLocEnd(el.loc, end + 1);
+    setLocEnd(el.loc, lookAhead(end, 62) + 1);
   }
   if (tokenizer$2.inSFCRoot) {
     if (el.children.length) {
@@ -17596,6 +17612,12 @@ function onCloseTag(el, end, isImplied = false) {
     tokenizer$2.inXML = false;
   }
 }
+function lookAhead(index, c) {
+  let i = index;
+  while (currentInput.charCodeAt(i) !== c && i < currentInput.length - 1)
+    i++;
+  return i;
+}
 function backTrack(index, c) {
   let i = index;
   while (currentInput.charCodeAt(i) !== c && i >= 0)
@@ -19433,6 +19455,7 @@ function SourceMapGenerator$8(aArgs) {
   this._file = util$9.getArg(aArgs, 'file', null);
   this._sourceRoot = util$9.getArg(aArgs, 'sourceRoot', null);
   this._skipValidation = util$9.getArg(aArgs, 'skipValidation', false);
+  this._ignoreInvalidMapping = util$9.getArg(aArgs, 'ignoreInvalidMapping', false);
   this._sources = new ArraySet$4();
   this._names = new ArraySet$4();
   this._mappings = new MappingList$2();
@@ -19447,12 +19470,12 @@ SourceMapGenerator$8.prototype._version = 3;
  * @param aSourceMapConsumer The SourceMap.
  */
 SourceMapGenerator$8.fromSourceMap =
-  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
+  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer, generatorOps) {
     var sourceRoot = aSourceMapConsumer.sourceRoot;
-    var generator = new SourceMapGenerator$8({
+    var generator = new SourceMapGenerator$8(Object.assign(generatorOps || {}, {
       file: aSourceMapConsumer.file,
       sourceRoot: sourceRoot
-    });
+    }));
     aSourceMapConsumer.eachMapping(function (mapping) {
       var newMapping = {
         generated: {
@@ -19515,7 +19538,9 @@ SourceMapGenerator$8.prototype.addMapping =
     var name = util$9.getArg(aArgs, 'name', null);
 
     if (!this._skipValidation) {
-      this._validateMapping(generated, original, source, name);
+      if (this._validateMapping(generated, original, source, name) === false) {
+        return;
+      }
     }
 
     if (source != null) {
@@ -19681,11 +19706,18 @@ SourceMapGenerator$8.prototype._validateMapping =
     // specific error message to try to guide them the right way.
     // For example: https://github.com/Polymer/polymer-bundler/pull/519
     if (aOriginal && typeof aOriginal.line !== 'number' && typeof aOriginal.column !== 'number') {
-        throw new Error(
-            'original.line and original.column are not numbers -- you probably meant to omit ' +
-            'the original mapping entirely and only map the generated position. If so, pass ' +
-            'null for the original mapping instead of an object with empty or null values.'
-        );
+      var message = 'original.line and original.column are not numbers -- you probably meant to omit ' +
+      'the original mapping entirely and only map the generated position. If so, pass ' +
+      'null for the original mapping instead of an object with empty or null values.';
+
+      if (this._ignoreInvalidMapping) {
+        if (typeof console !== 'undefined' && console.warn) {
+          console.warn(message);
+        }
+        return false;
+      } else {
+        throw new Error(message);
+      }
     }
 
     if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
@@ -19703,12 +19735,21 @@ SourceMapGenerator$8.prototype._validateMapping =
       return;
     }
     else {
-      throw new Error('Invalid mapping: ' + JSON.stringify({
+      var message = 'Invalid mapping: ' + JSON.stringify({
         generated: aGenerated,
         source: aSource,
         original: aOriginal,
         name: aName
-      }));
+      });
+
+      if (this._ignoreInvalidMapping) {
+        if (typeof console !== 'undefined' && console.warn) {
+          console.warn(message);
+        }
+        return false;
+      } else {
+        throw new Error(message)
+      }
     }
   };
 
@@ -21155,7 +21196,7 @@ IndexedSourceMapConsumer$1.prototype.sourceContentFor =
       var section = this._sections[i];
 
       var content = section.consumer.sourceContentFor(aSource, true);
-      if (content) {
+      if (content || content === '') {
         return content;
       }
     }
@@ -21799,7 +21840,6 @@ function createCodegenContext(ast, {
       generatedLine: context.line,
       generatedColumn: context.column - 1,
       source: filename,
-      // @ts-expect-error it is possible to be null
       name
     });
   }
@@ -23546,10 +23586,27 @@ const transformElement = (node, context) => {
 function resolveComponentType(node, context, ssr = false) {
   let { tag } = node;
   const isExplicitDynamic = isComponentTag(tag);
-  const isProp = findProp(node, "is");
+  const isProp = findProp(
+    node,
+    "is",
+    false,
+    true
+    /* allow empty */
+  );
   if (isProp) {
     if (isExplicitDynamic || false) {
-      const exp = isProp.type === 6 ? isProp.value && createSimpleExpression(isProp.value.content, true) : isProp.exp;
+      let exp;
+      if (isProp.type === 6) {
+        exp = isProp.value && createSimpleExpression(isProp.value.content, true);
+      } else {
+        exp = isProp.exp;
+        if (!exp) {
+          exp = createSimpleExpression(`is`, false, isProp.loc);
+          {
+            exp = isProp.exp = processExpression(exp, context);
+          }
+        }
+      }
       if (exp) {
         return createCallExpression(context.helper(RESOLVE_DYNAMIC_COMPONENT), [
           exp
@@ -26177,6 +26234,8 @@ function resolveTemplateUsedIdentifiers(sfc) {
               extractIdentifiers(ids, prop.forParseResult.source);
             } else if (prop.exp) {
               extractIdentifiers(ids, prop.exp);
+            } else if (prop.name === "bind" && !prop.exp) {
+              ids.add(prop.arg.content);
             }
           }
           if (prop.type === 6 && prop.name === "ref" && ((_a = prop.value) == null ? void 0 : _a.content)) {
@@ -26452,7 +26511,6 @@ function generateSourceMap(filename, source, generated, sourceRoot, lineOffset,
             generatedLine,
             generatedColumn: i,
             source: filename,
-            // @ts-expect-error
             name: null
           });
         }
@@ -29145,7 +29203,7 @@ function formatError(value) {
 function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
   var output = [];
   for (var i = 0, l = value.length; i < l; ++i) {
-    if (hasOwnProperty$2(value, String(i))) {
+    if (hasOwnProperty$3(value, String(i))) {
       output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
           String(i), true));
     } else {
@@ -29176,7 +29234,7 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
       str = ctx.stylize('[Setter]', 'special');
     }
   }
-  if (!hasOwnProperty$2(visibleKeys, key)) {
+  if (!hasOwnProperty$3(visibleKeys, key)) {
     name = '[' + key + ']';
   }
   if (!str) {
@@ -29347,7 +29405,7 @@ function _extend(origin, add) {
   }
   return origin;
 }
-function hasOwnProperty$2(obj, prop) {
+function hasOwnProperty$3(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
@@ -29537,7 +29595,7 @@ var _polyfillNode_util$1 = /*#__PURE__*/Object.freeze({
 // If obj.hasOwnProperty has been overridden, then calling
 // obj.hasOwnProperty(prop) will break.
 // See: https://github.com/joyent/node/issues/1707
-function hasOwnProperty$1(obj, prop) {
+function hasOwnProperty$2(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 var isArray = Array.isArray || function (xs) {
@@ -29640,7 +29698,7 @@ function parse$6(qs, sep, eq, options) {
     k = decodeURIComponent(kstr);
     v = decodeURIComponent(vstr);
 
-    if (!hasOwnProperty$1(obj, k)) {
+    if (!hasOwnProperty$2(obj, k)) {
       obj[k] = v;
     } else if (isArray(obj[k])) {
       obj[k].push(v);
@@ -30729,7 +30787,7 @@ const ssrTransformIf = createStructuralDirectiveTransform(
   /^(if|else|else-if)$/,
   processIf
 );
-function ssrProcessIf(node, context, disableNestedFragments = false) {
+function ssrProcessIf(node, context, disableNestedFragments = false, disableCommentAsIfAlternate = false) {
   const [rootBranch] = node.branches;
   const ifStatement = createIfStatement(
     rootBranch.condition,
@@ -30753,7 +30811,7 @@ function ssrProcessIf(node, context, disableNestedFragments = false) {
       currentIf.alternate = branchBlockStatement;
     }
   }
-  if (!currentIf.alternate) {
+  if (!currentIf.alternate && !disableCommentAsIfAlternate) {
     currentIf.alternate = createBlockStatement([
       createCallExpression(`_push`, ["`<!---->`"])
     ]);
@@ -31290,6 +31348,13 @@ function ssrProcessTransitionGroup(node, context) {
          * be patched using the same key map) so we need to account for that here
          * by disabling nested fragment wrappers from being generated.
          */
+        true,
+        /**
+         * TransitionGroup filters out comment children at runtime and thus
+         * doesn't expect comments to be present during hydration. We need to
+         * account for that by disabling the empty comment that is otherwise
+         * rendered for a falsy v-if that has no v-else specified. (#6715)
+         */
         true
       );
       context.pushStringPart(`</`);
@@ -31308,7 +31373,7 @@ function ssrProcessTransitionGroup(node, context) {
       context.pushStringPart(`</${tag.value.content}>`);
     }
   } else {
-    processChildren(node, context, true, true);
+    processChildren(node, context, true, true, true);
   }
 }
 
@@ -31638,7 +31703,7 @@ function createChildContext(parent, withSlotScopeId = parent.withSlotScopeId) {
     withSlotScopeId
   );
 }
-function processChildren(parent, context, asFragment = false, disableNestedFragments = false) {
+function processChildren(parent, context, asFragment = false, disableNestedFragments = false, disableCommentAsIfAlternate = false) {
   if (asFragment) {
     context.pushStringPart(`<!--[-->`);
   }
@@ -31684,7 +31749,12 @@ function processChildren(parent, context, asFragment = false, disableNestedFragm
         );
         break;
       case 9:
-        ssrProcessIf(child, context, disableNestedFragments);
+        ssrProcessIf(
+          child,
+          context,
+          disableNestedFragments,
+          disableCommentAsIfAlternate
+        );
         break;
       case 11:
         ssrProcessFor(child, context, disableNestedFragments);
@@ -33449,7 +33519,7 @@ let Node$4 = class Node {
           column: opts.end.column,
           line: opts.end.line
         };
-      } else if (opts.endIndex) {
+      } else if (typeof opts.endIndex === 'number') {
         end = this.positionInside(opts.endIndex);
       } else if (opts.index) {
         end = this.positionInside(opts.index + 1);
@@ -34121,9 +34191,14 @@ let MapGenerator$2 = class MapGenerator {
     } else if (this.previous().length === 1) {
       let prev = this.previous()[0].consumer();
       prev.file = this.outputFile();
-      this.map = SourceMapGenerator$3.fromSourceMap(prev);
+      this.map = SourceMapGenerator$3.fromSourceMap(prev, {
+        ignoreInvalidMapping: true
+      });
     } else {
-      this.map = new SourceMapGenerator$3({ file: this.outputFile() });
+      this.map = new SourceMapGenerator$3({
+        file: this.outputFile(),
+        ignoreInvalidMapping: true
+      });
       this.map.addMapping({
         generated: { column: 0, line: 1 },
         original: { column: 0, line: 1 },
@@ -34146,7 +34221,10 @@ let MapGenerator$2 = class MapGenerator {
 
   generateString() {
     this.css = '';
-    this.map = new SourceMapGenerator$3({ file: this.outputFile() });
+    this.map = new SourceMapGenerator$3({
+      file: this.outputFile(),
+      ignoreInvalidMapping: true
+    });
 
     let line = 1;
     let column = 1;
@@ -36464,7 +36542,7 @@ let Root$2 = root$2;
 
 let Processor$1 = class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.35';
+    this.version = '8.4.38';
     this.plugins = this.normalize(plugins);
   }
 
@@ -37521,7 +37599,7 @@ var className$1 = {exports: {}};
 /*! https://mths.be/cssesc v3.0.0 by @mathias */
 
 var object = {};
-var hasOwnProperty = object.hasOwnProperty;
+var hasOwnProperty$1 = object.hasOwnProperty;
 var merge$2 = function merge(options, defaults) {
 	if (!options) {
 		return defaults;
@@ -37530,7 +37608,7 @@ var merge$2 = function merge(options, defaults) {
 	for (var key in defaults) {
 		// `if (defaults.hasOwnProperty(key) { … }` is not needed here, since
 		// only recognized option names are used.
-		result[key] = hasOwnProperty.call(options, key) ? options[key] : defaults[key];
+		result[key] = hasOwnProperty$1.call(options, key) ? options[key] : defaults[key];
 	}
 	return result;
 };
@@ -40255,7 +40333,29 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
         return false;
       }
     }
-    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where")) {
+    if (n.type === "universal") {
+      const prev = selector.at(selector.index(n) - 1);
+      const next = selector.at(selector.index(n) + 1);
+      if (!prev) {
+        if (next) {
+          if (next.type === "combinator" && next.value === " ") {
+            selector.removeChild(next);
+          }
+          selector.removeChild(n);
+          return;
+        } else {
+          node = selectorParser.combinator({
+            value: ""
+          });
+          selector.insertBefore(n, node);
+          selector.removeChild(n);
+          return false;
+        }
+      }
+      if (node)
+        return;
+    }
+    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
       node = n;
     }
   });
@@ -44258,9 +44358,12 @@ class Mappings {
 
 	addEdit(sourceIndex, content, loc, nameIndex) {
 		if (content.length) {
+			const contentLengthMinusOne = content.length - 1;
 			let contentLineEnd = content.indexOf('\n', 0);
 			let previousContentLineEnd = -1;
-			while (contentLineEnd >= 0) {
+			// Loop through each line in the content and add a segment, but stop if the last line is empty,
+			// else code afterwards would fill one line too many
+			while (contentLineEnd >= 0 && contentLengthMinusOne > contentLineEnd) {
 				const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
 				if (nameIndex >= 0) {
 					segment.push(nameIndex);
@@ -46102,7 +46205,7 @@ function resolveExt(filename, fs) {
     if (fs.fileExists(filename2))
       return filename2;
   };
-  return tryResolve(filename) || tryResolve(filename + `.ts`) || tryResolve(filename + `.d.ts`) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.d.ts`));
+  return tryResolve(filename) || tryResolve(filename + `.ts`) || tryResolve(filename + `.tsx`) || tryResolve(filename + `.d.ts`) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.tsx`)) || tryResolve(joinPaths(filename, `index.d.ts`));
 }
 const tsConfigCache = createCache();
 const tsConfigRefMap = /* @__PURE__ */ new Map();
@@ -46758,13 +46861,14 @@ function genModelProps(ctx) {
     let skipCheck = false;
     let runtimeTypes = type && inferRuntimeType(ctx, type);
     if (runtimeTypes) {
+      const hasBoolean = runtimeTypes.includes("Boolean");
       const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE);
-      runtimeTypes = runtimeTypes.filter((el) => {
-        if (el === UNKNOWN_TYPE)
-          return false;
-        return isProd ? el === "Boolean" || el === "Function" && options : true;
-      });
-      skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      if (isProd || hasUnknownType) {
+        runtimeTypes = runtimeTypes.filter(
+          (t) => t === "Boolean" || hasBoolean && t === "String" || t === "Function" && options
+        );
+        skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      }
     }
     let runtimeType = runtimeTypes && runtimeTypes.length > 0 && toRuntimeTypeString(runtimeTypes) || void 0;
     const codegenOptions = concatStrings([
@@ -47437,7 +47541,7 @@ var __spreadValues$1 = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 function compileScript(sfc, options) {
-  var _a;
+  var _a, _b, _c;
   if (!options.id) {
     warnOnce$3(
       `compileScript now requires passing the \`id\` option.
@@ -48037,8 +48141,10 @@ ${exposeCall}`
     }
   }
   if (ctx.helperImports.size > 0) {
+    const runtimeModuleName = (_c = (_b = options.templateOptions) == null ? void 0 : _b.compilerOptions) == null ? void 0 : _c.runtimeModuleName;
+    const importSrc = runtimeModuleName ? JSON.stringify(runtimeModuleName) : `'vue'`;
     ctx.s.prepend(
-      `import { ${[...ctx.helperImports].map((h) => `${h} as _${h}`).join(", ")} } from 'vue'
+      `import { ${[...ctx.helperImports].map((h) => `${h} as _${h}`).join(", ")} } from ${importSrc}
 `
     );
   }
@@ -48228,7 +48334,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.4.20";
+const version = "3.4.22";
 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.4.20",
+  "version": "3.4.22",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -42,26 +42,26 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.9",
+    "@babel/parser": "^7.24.1",
     "estree-walker": "^2.0.2",
-    "magic-string": "^0.30.7",
-    "postcss": "^8.4.35",
-    "source-map-js": "^1.0.2",
-    "@vue/compiler-core": "3.4.20",
-    "@vue/compiler-dom": "3.4.20",
-    "@vue/compiler-ssr": "3.4.20",
-    "@vue/shared": "3.4.20"
+    "magic-string": "^0.30.8",
+    "postcss": "^8.4.38",
+    "source-map-js": "^1.2.0",
+    "@vue/compiler-core": "3.4.22",
+    "@vue/compiler-ssr": "3.4.22",
+    "@vue/compiler-dom": "3.4.22",
+    "@vue/shared": "3.4.22"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.9",
+    "@babel/types": "^7.24.0",
     "@vue/consolidate": "^1.0.0",
     "hash-sum": "^2.0.0",
     "lru-cache": "10.1.0",
     "merge-source-map": "^1.1.0",
-    "minimatch": "^9.0.3",
+    "minimatch": "^9.0.4",
     "postcss-modules": "^6.0.0",
-    "postcss-selector-parser": "^6.0.15",
+    "postcss-selector-parser": "^6.0.16",
     "pug": "^3.0.2",
-    "sass": "^1.71.1"
+    "sass": "^1.74.1"
   }
 }