Skip to content

Commit 5346db2

Browse files
committed
only inject when __inject__ is exposed (e.g. when used with extract-text-webpack-plugin)
1 parent 649f219 commit 5346db2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/loader.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ module.exports = function (content) {
295295
if (needsHotReload) {
296296
styleInjectionCode += ` if (disposed) return\n`
297297
}
298+
if (isServer) {
299+
styleInjectionCode += `var i\n`
300+
}
298301
parts.styles.forEach(function (style, i) {
299302
// require style
300303
var requireString = style.src
@@ -306,7 +309,7 @@ module.exports = function (content) {
306309
// vue-style-loader exposes inject functions during SSR so they are
307310
// always called
308311
var invokeStyle = isServer && hasVueStyleLoader
309-
? code => ` ;(${code}).__inject__(ssrContext)\n`
312+
? code => `;(i=${code},i.__inject__&&i.__inject__(ssrContext),i)\n`
310313
: code => ` ${code}\n`
311314

312315
var moduleName = (style.module === true) ? '$style' : style.module

0 commit comments

Comments
 (0)