Skip to content

Commit 2ad2a4c

Browse files
author
Spencer
authored
[eslint] ensure that all imports are resolvable (elastic#129002)
1 parent 0caddf8 commit 2ad2a4c

File tree

137 files changed

+1987
-1886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1987
-1886
lines changed

.buildkite/scripts/lifecycle/annotate_test_failures.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { TestFailures } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/lifecycle/build_status.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { BuildkiteClient } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/lifecycle/ci_stats_complete.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { CiStats } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/lifecycle/ci_stats_ready.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { CiStats } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/lifecycle/ci_stats_start.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { CiStats } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/lifecycle/print_agent_links.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// eslint-disable-next-line import/no-unresolved
109
const { BuildkiteClient } = require('kibana-buildkite-library');
1110

1211
(async () => {

.buildkite/scripts/pipelines/pull_request/pipeline.js

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
const execSync = require('child_process').execSync;
1010
const fs = require('fs');
11-
// eslint-disable-next-line import/no-unresolved
1211
const { areChangesSkippable, doAnyChangesMatch } = require('kibana-buildkite-library');
1312

1413
const SKIPPABLE_PATHS = [

.eslintrc.js

-33
Original file line numberDiff line numberDiff line change
@@ -579,30 +579,6 @@ module.exports = {
579579
},
580580
},
581581

582-
/**
583-
* Files that are allowed to import webpack-specific stuff
584-
*/
585-
{
586-
files: [
587-
'**/public/**/*.js',
588-
'src/fixtures/**/*.js', // TODO: this directory needs to be more obviously "public" (or go away)
589-
],
590-
settings: {
591-
// instructs import/no-extraneous-dependencies to treat certain modules
592-
// as core modules, even if they aren't listed in package.json
593-
'import/core-modules': ['plugins'],
594-
595-
'import/resolver': {
596-
'@kbn/eslint-import-resolver-kibana': {
597-
forceNode: false,
598-
rootPackageName: 'kibana',
599-
kibanaPath: '.',
600-
pluginMap: {},
601-
},
602-
},
603-
},
604-
},
605-
606582
/**
607583
* Single package.json rules, it tells eslint to ignore the child package.json files
608584
* and look for dependencies declarations in the single and root level package.json
@@ -690,7 +666,6 @@ module.exports = {
690666
{
691667
files: [
692668
'.eslintrc.js',
693-
'packages/kbn-eslint-import-resolver-kibana/**/*.js',
694669
'packages/kbn-eslint-plugin-eslint/**/*',
695670
'x-pack/gulpfile.js',
696671
'x-pack/scripts/*.js',
@@ -1567,14 +1542,6 @@ module.exports = {
15671542
{
15681543
files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
15691544
globals: { canvas: true, $: true },
1570-
rules: {
1571-
'import/no-unresolved': [
1572-
'error',
1573-
{
1574-
ignore: ['!!raw-loader.+.svg$'],
1575-
},
1576-
],
1577-
},
15781545
},
15791546
{
15801547
files: ['x-pack/plugins/canvas/public/**/*.js'],

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
/packages/*babel*/ @elastic/kibana-operations
222222
/packages/kbn-dev-utils*/ @elastic/kibana-operations
223223
/packages/kbn-es/ @elastic/kibana-operations
224+
/packages/kbn-eslint-plugin-imports/ @elastic/kibana-operations
224225
/packages/kbn-optimizer/ @elastic/kibana-operations
225226
/packages/kbn-pm/ @elastic/kibana-operations
226227
/packages/kbn-test/ @elastic/kibana-operations

docs/developer/getting-started/monorepo-packages.asciidoc

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ yarn kbn watch
6868
- @kbn/docs-utils
6969
- @kbn/es
7070
- @kbn/es-archiver
71-
- @kbn/eslint-import-resolver-kibana
7271
- @kbn/eslint-plugin-eslint
7372
- @kbn/expect
7473
- @kbn/i18n

examples/embeddable_examples/public/book/edit_book_action.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
} from './book_embeddable';
2626
import { CreateEditBookComponent } from './create_edit_book_component';
2727
import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
28-
import { SavedObjectsClientContract } from '../../../../src/core/target/types/public/saved_objects';
28+
import { SavedObjectsClientContract } from '../../../../src/core/public';
2929

3030
interface StartServices {
3131
openModal: OverlayStart['openModal'];

examples/field_formats_example/public/app.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ import example1SampleCode from '!!raw-loader!./examples/1_using_existing_format'
3232
import example2SampleCodePart1 from '!!raw-loader!../common/example_currency_format';
3333
// @ts-ignore
3434
import example2SampleCodePart2 from '!!raw-loader!./examples/2_creating_custom_formatter';
35+
/* eslint-disable @kbn/eslint/no-restricted-paths */
3536
// @ts-ignore
3637
import example2SampleCodePart3 from '!!raw-loader!../server/examples/2_creating_custom_formatter';
38+
/* eslint-enable @kbn/eslint/no-restricted-paths */
3739
// @ts-ignore
3840
import example3SampleCode from '!!raw-loader!./examples/3_creating_custom_format_editor';
3941

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
139139
"@kbn/doc-links": "link:bazel-bin/packages/kbn-doc-links",
140140
"@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
141+
"@kbn/eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports",
141142
"@kbn/field-types": "link:bazel-bin/packages/kbn-field-types",
142143
"@kbn/flot-charts": "link:bazel-bin/packages/kbn-flot-charts",
143144
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
@@ -473,7 +474,6 @@
473474
"@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
474475
"@kbn/es": "link:bazel-bin/packages/kbn-es",
475476
"@kbn/es-archiver": "link:bazel-bin/packages/kbn-es-archiver",
476-
"@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana",
477477
"@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
478478
"@kbn/expect": "link:bazel-bin/packages/kbn-expect",
479479
"@kbn/generate": "link:bazel-bin/packages/kbn-generate",
@@ -594,6 +594,7 @@
594594
"@types/kbn__docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module_types",
595595
"@types/kbn__es-archiver": "link:bazel-bin/packages/kbn-es-archiver/npm_module_types",
596596
"@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
597+
"@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
597598
"@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
598599
"@types/kbn__generate": "link:bazel-bin/packages/kbn-generate/npm_module_types",
599600
"@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
@@ -695,6 +696,7 @@
695696
"@types/reduce-reducers": "^1.0.0",
696697
"@types/redux-actions": "^2.6.1",
697698
"@types/redux-logger": "^3.0.8",
699+
"@types/resolve": "^1.20.1",
698700
"@types/seedrandom": ">=2.0.0 <4.0.0",
699701
"@types/selenium-webdriver": "^4.0.18",
700702
"@types/semver": "^7",
@@ -782,8 +784,6 @@
782784
"enzyme-to-json": "^3.6.1",
783785
"eslint": "^7.32.0",
784786
"eslint-config-prettier": "^7.2.0",
785-
"eslint-import-resolver-node": "^0.3.6",
786-
"eslint-import-resolver-webpack": "^0.13.1",
787787
"eslint-module-utils": "^2.6.2",
788788
"eslint-plugin-ban": "^1.5.2",
789789
"eslint-plugin-cypress": "^2.12.1",
@@ -876,7 +876,7 @@
876876
"react-test-renderer": "^16.12.0",
877877
"read-pkg": "^5.2.0",
878878
"regenerate": "^1.4.0",
879-
"resolve": "^1.7.1",
879+
"resolve": "^1.22.0",
880880
"rxjs-marbles": "^5.0.6",
881881
"sass-loader": "^10.2.0",
882882
"sass-resources-loader": "^2.0.1",

packages/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ filegroup(
3232
"//packages/kbn-es-archiver:build",
3333
"//packages/kbn-es-query:build",
3434
"//packages/kbn-es:build",
35-
"//packages/kbn-eslint-import-resolver-kibana:build",
3635
"//packages/kbn-eslint-plugin-eslint:build",
36+
"//packages/kbn-eslint-plugin-imports:build",
3737
"//packages/kbn-expect:build",
3838
"//packages/kbn-field-types:build",
3939
"//packages/kbn-flot-charts:build",
@@ -115,6 +115,7 @@ filegroup(
115115
"//packages/kbn-docs-utils:build_types",
116116
"//packages/kbn-es-archiver:build_types",
117117
"//packages/kbn-es-query:build_types",
118+
"//packages/kbn-eslint-plugin-imports:build_types",
118119
"//packages/kbn-field-types:build_types",
119120
"//packages/kbn-generate:build_types",
120121
"//packages/kbn-i18n-react:build_types",

packages/elastic-eslint-config-kibana/.eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = {
1010

1111
plugins: [
1212
'@kbn/eslint-plugin-eslint',
13+
'@kbn/eslint-plugin-imports',
1314
'prettier',
1415
],
1516

@@ -109,5 +110,6 @@ module.exports = {
109110
'@kbn/eslint/no_trailing_import_slash': 'error',
110111
'@kbn/eslint/no_constructor_args_in_property_initializers': 'error',
111112
'@kbn/eslint/no_this_in_property_initializers': 'error',
113+
'@kbn/imports/no_unresolved_imports': 'error',
112114
},
113115
};

packages/elastic-eslint-config-kibana/javascript.js

-9
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ module.exports = {
1818
'prefer-object-spread',
1919
],
2020

21-
settings: {
22-
'import/resolver': {
23-
'@kbn/eslint-import-resolver-kibana': {
24-
forceNode: true,
25-
},
26-
},
27-
},
28-
2921
env: {
3022
es6: true,
3123
node: true,
@@ -93,7 +85,6 @@ module.exports = {
9385
'mocha/handle-done-callback': 'error',
9486
'mocha/no-exclusive-tests': 'error',
9587

96-
'import/no-unresolved': [ 'error', { 'amd': true, 'commonjs': true } ],
9788
'import/named': 'error',
9889
'import/namespace': 'error',
9990
'import/default': 'error',

packages/elastic-eslint-config-kibana/typescript.js

-11
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,6 @@ module.exports = {
2727
'eslint-comments'
2828
],
2929

30-
settings: {
31-
'import/resolver': {
32-
node: {
33-
extensions: ['.mjs', '.js', '.json', '.ts', '.tsx'],
34-
},
35-
},
36-
react: {
37-
version: semver.valid(semver.coerce(PKG.dependencies.react)),
38-
},
39-
},
40-
4130
env: {
4231
es6: true,
4332
node: true,

packages/kbn-es-query/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ peggy(
6060
"--allowed-start-rules",
6161
"start,Literal",
6262
"-o",
63-
"$(@D)/index.js",
63+
"$(@D)/built_grammar.js",
6464
"./%s/grammar/grammar.peggy" % package_name()
6565
],
6666
)

packages/kbn-eslint-import-resolver-kibana/lib/debug.js packages/kbn-es-query/src/kuery/grammar/grammar.d.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
exports.debug = require('debug')('eslint-plugin-import:resolver:kibana');
9+
declare module '*/grammar/built_grammar.js' {
10+
export const parse: any;
11+
}

packages/kbn-es-query/src/kuery/grammar/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
* Side Public License, v 1.
77
*/
88

9-
// @ts-expect-error
10-
export { parse } from '../../../grammar';
9+
export { parse } from '../../../grammar/built_grammar.js';

packages/kbn-es-query/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
]
1111
},
1212
"include": [
13-
"src/**/*"
13+
"src/**/*",
14+
"src/kuery/grammar/grammar.d.ts"
1415
],
1516
"exclude": [
1617
"**/__fixtures__/**/*",

packages/kbn-eslint-import-resolver-kibana/BUILD.bazel

-55
This file was deleted.

0 commit comments

Comments
 (0)