diff --git a/.eslintrc.js b/.eslintrc.js index 5a4e92c89..7608c97cc 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,24 +13,12 @@ module.exports = { ], }, }, - plugins: ['ember'], - extends: [ - 'eslint:recommended', - 'plugin:ember/recommended', - 'plugin:prettier/recommended', - ], + extends: ['eslint:recommended'], env: { browser: true, }, rules: { 'no-console': 'off', - 'ember/no-new-mixins': 'off', - 'ember/no-mixins': 'off', - 'ember/require-tagless-components': 'off', - 'ember/no-classic-classes': 'off', - 'ember/no-get': 'off', - 'ember/no-classic-components': 'off', - 'ember/no-private-routing-service': 'off', }, overrides: [ // node files @@ -62,8 +50,35 @@ module.exports = { extends: ['plugin:n/recommended'], }, { - // test files - files: ['tests/**/*-test.{js,ts}'], + files: ['**/*.{js,ts}'], + plugins: ['ember'], + parser: '@typescript-eslint/parser', + extends: [ + 'eslint:recommended', + 'plugin:ember/recommended', // or other configuration + ], + rules: { + 'ember/no-new-mixins': 'off', + 'ember/no-mixins': 'off', + 'ember/require-tagless-components': 'off', + 'ember/no-classic-classes': 'off', + 'ember/no-get': 'off', + 'ember/no-classic-components': 'off', + 'ember/no-private-routing-service': 'off', + }, + }, + { + files: ['**/*.gjs'], + parser: 'ember-eslint-parser', + plugins: ['ember'], + extends: [ + 'eslint:recommended', + 'plugin:ember/recommended', + 'plugin:ember/recommended-gjs', + ], + }, + { + files: ['tests/**/*.{js,ts,gjs,gts}'], extends: ['plugin:qunit/recommended'], }, ], diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 73046de0c..1c37919d8 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -15,7 +15,7 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 with: - cache: 'pnpm' + cache: "pnpm" node-version: 20 - run: pnpm i --frozen-lockfile - run: npx lint-to-the-future output -o lttfOutput --rootUrl ember-api-docs --previous-results https://ember-learn.github.io/ember-api-docs/data.json diff --git a/.prettierignore b/.prettierignore index 4178fd571..1492509de 100644 --- a/.prettierignore +++ b/.prettierignore @@ -23,3 +23,15 @@ /package.json.ember-try /package-lock.json.ember-try /yarn.lock.ember-try + +# Misc files +*.md +pnpm-lock.yaml +jsconfig.json + +# api docs data +/ember-api-docs-data/ + + +# hbs -- no point to prettier before moving to