metro 0.70.2 → 0.71.1

package/src/ModuleGraph/types.flow.js.flow

@@ -22,19 +22,19 @@ export type BuildResult = GraphResult;
 export type Callback<A = void, B = void> = (Error => void) &
   ((null | void, A, B) => void);
 
-export type Dependency = {|
+export type Dependency = {
   // The module name or path used to require the dependency
   id: string,
   +isAsync: boolean,
   +isPrefetchOnly: boolean,
-  +splitCondition: ?{|
+  +splitCondition: ?{
     +mobileConfigName: string,
-  |},
+  },
   path: string,
   +locs: $ReadOnlyArray<BabelSourceLocation>,
-|};
+};
 
-export type File = {|
+export type File = {
   code: string,
   map: ?BasicSourceMap,
   functionMap: ?FBSourceFunctionMap,
@@ -42,7 +42,7 @@ export type File = {|
   type: CodeFileTypes,
   libraryIdx: ?number,
   soundResources?: ?Array<string>,
-|};
+};
 
 type CodeFileTypes = 'module' | 'script';
 
@@ -51,11 +51,11 @@ export type GraphFn = (
   // platform: string,
 ) => GraphResult;
 
-export type GraphResult = {|
+export type GraphResult = {
   modules: Array<Module>,
-|};
+};
 
-export type ModuleIds = {|
+export type ModuleIds = {
   /**
    * The module ID is global across all segments and identifies the module
    * uniquely. This is useful to cache modules that has been loaded already at
@@ -71,7 +71,7 @@ export type ModuleIds = {|
    * case this property does not apply and will be omitted.
    */
   +localId?: number,
-|};
+};
 
 /**
  * Indempotent function that gets us the IDs corresponding to a particular
@@ -87,17 +87,17 @@ export type LoadResult = {
 
 export type LoadFn = (file: string) => LoadResult;
 
-export type Module = {|
+export type Module = {
   dependencies: Array<Dependency>,
   file: File,
-|};
+};
 
 export type PostProcessModules = (
   modules: $ReadOnlyArray<Module>,
   entryPoints: Array<string>,
 ) => $ReadOnlyArray<Module>;
 
-export type OutputFnArg = {|
+export type OutputFnArg = {
   dependencyMapReservedName?: ?string,
   filename: string,
   globalPrefix: string,
@@ -107,22 +107,22 @@ export type OutputFnArg = {|
   sourceMapPath?: ?string,
   enableIDInlining: boolean,
   segmentID: number,
-|};
+};
 export type OutputFn<M: MixedSourceMap = MixedSourceMap> =
   OutputFnArg => OutputResult<M>;
 
-export type OutputResult<M: MixedSourceMap> = {|
+export type OutputResult<M: MixedSourceMap> = {
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: M,
-|};
+};
 
-export type PackageData = {|
+export type PackageData = {
   browser?: Object | string,
   main?: string,
   name?: string,
   'react-native'?: Object | string,
-|};
+};
 
 export type ResolveFn = (id: string, source: ?string) => string;
 
@@ -159,16 +159,16 @@ export type TransformResults = {
 
 export type TransformVariants = {+[name: string]: {...}};
 
-export type TransformedCodeFile = {|
+export type TransformedCodeFile = {
   +file: string,
   +functionMap: ?FBSourceFunctionMap,
   +hasteID: ?string,
   +package?: PackageData,
   +transformed: TransformResults,
   +type: CodeFileTypes,
-|};
+};
 
-export type ImageSize = {|+width: number, +height: number|};
+export type ImageSize = {+width: number, +height: number};
 
 export type AssetFileVariant = $ReadOnly<{
   /**
@@ -228,24 +228,24 @@ export type AssetFile = $ReadOnly<{
 }>;
 
 export type TransformedSourceFile =
-  | {|
+  | {
       +type: 'code',
       +details: TransformedCodeFile,
-    |}
-  | {|
+    }
+  | {
       +type: 'asset',
       +details: AssetFile,
-    |}
-  | {|
+    }
+  | {
       +type: 'unknown',
-    |};
+    };
 
-export type LibraryOptions = {|
+export type LibraryOptions = {
   dependencies?: Array<string>,
   optimize: boolean,
   platform?: string,
   rebasePath: string => string,
-|};
+};
 
 export type Base64Content = string;
 export type AssetContents = {
@@ -258,7 +258,7 @@ export type AssetContentsByPath = {
   ...
 };
 
-export type ResolvedCodeFile = {|
+export type ResolvedCodeFile = {
   +codeFile: TransformedCodeFile,
   /**
    * Imagine we have a source file that contains a `require('foo')`. The library
@@ -267,35 +267,35 @@ export type ResolvedCodeFile = {|
    * `{'foo': 'bar/foo.js', 'bar': 'node_modules/bar/index.js'}`.
    */
   +filePathsByDependencyName: {[dependencyName: string]: string, ...},
-|};
+};
 
