fix(prettier): add stylelint-config-prettier

clarkdo · clarkdo · commit 50aa2851f80f · 2020-05-18T18:41:38.000+01:00
diff --git a/packages/cna-template/template/_stylelint.config.js b/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: {}
diff --git a/packages/cna-template/template/nuxt/package.js b/packages/cna-template/template/nuxt/package.js
@@ -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
     }
 
diff --git a/packages/cna-template/template/nuxt/package.json b/packages/cna-template/template/nuxt/package.json
@@ -38,6 +38,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"
   }
 }
diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.md b/packages/create-nuxt-app/test/snapshots/index.test.js.md
@@ -1133,6 +1133,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: {
diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.snap b/packages/create-nuxt-app/test/snapshots/index.test.js.snap

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,12 @@ module.exports = {`
`43`	`43`	`delete pkg.devDependencies['@nuxtjs/stylelint-module']`
`44`	`44`	`delete pkg.devDependencies.stylelint`
`45`	`45`	`delete pkg.devDependencies['stylelint-config-standard']`
	`46`	`+ delete pkg.devDependencies['stylelint-config-prettier']`
`46`	`47`	`}`
`47`	`48`	`if (!prettier) {`
`48`	`49`	`delete pkg.devDependencies['eslint-config-prettier']`
`49`	`50`	`delete pkg.devDependencies['eslint-plugin-prettier']`
	`51`	`+ delete pkg.devDependencies['stylelint-config-prettier']`
`50`	`52`	`delete pkg.devDependencies.prettier`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`"lint-staged": "^10.2.4",`
`39`	`39`	`"@nuxtjs/stylelint-module": "^4.0.0",`
`40`	`40`	`"stylelint": "^13.4.0",`
`41`		`- "stylelint-config-standard": "^20.0.0"`
	`41`	`+ "stylelint-config-standard": "^20.0.0",`
	`42`	`+ "stylelint-config-prettier": "^8.0.1"`
`42`	`43`	`}`
`43`	`44`	`}`