[eslint] ensure that all imports are resolvable (elastic#129002)

markov00 · Apr 4, 2022 · 2ad2a4c · 2ad2a4c
1 parent 0caddf8
commit 2ad2a4c
Show file tree

Hide file tree

Showing 137 changed files with 1,987 additions and 1,886 deletions.
diff --git a/.buildkite/scripts/lifecycle/annotate_test_failures.js b/.buildkite/scripts/lifecycle/annotate_test_failures.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { TestFailures } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/lifecycle/build_status.js b/.buildkite/scripts/lifecycle/build_status.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { BuildkiteClient } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/lifecycle/ci_stats_complete.js b/.buildkite/scripts/lifecycle/ci_stats_complete.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/lifecycle/ci_stats_ready.js b/.buildkite/scripts/lifecycle/ci_stats_ready.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/lifecycle/ci_stats_start.js b/.buildkite/scripts/lifecycle/ci_stats_start.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/lifecycle/print_agent_links.js b/.buildkite/scripts/lifecycle/print_agent_links.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { BuildkiteClient } = require('kibana-buildkite-library');
 
 (async () => {

diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.js b/.buildkite/scripts/pipelines/pull_request/pipeline.js
@@ -8,7 +8,6 @@
 
 const execSync = require('child_process').execSync;
 const fs = require('fs');
-// eslint-disable-next-line import/no-unresolved
 const { areChangesSkippable, doAnyChangesMatch } = require('kibana-buildkite-library');
 
 const SKIPPABLE_PATHS = [

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -579,30 +579,6 @@ module.exports = {
       },
     },
 
-    /**
-     * Files that are allowed to import webpack-specific stuff
-     */
-    {
-      files: [
-        '**/public/**/*.js',
-        'src/fixtures/**/*.js', // TODO: this directory needs to be more obviously "public" (or go away)
-      ],
-      settings: {
-        // instructs import/no-extraneous-dependencies to treat certain modules
-        // as core modules, even if they aren't listed in package.json
-        'import/core-modules': ['plugins'],
-
-        'import/resolver': {
-          '@kbn/eslint-import-resolver-kibana': {
-            forceNode: false,
-            rootPackageName: 'kibana',
-            kibanaPath: '.',
-            pluginMap: {},
-          },
-        },
-      },
-    },
-
     /**
      * Single package.json rules, it tells eslint to ignore the child package.json files
      * and look for dependencies declarations in the single and root level package.json
@@ -690,7 +666,6 @@ module.exports = {
     {
       files: [
         '.eslintrc.js',
-        'packages/kbn-eslint-import-resolver-kibana/**/*.js',
         'packages/kbn-eslint-plugin-eslint/**/*',
         'x-pack/gulpfile.js',
         'x-pack/scripts/*.js',
@@ -1567,14 +1542,6 @@ module.exports = {
     {
       files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
       globals: { canvas: true, $: true },
-      rules: {
-        'import/no-unresolved': [
-          'error',
-          {
-            ignore: ['!!raw-loader.+.svg$'],
-          },
-        ],
-      },
     },
     {
       files: ['x-pack/plugins/canvas/public/**/*.js'],

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -221,6 +221,7 @@
 /packages/*babel*/ @elastic/kibana-operations
 /packages/kbn-dev-utils*/ @elastic/kibana-operations
 /packages/kbn-es/ @elastic/kibana-operations
+/packages/kbn-eslint-plugin-imports/ @elastic/kibana-operations
 /packages/kbn-optimizer/ @elastic/kibana-operations
 /packages/kbn-pm/ @elastic/kibana-operations
 /packages/kbn-test/ @elastic/kibana-operations

diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -68,7 +68,6 @@ yarn kbn watch
 - @kbn/docs-utils
 - @kbn/es
 - @kbn/es-archiver
-- @kbn/eslint-import-resolver-kibana
 - @kbn/eslint-plugin-eslint
 - @kbn/expect
 - @kbn/i18n

diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -25,7 +25,7 @@ import {
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
 import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
-import { SavedObjectsClientContract } from '../../../../src/core/target/types/public/saved_objects';
+import { SavedObjectsClientContract } from '../../../../src/core/public';
 
 interface StartServices {
   openModal: OverlayStart['openModal'];

diff --git a/examples/field_formats_example/public/app.tsx b/examples/field_formats_example/public/app.tsx
@@ -32,8 +32,10 @@ import example1SampleCode from '!!raw-loader!./examples/1_using_existing_format'
 import example2SampleCodePart1 from '!!raw-loader!../common/example_currency_format';
 // @ts-ignore
 import example2SampleCodePart2 from '!!raw-loader!./examples/2_creating_custom_formatter';
+/* eslint-disable @kbn/eslint/no-restricted-paths */
 // @ts-ignore
 import example2SampleCodePart3 from '!!raw-loader!../server/examples/2_creating_custom_formatter';
+/* eslint-enable @kbn/eslint/no-restricted-paths */
 // @ts-ignore
 import example3SampleCode from '!!raw-loader!./examples/3_creating_custom_format_editor';
 

diff --git a/package.json b/package.json
@@ -138,6 +138,7 @@
     "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
     "@kbn/doc-links": "link:bazel-bin/packages/kbn-doc-links",
     "@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
+    "@kbn/eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports",
     "@kbn/field-types": "link:bazel-bin/packages/kbn-field-types",
     "@kbn/flot-charts": "link:bazel-bin/packages/kbn-flot-charts",
     "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
@@ -473,7 +474,6 @@
     "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
     "@kbn/es": "link:bazel-bin/packages/kbn-es",
     "@kbn/es-archiver": "link:bazel-bin/packages/kbn-es-archiver",
-    "@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana",
     "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
     "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
     "@kbn/generate": "link:bazel-bin/packages/kbn-generate",
@@ -594,6 +594,7 @@
     "@types/kbn__docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module_types",
     "@types/kbn__es-archiver": "link:bazel-bin/packages/kbn-es-archiver/npm_module_types",
     "@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
+    "@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
     "@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
     "@types/kbn__generate": "link:bazel-bin/packages/kbn-generate/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
@@ -695,6 +696,7 @@
     "@types/reduce-reducers": "^1.0.0",
     "@types/redux-actions": "^2.6.1",
     "@types/redux-logger": "^3.0.8",
+    "@types/resolve": "^1.20.1",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
     "@types/selenium-webdriver": "^4.0.18",
     "@types/semver": "^7",
@@ -782,8 +784,6 @@
     "enzyme-to-json": "^3.6.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^7.2.0",
-    "eslint-import-resolver-node": "^0.3.6",
-    "eslint-import-resolver-webpack": "^0.13.1",
     "eslint-module-utils": "^2.6.2",
     "eslint-plugin-ban": "^1.5.2",
     "eslint-plugin-cypress": "^2.12.1",
@@ -876,7 +876,7 @@
     "react-test-renderer": "^16.12.0",
     "read-pkg": "^5.2.0",
     "regenerate": "^1.4.0",
-    "resolve": "^1.7.1",
+    "resolve": "^1.22.0",
     "rxjs-marbles": "^5.0.6",
     "sass-loader": "^10.2.0",
     "sass-resources-loader": "^2.0.1",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -32,8 +32,8 @@ filegroup(
     "//packages/kbn-es-archiver:build",
     "//packages/kbn-es-query:build",
     "//packages/kbn-es:build",
-    "//packages/kbn-eslint-import-resolver-kibana:build",
     "//packages/kbn-eslint-plugin-eslint:build",
+    "//packages/kbn-eslint-plugin-imports:build",
     "//packages/kbn-expect:build",
     "//packages/kbn-field-types:build",
     "//packages/kbn-flot-charts:build",
@@ -115,6 +115,7 @@ filegroup(
     "//packages/kbn-docs-utils:build_types",
     "//packages/kbn-es-archiver:build_types",
     "//packages/kbn-es-query:build_types",
+    "//packages/kbn-eslint-plugin-imports:build_types",
     "//packages/kbn-field-types:build_types",
     "//packages/kbn-generate:build_types",
     "//packages/kbn-i18n-react:build_types",

diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
@@ -10,6 +10,7 @@ module.exports = {
 
   plugins: [
     '@kbn/eslint-plugin-eslint',
+    '@kbn/eslint-plugin-imports',
     'prettier',
   ],
 
@@ -109,5 +110,6 @@ module.exports = {
     '@kbn/eslint/no_trailing_import_slash': 'error',
     '@kbn/eslint/no_constructor_args_in_property_initializers': 'error',
     '@kbn/eslint/no_this_in_property_initializers': 'error',
+    '@kbn/imports/no_unresolved_imports': 'error',
   },
 };
diff --git a/packages/elastic-eslint-config-kibana/javascript.js b/packages/elastic-eslint-config-kibana/javascript.js
@@ -18,14 +18,6 @@ module.exports = {
         'prefer-object-spread',
       ],
 
-      settings: {
-        'import/resolver': {
-          '@kbn/eslint-import-resolver-kibana': {
-            forceNode: true,
-          },
-        },
-      },
-
       env: {
         es6: true,
         node: true,
@@ -93,7 +85,6 @@ module.exports = {
         'mocha/handle-done-callback': 'error',
         'mocha/no-exclusive-tests': 'error',
 
-        'import/no-unresolved': [ 'error', { 'amd': true, 'commonjs': true } ],
         'import/named': 'error',
         'import/namespace': 'error',
         'import/default': 'error',

diff --git a/packages/elastic-eslint-config-kibana/typescript.js b/packages/elastic-eslint-config-kibana/typescript.js
@@ -27,17 +27,6 @@ module.exports = {
         'eslint-comments'
       ],
 
-      settings: {
-        'import/resolver': {
-          node: {
-            extensions: ['.mjs', '.js', '.json', '.ts', '.tsx'],
-          },
-        },
-        react: {
-          version: semver.valid(semver.coerce(PKG.dependencies.react)),
-        },
-      },
-
       env: {
         es6: true,
         node: true,

diff --git a/packages/kbn-es-query/BUILD.bazel b/packages/kbn-es-query/BUILD.bazel
@@ -60,7 +60,7 @@ peggy(
     "--allowed-start-rules",
     "start,Literal",
     "-o",
-    "$(@D)/index.js",
+    "$(@D)/built_grammar.js",
     "./%s/grammar/grammar.peggy" % package_name()
   ],
 )

diff --git a/...slint-import-resolver-kibana/lib/debug.js → ...n-es-query/src/kuery/grammar/grammar.d.ts b/...slint-import-resolver-kibana/lib/debug.js → ...n-es-query/src/kuery/grammar/grammar.d.ts
@@ -6,4 +6,6 @@
  * Side Public License, v 1.
  */
 
-exports.debug = require('debug')('eslint-plugin-import:resolver:kibana');
+declare module '*/grammar/built_grammar.js' {
+  export const parse: any;
+}
diff --git a/packages/kbn-es-query/src/kuery/grammar/index.ts b/packages/kbn-es-query/src/kuery/grammar/index.ts
@@ -6,5 +6,4 @@
  * Side Public License, v 1.
  */
 
-// @ts-expect-error
-export { parse } from '../../../grammar';
+export { parse } from '../../../grammar/built_grammar.js';
diff --git a/packages/kbn-es-query/tsconfig.json b/packages/kbn-es-query/tsconfig.json
@@ -10,7 +10,8 @@
     ]
   },
   "include": [
-    "src/**/*"
+    "src/**/*",
+    "src/kuery/grammar/grammar.d.ts"
   ],
   "exclude": [
     "**/__fixtures__/**/*",

diff --git a/packages/kbn-eslint-import-resolver-kibana/BUILD.bazel b/packages/kbn-eslint-import-resolver-kibana/BUILD.bazel