diff --git a/.eslintrc.js b/.eslintrc.js index 4c3ed2b85b..56fb199206 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -48,6 +48,31 @@ module.exports = { 'import/no-commonjs': 'error', }, }, + { + // Published sources resolve imports against the package's own + // dependencies. + files: ['packages/*/src/**/*.js'], + excludedFiles: [ + 'packages/metro/src/integration_tests/**/*.js', + '**/__tests__/**/*.js', + '**/__mocks__/**/*.js', + '**/__fixtures__/**/*.js', + '**/__flowtests__/**/*.js', + ], + settings: { + // Resolves `metro*/private/*` through package.json#exports, which the + // resolver bundled with eslint-plugin-import (^0.3.9) doesn't. + 'import/resolver': { + [require.resolve('eslint-import-resolver-node')]: {}, + }, + }, + rules: { + 'import/no-extraneous-dependencies': [ + 'error', + {devDependencies: false}, + ], + }, + }, { files: [ 'packages/metro/src/integration_tests/**/*.js', diff --git a/package.json b/package.json index 432850891e..cd2b62f3f9 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "eslint": "^8.57.0", "eslint-config-fb-strict": "^27.0.0", "eslint-config-prettier": "^8.5.0", + "eslint-import-resolver-node": "^0.4.0", "eslint-plugin-babel": "^5.3.1", "eslint-plugin-ft-flow": "^2.0.1", "eslint-plugin-import": "^2.32.0", diff --git a/packages/metro-config/src/index.js b/packages/metro-config/src/index.js index ad754a8d16..dc298e9d53 100644 --- a/packages/metro-config/src/index.js +++ b/packages/metro-config/src/index.js @@ -18,6 +18,8 @@ export type * from './index.flow'; */ try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/packages/metro/src/DeltaBundler/Worker.js b/packages/metro/src/DeltaBundler/Worker.js index bf5c1b00ea..3be89ab1e0 100644 --- a/packages/metro/src/DeltaBundler/Worker.js +++ b/packages/metro/src/DeltaBundler/Worker.js @@ -18,6 +18,8 @@ export type * from './Worker.flow'; */ try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/packages/metro/src/cli.js b/packages/metro/src/cli.js index 60432d88cd..171434c677 100755 --- a/packages/metro/src/cli.js +++ b/packages/metro/src/cli.js @@ -15,6 +15,8 @@ 'use strict'; try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/packages/metro/src/index.js b/packages/metro/src/index.js index ad754a8d16..dc298e9d53 100644 --- a/packages/metro/src/index.js +++ b/packages/metro/src/index.js @@ -18,6 +18,8 @@ export type * from './index.flow'; */ try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/packages/metro/src/shared/output/bundle.js b/packages/metro/src/shared/output/bundle.js index b4c2accf7d..6e532609cb 100644 --- a/packages/metro/src/shared/output/bundle.js +++ b/packages/metro/src/shared/output/bundle.js @@ -18,6 +18,8 @@ export type * from './bundle.flow'; */ try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/scripts/__tests__/subpackages-test.js b/scripts/__tests__/subpackages-test.js index 40d12f62b3..e3e3d6b733 100644 --- a/scripts/__tests__/subpackages-test.js +++ b/scripts/__tests__/subpackages-test.js @@ -164,6 +164,8 @@ export type * from './${flowFileBaseName}'; */ try { + // A devDependency, so only installed in the monorepo. + // eslint-disable-next-line import/no-extraneous-dependencies require('metro-babel-register').unstable_registerForMetroMonorepo(); } catch {} diff --git a/yarn.lock b/yarn.lock index 135487c571..7f65687ac3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2996,6 +2996,15 @@ eslint-import-resolver-node@^0.3.9: is-core-module "^2.13.0" resolve "^1.22.4" +eslint-import-resolver-node@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.4.0.tgz#a3901c970207c7ad753e5caead5e917780808ad7" + integrity sha512-wV22NewD4lwrMp94THds3/MjW7qPYupLj3wxLZCYkKrSLfVslRS/7lcbogiEwn9oT4cunDDCsTiBo/V16WlEUQ== + dependencies: + debug "^3.2.7" + is-core-module "^2.16.2" + resolve "^2.0.0-next.7" + eslint-module-utils@^2.12.1: version "2.12.1" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff" @@ -3885,12 +3894,12 @@ is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.13.0, is-core-module@^2.16.1: - version "2.16.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" - integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== +is-core-module@^2.13.0, is-core-module@^2.16.1, is-core-module@^2.16.2: + version "2.17.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.17.0.tgz#75c1c76236c9f7e38ddbfff292e127dc13b21027" + integrity sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA== dependencies: - hasown "^2.0.2" + hasown "^2.0.4" is-data-view@^1.0.1, is-data-view@^1.0.2: version "1.0.2" @@ -5315,6 +5324,16 @@ neo-async@^2.5.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== +node-exports-info@^1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/node-exports-info/-/node-exports-info-1.6.2.tgz#243a3105677d6781cd26e6a72350fd928a5cb46f" + integrity sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag== + dependencies: + array.prototype.flatmap "^1.3.3" + es-errors "^1.3.0" + object.entries "^1.1.9" + semver "^6.3.1" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -5873,12 +5892,15 @@ resolve@^1.20.0, resolve@^1.22.11, resolve@^1.22.4, resolve@~1.22.1, resolve@~1. path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^2.0.0-next.5: - version "2.0.0-next.5" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" - integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== +resolve@^2.0.0-next.5, resolve@^2.0.0-next.7: + version "2.0.0-next.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.7.tgz#ba3b035d4b1ee7c522426eee73cabcb0fd5515dd" + integrity sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ== dependencies: - is-core-module "^2.13.0" + es-errors "^1.3.0" + is-core-module "^2.16.2" + node-exports-info "^1.6.0" + object-keys "^1.1.1" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0"