Skip to content

Commit 51ffd89

Browse files
connorsheaSysix
connorshea
and
Sysix
authored
fix: improve global/env translation and cleaning up of overrides (#245)
* Add serviceworker and worker to the list of globalsm to allow flexibility on. And also improve the tests a bit. * Add more tests for serviceworker. * Strip out supersets from environment values in the migrated configs. This ensures that we aren't providing unnecessary extra values for the `env` key. I wrote a script to confirm these values were the ones that are supersets, but theoretically we could also just update this to use the `globals` package directly and determine supersets at runtime? * Add svelte, astro, and vue to match the rust crate. * Fix the implementation of cleanUpSupersetEnvs. * Skip envs not in the config. * Upgrade tsgolint * Add a many-extends config spec. This is showing a current problem where multiple extends are not being merged properly, and so we end up with exact-duplicate overrides. * Add fix for consecutive identical overrides. Saw this from the mastodon config file after trying to migrate it, so now it's fixed :) * Add basic cleanup tests. * Add more complex env superset resolution. This was heavily helped by AI, but looking through the tests and running it on the snapshots, it looks like it works correctly for all the cases I can come up with. * Add an integration test that shows the duplicated `"no-console": "off",` overrides being emitted (albeit with differing sets of files). Will fix this with the next commit. * Simplify example config/snapshot a lot. * Fix a comment that gets parsed as an ignore directive * Add fix for duplicate overrides objects. If the only difference is the set of files, merge the override objects and combine the file lists. * Add more test cases. * update --------- Co-authored-by: Sysix <[email protected]>
1 parent 5ab97bf commit 51ffd89

21 files changed

+2405
-148
lines changed

