Skip to content

Commit f7f5e7a

Browse files
committed
Update ESLint configuration
1 parent 7970fbe commit f7f5e7a

16 files changed

Lines changed: 142 additions & 164 deletions

File tree

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1-
node_modules/
2-
tmp/
3-
.DS_Store
4-
*.swp
5-
6-
dist/**/*.zip
7-
dist/testing
8-
9-
dist_prev
10-
11-
*.xpi
12-
13-
.mozilla-addon-sdk
14-
15-
aws.json
16-
config/secrets.json
17-
18-
# ember-try
19-
.node_modules.ember-try/
20-
bower.json.ember-try
21-
package.json.ember-try
22-
23-
.idea/
1+
# Development tooling — not needed in the published package
2+
babel.config.js
3+
ember-cli-build.js
4+
eslint.config.mjs
5+
gulpfile.js
6+
testem.js
7+
scripts/
8+
tests/

packages/ember-inspector/app/components/list.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global basicContext */
2+
13
import Component from '@glimmer/component';
24
import { tracked } from '@glimmer/tracking';
35
import { localCopy } from 'tracked-toolbox';
@@ -199,11 +201,10 @@ export default class ListComponent extends Component {
199201
* @property debounceColumnWidths
200202
* @type {Object} Ember Concurrency task
201203
*/
202-
// @task({restartable: true})
203-
debounceColumnWidths = task({restartable: true} , async () => {
204+
debounceColumnWidths = task({ restartable: true }, async () => {
204205
await timeout(100);
205206
this.resizableColumns.setTableWidth(this.getTableWidth());
206-
})
207+
});
207208

208209
/**
209210
* Hook called when the component element will be destroyed.

packages/ember-inspector/app/components/object-inspector/properties-all.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ export default class PropertiesAll extends PropertiesBase {
2828
? p.name.toLowerCase().indexOf(this.args.customFilter.toLowerCase()) >
2929
-1
3030
: true;
31-
return !p.hasOwnProperty('overridden') && shouldApplyCustomFilter;
31+
return (
32+
!Object.prototype.hasOwnProperty.call(p, 'overridden') &&
33+
shouldApplyCustomFilter
34+
);
3235
}, this);
3336
}, this);
3437

packages/ember-inspector/app/services/adapters/basic.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ export default class Basic extends Service {
7474
*
7575
* @param _neededVersion (The version to go to)
7676
*/
77-
onVersionMismatch(_neededVersion) {}
77+
onVersionMismatch(/* _neededVersion */) {}
7878

7979
/**
8080
Used to send messages to EmberDebug
8181
8282
@param _message the message to send
8383
**/
84-
sendMessage(_message) {}
84+
sendMessage(/* _message */) {}
8585

8686
/**
8787
Register functions to be called
@@ -99,7 +99,8 @@ export default class Basic extends Service {
9999

100100
// Called when the "Reload" is clicked by the user
101101
willReload() {}
102-
openResource(_file, _line) {}
102+
103+
openResource(/* _file, _line */) {}
103104

