fix(prettier): use recommended rules to avoid eslint conflicts

https://github.com/prettier/eslint-plugin-prettier#recommended-configuration
nuxt · Aug 23, 2021 · 5f05d22 · 5f05d22
1 parent 4950578
commit 5f05d22
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/packages/cna-template/template/_.eslintrc.js b/packages/cna-template/template/_.eslintrc.js
@@ -21,7 +21,7 @@ module.exports = {
  <%_ } _%>
  'plugin:nuxt/recommended',
  <%_ if (prettier) { _%>
- 'prettier'
+ 'plugin:prettier/recommended'
  <%_ } _%>
  ],
  plugins: [

diff --git a/packages/cna-template/template/nuxt/package.js b/packages/cna-template/template/nuxt/package.js
@@ -44,6 +44,9 @@ module.exports = {
  delete pkg.devDependencies['stylelint-config-standard']
  delete pkg.devDependencies['stylelint-config-prettier']
  }
+ if (!eslint || !prettier) {
+ delete pkg.devDependencies['eslint-plugin-prettier']
+ }
  if (!prettier) {
  delete pkg.devDependencies['eslint-config-prettier']
  delete pkg.devDependencies['stylelint-config-prettier']

diff --git a/packages/cna-template/template/nuxt/package.json b/packages/cna-template/template/nuxt/package.json
@@ -32,6 +32,7 @@
  "eslint": "^7.32.0",
  "eslint-config-prettier": "^8.3.0",
  "eslint-plugin-nuxt": "^2.0.0",
+ "eslint-plugin-prettier": "^3.4.1",
  "eslint-plugin-vue": "^7.16.0",
  "husky": "^6.0.0",
  "lint-staged": "^10.5.4",

diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.md b/packages/create-nuxt-app/test/snapshots/index.test.js.md
@@ -2099,6 +2099,7 @@ Generated by [AVA](https://avajs.dev).
   eslint: '^7.32.0',
   'eslint-config-prettier': '^8.3.0',
   'eslint-plugin-nuxt': '^2.0.0',
+  'eslint-plugin-prettier': '^3.4.1',
   'eslint-plugin-vue': '^7.16.0',
   husky: '^6.0.0',
   'lint-staged': '^10.5.4',

diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.snap b/packages/create-nuxt-app/test/snapshots/index.test.js.snap