@vue/compiler-sfc 2.7.0 → 2.7.3

package/dist/compiler-sfc.js

@@ -329,7 +329,7 @@ function hasChanged(x, y) {
         return x === 0 && 1 / x !== 1 / y;
     }
     else {
-        return x === x && y === y;
+        return x === x || y === y;
     }
 }
 
@@ -646,6 +646,7 @@ const DEFAULT_FILENAME = 'anonymous.vue';
 const splitRE$1 = /\r?\n/g;
 const replaceRE = /./g;
 const isSpecialTag = makeMap('script,style,template', true);
+const isNeedIndentLang = makeMap('pug,jade');
 /**
  * Parse a single-file component (*.vue) file into an SFC Descriptor Object.
  */
@@ -740,7 +741,9 @@ function parseComponent(source, options = {}) {
         if (depth === 1 && currentBlock) {
             currentBlock.end = start;
             let text = source.slice(currentBlock.start, currentBlock.end);
-            if (options.deindent) {
+            if (options.deindent ||
+                // certain langs like pug are indent sensitive, preserve old behavior
+                (currentBlock.lang && isNeedIndentLang(currentBlock.lang))) {
                 text = deIndent(text);
             }
             // pad content so that linters and pre-processors can output correct
@@ -3347,7 +3350,9 @@ const LIFECYCLE_HOOKS = [
     'activated',
     'deactivated',
     'errorCaptured',
-    'serverPrefetch'
+    'serverPrefetch',
+    'renderTracked',
+    'renderTriggered'
 ];
 
 var config = {
@@ -5186,6 +5191,13 @@ let shouldObserve = true;
 function toggleObserving(value) {
     shouldObserve = value;
 }
+// ssr mock dep
+const mockDep = {
+    notify: noop,
+    depend: noop,
+    addSub: noop,
+    removeSub: noop
+};
 /**
  * Observer class that is attached to each observed
  * object. Once attached, the observer converts the target
@@ -5193,76 +5205,60 @@ function toggleObserving(value) {
  * collect dependencies and dispatch updates.
  */
 class Observer {
-    constructor(value, shallow = false) {
+    constructor(value, shallow = false, mock = false) {
         this.value = value;
         this.shallow = shallow;
+        this.mock = mock;
         // this.value = value
-        this.dep = new Dep();
+        this.dep = mock ? mockDep : new Dep();
         this.vmCount = 0;
         def(value, '__ob__', this);
         if (isArray(value)) {
-            if (hasProto) {
-                protoAugment(value, arrayMethods);
-            }
-            else {
-                copyAugment(value, arrayMethods, arrayKeys);
+            if (!mock) {
+                if (hasProto) {
+                    value.__proto__ = arrayMethods;
+                    /* eslint-enable no-proto */
+                }
+                else {
+                    for (let i = 0, l = arrayKeys.length; i < l; i++) {
+                        const key = arrayKeys[i];
+                        def(value, key, arrayMethods[key]);
+                    }
+                }
             }
             if (!shallow) {
                 this.observeArray(value);
             }
         }
         else {
-            this.walk(value, shallow);
-        }
-    }
-    /**
-     * Walk through all properties and convert them into
-     * getter/setters. This method should only be called when
-     * value type is Object.
-     */
-    walk(obj, shallow) {
-        const keys = Object.keys(obj);
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            defineReactive(obj, key, NO_INIITIAL_VALUE, undefined, shallow);
+            /**
+             * Walk through all properties and convert them into
+             * getter/setters. This method should only be called when
+             * value type is Object.
+             */
+            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);
+            }
         }
     }
     /**
      * Observe a list of Array items.
      */
-    observeArray(items) {
-        for (let i = 0, l = items.length; i < l; i++) {
-            observe(items[i]);
+    observeArray(value) {
+        for (let i = 0, l = value.length; i < l; i++) {
+            observe(value[i], false, this.mock);
         }
     }
 }
 // helpers
-/**
- * Augment a target Object or Array by intercepting
- * the prototype chain using __proto__
- */
-function protoAugment(target, src) {
-    /* eslint-disable no-proto */
-    target.__proto__ = src;
-    /* eslint-enable no-proto */
-}
-/**
- * Augment a target Object or Array by defining
- * hidden properties.
- */
-/* istanbul ignore next */
-function copyAugment(target, src, keys) {
-    for (let i = 0, l = keys.length; i < l; i++) {
-        const key = keys[i];
-        def(target, key, src[key]);
-    }
-}
 /**
  * Attempt to create an observer instance for a value,
  * returns the new observer if successfully observed,
  * or the existing observer if the value already has one.
  */
-function observe(value, shallow) {
+function observe(value, shallow, ssrMockReactivity) {
     if (!isObject$1(value) || isRef(value) || value instanceof VNode) {
         return;
     }
@@ -5271,18 +5267,18 @@ function observe(value, shallow) {
         ob = value.__ob__;
     }
     else if (shouldObserve &&
-        !isServerRendering() &&
+        (ssrMockReactivity || !isServerRendering()) &&
         (isArray(value) || isPlainObject(value)) &&
         Object.isExtensible(value) &&
-        !value.__v_skip) {
-        ob = new Observer(value, shallow);
+        !value.__v_skip /* ReactiveFlags.SKIP */) {
+        ob = new Observer(value, shallow, ssrMockReactivity);
     }
     return ob;
 }
 /**
  * Define a reactive property on an Object.
  */
-function defineReactive(obj, key, val, customSetter, shallow) {
+function defineReactive(obj, key, val, customSetter, shallow, mock) {
     const dep = new Dep();
     const property = Object.getOwnPropertyDescriptor(obj, key);
     if (property && property.configurable === false) {
@@ -5295,7 +5291,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
         (val === NO_INIITIAL_VALUE || arguments.length === 2)) {
         val = obj[key];
     }
-    let childOb = !shallow && observe(val);
+    let childOb = !shallow && observe(val, false, mock);
     Object.defineProperty(obj, key, {
         enumerable: true,
         configurable: true,
@@ -5319,7 +5315,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
                     }
                 }
             }
-            return isRef(value) ? value.value : value;
+            return isRef(value) && !shallow ? value.value : value;
         },
         set: function reactiveSetter(newVal) {
             const value = getter ? getter.call(obj) : val;
@@ -5343,7 +5339,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
             else {
                 val = newVal;
             }
-            childOb = !shallow && observe(newVal);
+            childOb = !shallow && observe(newVal, false, mock);
             if (process.env.NODE_ENV !== 'production') {
                 dep.notify({
                     type: "set" /* TriggerOpTypes.SET */,
@@ -5368,16 +5364,20 @@ function set(target, key, val) {
         process.env.NODE_ENV !== 'production' && warn$3(`Set operation on key "${key}" failed: target is readonly.`);
         return;
     }
+    const ob = target.__ob__;
     if (isArray(target) && isValidArrayIndex(key)) {
         target.length = Math.max(target.length, key);
         target.splice(key, 1, val);
+        // when mocking for SSR, array methods are not hijacked
+        if (!ob.shallow && ob.mock) {
+            observe(val, false, true);
+        }
         return val;
     }
     if (key in target && !(key in Object.prototype)) {
         target[key] = val;
         return val;
     }
-    const ob = target.__ob__;
     if (target._isVue || (ob && ob.vmCount)) {
         process.env.NODE_ENV !== 'production' &&
             warn$3('Avoid adding reactive properties to a Vue instance or its root $data ' +
@@ -5388,7 +5388,7 @@ function set(target, key, val) {
         target[key] = val;
         return val;
     }
-    defineReactive(ob.value, key, val);
+    defineReactive(ob.value, key, val, undefined, ob.shallow, ob.mock);
     if (process.env.NODE_ENV !== 'production') {
         ob.dep.notify({
             type: "add" /* TriggerOpTypes.ADD */,
@@ -8360,18 +8360,14 @@ function compileScript(sfc, options = { id: '' }) {
     function error(msg, node, end = node.end + startOffset) {
         throw new Error(`[@vue/compiler-sfc] ${msg}\n\n${filename}\n${generateCodeFrame(source, node.start + startOffset, end)}`);
     }
-    function registerUserImport(source, local, imported, isType, isFromSetup, needTemplateUsageCheck) {
+    function registerUserImport(source, local, imported, isType, isFromSetup) {
         if (source === 'vue' && imported) {
             userImportAlias[imported] = local;
         }
         // template usage check is only needed in non-inline mode, so we can skip
         // the work if inlineTemplate is true.
-        let isUsedInTemplate = needTemplateUsageCheck;
-        if (needTemplateUsageCheck &&
-            isTS &&
-            sfc.template &&
-            !sfc.template.src &&
-            !sfc.template.lang) {
+        let isUsedInTemplate = true;
+        if (isTS && sfc.template && !sfc.template.src && !sfc.template.lang) {
             isUsedInTemplate = isImportUsed(local, sfc);
         }
         userImports[local] = {
@@ -8622,7 +8618,7 @@ function compileScript(sfc, options = { id: '' }) {
                         specifier.imported.name;
                     registerUserImport(node.source.value, specifier.local.name, imported, node.importKind === 'type' ||
                         (specifier.type === 'ImportSpecifier' &&
-                            specifier.importKind === 'type'), false, true);
+                            specifier.importKind === 'type'), false);
                 }
             }
             else if (node.type === 'ExportDefaultDeclaration') {
@@ -8791,7 +8787,7 @@ function compileScript(sfc, options = { id: '' }) {
                 else {
                     registerUserImport(source, local, imported, node.importKind === 'type' ||
                         (specifier.type === 'ImportSpecifier' &&
-                            specifier.importKind === 'type'), true, true);
+                            specifier.importKind === 'type'), true);
                 }
             }
             if (node.specifiers.length && removed === node.specifiers.length) {
@@ -9526,7 +9522,11 @@ function resolveTemplateUsageCheckString(sfc) {
             for (let i = 0; i < attrs.length; i++) {
                 const { name, value } = attrs[i];
                 if (dirRE.test(name)) {
-                    const baseName = name.replace(dirRE, '');
+                    const baseName = onRE.test(name)
+                        ? 'on'
+                        : bindRE.test(name)
+                            ? 'bind'
+                            : name.replace(dirRE, '');
                     if (!isBuiltInDir$1(baseName)) {
                         code += `,v${capitalize(camelize(baseName))}`;
                     }
@@ -9552,6 +9552,9 @@ function processExp(exp, dir) {
         if (dir === 'slot') {
             exp = `(${exp})=>{}`;
         }
+        else if (dir === 'on') {
+            exp = `()=>{${exp}}`;
+        }
         else if (dir === 'for') {
             const inMatch = exp.match(forAliasRE);
             if (inMatch) {
@@ -9807,7 +9810,7 @@ function transform(node, transformAssetUrlsOptions) {
                     return;
                 }
                 const imageCandidates = value
-                    .substr(1, value.length - 2)
+                    .slice(1, -1)
                     .split(',')
                     .map(s => {
                     // The attribute value arrives here with all whitespace, except

package/package.json

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