‎integration_test/__snapshots__/autoprefixer.spec.ts.snap‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ exports[`autoprefixer > autoprefixer 1`] = `
99
},
1010
"env": {
1111
"builtin": true,
12-
"commonjs": true,
1312
"es2024": true,
1413
"node": true,
15-
"shared-node-browser": true,
1614
},
1715
"globals": {
1816
"document": "readonly",
@@ -299,10 +297,8 @@ exports[`autoprefixer --js-plugins > autoprefixer--js-plugins 1`] = `
299297
},
300298
"env": {
301299
"builtin": true,
302-
"commonjs": true,
303300
"es2024": true,
304301
"node": true,
305-
"shared-node-browser": true,
306302
},
307303
"globals": {
308304
"document": "readonly",
@@ -733,10 +729,8 @@ exports[`autoprefixer --type-aware > autoprefixer--type-aware 1`] = `
733729
},
734730
"env": {
735731
"builtin": true,
736-
"commonjs": true,
737732
"es2024": true,
738733
"node": true,
739-
"shared-node-browser": true,
740734
},
741735
"globals": {
742736
"document": "readonly",
@@ -1024,10 +1018,8 @@ exports[`autoprefixer merge > autoprefixer--merge 1`] = `
10241018
},
10251019
"env": {
10261020
"builtin": true,
1027-
"commonjs": true,
10281021
"es2024": true,
10291022
"node": true,
1030-
"shared-node-browser": true,
10311023
},
10321024
"globals": {
10331025
"document": "readonly",

‎integration_test/__snapshots__/duplicate-overrides.spec.ts.snap‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2+
3+
exports[`duplicate-overrides > duplicate-overrides 1`] = `
4+
{
5+
"config": {
6+
"$schema": "./node_modules/oxlint/configuration_schema.json",
7+
"categories": {
8+
"correctness": "off",
9+
},
10+
"env": {
11+
"builtin": true,
12+
},
13+
"overrides": [
14+
{
15+
"files": [
16+
"**/*.js",
17+
"**/*.cjs",
18+
"**/*.mjs",
19+
],
20+
"rules": {
21+
"no-unused-vars": "error",
22+
},
23+
},
24+
{
25+
"files": [
26+
"**/*.ts",
27+
"**/*.mts",
28+
"**/*.cts",
29+
],
30+
"rules": {
31+
"arrow-body-style": "error",
32+
},
33+
},
34+
],
35+
"plugins": [],
36+
},
37+
"warnings": [],
38+
}
39+
`;
40+
41+
exports[`duplicate-overrides --js-plugins > duplicate-overrides--js-plugins 1`] = `
42+
{
43+
"config": {
44+
"$schema": "./node_modules/oxlint/configuration_schema.json",
45+
"categories": {
46+
"correctness": "off",
47+
},
48+
"env": {
49+
"builtin": true,
50+
},
51+
"overrides": [
52+
{
53+
"files": [
54+
"**/*.js",
55+
"**/*.cjs",
56+
"**/*.mjs",
57+
],
58+
"rules": {
59+
"no-unused-vars": "error",
60+
},
61+
},
62+
{
63+
"files": [
64+
"**/*.ts",
65+
"**/*.mts",
66+
"**/*.cts",
67+
],
68+
"rules": {
69+
"arrow-body-style": "error",
70+
},
71+
},
72+
],
73+
"plugins": [],
74+
},
75+
"warnings": [],
76+
}
77+
`;
78+
79+
exports[`duplicate-overrides --type-aware > duplicate-overrides--type-aware 1`] = `
80+
{
81+
"config": {
82+
"$schema": "./node_modules/oxlint/configuration_schema.json",
83+
"categories": {
84+
"correctness": "off",
85+
},
86+
"env": {
87+
"builtin": true,
88+
},
89+
"overrides": [
90+
{
91+
"files": [
92+
"**/*.js",
93+
"**/*.cjs",
94+
"**/*.mjs",
95+
],
96+
"rules": {
97+
"no-unused-vars": "error",
98+
},
99+
},
100+
{
101+
"files": [
102+
"**/*.ts",
103+
"**/*.mts",
104+
"**/*.cts",
105+
],
106+
"rules": {
107+
"arrow-body-style": "error",
108+
},
109+
},
110+
],
111+
"plugins": [],
112+
},
113+
"warnings": [],
114+
}
115+
`;
116+
117+
exports[`duplicate-overrides merge > duplicate-overrides--merge 1`] = `
118+
{
119+
"config": {
120+
"$schema": "./node_modules/oxlint/configuration_schema.json",
121+
"categories": {
122+
"correctness": "error",
123+
"perf": "error",
124+
},
125+
"env": {
126+
"builtin": true,
127+
},
128+
"overrides": [
129+
{
130+
"files": [
131+
"**/*.js",
132+
"**/*.cjs",
133+
"**/*.mjs",
134+
],
135+
"rules": {
136+
"no-unused-vars": "error",
137+
},
138+
},
139+
{
140+
"files": [
141+
"**/*.ts",
142+
"**/*.mts",
143+
"**/*.cts",
144+
],
145+
"rules": {
146+
"arrow-body-style": "error",
147+
},
148+
},
149+
],
150+
},
151+
"warnings": [],
152+
}
153+
`;

‎integration_test/__snapshots__/eslint-globals.spec.ts.snap‎

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ exports[`eslint-globals > eslint-globals 1`] = `
1414
{
1515
"env": {
1616
"browser": true,
17-
"commonjs": true,
1817
"es2026": true,
1918
"node": true,
20-
"shared-node-browser": true,
2119
},
2220
"files": [
2321
"**/*.js",
@@ -28,6 +26,19 @@ exports[`eslint-globals > eslint-globals 1`] = `
2826
"no-unused-vars": "error",
2927
},
3028
},
29+
{
30+
"env": {
31+
"browser": true,
32+
"serviceworker": true,
33+
"worker": true,
34+
},
35+
"files": [
36+
"**/*.ts",
37+
],
38+
"rules": {
39+
"arrow-body-style": "error",
40+
},
41+
},
3142
],
3243
"plugins": [],
3344
},
@@ -49,10 +60,8 @@ exports[`eslint-globals --js-plugins > eslint-globals--js-plugins 1`] = `
4960
{
5061
"env": {
5162
"browser": true,
52-
"commonjs": true,
5363
"es2026": true,
5464
"node": true,
55-
"shared-node-browser": true,
5665
},
5766
"files": [
5867
"**/*.js",
@@ -63,6 +72,19 @@ exports[`eslint-globals --js-plugins > eslint-globals--js-plugins 1`] = `
6372
"no-unused-vars": "error",
6473
},
6574
},
75+
{
76+
"env": {
77+
"browser": true,
78+
"serviceworker": true,
79+
"worker": true,
80+
},
81+
"files": [
82+
"**/*.ts",
83+
],
84+
"rules": {
85+
"arrow-body-style": "error",
86+
},
87+
},
6688
],
6789
"plugins": [],
6890
},
@@ -84,10 +106,8 @@ exports[`eslint-globals --type-aware > eslint-globals--type-aware 1`] = `
84106
{
85107
"env": {
86108
"browser": true,
87-
"commonjs": true,
88109
"es2026": true,
89110
"node": true,
90-
"shared-node-browser": true,
91111
},
92112
"files": [
93113
"**/*.js",
@@ -98,6 +118,19 @@ exports[`eslint-globals --type-aware > eslint-globals--type-aware 1`] = `
98118
"no-unused-vars": "error",
99119
},
100120
},
121+
{
122+
"env": {
123+
"browser": true,
124+
"serviceworker": true,
125+
"worker": true,
126+
},
127+
"files": [
128+
"**/*.ts",
129+
],
130+
"rules": {
131+
"arrow-body-style": "error",
132+
},
133+
},
101134
],
102135
"plugins": [],
103136
},
@@ -120,10 +153,8 @@ exports[`eslint-globals merge > eslint-globals--merge 1`] = `
120153
{
121154
"env": {
122155
"browser": true,
123-
"commonjs": true,
124156
"es2026": true,
125157
"node": true,
126-
"shared-node-browser": true,
127158
},
128159
"files": [
129160
"**/*.js",
@@ -134,6 +165,19 @@ exports[`eslint-globals merge > eslint-globals--merge 1`] = `
134165
"no-unused-vars": "error",
135166
},
136167
},
168+
{
169+
"env": {
170+
"browser": true,
171+
"serviceworker": true,
172+
"worker": true,
173+
},
174+
"files": [
175+
"**/*.ts",
176+
],
177+
"rules": {
178+
"arrow-body-style": "error",
179+
},
180+
},
137181
],
138182
},
139183
"warnings": [],

0 commit comments

Comments
 (0)