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

close #2055
This commit is contained in:
Evan You
2018-08-06 21:51:47 -04:00
parent 68aaa8fd7d
commit 4220835fa1
2 changed files with 4 additions and 5 deletions
@@ -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
+1 -2
View File
@@ -82,8 +82,7 @@ module.exports = (api, options) => {
sourceMap,
importLoaders: (
1 + // stylePostLoader injected by vue-loader
hasPostCSSConfig +
!!loader
hasPostCSSConfig
)
}, loaderOptions.css)