Only use .flow.js extensions when there is an accompanying entry file

docs/Configuration.md

@@ -180,11 +180,11 @@ function unstable_perfLoggerFactory(
 };
 ```
 
-* **`type`** Type of event being logged, e.g. `'STARTUP'`, `'BUNDLING_REQUEST'`, `'HMR'`. See type definition of [PerfLoggerFactory](https://github.com/facebook/metro/blob/main/packages/metro-config/src/configTypes.flow.js) for a full list of event types.
+* **`type`** Type of event being logged, e.g. `'STARTUP'`, `'BUNDLING_REQUEST'`, `'HMR'`. See type definition of [PerfLoggerFactory](https://github.com/facebook/metro/blob/main/packages/metro-config/src/types.js) for a full list of event types.
 * **`opts`**
   * **`key`**: An opaque identifier to distinguish between instances of an event type (e.g. multiple, possibly concurrent, HMR requests).
 
-`unstable_perfLoggerFactory` should return an object implementing the [RootPerfLogger](https://github.com/facebook/metro/blob/main/packages/metro-config/src/configTypes.flow.js) interface. For example, a factory function returning a no-op RootPerfLogger could be implemented as follows:
+`unstable_perfLoggerFactory` should return an object implementing the [RootPerfLogger](https://github.com/facebook/metro/blob/main/packages/metro-config/src/types.js) interface. For example, a factory function returning a no-op RootPerfLogger could be implemented as follows:
 
 
 ```javascript

packages/metro-cache/src/index.js

@@ -20,7 +20,7 @@ const HttpStore = require('./stores/HttpStore');
 
 export type {Options as FileOptions} from './stores/FileStore';
 export type {Options as HttpOptions} from './stores/HttpStore';
-export type {CacheStore} from './types.flow';
+export type {CacheStore} from './types';
 
 module.exports.AutoCleanFileStore = AutoCleanFileStore;
 module.exports.Cache = Cache;

packages/metro-config/src/defaults/defaults.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {PerfLogger, RootPerfLogger} from '../configTypes.flow';
+import type {PerfLogger, RootPerfLogger} from '../types';
 
 const defaultCreateModuleIdFactory = require('metro/private/lib/createModuleIdFactory');
 

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

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {ConfigT} from '../configTypes.flow';
+import type {ConfigT} from '../types';
 
 const {
   DEFAULT_METRO_MINIFIER_PATH,

packages/metro-config/src/index.js

@@ -12,7 +12,7 @@
 'use strict';
 
 /*::
-export type * from './configTypes.flow';
+export type * from './types';
 */
 
 try {

packages/metro-config/src/loadConfig.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {ConfigT, InputConfigT, YargArguments} from './configTypes.flow';
+import type {ConfigT, InputConfigT, YargArguments} from './types';
 
 const getDefaultConfig = require('./defaults');
 const validConfig = require('./defaults/validConfig');

packages/metro-config/src/configTypes.flow.js → packages/metro-config/src/types.js

@@ -23,7 +23,7 @@ import type {
   Module,
   ReadOnlyGraph,
   SerializerOptions,
-} from 'metro/private/DeltaBundler/types.flow';
+} from 'metro/private/DeltaBundler/types';
 import type {Reporter} from 'metro/private/lib/reporting';
 import type MetroServer from 'metro/private/Server';
 

packages/metro-config/types/index.d.ts

@@ -11,5 +11,5 @@
 import getDefaultConfig from './defaults';
 import {loadConfig, mergeConfig, resolveConfig} from './loadConfig';
 
-export * from './configTypes';
+export * from './types';
 export {loadConfig, mergeConfig, resolveConfig, getDefaultConfig};

packages/metro-config/types/loadConfig.d.ts

@@ -8,7 +8,7 @@
  * @oncall react_native
  */
 
-import type {ConfigT, InputConfigT, YargArguments} from './configTypes';
+import type {ConfigT, InputConfigT, YargArguments} from './types';
 
 export interface CosmiConfigResult {
   filepath: string;

packages/metro-core/src/Logger.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {BundleOptions} from 'metro/private/shared/types.flow';
+import type {BundleOptions} from 'metro/private/shared/types';
 
 const VERSION = require('../package.json').version;
 const {EventEmitter} = require('events');

packages/metro-resolver/src/createDefaultContext.js

@@ -10,7 +10,7 @@
  */
 
 import type {ResolutionContext} from './types';
-import type {TransformResultDependency} from 'metro/private/DeltaBundler/types.flow';
+import type {TransformResultDependency} from 'metro/private/DeltaBundler/types';
 
 import {redirectModulePath} from './PackageResolve';
 

packages/metro-resolver/src/types.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {TransformResultDependency} from 'metro/private/DeltaBundler/types.flow';
+import type {TransformResultDependency} from 'metro/private/DeltaBundler/types';
 
 export type Result<+TResolution, +TCandidates> =
   | {+type: 'resolved', +resolution: TResolution}

packages/metro-runtime/src/modules/HMRClient.js

@@ -10,8 +10,8 @@
  */
 
 'use strict';
-import type {HmrModule} from './types.flow';
-import type {HmrMessage, HmrUpdate} from './types.flow';
+import type {HmrModule} from './types';
+import type {HmrMessage, HmrUpdate} from './types';
 
 const EventEmitter = require('./vendor/eventemitter3');
 

packages/metro-runtime/src/modules/__tests__/HMRClient-test.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {HmrUpdate} from '../types.flow';
+import type {HmrUpdate} from '../types';
 
 const HMRClient = require('../HMRClient');
 

packages/metro-source-map/src/Consumer/AbstractConsumer.js

@@ -17,7 +17,7 @@ import type {
   IterationOrder,
   Mapping,
   SourcePosition,
-} from './types.flow';
+} from './types';
 
 const {GENERATED_ORDER, iterationOrderToString} = require('./constants');
 const invariant = require('invariant');

packages/metro-source-map/src/Consumer/DelegatingConsumer.js

@@ -18,7 +18,7 @@ import type {
   IterationOrder,
   Mapping,
   SourcePosition,
-} from './types.flow';
+} from './types';
 
 const {
   GENERATED_ORDER,

packages/metro-source-map/src/Consumer/MappingsConsumer.js

@@ -17,7 +17,7 @@ import type {
   IConsumer,
   Mapping,
   SourcePosition,
-} from './types.flow';
+} from './types';
 import type {Number0} from 'ob1';
 
 const AbstractConsumer = require('./AbstractConsumer');

