Skip to content

Commit 9c16238

Browse files
committed
Merge robhogan/jsx-a11y-drop-core-js-pure
2 parents a0a3d2f + 4f24707 commit 9c16238

13 files changed

Lines changed: 62 additions & 29 deletions

File tree

‎.eslintrc.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,18 @@ module.exports = {
5959
'**/__fixtures__/**/*.js',
6060
'**/__flowtests__/**/*.js',
6161
],
62+
settings: {
63+
// Resolves `metro*/private/*` through package.json#exports, which the
64+
// resolver bundled with eslint-plugin-import (^0.3.9) doesn't.
65+
'import/resolver': {
66+
[require.resolve('eslint-import-resolver-node')]: {},
67+
},
68+
},
6269
rules: {
63-
'import/no-extraneous-dependencies': ['error', {includeTypes: true}],
70+
'import/no-extraneous-dependencies': [
71+
'error',
72+
{devDependencies: false, includeTypes: true},
73+
],
6474
},
6575
},
6676
{

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"eslint": "^8.57.0",
2727
"eslint-config-fb-strict": "^27.0.0",
2828
"eslint-config-prettier": "^8.5.0",
29+
"eslint-import-resolver-node": "^0.4.0",
2930
"eslint-plugin-babel": "^5.3.1",
3031
"eslint-plugin-ft-flow": "^2.0.1",
3132
"eslint-plugin-import": "^2.32.0",

‎packages/metro-config/src/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export type * from './index.flow';
1818
*/
1919

2020
try {
21+
// A devDependency, so only installed in the monorepo.
22+
// eslint-disable-next-line import/no-extraneous-dependencies
2123
require('metro-babel-register').unstable_registerForMetroMonorepo();
2224
} catch {}
2325

‎packages/metro-config/src/types.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
import type {HandleFunction, Server} from 'connect';
1313
import type {
14-
CacheManagerFactory,
1514
CustomResolver,
1615
DeltaResult,
17-
InputFileMapPlugin,
1816
JsTransformerConfig,
1917
MetroServer,
2018
Module,
@@ -24,6 +22,10 @@ import type {
2422
TransformResult,
2523
} from 'metro';
2624
import type {CacheStore, MetroCache} from 'metro-cache';
25+
import type {
26+
CacheManagerFactory,
27+
InputFileMapPlugin,
28+
} from 'metro/private/node-haste/DependencyGraph/createFileMap';
2729
import type {IntermediateStackFrame} from 'metro/private/Server/symbolicate';
2830

2931
export type ExtraTransformOptions = Readonly<{

‎packages/metro/API.md‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ export type BundleDetails = {
4141
platform: null | undefined | string;
4242
};
4343

44-
export type CacheManagerFactory = (options: CacheManagerFactoryOptions) => CacheManager;
45-
4644
export type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
4745

4846
export const createConnectMiddleware: (config: ConfigT, options?: RunMetroOptions) => Promise<MetroMiddleWare>;
@@ -91,19 +89,6 @@ export function getSchemeResolvers(): Readonly<{
9189
[scheme: string]: CustomResolver;
9290
}>;
9391

94-
export type InputFileMapPlugin = FileMapPlugin<
95-
/**
96-
* > | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
97-
* | ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
98-
**/
99-
any,
100-
/**
101-
* > | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
102-
* | ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
103-
**/
104-
any
105-
>;
106-
10792
export class JsonReporter<TEvent extends {readonly [prop: string]: unknown}> {
10893
constructor(stream: Writable);
10994
update(event: TEvent): void;

‎packages/metro/src/DeltaBundler/Worker.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export type * from './Worker.flow';
1818
*/
1919

2020
try {
21+
// A devDependency, so only installed in the monorepo.
22+
// eslint-disable-next-line import/no-extraneous-dependencies
2123
require('metro-babel-register').unstable_registerForMetroMonorepo();
2224
} catch {}
2325

‎packages/metro/src/cli.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
'use strict';
1616

1717
try {
18+
// A devDependency, so only installed in the monorepo.
19+
// eslint-disable-next-line import/no-extraneous-dependencies
1820
require('metro-babel-register').unstable_registerForMetroMonorepo();
1921
} catch {}
2022

‎packages/metro/src/index.flow.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ export type {
186186
} from './ModuleGraph/worker/collectDependencies';
187187
export type {ServerOptions} from './Server';
188188
export type {MetroLogEntry} from './shared/types';
189-
export type {CacheManagerFactory, InputFileMapPlugin} from 'metro-file-map';
190189
export type {CustomResolver} from 'metro-resolver';
191190
export type {JsTransformerConfig} from 'metro-transform-worker';
192191
export type {MetroConfig, MetroServer};

‎packages/metro/src/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export type * from './index.flow';
1818
*/
1919

2020
try {
21+
// A devDependency, so only installed in the monorepo.
22+
// eslint-disable-next-line import/no-extraneous-dependencies
2123
require('metro-babel-register').unstable_registerForMetroMonorepo();
2224
} catch {}
2325

‎packages/metro/src/node-haste/DependencyGraph/createFileMap.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import MetroFileMap, {
1818
HastePlugin,
1919
} from 'metro-file-map';
2020

21+
export type {CacheManagerFactory, InputFileMapPlugin} from 'metro-file-map';
22+
2123
const flattenBlockList = (regexes: ConfigT['resolver']['blockList']) => {
2224
if (!Array.isArray(regexes)) {
2325
return regexes;

0 commit comments

Comments
 (0)