Merge pull request #35 from ember-cli/nvp/prettier-on-own-code

Adjust the lint command / enforce prettier in CI (our code, not for the output)

Author: NullVoxPopuli

.prettierignore

@@ -0,0 +1,8 @@
+files/
+node_modules/
+tests/fixture/
+tests/fixture-ts/
+
+*.yml
+*.yaml
+*.md

eslint.config.mjs

@@ -25,6 +25,10 @@ export default [
   pluginJs.configs.recommended,
   eslintConfigPrettier,
   {
-    ignores: ['tests/fixture/*', 'tests/fixture-ts/*', 'files/ember-cli-build.js'],
+    ignores: [
+      'tests/fixture/*',
+      'tests/fixture-ts/*',
+      'files/ember-cli-build.js',
+    ],
   },
 ];

index.js

@@ -24,7 +24,8 @@ module.exports = {
     let name = stringUtil.dasherize(rawName);
     let namespace = stringUtil.classify(rawName);
 
-    let hasOptions = !options.welcome || options.packageManager || options.ciProvider;
+    let hasOptions =
+      !options.welcome || options.packageManager || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -66,7 +67,8 @@ module.exports = {
       blueprintVersion: require('./package').version,
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
-      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      npm:
+        options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
       invokeScriptPrefix,
       execBinPrefix,
       welcome: options.welcome,
@@ -93,7 +95,9 @@ module.exports = {
 
     if (!options.typescript) {
       files = files.filter(
-        (file) => !['tsconfig.json', 'app/config/', 'types/'].includes(file) && !file.endsWith('.d.ts')
+        (file) =>
+          !['tsconfig.json', 'app/config/', 'types/'].includes(file) &&
+          !file.endsWith('.d.ts'),
       );
     }
 
@@ -110,7 +114,12 @@ module.exports = {
   beforeInstall() {
     const prependEmoji = require('./lib/prepend-emoji');
 
-    this.ui.writeLine(prependEmoji('✨', `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`));
+    this.ui.writeLine(
+      prependEmoji(
+        '✨',
+        `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`,
+      ),
+    );
   },
 
   /**

lib/prepend-emoji.js

@@ -2,7 +2,9 @@
 
 function supportEmoji() {
   const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
-  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
+  return (
+    process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff
+  );
 }
 
 const areEmojiSupported = supportEmoji();

package.json

@@ -13,7 +13,11 @@
   "author": "",
   "main": "index.js",
   "scripts": {
-    "lint": "eslint .",
+    "lint": "concurrently 'pnpm:lint:*(!fix)'",
+    "lint:fix": "pnpm lint:eslint && pnpm format",
+    "lint:eslint": "eslint .",
+    "lint:prettier": "prettier . --check",
+    "format": "prettier . --write",
     "test": "vitest"
   },
   "dependencies": {
@@ -24,6 +28,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.3.0",
+    "concurrently": "^9.1.2",
     "ember-cli": "^6.3.1",
     "eslint": "9.x",
     "eslint-config-prettier": "^9.1.0",