Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enable postcss+autoprefixer by default internally, reducing boilerplate #4798

Merged
merged 1 commit into from
Nov 7, 2019
Merged

feat: enable postcss+autoprefixer by default internally, reducing boilerplate #4798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .postcssrc
View file
Open in desktop

This file was deleted.

43 changes: 25 additions & 18 deletions packages/@vue/cli-service/__tests__/css.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ const findOptions = (config, lang, _loader, index) => {
}

test('default loaders', () => {
const config = genConfig({ postcss: {}})
const config = genConfig()

LANGS.forEach(lang => {
const loader = lang === 'css' ? [] : LOADERS[lang]
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss'].concat(loader))
expect(findOptions(config, lang, 'postcss').plugins).toBeFalsy()
expect(findOptions(config, lang, 'postcss').plugins).toEqual([require('autoprefixer')])
// assert css-loader options
expect(findOptions(config, lang, 'css')).toEqual({
sourceMap: false,
Expand All @@ -79,11 +79,25 @@ test('default loaders', () => {
})

test('production defaults', () => {
const config = genConfig({ postcss: {}}, 'production')
const config = genConfig({}, 'production')
LANGS.forEach(lang => {
const loader = lang === 'css' ? [] : LOADERS[lang]
expect(findLoaders(config, lang)).toEqual([extractLoaderPath, 'css', 'postcss'].concat(loader))
expect(findOptions(config, lang, 'postcss').plugins).toEqual([require('autoprefixer')])
expect(findOptions(config, lang, 'css')).toEqual({
sourceMap: false,
importLoaders: 2
})
})
})

test('override postcss config', () => {
const config = genConfig({ postcss: {}})
LANGS.forEach(lang => {
const loader = lang === 'css' ? [] : LOADERS[lang]
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss'].concat(loader))
expect(findOptions(config, lang, 'postcss').plugins).toBeFalsy()
// assert css-loader options
expect(findOptions(config, lang, 'css')).toEqual({
sourceMap: false,
importLoaders: 2
Expand All @@ -101,7 +115,7 @@ test('CSS Modules rules', () => {
})
LANGS.forEach(lang => {
const expected = {
importLoaders: 1, // no postcss-loader
importLoaders: 2, // with postcss-loader
sourceMap: false,
modules: {
localIdentName: `[name]_[local]_[hash:base64:5]`
Expand Down Expand Up @@ -140,7 +154,7 @@ test('Customized CSS Modules rules', () => {

LANGS.forEach(lang => {
const expected = {
importLoaders: 1, // no postcss-loader
importLoaders: 2, // with postcss-loader
sourceMap: false,
modules: {
localIdentName: `[folder]-[name]-[local][emoji]`
Expand Down Expand Up @@ -174,7 +188,7 @@ test('deprecate `css.modules` option', () => {

LANGS.forEach(lang => {
const expected = {
importLoaders: 1, // no postcss-loader
importLoaders: 2, // with postcss-loader
sourceMap: false,
modules: {
localIdentName: `[folder]-[name]-[local][emoji]`
Expand Down Expand Up @@ -211,7 +225,7 @@ test('favor `css.requireModuleExtension` over `css.modules`', () => {

LANGS.forEach(lang => {
const expected = {
importLoaders: 1, // no postcss-loader
importLoaders: 2, // with postcss-loader
sourceMap: false,
modules: {
localIdentName: `[folder]-[name]-[local][emoji]`
Expand All @@ -236,10 +250,10 @@ test('css.extract', () => {
}, 'production')
LANGS.forEach(lang => {
const loader = lang === 'css' ? [] : LOADERS[lang]
// when extract is false in production, even without postcss config,
// an instance of postcss-loader is injected for inline minification.
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss'].concat(loader))
expect(findOptions(config, lang, 'css').importLoaders).toBe(2)
// when extract is false in production,
// an additional instance of postcss-loader is injected for inline minification.
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss', 'postcss'].concat(loader))
expect(findOptions(config, lang, 'css').importLoaders).toBe(3)
expect(findOptions(config, lang, 'postcss').plugins).toBeTruthy()
})

Expand Down Expand Up @@ -380,10 +394,3 @@ test('should use dart sass implementation whenever possible', () => {
expect(findOptions(config, 'sass', 'sass')).toMatchObject({ implementation: require('sass') })
})

test('skip postcss-loader if no postcss config found', () => {
const config = genConfig()
LANGS.forEach(lang => {
const loader = lang === 'css' ? [] : LOADERS[lang]
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css'].concat(loader))
})
})
5 changes: 0 additions & 5 deletions packages/@vue/cli-service/generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ module.exports = (api, options) => {
devDependencies: {
'vue-template-compiler': '^2.6.10'
},
'postcss': {
'plugins': {
'autoprefixer': {}
}
},
browserslist: [
'> 1%',
'last 2 versions'
Expand Down
20 changes: 13 additions & 7 deletions packages/@vue/cli-service/lib/config/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ module.exports = (api, rootOptions) => {
'.postcssrc.json'
]))

if (!hasPostCSSConfig) {
loaderOptions.postcss = {
plugins: [
require('autoprefixer')
]
}
}

// if building for production but not extracting CSS, we need to minimize
// the embbeded inline CSS as they will not be going through the optimizing
// plugin.
Expand Down Expand Up @@ -139,7 +147,7 @@ module.exports = (api, rootOptions) => {
sourceMap,
importLoaders: (
1 + // stylePostLoader injected by vue-loader
(hasPostCSSConfig ? 1 : 0) +
1 + // postcss-loader
(needInlineMinification ? 1 : 0)
)
}, loaderOptions.css)
Expand Down Expand Up @@ -168,12 +176,10 @@ module.exports = (api, rootOptions) => {
})
}

if (hasPostCSSConfig) {
rule
.use('postcss-loader')
.loader(require.resolve('postcss-loader'))
.options(Object.assign({ sourceMap }, loaderOptions.postcss))
}
rule
.use('postcss-loader')
.loader(require.resolve('postcss-loader'))
.options(Object.assign({ sourceMap }, loaderOptions.postcss))

if (loader) {
let resolvedLoader
Expand Down
5 changes: 0 additions & 5 deletions packages/@vue/cli-ui-addon-webpack/.postcssrc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions packages/@vue/cli-ui-addon-widgets/postcss.config.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions packages/@vue/cli-ui/.postcssrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@vue/cli/lib/Creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ module.exports = class Creator extends EventEmitter {
name: 'useConfigFiles',
when: isManualMode,
type: 'list',
message: 'Where do you prefer placing config for Babel, PostCSS, ESLint, etc.?',
message: 'Where do you prefer placing config for Babel, ESLint, etc.?',
choices: [
{
name: 'In dedicated config files',
Expand Down