fix: reorder prettier in lintfix to avoid eslint conflicts, fix nuxt#827

scscgit · Sep 6, 2021 · 9a5a997 · 9a5a997
1 parent 6585d22
commit 9a5a997
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/cna-template/template/nuxt/package.js b/packages/cna-template/template/nuxt/package.js
@@ -22,9 +22,11 @@ module.exports = {
  prettier: '<%= pmRun %> lint:prettier'
  }
  const lintfixScripts = {
+ // prettier before eslint to avoid conflicting rules like no-return-assign
+ // without having to use prettier via eslint (plugin:prettier/recommended)
+ prettier: 'prettier --write --list-different .',
  eslint: "<%= pmRun %> lint:js <%= pm === 'npm' ? '-- ' : '' %>--fix",
- stylelint: "<%= pmRun %> lint:style <%= pm === 'npm' ? '-- ' : '' %>--fix",
- prettier: 'prettier --write --list-different .'
+ stylelint: "<%= pmRun %> lint:style <%= pm === 'npm' ? '-- ' : '' %>--fix"
  }
 
  if (!eslint) {

diff --git a/packages/create-nuxt-app/test/snapshots/index.test.js.md b/packages/create-nuxt-app/test/snapshots/index.test.js.md
@@ -2122,7 +2122,7 @@ Generated by [AVA](https://avajs.dev).
   'lint:js': 'eslint --ext ".js,.vue" --ignore-path .gitignore .',
   'lint:prettier': 'prettier --check .',
   'lint:style': 'stylelint "**/*.{css,scss,sass,html,vue}" --ignore-path .gitignore',
-  lintfix: 'yarn lint:js --fix && yarn lint:style --fix && prettier --write --list-different .',
+  lintfix: 'prettier --write --list-different . && yarn lint:js --fix && yarn lint:style --fix',
   prepare: 'husky install',
   start: 'nuxt start',
   },

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