build: build 2.4.4

vuejs · Sep 14, 2017 · a32490f · a32490f
1 parent a2f73f2
commit a32490f
Show file tree

Hide file tree

Showing 13 changed files with 7,633 additions and 82 deletions.
diff --git a/dist/vue.common.js b/dist/vue.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4724,7 +4724,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.esm.js b/dist/vue.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4722,7 +4722,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.js b/dist/vue.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4713,7 +4713,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.min.js b/dist/vue.min.js
diff --git a/dist/vue.runtime.common.js b/dist/vue.runtime.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4720,7 +4720,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.runtime.esm.js b/dist/vue.runtime.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4718,7 +4718,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.runtime.js b/dist/vue.runtime.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.4.3
+ * Vue.js v2.4.4
  * (c) 2014-2017 Evan You
  * Released under the MIT License.
  */
@@ -4709,7 +4709,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
   }
 });
 
-Vue$3.version = '2.4.3';
+Vue$3.version = '2.4.4';
 
 /*  */
 

diff --git a/dist/vue.runtime.min.js b/dist/vue.runtime.min.js
diff --git a/packages/vue-server-renderer/build.js b/packages/vue-server-renderer/build.js
@@ -7833,27 +7833,25 @@ function createBundleRunner (entry, files, basedir, runInNewContext) {
         }
       }
       userContext._registeredComponents = new Set();
+
       // vue-style-loader styles imported outside of component lifecycle hooks
       if (initialContext._styles) {
         userContext._styles = deepClone(initialContext._styles);
-      }
-      // #6353 after the app is resolved, if the userContext doesn't have a
-      // styles property, it means the app doesn't have any lifecycle-injected
-      // styles, so vue-style-loader never defined the styles getter.
-      // just expose the same styles from the initialContext.
-      var exposeStylesAndResolve = function (app) {
-        if (!userContext.hasOwnProperty('styles')) {
-          userContext.styles = initialContext.styles;
+        // #6353 ensure "styles" is exposed even if no styles are injected
+        // in component lifecycles.
+        // the renderStyles fn is exposed by vue-style-loader >= 3.0.3
+        var renderStyles = initialContext._renderStyles;
+        if (renderStyles) {
+          Object.defineProperty(userContext, 'styles', {
+            enumerable: true,
+            get: function get () {
+              return renderStyles(userContext._styles)
+            }
+          });
         }
-        resolve(app);
-      };
-
-      var res = runner(userContext);
-      if (typeof res.then === 'function') {
-        res.then(exposeStylesAndResolve);
-      } else {
-        exposeStylesAndResolve(res);
       }
+
+      resolve(runner(userContext));
     });
     }
   }