Run prettier separately

.prettierignore

@@ -1 +1,4 @@
+files/
 tests/fixtures/
+
+*.md

files/__addonLocation__/.eslintrc.cjs

@@ -14,7 +14,7 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended',
-    'plugin:prettier/recommended',
+    'prettier',
   ],
   env: {
     browser: true,

files/__addonLocation__/package.json

@@ -24,6 +24,8 @@
     "lint:js": "eslint . --cache",
     "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
     "lint:js:fix": "eslint . --fix",<% if (typescript) { %>
+    "lint:prettier": "prettier --check .",
+    "lint:prettier:fix": "prettier --write .",
     "lint:types": "glint",
     "start": "concurrently 'npm:start:*'",
     "start:js": "rollup --config --watch --no-watch.clearScreen",
@@ -75,7 +77,6 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^11.6.0",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-prettier": "^4.0.0",
     "prettier": "^2.5.1",
     "prettier-plugin-ember-template-tag": "^1.0.0",
     "rollup": "^3.21.8"<% if (!isExistingMonorepo) { %>,

index.js

@@ -38,7 +38,7 @@ module.exports = {
     if (!options.addonOnly) {
       if (fs.existsSync(path.join('..', 'package.json'))) {
         options.ui.writeInfoLine(
-          "Existing monorepo detected! The blueprint will only create the addon and test-app folders, and omit any other files in the repo's root folder."
+          "Existing monorepo detected! The blueprint will only create the addon and test-app folders, and omit any other files in the repo's root folder.",
         );
 
         this.isExistingMonorepo = true;
@@ -79,7 +79,7 @@ module.exports = {
           }
 
           await fs.writeFile(packageJson, JSON.stringify(json, null, 2));
-        })()
+        })(),
       );
 
       if (options.pnpm) {
@@ -97,7 +97,7 @@ module.exports = {
       await this.moveFilesForExistingMonorepo(options);
 
       this.ui.writeWarnLine(
-        `Make sure your workspaces are configured correctly to cover the newly created ${addonInfo.location} and ${testAppInfo.location} packages!`
+        `Make sure your workspaces are configured correctly to cover the newly created ${addonInfo.location} and ${testAppInfo.location} packages!`,
       );
     }
 
@@ -118,7 +118,7 @@ module.exports = {
     assert(
       !options.addonOnly,
       `When in --addon-only mode, we don't need to move files within an existing monorepo. ` +
-        `If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`
+        `If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`,
     );
 
     let addonInfo = addonInfoFromOptions(options);
@@ -151,7 +151,7 @@ module.exports = {
     assert(
       !options.addonOnly,
       `When in --addon-only mode, we don't create a test-app. ` +
-        `If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`
+        `If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`,
     );
 
     const appBlueprint = this.lookupBlueprint('app');
@@ -190,11 +190,11 @@ module.exports = {
 
       if (lt(hasVersion, needsVersion)) {
         this.ui.writeWarnLine(
-          `Your version ${hasVersion} of Ember CLI does not support the --typescript flag yet. Please run \`ember install ember-cli-typescript\` in the ${testAppInfo.location} folder manually!`
+          `Your version ${hasVersion} of Ember CLI does not support the --typescript flag yet. Please run \`ember install ember-cli-typescript\` in the ${testAppInfo.location} folder manually!`,
         );
       } else if (lt(hasVersion, recommendedVersion)) {
         this.ui.writeWarnLine(
-          `We recommend using Ember CLI >= ${recommendedVersion} for the best blueprint support when using TypeScript!`
+          `We recommend using Ember CLI >= ${recommendedVersion} for the best blueprint support when using TypeScript!`,
         );
       }
     }
@@ -298,7 +298,7 @@ module.exports = {
       let ignoredFiles = ['__addonLocation__/tsconfig.json'];
 
       files = files.filter(
-        (filename) => !filename.match(/.*\.ts$/) && !ignoredFiles.includes(filename)
+        (filename) => !filename.match(/.*\.ts$/) && !ignoredFiles.includes(filename),
       );
     }
 
@@ -316,7 +316,7 @@ module.exports = {
 
     if (this.project.isEmberCLIProject() && !this.project.isEmberCLIAddon()) {
       throw new SilentError(
-        'Generating an addon in an existing ember-cli project is not supported.'
+        'Generating an addon in an existing ember-cli project is not supported.',
       );
     }
 

package.json

@@ -9,8 +9,12 @@
   "license": "MIT",
   "author": "simonihmig <[email protected]>",
   "scripts": {
-    "lint": "eslint . --cache",
-    "lint:fix": "eslint . --fix",
+    "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
+    "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
+    "lint:prettier": "prettier -c .",
+    "lint:prettier:fix": "prettier -w .",
     "test": "pnpm --filter 'blueprint-tests' test"
   },
   "dependencies": {
@@ -29,6 +33,7 @@
     "@release-it-plugins/lerna-changelog": "^5.0.0",
     "@typescript-eslint/eslint-plugin": "^6.4.0",
     "@typescript-eslint/parser": "^6.4.0",
+    "concurrently": "^8.2.0",
     "eslint": "^8.19.0",
     "prettier": "^3.0.2",
     "release-it": "^15.5.0",