fix(css): fix importLoaders which only applies to plain CSS imports

yyx990803 · yyx990803 · commit 4220835fa14e · 2018-08-06T21:51:47.000-04:00
close vuejs#2055
diff --git a/packages/@vue/cli-service/__tests__/css.spec.js b/packages/@vue/cli-service/__tests__/css.spec.js
@@ -57,7 +57,7 @@ test('default loaders', () => {
     // assert css-loader options
     expect(findOptions(config, lang, 'css')).toEqual({
       sourceMap: false,
-      importLoaders: lang === 'css' ? 2 : 3
+      importLoaders: 2
     })
   })
   // sass indented syntax
@@ -71,7 +71,7 @@ test('production defaults', () => {
     expect(findLoaders(config, lang)).toEqual([extractLoaderPath, 'css', 'postcss'].concat(loader))
     expect(findOptions(config, lang, 'css')).toEqual({
       sourceMap: false,
-      importLoaders: lang === 'css' ? 2 : 3
+      importLoaders: 2
     })
   })
 })
@@ -86,7 +86,7 @@ test('CSS Modules rules', () => {
   })
   LANGS.forEach(lang => {
     const expected = {
-      importLoaders: lang === 'css' ? 1 : 2, // no postcss-loader
+      importLoaders: 1, // no postcss-loader
       localIdentName: `[name]_[local]_[hash:base64:5]`,
       sourceMap: false,
       modules: true
diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js
@@ -82,8 +82,7 @@ module.exports = (api, options) => {
           sourceMap,
           importLoaders: (
             1 + // stylePostLoader injected by vue-loader
-            hasPostCSSConfig +
-            !!loader
+            hasPostCSSConfig
           )
         }, loaderOptions.css)
 

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,7 @@ module.exports = (api, options) => {`
`82`	`82`	`sourceMap,`
`83`	`83`	`importLoaders: (`
`84`	`84`	`1 + // stylePostLoader injected by vue-loader`
`85`		`- hasPostCSSConfig +`
`86`		`- !!loader`
	`85`	`+ hasPostCSSConfig`
`87`	`86`	`)`
`88`	`87`	`}, loaderOptions.css)`
`89`	`88`