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

close #2055
vuejs · Aug 7, 2018 · 4220835 · 4220835
1 parent 68aaa8f
commit 4220835
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
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)