adjust style injection calling by taking context as argument

yyx990803 · yyx990803 · commit fe3e3ab75f5b · 2017-04-12T16:29:15.000+08:00
diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
@@ -1,3 +1,5 @@
+/* globals __VUE_SSR_CONTEXT__ */
+
 // this module is a runtime utility for cleaner component module output and will
 // be included in the final webpack user bundle
 
@@ -28,21 +30,30 @@ module.exports = function normalizeComponent (
     options.staticRenderFns = compiledTemplate.staticRenderFns
   }
 
-  if (injectStyles) {
-    var existing = options.beforeCreate
-    options.beforeCreate = existing
-      ? [].concat(existing, injectStyles)
-      : [injectStyles]
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._injectStyles = injectStyles
-  }
-
   // scopedId
   if (scopeId) {
     options._scopeId = scopeId
   }
 
+  var existing = options.beforeCreate
+  var registerComponent = function (context) {
+    if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
+      context = __VUE_SSR_CONTEXT__
+    }
+    if (injectStyles) {
+      injectStyles(this, context)
+    }
+  }
+
+  // inject component registration as beforeCreate hook
+  options.beforeCreate = existing
+    ? [].concat(existing, registerComponent)
+    : [registerComponent]
+
+  // used by ssr in case component is cached and beforeCreate
+  // never gets called
+  options._ssrRegister = registerComponent
+
   return {
     esModule: esModule,
     exports: scriptExports,
diff --git a/lib/loader.js b/lib/loader.js
@@ -18,12 +18,12 @@ var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 var hasBabel = false
 try {
-  hasBabel = !!require('babel-loader')
+  hasBabel = !!require(normalize.dep('babel-loader'))
 } catch (e) {}
 
 var hasBuble = false
 try {
-  hasBuble = !!require('buble-loader')
+  hasBuble = !!require(normalize.dep('buble-loader'))
 } catch (e) {}
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
@@ -284,7 +284,7 @@ module.exports = function (content) {
   // add requires for styles
   if (parts.styles.length) {
     var styleInjectionCode =
-      'function __injectVueStyle__ () {\n'
+      'function __injectVueStyle__ (vm, context) {\n'
     var cssModules = {}
     parts.styles.forEach(function (style, i) {
       // require style
@@ -297,7 +297,7 @@ module.exports = function (content) {
       // vue-style-loader exposes inject functions during SSR so they are
       // always called
       var invokeStyle = isServer && hasVueStyleLoader
-        ? code => `;(${code}).__inject__()`
+        ? code => `;(${code}).__inject__(context)`
         : code => code
 
       var moduleName = (style.module === true) ? '$style' : style.module
@@ -316,7 +316,7 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += invokeStyle('this["' + moduleName + '"] = ' + requireString) + '\n'
+          styleInjectionCode += invokeStyle('vm["' + moduleName + '"] = ' + requireString) + '\n'
         }
       } else {
         styleInjectionCode += invokeStyle(requireString) + '\n'
diff --git a/test/test.js b/test/test.js
@@ -575,7 +575,9 @@ describe('vue-loader', function () {
         rules: [{ test: /\.vue$/, loader: rawLoaderPath }]
       }
     }, code => {
-      const renderer = SSR.createBundleRenderer(code)
+      const renderer = SSR.createBundleRenderer(code, {
+        basedir: __dirname
+      })
       const context = {}
       renderer.renderToString(context, (err, res) => {
         if (err) return done(err)