packages/metro-source-map/src/Consumer/SectionsConsumer.js

@@ -18,7 +18,7 @@ import type {
   IConsumer,
   Mapping,
   SourcePosition,
-} from './types.flow';
+} from './types';
 
 const AbstractConsumer = require('./AbstractConsumer');
 const {EMPTY_POSITION, FIRST_COLUMN, FIRST_LINE} = require('./constants');

packages/metro-source-map/src/Consumer/createConsumer.js

@@ -12,7 +12,7 @@
 'use strict';
 
 import type {MixedSourceMap} from '../source-map';
-import type {IConsumer} from './types.flow';
+import type {IConsumer} from './types';
 
 const invariant = require('invariant');
 

packages/metro-source-map/src/Consumer/positionMath.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {GeneratedOffset} from './types.flow';
+import type {GeneratedOffset} from './types';
 import type {Number0, Number1} from 'ob1';
 
 const {add, add0, add1, neg} = require('ob1');

packages/metro-source-map/src/composeSourceMaps.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {SourcePosition} from './Consumer/types.flow';
+import type {SourcePosition} from './Consumer/types';
 import type {IConsumer, MixedSourceMap} from './source-map';
 import type {Number0, Number1} from 'ob1';
 

packages/metro-source-map/src/source-map.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {IConsumer} from './Consumer/types.flow';
+import type {IConsumer} from './Consumer/types';
 import type {BabelSourceMapSegment} from '@babel/generator';
 
 const {BundleBuilder, createIndexMap} = require('./BundleBuilder');

packages/metro-transform-worker/src/index.js

@@ -29,7 +29,7 @@ import type {
   InlineRequiresPluginOptions,
 } from 'metro-transform-plugins';
 import type {TransformResultDependency} from 'metro/private/DeltaBundler';
-import type {AllowOptionalDependencies} from 'metro/private/DeltaBundler/types.flow';
+import type {AllowOptionalDependencies} from 'metro/private/DeltaBundler/types';
 import type {
   DependencyTransformer,
   DynamicRequiresBehavior,

packages/metro/src/Bundler/util.js

@@ -12,7 +12,7 @@
 'use strict';
 
 import type {AssetDataFiltered, AssetDataWithoutFiles} from '../Assets';
-import type {ModuleTransportLike} from '../shared/types.flow';
+import type {ModuleTransportLike} from '../shared/types';
 import type {File} from '@babel/types';
 
 const babylon = require('@babel/parser');

packages/metro/src/DeltaBundler.js

@@ -18,7 +18,7 @@ import type {
   MixedOutput,
   Options,
   ReadOnlyGraph,
-} from './DeltaBundler/types.flow';
+} from './DeltaBundler/types';
 import type EventEmitter from 'events';
 
 const DeltaCalculator = require('./DeltaBundler/DeltaCalculator');
