vue 2.7.13 → 2.7.15

package/packages/compiler-sfc/dist/compiler-sfc.js

@@ -248,9 +248,7 @@ const identity = (_) => _;
  */
 function genStaticKeys$1(modules) {
     return modules
-        .reduce((keys, m) => {
-        return keys.concat(m.staticKeys || []);
-    }, [])
+        .reduce((keys, m) => keys.concat(m.staticKeys || []), [])
         .join(',');
 }
 /**
@@ -413,7 +411,7 @@ function parseHTML(html, options) {
                         continue;
                     }
                 }
-                // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
+                // https://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
                 if (conditionalComment.test(html)) {
                     const conditionalEnd = html.indexOf(']>');
                     if (conditionalEnd >= 0) {
@@ -3643,13 +3641,8 @@ methodsToPatch.forEach(function (method) {
     });
 });
 
-const rawMap = new WeakMap();
-function isReadonly(value) {
-    return !!(value && value.__v_isReadonly);
-}
-
 const arrayKeys = Object.getOwnPropertyNames(arrayMethods);
-const NO_INIITIAL_VALUE = {};
+const NO_INITIAL_VALUE = {};
 /**
  * In some cases we may want to disable observation inside a component's
  * update computation.
@@ -3706,7 +3699,7 @@ class Observer {
             const keys = Object.keys(value);
             for (let i = 0; i < keys.length; i++) {
                 const key = keys[i];
-                defineReactive(value, key, NO_INIITIAL_VALUE, undefined, shallow, mock);
+                defineReactive(value, key, NO_INITIAL_VALUE, undefined, shallow, mock);
             }
         }
     }
@@ -3734,7 +3727,6 @@ function observe(value, shallow, ssrMockReactivity) {
         (isArray(value) || isPlainObject(value)) &&
         Object.isExtensible(value) &&
         !value.__v_skip /* ReactiveFlags.SKIP */ &&
