@vue/compat 3.5.0-beta.1 → 3.5.0-beta.2

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.0-beta.1
+* @vue/compat v3.5.0-beta.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -7,7 +7,7 @@
 
 var parser = require('@babel/parser');
 var estreeWalker = require('estree-walker');
-var decode_js = require('entities/dist/decode.js');
+var decode_js = require('entities/lib/decode.js');
 var sourceMapJs = require('source-map-js');
 
 /*! #__NO_SIDE_EFFECTS__ */
@@ -583,11 +583,11 @@ class ReactiveEffect {
     }
   }
   pause() {
-    this.flags |= 128;
+    this.flags |= 64;
   }
   resume() {
-    if (this.flags & 128) {
-      this.flags &= ~128;
+    if (this.flags & 64) {
+      this.flags &= ~64;
       if (pausedQueueEffects.has(this)) {
         pausedQueueEffects.delete(this);
         this.trigger();
@@ -601,9 +601,6 @@ class ReactiveEffect {
     if (this.flags & 2 && !(this.flags & 32)) {
       return;
     }
-    if (this.flags & 64) {
-      return this.trigger();
-    }
     if (!(this.flags & 8)) {
       this.flags |= 8;
       this.nextEffect = batchedEffect;
@@ -647,7 +644,7 @@ class ReactiveEffect {
     }
   }
   trigger() {
-    if (this.flags & 128) {
+    if (this.flags & 64) {
       pausedQueueEffects.add(this);
     } else if (this.scheduler) {
       this.scheduler();
@@ -677,6 +674,7 @@ function endBatch() {
     batchDepth--;
     return;
   }
+  batchDepth--;
   let error;
   while (batchedEffect) {
     let e = batchedEffect;
@@ -695,7 +693,6 @@ function endBatch() {
       e = next;
     }
   }
-  batchDepth--;
   if (error) throw error;
 }
 function prepareDeps(sub) {
@@ -1098,26 +1095,26 @@ const arrayInstrumentations = {
     });
   },
   every(fn, thisArg) {
-    return apply(this, "every", fn, thisArg);
+    return apply(this, "every", fn, thisArg, void 0, arguments);
   },
   filter(fn, thisArg) {
-    return apply(this, "filter", fn, thisArg, (v) => v.map(toReactive));
+    return apply(this, "filter", fn, thisArg, (v) => v.map(toReactive), arguments);
   },
   find(fn, thisArg) {
-    return apply(this, "find", fn, thisArg, toReactive);
+    return apply(this, "find", fn, thisArg, toReactive, arguments);
   },
   findIndex(fn, thisArg) {
-    return apply(this, "findIndex", fn, thisArg);
+    return apply(this, "findIndex", fn, thisArg, void 0, arguments);
   },
   findLast(fn, thisArg) {
-    return apply(this, "findLast", fn, thisArg, toReactive);
+    return apply(this, "findLast", fn, thisArg, toReactive, arguments);
   },
   findLastIndex(fn, thisArg) {
-    return apply(this, "findLastIndex", fn, thisArg);
+    return apply(this, "findLastIndex", fn, thisArg, void 0, arguments);
   },
   // flat, flatMap could benefit from ARRAY_ITERATE but are not straight-forward to implement
   forEach(fn, thisArg) {
-    return apply(this, "forEach", fn, thisArg);
+    return apply(this, "forEach", fn, thisArg, void 0, arguments);
   },
   includes(...args) {
     return searchProxy(this, "includes", args);
@@ -1133,7 +1130,7 @@ const arrayInstrumentations = {
     return searchProxy(this, "lastIndexOf", args);
   },
   map(fn, thisArg) {
-    return apply(this, "map", fn, thisArg);
+    return apply(this, "map", fn, thisArg, void 0, arguments);
   },
   pop() {
     return noTracking(this, "pop");
@@ -1152,7 +1149,7 @@ const arrayInstrumentations = {
   },
   // slice could use ARRAY_ITERATE but also seems to beg for range tracking
   some(fn, thisArg) {
-    return apply(this, "some", fn, thisArg);
+    return apply(this, "some", fn, thisArg, void 0, arguments);
   },
   splice(...args) {
     return noTracking(this, "splice", args);
@@ -1188,8 +1185,13 @@ function iterator(self, method, wrapValue) {
   }
   return iter;
 }
-function apply(self, method, fn, thisArg, wrappedRetFn) {
+const arrayProto = Array.prototype;
+function apply(self, method, fn, thisArg, wrappedRetFn, args) {
   const arr = shallowReadArray(self);
+  let methodFn;
+  if ((methodFn = arr[method]) !== arrayProto[method]) {
+    return methodFn.apply(arr, args);
+  }
   let needsWrap = false;
   let wrappedFn = fn;
   if (arr !== self) {
@@ -1204,7 +1206,7 @@ function apply(self, method, fn, thisArg, wrappedRetFn) {
       };
     }
   }
-  const result = arr[method](wrappedFn, thisArg);
+  const result = methodFn.call(arr, wrappedFn, thisArg);
   return needsWrap && wrappedRetFn ? wrappedRetFn(result) : result;
 }
 function reduce(self, method, fn, args) {
@@ -4140,6 +4142,7 @@ const logMismatchError = () => {
 const isSVGContainer = (container) => container.namespaceURI.includes("svg") && container.tagName !== "foreignObject";
 const isMathMLContainer = (container) => container.namespaceURI.includes("MathML");
 const getContainerType = (container) => {
+  if (container.nodeType !== 1) return void 0;
   if (isSVGContainer(container)) return "svg";
   if (isMathMLContainer(container)) return "mathml";
   return void 0;
@@ -5068,7 +5071,7 @@ const KeepAliveImpl = {
     function pruneCache(filter) {
       cache.forEach((vnode, key) => {
         const name = getComponentName(vnode.type);
-        if (name && (!filter || !filter(name))) {
+        if (name && !filter(name)) {
           pruneCacheEntry(key);
         }
       });
@@ -5190,6 +5193,7 @@ function matches(pattern, name) {
   } else if (isString(pattern)) {
     return pattern.split(",").includes(name);
   } else if (isRegExp(pattern)) {
+    pattern.lastIndex = 0;
     return pattern.test(name);
   }
   return false;
@@ -6874,7 +6878,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.5.0-beta.1"}`;
+  Vue.version = `2.6.14-compat:${"3.5.0-beta.2"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -9826,7 +9830,6 @@ function doWatch(source, cb, {
   const effect = new ReactiveEffect(getter);
   let scheduler;
   if (flush === "sync") {
-    effect.flags |= 64;
     scheduler = job;
   } else if (flush === "post") {
     scheduler = () => queuePostRenderEffect(job, instance && instance.suspense);
@@ -12178,7 +12181,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-beta.1";
+const version = "3.5.0-beta.2";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;
@@ -13069,7 +13072,6 @@ class VueElement extends BaseClass {
     this._ob = null;
     if (this.shadowRoot && _createApp !== createApp) {
       this._root = this.shadowRoot;
-      this._mount(_def);
     } else {
       if (this.shadowRoot) {
         warn(
@@ -13082,9 +13084,9 @@ class VueElement extends BaseClass {
       } else {
         this._root = this;
       }
-      if (!this._def.__asyncLoader) {
-        this._resolveProps(this._def);
-      }
+    }
+    if (!this._def.__asyncLoader) {
+      this._resolveProps(this._def);
     }
   }
   connectedCallback() {
@@ -13284,6 +13286,7 @@ class VueElement extends BaseClass {
       vnode.ce = (instance) => {
         this._instance = instance;
         instance.ce = this;
+        instance.isCE = true;
         {
           instance.ceReload = (newStyles) => {
             if (this._styles) {
@@ -15880,10 +15883,11 @@ function isCoreComponent(tag) {
 }
 const nonIdentifierRE = /^\d|[^\$\w\xA0-\uFFFF]/;
 const isSimpleIdentifier = (name) => !nonIdentifierRE.test(name);
-const isMemberExpressionNode = (path, context) => {
+const getExpSource = (exp) => exp.type === 4 ? exp.content : exp.loc.source;
+const isMemberExpressionNode = (exp, context) => {
   try {
-    let ret = parser.parseExpression(path, {
-      plugins: context.expressionPlugins
+    let ret = exp.ast || parser.parseExpression(getExpSource(exp), {
+      plugins: context.expressionPlugins ? [...context.expressionPlugins, "typescript"] : ["typescript"]
     });
     ret = unwrapTSNode(ret);
     return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier" && ret.name !== "undefined";
@@ -15892,6 +15896,24 @@ const isMemberExpressionNode = (path, context) => {
   }
 };
 const isMemberExpression = isMemberExpressionNode;
+const isFnExpressionNode = (exp, context) => {
+  try {
+    let ret = exp.ast || parser.parseExpression(getExpSource(exp), {
+      plugins: context.expressionPlugins ? [...context.expressionPlugins, "typescript"] : ["typescript"]
+    });
+    if (ret.type === "Program") {
+      ret = ret.body[0];
+      if (ret.type === "ExpressionStatement") {
+        ret = ret.expression;
+      }
+    }
+    ret = unwrapTSNode(ret);
+    return ret.type === "FunctionExpression" || ret.type === "ArrowFunctionExpression";
+  } catch (e) {
+    return false;
+  }
+};
+const isFnExpression = isFnExpressionNode;
 function advancePositionWithClone(pos, source, numberOfCharacters = source.length) {
   return advancePositionWithMutation(
     {
@@ -19993,7 +20015,6 @@ function processSlotOutlet(node, context) {
   };
 }
 
-const fnExpRE = /^\s*(async\s*)?(\([^)]*?\)|[\w$_]+)\s*(:[^=]+)?=>|^\s*(async\s+)?function(?:\s+[\w$]+)?\s*\(/;
 const transformOn$1 = (dir, node, context, augmentor) => {
   const { loc, modifiers, arg } = dir;
   if (!dir.exp && !modifiers.length) {
@@ -20037,8 +20058,8 @@ const transformOn$1 = (dir, node, context, augmentor) => {
   }
   let shouldCache = context.cacheHandlers && !exp && !context.inVOnce;
   if (exp) {
-    const isMemberExp = isMemberExpression(exp.content, context);
-    const isInlineStatement = !(isMemberExp || fnExpRE.test(exp.content));
+    const isMemberExp = isMemberExpression(exp, context);
+    const isInlineStatement = !(isMemberExp || isFnExpression(exp, context));
     const hasMultipleStatements = exp.content.includes(`;`);
     if (context.prefixIdentifiers) {
       isInlineStatement && context.addIdentifiers(`$event`);
@@ -20208,7 +20229,7 @@ const transformModel$1 = (dir, node, context) => {
     return createTransformProps();
   }
   const maybeRef = context.inline && (bindingType === "setup-let" || bindingType === "setup-ref" || bindingType === "setup-maybe-ref");
-  if (!expString.trim() || !isMemberExpression(expString, context) && !maybeRef) {
+  if (!expString.trim() || !isMemberExpression(exp, context) && !maybeRef) {
     context.onError(
       createCompilerError(42, exp.loc)
     );

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.0-beta.1
+* @vue/compat v3.5.0-beta.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -7,7 +7,7 @@
 
 var parser = require('@babel/parser');
 var estreeWalker = require('estree-walker');
-var decode_js = require('entities/dist/decode.js');
+var decode_js = require('entities/lib/decode.js');
 var sourceMapJs = require('source-map-js');
 
 /*! #__NO_SIDE_EFFECTS__ */
@@ -501,11 +501,11 @@ class ReactiveEffect {
     }
   }
   pause() {
-    this.flags |= 128;
+    this.flags |= 64;
   }
   resume() {
-    if (this.flags & 128) {
-      this.flags &= ~128;
+    if (this.flags & 64) {
+      this.flags &= ~64;
       if (pausedQueueEffects.has(this)) {
         pausedQueueEffects.delete(this);
         this.trigger();
@@ -519,9 +519,6 @@ class ReactiveEffect {
     if (this.flags & 2 && !(this.flags & 32)) {
       return;
     }
-    if (this.flags & 64) {
-      return this.trigger();
-    }
     if (!(this.flags & 8)) {
       this.flags |= 8;
       this.nextEffect = batchedEffect;
@@ -560,7 +557,7 @@ class ReactiveEffect {
     }
   }
   trigger() {
-    if (this.flags & 128) {
+    if (this.flags & 64) {
       pausedQueueEffects.add(this);
     } else if (this.scheduler) {
       this.scheduler();
@@ -590,6 +587,7 @@ function endBatch() {
     batchDepth--;
     return;
   }
+  batchDepth--;
   let error;
   while (batchedEffect) {
     let e = batchedEffect;
@@ -608,7 +606,6 @@ function endBatch() {
       e = next;
     }
   }
-  batchDepth--;
   if (error) throw error;
 }
 function prepareDeps(sub) {
@@ -971,26 +968,26 @@ const arrayInstrumentations = {
     });
   },
   every(fn, thisArg) {
-    return apply(this, "every", fn, thisArg);
+    return apply(this, "every", fn, thisArg, void 0, arguments);
   },
   filter(fn, thisArg) {
-    return apply(this, "filter", fn, thisArg, (v) => v.map(toReactive));
+    return apply(this, "filter", fn, thisArg, (v) => v.map(toReactive), arguments);
   },
   find(fn, thisArg) {
-    return apply(this, "find", fn, thisArg, toReactive);
+    return apply(this, "find", fn, thisArg, toReactive, arguments);
   },
   findIndex(fn, thisArg) {
-    return apply(this, "findIndex", fn, thisArg);
+    return apply(this, "findIndex", fn, thisArg, void 0, arguments);
   },
   findLast(fn, thisArg) {
-    return apply(this, "findLast", fn, thisArg, toReactive);
+    return apply(this, "findLast", fn, thisArg, toReactive, arguments);
   },
   findLastIndex(fn, thisArg) {
-    return apply(this, "findLastIndex", fn, thisArg);
+    return apply(this, "findLastIndex", fn, thisArg, void 0, arguments);
   },
   // flat, flatMap could benefit from ARRAY_ITERATE but are not straight-forward to implement
   forEach(fn, thisArg) {
-    return apply(this, "forEach", fn, thisArg);
+    return apply(this, "forEach", fn, thisArg, void 0, arguments);
   },
   includes(...args) {
     return searchProxy(this, "includes", args);
@@ -1006,7 +1003,7 @@ const arrayInstrumentations = {
     return searchProxy(this, "lastIndexOf", args);
   },
   map(fn, thisArg) {
-    return apply(this, "map", fn, thisArg);
+    return apply(this, "map", fn, thisArg, void 0, arguments);
   },
   pop() {
     return noTracking(this, "pop");
@@ -1025,7 +1022,7 @@ const arrayInstrumentations = {
   },
   // slice could use ARRAY_ITERATE but also seems to beg for range tracking
   some(fn, thisArg) {
-    return apply(this, "some", fn, thisArg);
+    return apply(this, "some", fn, thisArg, void 0, arguments);
   },
   splice(...args) {
     return noTracking(this, "splice", args);
@@ -1061,8 +1058,13 @@ function iterator(self, method, wrapValue) {
   }
   return iter;
 }
-function apply(self, method, fn, thisArg, wrappedRetFn) {
+const arrayProto = Array.prototype;
+function apply(self, method, fn, thisArg, wrappedRetFn, args) {
   const arr = shallowReadArray(self);
+  let methodFn;
+  if ((methodFn = arr[method]) !== arrayProto[method]) {
+    return methodFn.apply(arr, args);
+  }
   let needsWrap = false;
   let wrappedFn = fn;
   if (arr !== self) {
@@ -1077,7 +1079,7 @@ function apply(self, method, fn, thisArg, wrappedRetFn) {
       };
     }
   }
-  const result = arr[method](wrappedFn, thisArg);
+  const result = methodFn.call(arr, wrappedFn, thisArg);
   return needsWrap && wrappedRetFn ? wrappedRetFn(result) : result;
 }
 function reduce(self, method, fn, args) {
@@ -3229,6 +3231,7 @@ const logMismatchError = () => {
 const isSVGContainer = (container) => container.namespaceURI.includes("svg") && container.tagName !== "foreignObject";
 const isMathMLContainer = (container) => container.namespaceURI.includes("MathML");
 const getContainerType = (container) => {
+  if (container.nodeType !== 1) return void 0;
   if (isSVGContainer(container)) return "svg";
   if (isMathMLContainer(container)) return "mathml";
   return void 0;
@@ -3975,7 +3978,7 @@ const KeepAliveImpl = {
     function pruneCache(filter) {
       cache.forEach((vnode, key) => {
         const name = getComponentName(vnode.type);
-        if (name && (!filter || !filter(name))) {
+        if (name && !filter(name)) {
           pruneCacheEntry(key);
         }
       });
@@ -4094,6 +4097,7 @@ function matches(pattern, name) {
   } else if (isString(pattern)) {
     return pattern.split(",").includes(name);
   } else if (isRegExp(pattern)) {
+    pattern.lastIndex = 0;
     return pattern.test(name);
   }
   return false;
@@ -5502,7 +5506,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.5.0-beta.1"}`;
+  Vue.version = `2.6.14-compat:${"3.5.0-beta.2"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -7975,7 +7979,6 @@ function doWatch(source, cb, {
   const effect = new ReactiveEffect(getter);
   let scheduler;
   if (flush === "sync") {
-    effect.flags |= 64;
     scheduler = job;
   } else if (flush === "post") {
     scheduler = () => queuePostRenderEffect(job, instance && instance.suspense);
@@ -9793,7 +9796,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-beta.1";
+const version = "3.5.0-beta.2";
 const warn$1 = NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;
@@ -10648,7 +10651,6 @@ class VueElement extends BaseClass {
     this._ob = null;
     if (this.shadowRoot && _createApp !== createApp) {
       this._root = this.shadowRoot;
-      this._mount(_def);
     } else {
       if (_def.shadowRoot !== false) {
         this.attachShadow({ mode: "open" });
@@ -10656,9 +10658,9 @@ class VueElement extends BaseClass {
       } else {
         this._root = this;
       }
-      if (!this._def.__asyncLoader) {
-        this._resolveProps(this._def);
-      }
+    }
+    if (!this._def.__asyncLoader) {
+      this._resolveProps(this._def);
     }
   }
   connectedCallback() {
@@ -10849,6 +10851,7 @@ class VueElement extends BaseClass {
       vnode.ce = (instance) => {
         this._instance = instance;
         instance.ce = this;
+        instance.isCE = true;
         const dispatch = (event, args) => {
           this.dispatchEvent(
             new CustomEvent(
@@ -13271,10 +13274,11 @@ function isCoreComponent(tag) {
 }
 const nonIdentifierRE = /^\d|[^\$\w\xA0-\uFFFF]/;
 const isSimpleIdentifier = (name) => !nonIdentifierRE.test(name);
-const isMemberExpressionNode = (path, context) => {
+const getExpSource = (exp) => exp.type === 4 ? exp.content : exp.loc.source;
+const isMemberExpressionNode = (exp, context) => {
   try {
-    let ret = parser.parseExpression(path, {
-      plugins: context.expressionPlugins
+    let ret = exp.ast || parser.parseExpression(getExpSource(exp), {
+      plugins: context.expressionPlugins ? [...context.expressionPlugins, "typescript"] : ["typescript"]
     });
     ret = unwrapTSNode(ret);
     return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier" && ret.name !== "undefined";
@@ -13283,6 +13287,24 @@ const isMemberExpressionNode = (path, context) => {
   }
 };
 const isMemberExpression = isMemberExpressionNode;
+const isFnExpressionNode = (exp, context) => {
+  try {
+    let ret = exp.ast || parser.parseExpression(getExpSource(exp), {
+      plugins: context.expressionPlugins ? [...context.expressionPlugins, "typescript"] : ["typescript"]
+    });
+    if (ret.type === "Program") {
+      ret = ret.body[0];
+      if (ret.type === "ExpressionStatement") {
+        ret = ret.expression;
+      }
+    }
+    ret = unwrapTSNode(ret);
+    return ret.type === "FunctionExpression" || ret.type === "ArrowFunctionExpression";
+  } catch (e) {
+    return false;
+  }
+};
+const isFnExpression = isFnExpressionNode;
 function advancePositionWithClone(pos, source, numberOfCharacters = source.length) {
   return advancePositionWithMutation(
     {
@@ -17265,7 +17287,6 @@ function processSlotOutlet(node, context) {
   };
 }
 
-const fnExpRE = /^\s*(async\s*)?(\([^)]*?\)|[\w$_]+)\s*(:[^=]+)?=>|^\s*(async\s+)?function(?:\s+[\w$]+)?\s*\(/;
 const transformOn$1 = (dir, node, context, augmentor) => {
   const { loc, modifiers, arg } = dir;
   if (!dir.exp && !modifiers.length) {
@@ -17306,8 +17327,8 @@ const transformOn$1 = (dir, node, context, augmentor) => {
   }
   let shouldCache = context.cacheHandlers && !exp && !context.inVOnce;
   if (exp) {
-    const isMemberExp = isMemberExpression(exp.content, context);
-    const isInlineStatement = !(isMemberExp || fnExpRE.test(exp.content));
+    const isMemberExp = isMemberExpression(exp, context);
+    const isInlineStatement = !(isMemberExp || isFnExpression(exp, context));
     const hasMultipleStatements = exp.content.includes(`;`);
     if (context.prefixIdentifiers) {
       isInlineStatement && context.addIdentifiers(`$event`);
@@ -17477,7 +17498,7 @@ const transformModel$1 = (dir, node, context) => {
     return createTransformProps();
   }
   const maybeRef = context.inline && (bindingType === "setup-let" || bindingType === "setup-ref" || bindingType === "setup-maybe-ref");
-  if (!expString.trim() || !isMemberExpression(expString, context) && !maybeRef) {
+  if (!expString.trim() || !isMemberExpression(exp, context) && !maybeRef) {
     context.onError(
       createCompilerError(42, exp.loc)
     );