Skip to content

Commit 0e3c67d

Browse files
mournergithub-actions[bot]
authored andcommitted
Replace unmaintained Node dev deps with modern alternatives
GitOrigin-RevId: 4003a9245fd84b89ef16e756d1c646ca89417326
1 parent 0d399a8 commit 0e3c67d

22 files changed

+479
-3901
lines changed

build/generate-struct-arrays.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import fs from 'fs';
1212
import ejs from 'ejs';
1313
import {createLayout, viewTypes} from '../src/util/struct_array';
1414

15-
// eslint-disable-next-line import/order
15+
// eslint-disable-next-line import-x/order
1616
import type {ViewType, StructArrayLayout, StructArrayMember} from '../src/util/struct_array';
1717

1818
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
@@ -136,7 +136,7 @@ global.camelize = camelize;
136136

137137
import particleAttributes from '../src/data/particle_attributes';
138138
import posAttributes, {posAttributesGlobeExt} from '../src/data/pos_attributes';
139-
// eslint-disable-next-line import/order
139+
// eslint-disable-next-line import-x/order
140140
import boundsAttributes from '../src/data/bounds_attributes';
141141

142142
createStructArrayType('pos', posAttributes);
@@ -163,7 +163,7 @@ import {
163163
buildingBloomAttenuationAttributes,
164164
buildingFloodLightWallRadiusAttributes
165165
} from '../3d-style/data/building_attributes';
166-
// eslint-disable-next-line import/order
166+
// eslint-disable-next-line import-x/order
167167
import {modelAttributes, color3fAttributes, color4fAttributes, normalAttributes, texcoordAttributes, instanceAttributes, featureAttributes} from '../3d-style/data/model_attributes';
168168

169169
// layout vertex arrays
@@ -193,7 +193,7 @@ for (const name in layoutAttributes) {
193193
createStructArrayType('fill_extrusion_ext', fillExtrusionAttributesExt);
194194

195195
// symbol layer specific arrays
196-
// eslint-disable-next-line import/order
196+
// eslint-disable-next-line import-x/order
197197
import {
198198
symbolLayoutAttributes,
199199
symbolGlobeExtAttributes,
@@ -233,20 +233,20 @@ createStructArrayType('z_offset_vertex', zOffsetAttributes);
233233
createStructArrayType('symbol_orientation', orientationAttributes);
234234

235235
import globeAttributes from '../src/terrain/globe_attributes';
236-
// eslint-disable-next-line import/order
236+
// eslint-disable-next-line import-x/order
237237
import {atmosphereLayout} from '../src/render/atmosphere_attributes';
238238
createStructArrayType('globe_vertex', globeAttributes);
239239
createStructArrayType('atmosphere_vertex', atmosphereLayout);
240240

241-
// eslint-disable-next-line import/order
241+
// eslint-disable-next-line import-x/order
242242
import {starsLayout} from '../src/render/stars_attributes';
243243
createStructArrayType('stars_vertex', starsLayout);
244244

245-
// eslint-disable-next-line import/order
245+
// eslint-disable-next-line import-x/order
246246
import {snowLayout} from '../src/precipitation/snow_attributes.js';
247247
createStructArrayType('snow_vertex', snowLayout);
248248

249-
// eslint-disable-next-line import/order
249+
// eslint-disable-next-line import-x/order
250250
import {rainLayout} from '../src/precipitation/rain_attributes.js';
251251
createStructArrayType('rain_vertex', rainLayout);
252252

debug/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"strict": "off",
1515
"no-unused-vars": "off",
1616
"prefer-template": "off",
17-
"import/no-unresolved": "off"
17+
"import-x/no-unresolved": "off"
1818
},
1919
"env": {
2020
"es6": true,

eslint.config.js

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {fileURLToPath} from 'node:url';
33
import jsdoc from 'eslint-plugin-jsdoc';
44
import config from 'eslint-config-mourner';
55
import tseslint from 'typescript-eslint';
6-
import importPlugin from 'eslint-plugin-import';
6+
import {createNodeResolver, importX} from 'eslint-plugin-import-x';
7+
import {createTypeScriptImportResolver} from 'eslint-import-resolver-typescript';
78
import {globalIgnores} from 'eslint/config';
89
import {includeIgnoreFile} from '@eslint/compat';
910
import tsConfig from './tsconfig.json' with {type: 'json'};
@@ -19,7 +20,7 @@ export default tseslint.config(
1920
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
2021
...config,
2122
tseslint.configs.recommendedTypeChecked,
22-
importPlugin.flatConfigs.recommended,
23+
importX.flatConfigs.recommended,
2324
jsdoc.configs['flat/recommended'],
2425

2526
// Settings
@@ -32,16 +33,11 @@ export default tseslint.config(
3233
},
3334

3435
settings: {
35-
'import/parsers': {
36+
'import-x/parsers': {
3637
'@typescript-eslint/parser': ['.ts'],
3738
},
3839

39-
'import/resolver': {
40-
node: true,
41-
typescript: {
42-
project: './tsconfig.json',
43-
},
44-
},
40+
'import-x/resolver-next': [createTypeScriptImportResolver(), createNodeResolver()],
4541

4642
jsdoc: {
4743
mode: 'typescript',
@@ -74,7 +70,7 @@ export default tseslint.config(
7470
'array-bracket-spacing': 'off',
7571
'consistent-return': 'off',
7672
'global-require': 'off',
77-
'import/no-commonjs': 'error',
73+
'import-x/no-commonjs': 'error',
7874
'key-spacing': 'off',
7975
'no-eq-null': 'off',
8076
'no-lonely-if': 'off',
@@ -163,16 +159,16 @@ export default tseslint.config(
163159
// Import plugin rules
164160
{
165161
rules: {
166-
'import/named': 'off',
167-
'import/namespace': 'off',
168-
'import/default': 'off',
169-
'import/no-named-as-default-member': 'off',
170-
'import/no-unresolved': 'off',
171-
'import/no-named-as-default': 'off',
162+
'import-x/named': 'off',
163+
'import-x/namespace': 'off',
164+
'import-x/default': 'off',
165+
'import-x/no-named-as-default-member': 'off',
166+
'import-x/no-unresolved': 'off',
167+
'import-x/no-named-as-default': 'off',
172168
'no-duplicate-imports': 'off',
173-
'import/no-duplicates': 'error',
169+
'import-x/no-duplicates': 'error',
174170

175-
'import/order': ['error', {
171+
'import-x/order': ['error', {
176172
groups: [[
177173
'builtin',
178174
'external',
@@ -187,14 +183,14 @@ export default tseslint.config(
187183
'newlines-between': 'always',
188184
}],
189185

190-
'import/no-restricted-paths': ['error', {
186+
'import-x/no-restricted-paths': ['error', {
191187
zones: [{
192188
target: './src/style-spec',
193189
from: ['./src/!(style-spec)/**/*', './3d-style/**/*'],
194190
}],
195191
}],
196192

197-
'import/extensions': ['error', {
193+
'import-x/extensions': ['error', {
198194
ts: 'ignorePackages',
199195
js: 'always',
200196
json: 'always',

0 commit comments

Comments
 (0)