Skip to content

Commit 9bdfde1

Browse files
ljharbljharb
committed
[Dev Deps] update eslint, @ljharb/eslint-config 
1 parent acbc663 commit 9bdfde1

8 files changed

Lines changed: 109 additions & 117 deletions

‎.eslintrc‎

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

‎eslint.config.mjs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import ljharbConfig from '@ljharb/eslint-config/flat/node/14';
2+
3+
export default [
4+
{
5+
ignores: ['test/fixtures/**', 'coverage/**'],
6+
},
7+
...ljharbConfig.map((config) => (config.files ? config : { ...config, files: ['**/*.js', 'bin/ls-engines'] })),
8+
{
9+
rules: {
10+
'array-bracket-newline': 0,
11+
'func-style': 0,
12+
'id-length': 0,
13+
'max-len': 0,
14+
'max-lines': 0,
15+
'max-lines-per-function': [2, 110],
16+
'max-nested-callbacks': [2, 4],
17+
'max-params': [2, 6],
18+
'multiline-comment-style': 0,
19+
'object-curly-newline': 0,
20+
},
21+
},
22+
{
23+
files: ['checkCurrent.js', 'checkEngines.js'],
24+
rules: {
25+
'no-throw-literal': 0,
26+
},
27+
},
28+
{
29+
files: ['checkEngines.js'],
30+
rules: {
31+
'max-lines-per-function': 0,
32+
'max-params': 0,
33+
},
34+
},
35+
{
36+
files: ['getLatestMajors.js'],
37+
rules: {
38+
'no-param-reassign': [2, { props: false }],
39+
},
40+
},
41+
{
42+
files: ['test/**'],
43+
rules: {
44+
'max-lines-per-function': 0,
45+
'max-params': 0,
46+
},
47+
},
48+
];

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
"yargs": "^17.7.2"
6262
},
6363
"devDependencies": {
64-
"@ljharb/eslint-config": "^21.4.0",
64+
"@ljharb/eslint-config": "^22.1.2",
6565
"auto-changelog": "^2.5.0",
6666
"encoding": "^0.1.13",
6767
"es-value-fixtures": "^1.7.1",
68-
"eslint": "^8.57.1",
68+
"eslint": "^9.39.2",
6969
"npmignore": "^0.3.2",
7070
"nyc": "^10.3.2",
7171
"object-inspect": "^1.13.4",

‎test/getGraphEntries.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ test('getGraphEntries: default dev/peer values', async (t) => {
3636
const getGraphEntriesFresh = require('../getGraphEntries'); // eslint-disable-line global-require
3737

3838
const entries = await getGraphEntriesFresh({
39-
mode: 'ideal',
4039
dev: true,
40+
logger: silentLogger,
41+
mode: 'ideal',
4142
peer: true,
4243
production: true,
4344
selectedEngines: ['node'],
44-
logger: silentLogger,
4545
});
4646

4747
t.ok(Array.isArray(entries), 'returns an array');
@@ -52,27 +52,27 @@ test('getGraphEntries: default dev/peer values', async (t) => {
5252
test('getGraphEntries', async (t) => {
5353
t.test('returns array of entries', async (st) => {
5454
const entries = await getGraphEntries({
55-
mode: 'ideal',
5655
dev: true,
56+
logger: silentLogger,
57+
mode: 'ideal',
58+
path: fixturePath,
5759
peer: true,
5860
production: true,
5961
selectedEngines: ['node'],
60-
path: fixturePath,
61-
logger: silentLogger,
6262
});
6363

6464
st.ok(Array.isArray(entries), 'returns an array');
6565
});
6666

6767
t.test('each entry is [name, engines] tuple', async (st) => {
6868
const entries = await getGraphEntries({
69-
mode: 'ideal',
7069
dev: true,
70+
logger: silentLogger,
71+
mode: 'ideal',
72+
path: fixturePath,
7173
peer: true,
7274
production: true,
7375
selectedEngines: ['node'],
74-
path: fixturePath,
75-
logger: silentLogger,
7676
});
7777

7878
if (entries.length > 0) {
@@ -87,13 +87,13 @@ test('getGraphEntries', async (t) => {
8787

8888
t.test('entries are sorted by name then engine', async (st) => {
8989
const entries = await getGraphEntries({
90-
mode: 'ideal',
9190
dev: true,
91+
logger: silentLogger,
92+
mode: 'ideal',
93+
path: fixturePath,
9294
peer: true,
9395
production: true,
9496
selectedEngines: ['node'],
95-
path: fixturePath,
96-
logger: silentLogger,
9797
});
9898

9999
if (entries.length > 1) {
@@ -110,37 +110,37 @@ test('getGraphEntries', async (t) => {
110110

111111
t.test('filters by production flag', async (st) => {
112112
const prodEntries = await getGraphEntries({
113-
mode: 'ideal',
114113
dev: false,
114+
logger: silentLogger,
115+
mode: 'ideal',
116+
path: fixturePath,
115117
peer: false,
116118
production: true,
117119
selectedEngines: ['node'],
118-
path: fixturePath,
119-
logger: silentLogger,
120120
});
121121

122122
const allEntries = await getGraphEntries({
123-
mode: 'ideal',
124123
dev: true,
124+
logger: silentLogger,
125+
mode: 'ideal',
126+
path: fixturePath,
125127
peer: true,
126128
production: true,
127129
selectedEngines: ['node'],
128-
path: fixturePath,
129-
logger: silentLogger,
130130
});
131131

132132
st.ok(prodEntries.length <= allEntries.length, 'production-only has <= entries than all');
133133
});
134134

135135
t.test('filters out packages with engines.node = "*"', async (st) => {
136136
const entries = await getGraphEntries({
137-
mode: 'ideal',
138137
dev: true,
138+
logger: silentLogger,
139+
mode: 'ideal',
140+
path: fixturePath,
139141
peer: true,
140142
production: true,
141143
selectedEngines: ['node'],
142-
path: fixturePath,
143-
logger: silentLogger,
144144
});
145145

146146
const hasStarEngine = entries.some(([, engines]) => engines.node === '*');
@@ -152,13 +152,13 @@ test('getGraphEntries', async (t) => {
152152
const logger = (...args) => logs.push(args);
153153

154154
await getGraphEntries({
155-
mode: 'ideal',
156155
dev: true,
156+
logger,
157+
mode: 'ideal',
158+
path: fixturePath,
157159
peer: true,
158160
production: true,
159161
selectedEngines: ['node'],
160-
path: fixturePath,
161-
logger,
162162
});
163163

164164
st.ok(logs.length > 0, 'logger was called');
@@ -170,13 +170,13 @@ test('getGraphEntries', async (t) => {
170170

171171
t.test('works with ideal mode', async (st) => {
172172
const entries = await getGraphEntries({
173-
mode: 'ideal',
174173
dev: true,
174+
logger: silentLogger,
175+
mode: 'ideal',
176+
path: fixturePath,
175177
peer: true,
176178
production: true,
177179
selectedEngines: ['node'],
178-
path: fixturePath,
179-
logger: silentLogger,
180180
});
181181

182182
st.ok(Array.isArray(entries), 'mode "ideal" returns array');
@@ -186,13 +186,13 @@ test('getGraphEntries', async (t) => {
186186
// Virtual mode requires a lockfile
187187
try {
188188
const entries = await getGraphEntries({
189-
mode: 'virtual',
190189
dev: true,
190+
logger: silentLogger,
191+
mode: 'virtual',
192+
path: fixturePath,
191193
peer: true,
192194
production: true,
193195
selectedEngines: ['node'],
194-
path: fixturePath,
195-
logger: silentLogger,
196196
});
197197

198198
st.ok(Array.isArray(entries), 'mode "virtual" returns array');

‎test/getGraphValids.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ test('getGraphValids', async (t) => {
3333
));
3434

3535
const allVersions = {
36-
foo: [
37-
'v0.1.2',
38-
'v2.3.4',
39-
'v4.5.6',
40-
'v6.7.8',
41-
],
4236
bar: [
4337
'v0.1.2',
4438
'v1.2.3',
@@ -50,6 +44,12 @@ test('getGraphValids', async (t) => {
5044
'v5.6.7',
5145
'v7.8.9',
5246
],
47+
foo: [
48+
'v0.1.2',
49+
'v2.3.4',
50+
'v4.5.6',
51+
'v6.7.8',
52+
],
5353
};
5454

5555
t.deepEqual(
@@ -60,12 +60,12 @@ test('getGraphValids', async (t) => {
6060

6161
const graphEntries = [
6262
['one', {
63-
foo: '^1.0.0',
6463
bar: '>= 2',
64+
foo: '^1.0.0',
6565
}],
6666
['two', {
67-
foo: '^1.3.4',
6867
baz: '^0',
68+
foo: '^1.3.4',
6969
}],
7070
['three', {
7171
foo: '^2.0.0',
@@ -82,24 +82,24 @@ test('getGraphValids', async (t) => {
8282
[
8383
'one',
8484
{
85-
foo: '^1.0.0',
8685
bar: '>= 2',
86+
foo: '^1.0.0',
8787
},
8888
{
89-
foo: [],
9089
bar: ['v3.4.5', 'v5.6.7'],
9190
baz: allVersions.baz,
91+
foo: [],
9292
},
9393
],
9494
[
9595
'two',
9696
{
97-
foo: '^1.3.4', baz: '^0',
97+
baz: '^0', foo: '^1.3.4',
9898
},
9999
{
100-
foo: [],
101100
bar: allVersions.bar,
102101
baz: [],
102+
foo: [],
103103
},
104104
],
105105
[
@@ -108,9 +108,9 @@ test('getGraphValids', async (t) => {
108108
foo: '^2.0.0',
109109
},
110110
{
111-
foo: ['v2.3.4'],
112111
bar: allVersions.bar,
113112
baz: allVersions.baz,
113+
foo: ['v2.3.4'],
114114
},
115115
],
116116
[
@@ -119,16 +119,16 @@ test('getGraphValids', async (t) => {
119119
foo: '^2.4.5',
120120
},
121121
{
122-
foo: [],
123122
bar: allVersions.bar,
124123
baz: allVersions.baz,
124+
foo: [],
125125
},
126126
],
127127
],
128128
valids: {
129-
foo: [],
130129
bar: ['v5.6.7', 'v3.4.5'],
131130
baz: [],
131+
foo: [],
132132
},
133133
},
134134
'handles a populated graphEntries array',

0 commit comments

Comments
 (0)