104105
@action
105106
refreshPage() {

packages/ember-inspector/app/services/adapters/chrome.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global chrome */
2+
13
import WebExtension from './web-extension';
24
import { tracked } from '@glimmer/tracking';
35

packages/ember-inspector/app/services/adapters/web-extension.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global chrome */
2+
13
import { tracked } from '@glimmer/tracking';
24

35
import BasicAdapter from './basic';

packages/ember-inspector/babel.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-env node */
2-
31
module.exports = {
42
plugins: [
53
[

packages/ember-inspector/config/ember-try.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable n/no-unpublished-require */
2+
13
'use strict';
24

35
const getChannelURL = require('ember-source-channel-url');

packages/ember-inspector/ember-cli-build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
'use strict';
1+
/* eslint-disable no-undef */
22

3+
'use strict';
34
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
45
const VersionChecker = require('ember-cli-version-checker');
56
const mergeTrees = require('broccoli-merge-trees');

packages/ember-inspector/eslint.config.mjs

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,33 @@
1414
*/
1515
import globals from 'globals';
1616
import js from '@eslint/js';
17+
import { defineConfig, globalIgnores } from 'eslint/config';
1718

1819
import ember from 'eslint-plugin-ember/recommended';
19-
20-
import prettierConfig from 'eslint-config-prettier';
20+
import eslintConfigPrettier from 'eslint-config-prettier';
2121
import qunit from 'eslint-plugin-qunit';
2222
import n from 'eslint-plugin-n';
2323

24-
import babelParser from '@babel/eslint-parser';
24+
import babelParser from '@babel/eslint-parser/experimental-worker';
2525

26-
const parserOptions = {
27-
esm: {
28-
js: {
29-
ecmaFeatures: { modules: true },
30-
ecmaVersion: 'latest',
31-
requireConfigFile: false,
32-
babelOptions: {
33-
plugins: [
34-
[
35-
'@babel/plugin-proposal-decorators',
36-
{ decoratorsBeforeExport: true },
37-
],
38-
],
39-
},
40-
},
41-
},
26+
const esmParserOptions = {
27+
ecmaFeatures: { modules: true },
28+
ecmaVersion: 'latest',
4229
};
4330

44-
export default [
31+
export default defineConfig([
32+
globalIgnores([
33+
'dist/',
34+
'dist_prev/',
35+
'vendor/',
36+
'coverage/',
37+
'skeletons/',
38+
'!**/.*',
39+
]),
4540
js.configs.recommended,
41+
eslintConfigPrettier,
4642
ember.configs.base,
4743
ember.configs.gjs,
48-
prettierConfig,
49-
/**
50-
* Ignores must be in their own object
51-
* https://eslint.org/docs/latest/use/configure/ignore
52-
*/
53-
{
54-
ignores: [
55-
'dist/',
56-
'node_modules/',
57-
'coverage/',
58-
'!**/.*',
59-
'vendor/',
60-
'dist_prev/',
61-
'skeletons/',
62-
],
63-
},
6444
/**
6545
* https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
6646
*/
@@ -69,33 +49,26 @@ export default [
6949
reportUnusedDisableDirectives: 'error',
7050
},
7151
},
72-
{
73-
rules: {
74-
'no-prototype-builtins': 'off',
75-
'no-useless-escape': 'off',
76-
'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
77-
},
78-
},
7952
{
8053
files: ['**/*.js'],
8154
languageOptions: {
8255
parser: babelParser,
8356
},
57+
rules: {
58+
'no-useless-escape': 'off',
59+
},
8460
},
8561
{
8662
files: ['**/*.{js,gjs}'],
8763
languageOptions: {
88-
parserOptions: parserOptions.esm.js,
64+
parserOptions: esmParserOptions,
8965
globals: {
9066
...globals.browser,
91-
basicContext: false,
92-
requireModule: false,
93-
globalThis: true,
94-
chrome: 'readonly',
9567
},
9668
},
9769
},
9870
{
71+
...qunit.configs.recommended,
9972
files: ['tests/**/*-test.{js,gjs}'],
10073
plugins: {
10174
qunit,
@@ -105,19 +78,16 @@ export default [
10578
* CJS node files
10679
*/
10780
{
81+
...n.configs['flat/recommended-script'],
10882
files: [
10983
'**/*.cjs',
110-
'config/**/*.js',
111-
'lib/*/index.js',
112-
'scripts/**/*.js',
113-
'testem.js',
114-
'testem*.js',
11584
'.prettierrc.js',
11685
'.stylelintrc.js',
11786
'.template-lintrc.js',
11887
'babel.config.js',
119-
'ember-cli-build.js',
120-
'gulpfile.js',
88+
'config/**/*.js',
89+
'scripts/download-panes.js',
90+
'testem.js',
12191
],
12292
plugins: {
12393
n,
@@ -128,15 +98,14 @@ export default [
12898
ecmaVersion: 'latest',
12999
globals: {
130100
...globals.node,
131-
basicContext: false,
132-
requireModule: false,
133101
},
134102
},
135103
},
136104
/**
137105
* ESM node files
138106
*/
139107
{
108+
...n.configs['flat/recommended-module'],
140109
files: ['**/*.mjs'],
141110
plugins: {
142111
n,
@@ -145,12 +114,22 @@ export default [
145114
languageOptions: {
146115
sourceType: 'module',
147116
ecmaVersion: 'latest',
148-
parserOptions: parserOptions.esm.js,
117+
parserOptions: esmParserOptions,
118+
globals: {
119+
...globals.node,
120+
},
121+
},
122+
},
123+
/**
124+
* Gulp files
125+
*/
126+
{
127+
files: ['gulpfile.js'],
128+
languageOptions: {
149129
globals: {
150130
...globals.node,
151-
basicContext: false,
152-
requireModule: false,
131+
gulp: 'readonly',
153132
},
154133
},
155134
},
156-
];
135+
]);

0 commit comments

Comments
 (0)