Skip to content

Commit

Permalink
fix(prettier): add stylelint-config-prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkdo authored and Atinux committed Jun 19, 2020
1 parent e8640e3 commit f022bce
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
7 changes: 6 additions & 1 deletion packages/cna-template/template/_stylelint.config.js
@@ -1,5 +1,10 @@
module.exports = {
extends: 'stylelint-config-standard',
extends: [
'stylelint-config-standard',
<%_ if (prettier) { _%>
'stylelint-config-prettier'
<%_ } _%>
],
// add your custom config here
// https://stylelint.io/user-guide/configuration
rules: {}
Expand Down
2 changes: 2 additions & 0 deletions packages/cna-template/template/nuxt/package.js
Expand Up @@ -43,10 +43,12 @@ module.exports = {
delete pkg.devDependencies['@nuxtjs/stylelint-module']
delete pkg.devDependencies.stylelint
delete pkg.devDependencies['stylelint-config-standard']
delete pkg.devDependencies['stylelint-config-prettier']
}
if (!prettier) {
delete pkg.devDependencies['eslint-config-prettier']
delete pkg.devDependencies['eslint-plugin-prettier']
delete pkg.devDependencies['stylelint-config-prettier']
delete pkg.devDependencies.prettier
}

Expand Down
3 changes: 2 additions & 1 deletion packages/cna-template/template/nuxt/package.json
Expand Up @@ -39,6 +39,7 @@
"lint-staged": "^10.2.4",
"@nuxtjs/stylelint-module": "^4.0.0",
"stylelint": "^13.4.0",
"stylelint-config-standard": "^20.0.0"
"stylelint-config-standard": "^20.0.0",
"stylelint-config-prettier": "^8.0.1"
}
}
1 change: 1 addition & 0 deletions packages/create-nuxt-app/test/snapshots/index.test.js.md
Expand Up @@ -1254,6 +1254,7 @@ Generated by [AVA](https://avajs.dev).
'lint-staged': '^10.2.4',
prettier: '^2.0.5',
stylelint: '^13.4.0',
'stylelint-config-prettier': '^8.0.1',
'stylelint-config-standard': '^20.0.0',
},
husky: {
Expand Down
Binary file modified packages/create-nuxt-app/test/snapshots/index.test.js.snap
Binary file not shown.

0 comments on commit f022bce

Please sign in to comment.