@vue/compiler-sfc 2.7.14 → 2.7.15

package/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) {
@@ -3644,7 +3642,7 @@ methodsToPatch.forEach(function (method) {
 });
 
 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.
@@ -3701,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);
             }
         }
     }
@@ -3747,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);
@@ -4786,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`;
@@ -4798,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();
 }
 
@@ -8468,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;
     }
@@ -8845,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);
@@ -9024,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) {
@@ -9578,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);

package/package.json

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