@@ -34,7 +34,7 @@ export type {
   TransformResult,
   TransformResultDependency,
   TransformResultWithSource,
-} from './DeltaBundler/types.flow';
+} from './DeltaBundler/types';
 
 /**
  * `DeltaBundler` uses the `DeltaTransformer` to build bundle deltas. This

packages/metro/src/DeltaBundler/DeltaCalculator.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {DeltaResult, Options} from './types.flow';
+import type {DeltaResult, Options} from './types';
 import type {RootPerfLogger} from 'metro-config';
 import type {ChangeEvent} from 'metro-file-map';
 

packages/metro/src/DeltaBundler/Graph.js

@@ -41,7 +41,7 @@ import type {
   Options,
   ResolvedDependency,
   TransformInputOptions,
-} from './types.flow';
+} from './types';
 
 import {fileMatchesContext} from '../lib/contextModule';
 import CountingSet from '../lib/CountingSet';

packages/metro/src/DeltaBundler/Serializers/__tests__/baseJSBundle-test.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module, TransformInputOptions} from '../../types.flow';
+import type {Module, TransformInputOptions} from '../../types';
 
 import CountingSet from '../../../lib/CountingSet';
 

packages/metro/src/DeltaBundler/Serializers/__tests__/getRamBundleInfo-test.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module, TransformInputOptions} from '../../types.flow';
+import type {Module, TransformInputOptions} from '../../types';
 import type {JsOutput} from 'metro-transform-worker';
 
 import CountingSet from '../../../lib/CountingSet';

packages/metro/src/DeltaBundler/Serializers/__tests__/sourceMapString-test.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module} from '../../types.flow';
+import type {Module} from '../../types';
 
 import CountingSet from '../../../lib/CountingSet';
 

packages/metro/src/DeltaBundler/Serializers/baseJSBundle.js

@@ -16,8 +16,8 @@ import type {
   Module,
   ReadOnlyGraph,
   SerializerOptions,
-} from '../types.flow';
-import type {Bundle} from 'metro-runtime/src/modules/types.flow';
+} from '../types';
+import type {Bundle} from 'metro-runtime/src/modules/types';
 
 const getAppendScripts = require('../../lib/getAppendScripts');
 const processModules = require('./helpers/processModules');

packages/metro/src/DeltaBundler/Serializers/getAllFiles.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module, ReadOnlyGraph} from '../types.flow';
+import type {Module, ReadOnlyGraph} from '../types';
 
 const {getAssetFiles} = require('../../Assets');
 const {getJsOutput, isJsModule} = require('./helpers/js');

packages/metro/src/DeltaBundler/Serializers/getAssets.js

@@ -12,7 +12,7 @@
 'use strict';
 
 import type {AssetData} from '../../Assets';
-import type {Module, ReadOnlyDependencies} from '../types.flow';
+import type {Module, ReadOnlyDependencies} from '../types';
 
 const {getAssetData} = require('../../Assets');
 const {getJsOutput, isJsModule} = require('./helpers/js');

packages/metro/src/DeltaBundler/Serializers/getExplodedSourceMap.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module} from '../types.flow';
+import type {Module} from '../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,

packages/metro/src/DeltaBundler/Serializers/getRamBundleInfo.js

@@ -11,11 +11,8 @@
 
 'use strict';
 
-import type {
-  ModuleTransportLike,
-  RamModuleTransport,
-} from '../../shared/types.flow';
-import type {Module, ReadOnlyGraph, SerializerOptions} from '../types.flow';
+import type {ModuleTransportLike, RamModuleTransport} from '../../shared/types';
+import type {Module, ReadOnlyGraph, SerializerOptions} from '../types';
 import type {SourceMapGeneratorOptions} from './sourceMapGenerator';
 import type {GetTransformOptions} from 'metro-config';
 

packages/metro/src/DeltaBundler/Serializers/helpers/__tests__/js-test.js

@@ -9,7 +9,7 @@
  * @oncall react_native
  */
 
-import type {Dependency} from '../../../types.flow';
+import type {Dependency} from '../../../types';
 
 import CountingSet from '../../../../lib/CountingSet';
 import createModuleIdFactory from '../../../../lib/createModuleIdFactory';

packages/metro/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module} from '../../types.flow';
+import type {Module} from '../../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,

packages/metro/src/DeltaBundler/Serializers/helpers/getTransitiveDependencies.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {ReadOnlyGraph} from '../../types.flow';
+import type {ReadOnlyGraph} from '../../types';
 
 import {isResolvedDependency} from '../../../lib/isResolvedDependency';
 

packages/metro/src/DeltaBundler/Serializers/helpers/js.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {MixedOutput, Module} from '../../types.flow';
+import type {MixedOutput, Module} from '../../types';
 import type {JsOutput} from 'metro-transform-worker';
 
 const {isResolvedDependency} = require('../../../lib/isResolvedDependency');

packages/metro/src/DeltaBundler/Serializers/helpers/processModules.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {Module} from '../../types.flow';
+import type {Module} from '../../types';
 
 const {isJsModule, wrapModule} = require('./js');
 

packages/metro/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -12,8 +12,8 @@
 'use strict';
 
 import type {EntryPointURL} from '../../HmrServer';
-import type {DeltaResult, Module, ReadOnlyGraph} from '../types.flow';
-import type {HmrModule} from 'metro-runtime/src/modules/types.flow';
+import type {DeltaResult, Module, ReadOnlyGraph} from '../types';
+import type {HmrModule} from 'metro-runtime/src/modules/types';
 
 const {isJsModule, wrapModule} = require('./helpers/js');
 const jscSafeUrl = require('jsc-safe-url');