Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 819c4af

Browse files
committed
fix import rule to allow mixed js-ts projects
1 parent 26a950e commit 819c4af

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

configs/import.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ module.exports = {
1616
'.js',
1717
'.json',
1818
'.jsx',
19-
'.mjs'
19+
'.mjs',
20+
// typescript + react
21+
'.ts',
22+
'.tsx'
2023
]
2124
}
2225
}
@@ -29,7 +32,8 @@ module.exports = {
2932
// revert warn to error after https://github.com/benmosher/eslint-plugin-import/pull/1563 is released
3033
// 'import/extensions': ['error', 'ignorePackages', {
3134
'import/extensions': ['warn', 'ignorePackages', {
32-
js: 'never'
35+
js: 'never',
36+
ts: 'never'
3337
}],
3438
'import/first': 'error',
3539
'import/group-exports': 'off',

configs/typescript.js

-26
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ if (!_semver.satisfies(_pluginActualVsn, _pluginVsn)) {
1212
let _ = require('lodash');
1313
let _basic = require('./basic');
1414
let _babel = require('./babel');
15-
let _import = require('./import');
1615
let _restoreBasicOverrides = require('./typescript-eslint-recommended');
1716

1817
// see https://github.com/eslint/eslint/issues/12592
1918
_basic = _.cloneDeep(_basic);
2019
_babel = _.cloneDeep(_babel);
21-
_import = _.cloneDeep(_import);
2220

2321
let isIde = process.env.VSCODE_PID !== undefined;
2422

@@ -32,17 +30,6 @@ module.exports = {
3230
},
3331

3432
settings: {
35-
'import/resolver': {
36-
node: {
37-
extensions: [
38-
..._import.settings['import/resolver'].node.extensions,
39-
// typescript + react
40-
'.ts',
41-
'.tsx'
42-
]
43-
}
44-
},
45-
4633
jsdoc: {
4734
mode: 'typescript'
4835
}
@@ -203,19 +190,6 @@ module.exports = {
203190

204191
// -------------------------------------------------------------------------
205192

206-
// NOTE we assume eslint-plugin-import is still loaded
207-
208-
'import/extensions': [
209-
_import.rules['import/extensions'][0],
210-
_import.rules['import/extensions'][1],
211-
{
212-
..._import.rules['import/extensions'][2],
213-
ts: 'never'
214-
}
215-
],
216-
217-
// -------------------------------------------------------------------------
218-
219193
// NOTE we assume eslint-plugin-lodash is still loaded
220194

221195
'lodash/prefer-noop': 'off',

0 commit comments

Comments
 (0)