Skip to content

Commit 2be2858

Browse files
committed
Split prettier out of eslint
1 parent f98e37e commit 2be2858

File tree

4 files changed

+11
-60
lines changed

4 files changed

+11
-60
lines changed

.prettierignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
blueprints/*/*files/
2+
node-tests/fixtures/**/*.js
3+
docs/
4+
**/.*
5+
**/dist/
6+
**/tmp/
7+
**/smoke-tests/
8+
**/types/
9+
**/type-tests/

eslint.config.mjs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { fixupConfigRules } from '@eslint/compat';
21
import emberInternal from 'eslint-plugin-ember-internal';
32
import importPlugin from 'eslint-plugin-import';
43
import qunitPluginRecommended from 'eslint-plugin-qunit/configs/recommended';
@@ -9,15 +8,9 @@ import nodePlugin from 'eslint-plugin-n';
98
import path from 'node:path';
109
import { fileURLToPath } from 'node:url';
1110
import pluginJs from '@eslint/js';
12-
import { FlatCompat } from '@eslint/eslintrc';
1311

1412
const __filename = fileURLToPath(import.meta.url);
1513
const __dirname = path.dirname(__filename);
16-
const compat = new FlatCompat({
17-
baseDirectory: __dirname,
18-
recommendedConfig: pluginJs.configs.recommended,
19-
allConfig: pluginJs.configs.all,
20-
});
2114

2215
export default [
2316
{
@@ -38,7 +31,6 @@ export default [
3831
importPlugin.flatConfigs.errors,
3932
importPlugin.flatConfigs.typescript,
4033
qunitPluginRecommended,
41-
...fixupConfigRules(compat.extends('plugin:prettier/recommended')),
4234
{
4335
plugins: {
4436
'ember-internal': emberInternal,

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
"lint:eslint": "eslint --report-unused-disable-directives --cache .",
5353
"lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
5454
"lint:fix": "npm-run-all lint:*:fix",
55+
"lint:format": "prettier --check .",
56+
"lint:format:fix": "prettier --write .",
5557
"test": "node bin/run-tests.js",
5658
"test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
5759
"test:node": "qunit tests/node/**/*-test.js",
@@ -111,8 +113,6 @@
111113
"@babel/preset-env": "^7.16.11",
112114
"@babel/types": "^7.22.5",
113115
"@embroider/shared-internals": "^2.5.0",
114-
"@eslint/compat": "^1.2.7",
115-
"@eslint/eslintrc": "^3.3.0",
116116
"@eslint/js": "^9.21.0",
117117
"@glimmer/component": "workspace:^",
118118
"@rollup/plugin-babel": "^6.0.4",
@@ -134,13 +134,11 @@
134134
"ember-cli-dependency-checker": "^3.3.1",
135135
"ember-cli-yuidoc": "^0.9.1",
136136
"eslint": "^9.21.0",
137-
"eslint-config-prettier": "^9.1.0",
138137
"eslint-import-resolver-node": "^0.3.7",
139138
"eslint-plugin-disable-features": "^0.1.3",
140139
"eslint-plugin-ember-internal": "^3.0.0",
141140
"eslint-plugin-import": "^2.31.0",
142141
"eslint-plugin-n": "^17.16.2",
143-
"eslint-plugin-prettier": "^4.2.1",
144142
"eslint-plugin-qunit": "^8.1.2",
145143
"execa": "^5.1.1",
146144
"expect-type": "^0.15.0",

pnpm-lock.yaml

Lines changed: 0 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)