Merge pull request #1434 from NullVoxPopuli/enable-prettier-in-ci

Add prettier to lint, don't run lint with tests

Author: NullVoxPopuli

.github/workflows/ci.yml

@@ -11,6 +11,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  lint:
+    name: Lints
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'pnpm'
+      - run: pnpm install
+      - run: pnpm lint
+
   test:
     name: Tests
     runs-on: ubuntu-latest
@@ -24,7 +39,6 @@ jobs:
           node-version: 18
           cache: 'pnpm'
       - run: pnpm install
-      - run: pnpm lint
       - run: pnpm test:ember
 
   test-node:

.prettierignore

@@ -11,3 +11,11 @@
 
 # ember-try
 /.node_modules.ember-try/
+
+# Ignored when enabling prettier in CI
+# Changes are too much, and also not super functional
+*.yml
+*.yaml
+*.md
+*.html
+*.json

addon-test-support/-private/async-iterator.js

@@ -115,7 +115,6 @@ export default class AsyncIterator {
         );
         reject(err);
       } else {
-         
         console.error(
           `EmberExam: Promise timed out after ${this._timeout} s while waiting for response for ${this._request}. Closing browser to exit gracefully.`,
         );

addon-test-support/load.js

@@ -11,7 +11,6 @@ let loaded = false;
  */
 export default function loadEmberExam() {
   if (loaded) {
-     
     console.warn('Attempted to load Ember Exam more than once.');
     return;
   }

lib/commands/exam/iterate.js

@@ -72,7 +72,7 @@ module.exports = {
       input = chalk.blue(input);
     }
 
-    console.info(input);  
+    console.info(input);
   },
 
   /**

lib/utils/test-page-helper.js

@@ -156,7 +156,6 @@ function getTestUrlFromTestemConfig(configFile) {
   // If there is no test_page to use as the testPage, we warn that we're using
   // a default value
   if (!testPage) {
-     
     console.warn(
       'No test_page value found in the config. Defaulting to "tests/index.html?hidepassed"',
     );

lib/utils/tests-options-validator.js

@@ -171,7 +171,6 @@ module.exports = class TestsOptionsValidator {
     let split = options.split;
 
     if (typeof split !== 'undefined' && split < 2) {
-       
       console.warn(
         'You should specify a number of files greater than 1 to split your tests across. Defaulting to 1 split which is the same as not using `split`.',
       );

node-tests/unit/utils/tests-options-validator-test.js

@@ -43,7 +43,6 @@ describe('TestOptionsValidator', function () {
   }
 
   function shouldWarn(cmd, options, value, emberCliVer = '3.7.0') {
-     
     let originalWarn = console.warn;
     let warnCalled = 0;
     let warnMessage = '';
@@ -58,7 +57,6 @@ describe('TestOptionsValidator', function () {
     assert.strictEqual(warnMessage, value);
 
     console.warn = originalWarn;
-     
   }
 
   describe('shouldSplit', function () {

package.json

@@ -19,11 +19,13 @@
   "scripts": {
     "build": "ember build --environment=production",
     "coverage": "nyc report --reporter=text-lcov | codeclimate-test-reporter",
+    "format": "prettier . --write",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:format": "prettier . --cache --check",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
-    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
+    "test": "concurrently \"npm:test:*\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each",
     "test:node": "nyc mocha 'node-tests/**/*-test.js'"

tests/dummy/app/templates/docs.hbs

@@ -8,7 +8,10 @@
     {{nav.section "Options"}}
     {{nav.item "Randomization" "docs.randomization"}}
     {{nav.item "Randomization Iterator" "docs.randomization-iterator"}}
-    {{nav.item "Generating Module Metadata For Test Execution" "docs.module-metadata"}}
+    {{nav.item
+      "Generating Module Metadata For Test Execution"
+      "docs.module-metadata"
+    }}
     {{nav.item "Splitting" "docs.splitting"}}
     {{nav.item "Split Test Parallelization" "docs.split-parallel"}}
     {{nav.item "Filtering" "docs.filtering"}}
@@ -23,4 +26,4 @@
   <viewer.main>
     {{outlet}}
   </viewer.main>
-</DocsViewer>
+</DocsViewer>