-export type LibraryBoundCodeFile = {|
+export type LibraryBoundCodeFile = {
   ...ResolvedCodeFile,
   /**
    * Index of the library that this code file has been exported from.
    */
   +libraryIdx: number,
-|};
+};
 
 /**
  * Describe a set of JavaScript files and the associated assets. It could be
  * depending on modules from other libraries. To be able to resolve these
  * dependencies, these libraries need to be provided by callsites (ex. Buck).
  */
-export type Library = {|
+export type Library = {
   +files: Array<TransformedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
-|};
+};
 
 /**
  * Just like a `Library`, but it also contains module resolutions. For example
  * if there is a `require('foo')` in some JavaScript file, we keep track of the
  * path it resolves to, ex. `beep/glo/foo.js`.
  */
-export type ResolvedLibrary = {|
+export type ResolvedLibrary = {
   +files: $ReadOnlyArray<ResolvedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
   +isPartiallyResolved?: boolean,
-|};
+};

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -332,7 +332,7 @@ function processRequireCall<TSplitCondition>(
 }
 
 function getNearestLocFromPath(path: NodePath<>): ?BabelSourceLocation {
-  let current = path;
+  let current: ?(NodePath<> | NodePath<BabelNode>) = path;
   while (current && !current.node.loc) {
     current = current.parentPath;
   }
@@ -383,7 +383,7 @@ function isOptionalDependency<TSplitCondition>(
 
   // Valid statement stack for single-level try-block: expressionStatement -> blockStatement -> tryStatement
   let sCount = 0;
-  let p = path;
+  let p: ?(NodePath<> | NodePath<BabelNode>) = path;
   while (p && sCount < 3) {
     if (p.isStatement()) {
       if (p.node.type === 'BlockStatement') {

package/src/Server/symbolicate.js.flow

@@ -35,7 +35,7 @@ export type StackFrameOutput = $ReadOnly<{
   ...
 }>;
 type ExplodedSourceMapModule = $ElementType<ExplodedSourceMap, number>;
-type Position = {|+line1Based: number, column0Based: number|};
+type Position = {+line1Based: number, column0Based: number};
 
 function createFunctionNameGetter(
   module: ExplodedSourceMapModule,

package/src/Server.js.flow

@@ -81,7 +81,7 @@ export type BundleMetadata = {
   ...
 };
 
-type ProcessStartContext = {|
+type ProcessStartContext = {
   +buildID: string,
   +bundleOptions: BundleOptions,
   +graphId: GraphId,
@@ -91,24 +91,24 @@ type ProcessStartContext = {|
   +req: IncomingMessage,
   +revisionId?: ?RevisionId,
   ...SplitBundleOptions,
-|};
+};
 
-type ProcessDeleteContext = {|
+type ProcessDeleteContext = {
   +graphId: GraphId,
   +req: IncomingMessage,
   +res: ServerResponse,
-|};
+};
 
-type ProcessEndContext<T> = {|
+type ProcessEndContext<T> = {
   ...ProcessStartContext,
   +result: T,
-|};
+};
 
-export type ServerOptions = $ReadOnly<{|
+export type ServerOptions = $ReadOnly<{
   hasReducedPerformance?: boolean,
   onBundleBuilt?: (bundlePath: string) => void,
   watch?: boolean,
-|}>;
+}>;
 
 const DELTA_ID_HEADER = 'X-Metro-Delta-ID';
 const FILES_CHANGED_COUNT_HEADER = 'X-Metro-Files-Changed-Count';
@@ -504,7 +504,7 @@ class Server {
     build,
     delete: deleteFn,
     finish,
-  }: {|
+  }: {
     +createStartEntry: (context: ProcessStartContext) => ActionLogEntryData,
     +createEndEntry: (
       context: ProcessEndContext<T>,
@@ -512,7 +512,7 @@ class Server {
     +build: (context: ProcessStartContext) => Promise<T>,
     +delete?: (context: ProcessDeleteContext) => Promise<void>,
     +finish: (context: ProcessEndContext<T>) => void,
-  |}) {
+  }) {
     return async function requestProcessor(
       req: IncomingMessage,
       res: ServerResponse,
@@ -703,12 +703,12 @@ class Server {
       };
     },
     createEndEntry(
-      context: ProcessEndContext<{|
+      context: ProcessEndContext<{
         bundle: string,
         lastModifiedDate: Date,
         nextRevId: RevisionId,
         numModifiedFiles: number,
-      |}>,
+      }>,
     ) {
       return {
         outdated_modules: context.result.numModifiedFiles,
@@ -820,12 +820,12 @@ class Server {
       };
     },
     createEndEntry(
-      context: ProcessEndContext<{|
+      context: ProcessEndContext<{
         bytecode: Buffer,
         lastModifiedDate: Date,
         nextRevId: RevisionId,
         numModifiedFiles: number,
-      |}>,
+      }>,
     ) {
       return {
         outdated_modules: context.result.numModifiedFiles,
@@ -1193,14 +1193,14 @@ class Server {
     return this._config.watchFolders;
   }
 
-  static DEFAULT_GRAPH_OPTIONS: {|
+  static DEFAULT_GRAPH_OPTIONS: {
     customTransformOptions: any,
     dev: boolean,
     hot: boolean,
     minify: boolean,
     runtimeBytecodeVersion: ?number,
     unstable_transformProfile: 'default',
-  |} = {
+  } = {
     customTransformOptions: Object.create(null),
     dev: true,
     hot: false,
@@ -1209,7 +1209,7 @@ class Server {
     unstable_transformProfile: 'default',
   };
 
-  static DEFAULT_BUNDLE_OPTIONS: {|
+  static DEFAULT_BUNDLE_OPTIONS: {
     ...typeof Server.DEFAULT_GRAPH_OPTIONS,
     excludeSource: false,
     inlineSourceMap: false,
@@ -1219,7 +1219,7 @@ class Server {
     shallow: false,
     sourceMapUrl: null,
     sourceUrl: null,
-  |} = {
+  } = {
     ...Server.DEFAULT_GRAPH_OPTIONS,
     excludeSource: false,
     inlineSourceMap: false,

package/src/cli.js

@@ -11,6 +11,11 @@
  */
 "use strict";
 
+try {
+  // $FlowFixMe[untyped-import]
+  require("metro-babel-register").unstable_registerForMetroMonorepo();
+} catch {}
+
 const { attachMetroCli } = require("./index");
 
 const yargs = require("yargs");

package/src/cli.js.flow

@@ -11,6 +11,11 @@
 
 'use strict';
 
+try {
+  // $FlowFixMe[untyped-import]
+  require('metro-babel-register').unstable_registerForMetroMonorepo();
+} catch {}
+
 const {attachMetroCli} = require('./index');
 const yargs = require('yargs');
 

package/src/commands/build.js

@@ -11,8 +11,6 @@
 
 const { makeAsyncCommand } = require("../cli-utils");
 
-const MetroApi = require("../index");
-
 const TerminalReporter = require("../lib/TerminalReporter");
 
 const { loadConfig } = require("metro-config");
@@ -78,7 +76,10 @@ module.exports = () => ({
   handler: makeAsyncCommand(async (argv) => {
     const config = await loadConfig(argv); // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
 
-    const options = argv;
+    const options = argv; // Inline require() to avoid circular dependency with ../index
+
+    const MetroApi = require("../index");
+
     await MetroApi.runBuild(config, {
       ...options,
       onBegin: () => {

package/src/commands/build.js.flow

@@ -15,7 +15,6 @@ import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
 
 const {makeAsyncCommand} = require('../cli-utils');
-const MetroApi = require('../index');
 const TerminalReporter = require('../lib/TerminalReporter');
 const {loadConfig} = require('metro-config');
 const {Terminal} = require('metro-core');
@@ -23,12 +22,12 @@ const {Terminal} = require('metro-core');
 const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
-module.exports = (): ({|
+module.exports = (): ({
   builder: (yargs: Yargs) => void,
   command: string,
   description: string,
   handler: (argv: YargArguments) => void,
-|}) => ({
+}) => ({
   command: 'build <entry>',
 
   description:
@@ -66,6 +65,9 @@ module.exports = (): ({|
     // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
     const options = (argv: RunBuildOptions);
 
+    // Inline require() to avoid circular dependency with ../index
+    const MetroApi = require('../index');
+
     await MetroApi.runBuild(config, {
       ...options,
       onBegin: (): void => {

package/src/commands/serve.js

@@ -11,8 +11,6 @@
 
 const { makeAsyncCommand, watchFile } = require("../cli-utils");
 
-const MetroApi = require("../index");
-
 const { loadConfig, resolveConfig } = require("metro-config");
 
 const { promisify } = require("util");
@@ -93,7 +91,9 @@ module.exports = () => ({
         await promisify(server.close).call(server);
       }
 
-      const config = await loadConfig(argv); // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
+      const config = await loadConfig(argv); // Inline require() to avoid circular dependency with ../index
+
+      const MetroApi = require("../index"); // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
 
       server = await MetroApi.runServer(config, argv);
       restarting = false;

package/src/commands/serve.js.flow

@@ -15,16 +15,15 @@ import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
 
 const {makeAsyncCommand, watchFile} = require('../cli-utils');
-const MetroApi = require('../index');
 const {loadConfig, resolveConfig} = require('metro-config');
 const {promisify} = require('util');
 
-module.exports = (): ({|
+module.exports = (): ({
   builder: (yargs: Yargs) => void,
   command: $TEMPORARY$string<'serve'>,
   description: string,
   handler: (argv: YargArguments) => void,
-|}) => ({
+}) => ({
   command: 'serve',
 
   description: 'Starts Metro on the given port, building bundles on the fly',
@@ -84,6 +83,9 @@ module.exports = (): ({|
 
       const config = await loadConfig(argv);
 
+      // Inline require() to avoid circular dependency with ../index
+      const MetroApi = require('../index');
+
       // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
       server = await MetroApi.runServer(config, (argv: RunServerOptions));