Bugfix/8.x webpack2 (#668)

yinheli · yyx990803 · commit ef3956885feb · 2017-02-23T13:08:22.000-05:00
* adapt for webpack2 loader suffix is no longer optional in webpack2 for clarity reasons @see https://webpack.js.org/configuration/#options * fix tests, className failed in windows test className is not always start with "_"
diff --git a/lib/loader.js b/lib/loader.js
@@ -145,7 +145,7 @@ module.exports = function (content) {
           return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'
         case 'style':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + rewriter + lang + '!'
+          return loader + '!' + rewriter + lang + '-loader' + '!'
         case 'script':
           return injectString + lang + '!'
       }
diff --git a/test/test.js b/test/test.js
@@ -306,7 +306,7 @@ describe('vue-loader', function () {
 
       // get local class name
       var className = module.computed.style().red
-      expect(className).to.match(/^_/)
+      expect(className).to.match(/_/)
 
       // class name in style
       var style = [].slice.call(window.document.querySelectorAll('style')).map(function (style) {
@@ -323,7 +323,7 @@ describe('vue-loader', function () {
 
       // default module + pre-processor + scoped
       var anotherClassName = module.computed.$style().red
-      expect(anotherClassName).to.match(/^_/).and.not.equal(className)
+      expect(anotherClassName).to.match(/_/).and.not.equal(className)
       var id = '_v-' + hash(require.resolve('./fixtures/css-modules.vue'))
       expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ module.exports = function (content) {`
`145`	`145`	`return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'`
`146`	`146`	`case 'style':`
`147`	`147`	`loader = addCssModulesToLoader(defaultLoaders.css, part, index)`
`148`		`- return loader + '!' + rewriter + lang + '!'`
	`148`	`+ return loader + '!' + rewriter + lang + '-loader' + '!'`
`149`	`149`	`case 'script':`
`150`	`150`	`return injectString + lang + '!'`
`151`	`151`	`}`