Skip to content

Commit 93c688b

Browse files
Merge pull request #1431 from NullVoxPopuli/upgrade-lint-and-prettier
Upgrade eslint / prettier
2 parents 93915f0 + f0a7225 commit 93c688b

17 files changed

Lines changed: 561 additions & 739 deletions

.eslintignore

Lines changed: 0 additions & 13 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 73 deletions
This file was deleted.

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/yarn.lock
3232
/*.tgz
3333
.gitkeep
34+
eslint.config.mjs
3435

3536
# ember-try
3637
/.node_modules.ember-try/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default class AsyncIterator {
115115
);
116116
reject(err);
117117
} else {
118-
// eslint-disable-next-line no-console
118+
119119
console.error(
120120
`EmberExam: Promise timed out after ${this._timeout} s while waiting for response for ${this._request}. Closing browser to exit gracefully.`,
121121
);

addon-test-support/.eslintrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

addon-test-support/load.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let loaded = false;
1111
*/
1212
export default function loadEmberExam() {
1313
if (loaded) {
14-
// eslint-disable-next-line no-console
14+
1515
console.warn('Attempted to load Ember Exam more than once.');
1616
return;
1717
}

eslint.config.mjs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import globals from "globals";
2+
import { ember } from "ember-eslint";
3+
import * as url from "url";
4+
5+
// Needed until Node 20
6+
const dirname = url.fileURLToPath(new URL(".", import.meta.url));
7+
8+
export default [
9+
...ember.recommended(dirname),
10+
{
11+
files: ["lib/**/*"],
12+
languageOptions: {
13+
globals: {
14+
...globals.node,
15+
},
16+
},
17+
},
18+
{
19+
files: ["node-tests/**/*"],
20+
languageOptions: {
21+
globals: {
22+
...globals.node,
23+
...globals.mocha,
24+
},
25+
},
26+
rules: {
27+
"ember/no-test-support-import": "off",
28+
},
29+
},
30+
];

lib/.eslintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/commands/exam.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const {
99
getMultipleTestPages,
1010
} = require('../utils/test-page-helper');
1111
const TestemEvents = require('../utils/testem-events');
12-
const TestCommand = require('ember-cli/lib/commands/test'); // eslint-disable-line n/no-unpublished-require
12+
const TestCommand = require('ember-cli/lib/commands/test');
1313
const TestServerTask = require('./task/test-server');
1414
const TestTask = require('./task/test');
1515

lib/commands/exam/iterate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ module.exports = {
7272
input = chalk.blue(input);
7373
}
7474

75-
console.info(input); // eslint-disable-line no-console
75+
console.info(input);
7676
},
7777

7878
/**

0 commit comments

Comments
 (0)