Skip to content

Commit 775d5ef

Browse files
author
YiSiWang
committed
use vue-template-compiler#dev and remove parse hack
1 parent 6659b04 commit 775d5ef

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

lib/loader.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,22 +180,21 @@ module.exports = function (content) {
180180
if (parts.styles.length) {
181181
output += '\n/* styles */\n'
182182
parts.styles.forEach(function (style, i) {
183-
/* !HACK! */
184-
style.module = i === 0 ? 'style' : '$style'
183+
var moduleName = (style.module === true) ? '$style' : style.module
185184

186185
// require style
187-
if (isServer && !style.module) return
186+
if (isServer && !moduleName) return
188187
var requireString = style.src
189188
? getRequireForImport('styles', style, style.scoped)
190189
: getRequire('styles', style, i, style.scoped)
191190

192191
// setCssModule
193-
if (style.module) {
194-
if (style.module in cssModules) {
195-
loaderContext.emitError('CSS module name "' + style.module + '" is not unique!')
192+
if (moduleName) {
193+
if (moduleName in cssModules) {
194+
loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
196195
output += requireString
197196
} else {
198-
cssModules[style.module] = true
197+
cssModules[moduleName] = true
199198

200199
// `style-loader` exposes the name-to-hash map directly
201200
// `css-loader` exposes it in `.locals`
@@ -204,7 +203,7 @@ module.exports = function (content) {
204203
requireString += '.locals'
205204
}
206205

207-
output += '__vue_styles__["' + style.module + '"] = ' + requireString + '\n'
206+
output += '__vue_styles__["' + moduleName + '"] = ' + requireString + '\n'
208207
}
209208
} else {
210209
output += requireString

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"source-map": "^0.5.6",
4141
"vue-hot-reload-api": "^2.0.1",
4242
"vue-style-loader": "^1.0.0",
43-
"vue-template-compiler": "^2.0.0-rc.3",
43+
"vue-template-compiler": "git://github.com/YiSiWang/vue-template-compiler.git#fc2ce58",
4444
"vue-template-es2015-compiler": "^1.0.0"
4545
},
4646
"peerDependencies": {

test/test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ function bundle (options, cb) {
4040
})
4141
}
4242
expect(stats.compilation.errors).to.be.empty
43-
require('fs').writeFileSync('./test.build.js', mfs.readFileSync('/test.build.js').toString())
4443
cb(mfs.readFileSync('/test.build.js').toString())
4544
})
4645
}
@@ -426,7 +425,7 @@ describe('vue-loader', function () {
426425
})
427426
})
428427

429-
it.only('css-modules in SSR', function (done) {
428+
it('css-modules in SSR', function (done) {
430429
bundle({
431430
entry: './test/fixtures/css-modules.vue',
432431
target: 'node',
@@ -444,6 +443,7 @@ describe('vue-loader', function () {
444443

445444
var output = requireFromString(code, './test.build.js')
446445
expect(output.computed.style().red).to.match(/^_/)
446+
447447
done()
448448
})
449449
})

0 commit comments

Comments
 (0)