-        !rawMap.has(value) &&
         !isRef(value) &&
         !(value instanceof VNode)) {
         return new Observer(value, shallow, ssrMockReactivity);
@@ -3753,7 +3745,7 @@ function defineReactive(obj, key, val, customSetter, shallow, mock) {
     const getter = property && property.get;
     const setter = property && property.set;
     if ((!getter || setter) &&
-        (val === NO_INIITIAL_VALUE || arguments.length === 2)) {
+        (val === NO_INITIAL_VALUE || arguments.length === 2)) {
         val = obj[key];
     }
     let childOb = !shallow && observe(val, false, mock);
@@ -3884,6 +3876,10 @@ function dependArray(value) {
     }
 }
 
+function isReadonly(value) {
+    return !!(value && value.__v_isReadonly);
+}
+
 function isRef(r) {
     return !!(r && r.__v_isRef === true);
 }
@@ -4788,7 +4784,7 @@ function deactivateChildComponent(vm, direct) {
 function callHook(vm, hook, args, setContext = true) {
     // #7573 disable dep collection when invoking lifecycle hooks
     pushTarget();
-    const prev = currentInstance;
+    const prevInst = currentInstance;
     setContext && setCurrentInstance(vm);
     const handlers = vm.$options[hook];
     const info = `${hook} hook`;
@@ -4800,7 +4796,9 @@ function callHook(vm, hook, args, setContext = true) {
     if (vm._hasHookEvent) {
         vm.$emit('hook:' + hook);
     }
-    setContext && setCurrentInstance(prev);
+    if (setContext) {
+        setCurrentInstance(prevInst);
+    }
     popTarget();
 }
 
@@ -5447,7 +5445,7 @@ if (process.env.NODE_ENV !== 'production') {
 /**
  * Helper that recursively merges two data objects together.
  */
-function mergeData(to, from) {
+function mergeData(to, from, recursive = true) {
     if (!from)
         return to;
     let key, toVal, fromVal;
@@ -5461,7 +5459,7 @@ function mergeData(to, from) {
             continue;
         toVal = to[key];
         fromVal = from[key];
-        if (!hasOwn(to, key)) {
+        if (!recursive || !hasOwn(to, key)) {
             set(to, key, fromVal);
         }
         else if (toVal !== fromVal &&
@@ -5622,7 +5620,19 @@ strats.props =
                         extend(ret, childVal);
                     return ret;
                 };
-strats.provide = mergeDataOrFn;
+strats.provide = function (parentVal, childVal) {
+    if (!parentVal)
+        return childVal;
+    return function () {
+        const ret = Object.create(null);
+        mergeData(ret, isFunction(parentVal) ? parentVal.call(this) : parentVal);
+        if (childVal) {
+            mergeData(ret, isFunction(childVal) ? childVal.call(this) : childVal, false // non-recursive
+            );
+        }
+        return ret;
+    };
+};
 /**
  * Default strategy.
  */
@@ -8458,7 +8468,10 @@ function compileScript(sfc, options = { id: '' }) {
             }
         }
         if (declId) {
-            emitIdentifier = scriptSetup.content.slice(declId.start, declId.end);
+            emitIdentifier =
+                declId.type === 'Identifier'
+                    ? declId.name
+                    : scriptSetup.content.slice(declId.start, declId.end);
         }
         return true;
     }
@@ -8835,12 +8848,12 @@ function compileScript(sfc, options = { id: '' }) {
                         else {
                             let start = decl.start + startOffset;
                             let end = decl.end + startOffset;
-                            if (i < total - 1) {
-                                // not the last one, locate the start of the next
+                            if (i === 0) {
+                                // first one, locate the start of the next
                                 end = node.declarations[i + 1].start + startOffset;
                             }
                             else {
-                                // last one, locate the end of the prev
+                                // not first one, locate the end of the prev
                                 start = node.declarations[i - 1].end + startOffset;
                             }
                             s.remove(start, end);
@@ -9014,7 +9027,7 @@ function compileScript(sfc, options = { id: '' }) {
     // we use a default __props so that template expressions referencing props
     // can use it directly
     if (propsIdentifier) {
-        s.prependLeft(startOffset, `\nconst ${propsIdentifier} = __props${propsTypeDecl ? ` as ${genSetupPropsType(propsTypeDecl)}` : ``}\n`);
+        s.prependLeft(startOffset, `\nconst ${propsIdentifier} = __props${propsTypeDecl ? ` as ${genSetupPropsType(propsTypeDecl)}` : ``};\n`);
     }
     const destructureElements = hasDefineExposeCall ? [`expose`] : [];
     if (emitIdentifier) {
@@ -9537,9 +9550,11 @@ function resolveTemplateUsageCheckString(sfc, isTS) {
                 if (dirRE.test(name)) {
                     const baseName = onRE.test(name)
                         ? 'on'
-                        : bindRE.test(name)
-                            ? 'bind'
-                            : name.replace(dirRE, '');
+                        : slotRE.test(name)
+                            ? 'slot'
+                            : bindRE.test(name)
+                                ? 'bind'
+                                : name.replace(dirRE, '');
                     if (!isBuiltInDir$1(baseName)) {
                         code += `,v${capitalize(camelize(baseName))}`;
                     }
@@ -9566,7 +9581,7 @@ function processExp(exp, isTS, dir) {
             exp = `(${exp})=>{}`;
         }
         else if (dir === 'on') {
-            exp = `()=>{${exp}}`;
+            exp = `()=>{return ${exp}}`;
         }
         else if (dir === 'for') {
             const inMatch = exp.match(forAliasRE);
@@ -12136,7 +12151,7 @@ function genFor(el, state, altGen, altHelper) {
         !el.key) {
         state.warn(`<${el.tag} v-for="${alias} in ${exp}">: component lists rendered with ` +
             `v-for should have explicit keys. ` +
-            `See https://vuejs.org/guide/list.html#key for more info.`, el.rawAttrsMap['v-for'], true /* tip */);
+            `See https://v2.vuejs.org/v2/guide/list.html#key for more info.`, el.rawAttrsMap['v-for'], true /* tip */);
     }
     el.forProcessed = true; // avoid recursion
     return (`${altHelper || '_l'}((${exp}),` +

package/packages/compiler-sfc/node_modules/.bin/lessc

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules/less/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules/less/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="$NODE_PATH:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules/less/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules/less/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/less@4.1.3/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/less@4.1.3/node_modules/less/bin/lessc" "$@"
+  exec "$basedir/node"  "$basedir/../less/bin/lessc" "$@"
 else
-  exec node  "$basedir/../../../../node_modules/.pnpm/less@4.1.3/node_modules/less/bin/lessc" "$@"
+  exec node  "$basedir/../less/bin/lessc" "$@"
 fi

package/packages/compiler-sfc/node_modules/.bin/parser

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="$NODE_PATH:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/@babel+parser@7.19.4/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/bin/babel-parser.js" "$@"
+  exec "$basedir/node"  "$basedir/../@babel/parser/bin/babel-parser.js" "$@"
 else
-  exec node  "$basedir/../../../../node_modules/.pnpm/@babel+parser@7.19.4/node_modules/@babel/parser/bin/babel-parser.js" "$@"
+  exec node  "$basedir/../@babel/parser/bin/babel-parser.js" "$@"
 fi

package/packages/compiler-sfc/node_modules/.bin/sass

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/sass@1.55.0/node_modules/sass/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/sass@1.55.0/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="$NODE_PATH:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/sass@1.55.0/node_modules/sass/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/sass@1.55.0/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/sass@1.55.0/node_modules/sass/sass.js" "$@"
+  exec "$basedir/node"  "$basedir/../sass/sass.js" "$@"
 else
-  exec node  "$basedir/../../../../node_modules/.pnpm/sass@1.55.0/node_modules/sass/sass.js" "$@"
+  exec node  "$basedir/../sass/sass.js" "$@"
 fi

package/packages/compiler-sfc/node_modules/.bin/stylus

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="$NODE_PATH:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/bin/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/stylus@0.58.1/node_modules:/Users/evan/Vue/vue/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/bin/stylus" "$@"
+  exec "$basedir/node"  "$basedir/../stylus/bin/stylus" "$@"
 else
-  exec node  "$basedir/../../../../node_modules/.pnpm/stylus@0.58.1/node_modules/stylus/bin/stylus" "$@"
+  exec node  "$basedir/../stylus/bin/stylus" "$@"
 fi

package/packages/compiler-sfc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "2.7.13",
+  "version": "2.7.15",
   "description": "compiler-sfc for Vue 2",
   "main": "dist/compiler-sfc.js",
   "types": "dist/compiler-sfc.d.ts",

package/packages/compiler-sfc/src/compileScript.ts

@@ -39,7 +39,7 @@ import { walk } from 'estree-walker'
 import { RawSourceMap } from 'source-map'
 import { warnOnce } from './warn'
 import { isReservedTag } from 'web/util'
-import { bindRE, dirRE, onRE } from 'compiler/parser'
+import { bindRE, dirRE, onRE, slotRE } from 'compiler/parser'
 import { parseText } from 'compiler/parser/text-parser'
 import { DEFAULT_FILENAME } from './parseComponent'
 import {
@@ -414,7 +414,10 @@ export function compileScript(
     }
 
     if (declId) {
-      emitIdentifier = scriptSetup!.content.slice(declId.start!, declId.end!)
+      emitIdentifier =
+        declId.type === 'Identifier'
+          ? declId.name
+          : scriptSetup!.content.slice(declId.start!, declId.end!)
     }
 
     return true
@@ -907,11 +910,11 @@ export function compileScript(
             } else {
               let start = decl.start! + startOffset
               let end = decl.end! + startOffset
-              if (i < total - 1) {
-                // not the last one, locate the start of the next
+              if (i === 0) {
+                // first one, locate the start of the next
                 end = node.declarations[i + 1].start! + startOffset
               } else {
-                // last one, locate the end of the prev
+                // not first one, locate the end of the prev
                 start = node.declarations[i - 1].end! + startOffset
               }
               s.remove(start, end)
@@ -1122,7 +1125,7 @@ export function compileScript(
       startOffset,
       `\nconst ${propsIdentifier} = __props${
         propsTypeDecl ? ` as ${genSetupPropsType(propsTypeDecl)}` : ``
-      }\n`
+      };\n`
     )
   }
   if (propsDestructureRestId) {
@@ -1130,7 +1133,7 @@ export function compileScript(
       startOffset,
       `\nconst ${propsDestructureRestId} = ${helper(
         `createPropsRestProxy`
-      )}(__props, ${JSON.stringify(Object.keys(propsDestructuredBindings))})\n`
+      )}(__props, ${JSON.stringify(Object.keys(propsDestructuredBindings))});\n`
     )
   }
 
@@ -1804,6 +1807,8 @@ function resolveTemplateUsageCheckString(sfc: SFCDescriptor, isTS: boolean) {
         if (dirRE.test(name)) {
           const baseName = onRE.test(name)
             ? 'on'
+            : slotRE.test(name)
+            ? 'slot'
             : bindRE.test(name)
             ? 'bind'
             : name.replace(dirRE, '')
@@ -1836,7 +1841,7 @@ function processExp(exp: string, isTS: boolean, dir?: string): string {
     if (dir === 'slot') {
       exp = `(${exp})=>{}`
     } else if (dir === 'on') {
-      exp = `()=>{${exp}}`
+      exp = `()=>{return ${exp}}`
     } else if (dir === 'for') {
       const inMatch = exp.match(forAliasRE)
       if (inMatch) {

package/packages/compiler-sfc/test/__snapshots__/compileScript.spec.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`SFC analyze <script> bindings > auto name inference > basic 1`] = `
 "export default {
@@ -212,7 +212,7 @@ export default {
   props: propsModel,
   setup(__props) {
 
-const props = __props
+const props = __props;
 
     
     
@@ -229,7 +229,7 @@ export default {
   props: {},
   setup(__props) {
 
-const props = __props
+const props = __props;
 
     
 return { props, x }
@@ -245,7 +245,7 @@ exports[`SFC compile <script setup> > defineProps() 1`] = `
 },
   setup(__props) {
 
-const props = __props
+const props = __props;
 
 
 const bar = 1
@@ -262,7 +262,7 @@ exports[`SFC compile <script setup> > defineProps/defineEmits in multi-variable
   emits: ['a'],
   setup(__props, { emit }) {
 
-const props = __props
+const props = __props;
 
     
     
@@ -278,7 +278,7 @@ exports[`SFC compile <script setup> > defineProps/defineEmits in multi-variable
   emits: ['a'],
   setup(__props, { emit }) {
 
-const props = __props
+const props = __props;
 
     const a = 1;
     
@@ -288,6 +288,22 @@ return { props, a, emit }
 }"
 `;
 
+exports[`SFC compile <script setup> > defineProps/defineEmits in multi-variable declaration fix #6757  1`] = `
+"export default {
+  props: ['item'],
+  emits: ['a'],
+  setup(__props, { emit }) {
+
+const props = __props;
+
+    const a = 1;
+    
+return { a, props, emit }
+}
+
+}"
+`;
+
 exports[`SFC compile <script setup> > dev mode import usage check > TS annotations 1`] = `
 "import { defineComponent as _defineComponent } from 'vue'
 import { Foo, Baz, Qux, Fred } from './x'
@@ -558,6 +574,22 @@ export default /*#__PURE__*/_defineComponent({
 
       
       
+return { emit }
+}
+
+})"
+`;
+
+exports[`SFC compile <script setup> > with TypeScript > defineEmits w/ type (interface ts type) 1`] = `
+"import { defineComponent as _defineComponent } from 'vue'
+interface Emits { (e: 'foo'): void }
+      
+export default /*#__PURE__*/_defineComponent({
+  emits: ['foo'],
+  setup(__props, { emit }) {
+
+      
+      
 return { emit }
 }
 
@@ -803,7 +835,7 @@ export default /*#__PURE__*/_defineComponent({
   emits: ['a', 'b'],
   setup(__props, { emit }) {
 
-const props = __props
+const props = __props;
 
 
 
@@ -892,7 +924,7 @@ const props = __props as {
         foo?: string
         bar?: number
         baz: boolean
-      }
+      };
 
       
       
@@ -914,7 +946,7 @@ export default /*#__PURE__*/_defineComponent({
   },
   setup(__props: any) {
 
-const props = __props as { foo: string, bar?: number, baz: boolean, qux(): number }
+const props = __props as { foo: string, bar?: number, baz: boolean, qux(): number };
 
       
       

package/packages/compiler-sfc/test/__snapshots__/cssVars.spec.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`CSS vars injection > codegen > <script> w/ default export 1`] = `
 "const __default__ = { setup() {} }

package/packages/compiler-sfc/test/compileScript.spec.ts

@@ -141,6 +141,21 @@ const myEmit = defineEmits(['foo', 'bar'])
     expect(content).toMatch(`emits: ['a'],`)
   })
 
+  // vuejs/core #6757
+  test('defineProps/defineEmits in multi-variable declaration fix #6757 ', () => {
+    const { content } = compile(`
+    <script setup>
+    const a = 1,
+          props = defineProps(['item']),
+          emit = defineEmits(['a']);
+    </script>
+  `)
+    assertCode(content)
+    expect(content).toMatch(`const a = 1;`) // test correct removal
+    expect(content).toMatch(`props: ['item'],`)
+    expect(content).toMatch(`emits: ['a'],`)
+  })
+
   test('defineProps/defineEmits in multi-variable declaration (full removal)', () => {
     const { content } = compile(`
     <script setup>
@@ -1081,6 +1096,19 @@ const emit = defineEmits(['a', 'b'])
       expect(content).toMatch(`emits: ["foo", "bar"]`)
     })
 
+    // https://github.com/vuejs/core/issues/5393
+    test('defineEmits w/ type (interface ts type)', () => {
+      const { content } = compile(`
+      <script setup lang="ts">
+      interface Emits { (e: 'foo'): void }
+      const emit: Emits = defineEmits(['foo'])
+      </script>
+      `)
+      assertCode(content)
+      expect(content).toMatch(`setup(__props, { emit }) {`)
+      expect(content).toMatch(`emits: ['foo']`)
+    })
+
     test('runtime Enum', () => {
       const { content, bindings } = compile(
         `<script setup lang="ts">
@@ -1571,7 +1599,23 @@ describe('SFC analyze <script> bindings', () => {
       </script>
       <template>
         <div @click="$emit('update:a');"></div>
-      </tempalte>
+      </template>
+      `)
+    })
+
+    // #12841
+    test('should not error when performing ts expression check for v-slot destructured default value', () => {
+      compile(`
+      <script setup lang="ts">
+        import FooComp from './Foo.vue'
+      </script>
+      <template>
+        <FooComp>
+          <template #bar="{ bar = { baz: '' } }">
+            {{ bar.baz }}
+          </template>
+        </FooComp>
+      </template>
       `)
     })
   })

package/src/compiler/codegen/index.ts

@@ -259,7 +259,7 @@ export function genFor(
     state.warn(
       `<${el.tag} v-for="${alias} in ${exp}">: component lists rendered with ` +
         `v-for should have explicit keys. ` +
-        `See https://vuejs.org/guide/list.html#key for more info.`,
+        `See https://v2.vuejs.org/v2/guide/list.html#key for more info.`,
       el.rawAttrsMap['v-for'],
       true /* tip */
     )

package/src/compiler/parser/html-parser.ts

@@ -98,7 +98,7 @@ export function parseHTML(html, options: HTMLParserOptions) {
           }
         }
 
-        // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
+        // https://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
         if (conditionalComment.test(html)) {
           const conditionalEnd = html.indexOf(']>')
 

package/src/compiler/parser/index.ts

@@ -42,7 +42,7 @@ export const bindRE = /^:|^\.|^v-bind:/
 const propBindRE = /^\./
 const modifierRE = /\.[^.\]]+(?=[^\]]*$)/g
 
-const slotRE = /^v-slot(:|$)|^#/
+export const slotRE = /^v-slot(:|$)|^#/
 
 const lineBreakRE = /[\r\n]/
 const whitespaceRE = /[ \f\t\r\n]+/g

package/src/core/instance/lifecycle.ts

@@ -18,6 +18,7 @@ import {
   invokeWithErrorHandling
 } from '../util/index'
 import { currentInstance, setCurrentInstance } from 'v3/currentInstance'
+import { getCurrentScope } from 'v3/reactivity/effectScope'
 import { syncSetupProxy } from 'v3/apiSetup'
 
 export let activeInstance: any = null
@@ -398,7 +399,8 @@ export function callHook(
 ) {
   // #7573 disable dep collection when invoking lifecycle hooks
   pushTarget()
-  const prev = currentInstance
+  const prevInst = currentInstance
+  const prevScope = getCurrentScope()
   setContext && setCurrentInstance(vm)
   const handlers = vm.$options[hook]
   const info = `${hook} hook`
@@ -410,6 +412,10 @@ export function callHook(
   if (vm._hasHookEvent) {
     vm.$emit('hook:' + hook)
   }
-  setContext && setCurrentInstance(prev)
+  if (setContext) {
+    setCurrentInstance(prevInst)
+    prevScope && prevScope.on()
+  }
+
   popTarget()
 }

package/src/core/observer/index.ts

@@ -16,11 +16,10 @@ import {
   noop
 } from '../util/index'
 import { isReadonly, isRef, TrackOpTypes, TriggerOpTypes } from '../../v3'
-import { rawMap } from '../../v3/reactivity/reactive'
 
 const arrayKeys = Object.getOwnPropertyNames(arrayMethods)
 
-const NO_INIITIAL_VALUE = {}
+const NO_INITIAL_VALUE = {}
 
 /**
  * In some cases we may want to disable observation inside a component's
@@ -80,7 +79,7 @@ export class Observer {
       const keys = Object.keys(value)
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i]
-        defineReactive(value, key, NO_INIITIAL_VALUE, undefined, shallow, mock)
+        defineReactive(value, key, NO_INITIAL_VALUE, undefined, shallow, mock)
       }
     }
   }
@@ -116,7 +115,6 @@ export function observe(
     (isArray(value) || isPlainObject(value)) &&
     Object.isExtensible(value) &&
     !value.__v_skip /* ReactiveFlags.SKIP */ &&
-    !rawMap.has(value) &&
     !isRef(value) &&
     !(value instanceof VNode)
   ) {
@@ -147,7 +145,7 @@ export function defineReactive(
   const setter = property && property.set
   if (
     (!getter || setter) &&
-    (val === NO_INIITIAL_VALUE || arguments.length === 2)
+    (val === NO_INITIAL_VALUE || arguments.length === 2)
   ) {
     val = obj[key]
   }