metro 0.65.2 → 0.67.0

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,10 +10,11 @@
 
 'use strict';
 
+import type {FunctionExpression, Identifier, Program} from '@babel/types';
+
 import template from '@babel/template';
 import traverse from '@babel/traverse';
 import * as t from '@babel/types';
-import type {Program, FunctionExpression, Identifier} from '@babel/types';
 import invariant from 'invariant';
 
 const WRAP_NAME = '$$_REQUIRE'; // note: babel will prefix this with _

package/src/ModuleGraph/worker/Platforms.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,5 +17,5 @@
 
 const VALID_PLATFORMS = new Set(["ios", "android", "web"]);
 module.exports = {
-  VALID_PLATFORMS
+  VALID_PLATFORMS,
 };

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/ModuleGraph/worker/collectDependencies.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,10 +9,6 @@
  */
 "use strict";
 
-const invariant = require("invariant");
-
-const nullthrows = require("nullthrows");
-
 const generate = require("@babel/generator").default;
 
 const template = require("@babel/template").default;
@@ -21,6 +17,10 @@ const traverse = require("@babel/traverse").default;
 
 const types = require("@babel/types");
 
+const invariant = require("invariant");
+
+const nullthrows = require("nullthrows");
+
 const { isImport } = types;
 
 /**
@@ -52,7 +52,7 @@ function collectDependencies(ast, options) {
     dependencyMapIdentifier: null,
     dynamicRequires: options.dynamicRequires,
     keepRequireNames: options.keepRequireNames,
-    allowOptionalDependencies: options.allowOptionalDependencies
+    allowOptionalDependencies: options.allowOptionalDependencies,
   };
   const visitor = {
     CallExpression(path, state) {
@@ -65,14 +65,14 @@ function collectDependencies(ast, options) {
 
       if (isImport(callee)) {
         processImportCall(path, state, {
-          asyncType: "async"
+          asyncType: "async",
         });
         return;
       }
 
       if (name === "__prefetchImport" && !path.scope.getBinding(name)) {
         processImportCall(path, state, {
-          asyncType: "prefetch"
+          asyncType: "prefetch",
         });
         return;
       }
@@ -80,7 +80,7 @@ function collectDependencies(ast, options) {
       if (name === "__jsResource" && !path.scope.getBinding(name)) {
         processImportCall(path, state, {
           asyncType: "async",
-          jsResource: true
+          jsResource: true,
         });
         return;
       }
@@ -94,7 +94,7 @@ function collectDependencies(ast, options) {
         processImportCall(path, state, {
           asyncType: "async",
           jsResource: true,
-          splitCondition: args[1]
+          splitCondition: args[1],
         });
         return;
       }
@@ -123,13 +123,12 @@ function collectDependencies(ast, options) {
           options.dependencyMapName
         );
       } else {
-        state.dependencyMapIdentifier = path.scope.generateUidIdentifier(
-          "dependencyMap"
-        );
+        state.dependencyMapIdentifier =
+          path.scope.generateUidIdentifier("dependencyMap");
       }
 
       state.dependencyCalls = new Set(["require", ...options.inlineableCalls]);
-    }
+    },
   };
   traverse(ast, visitor, null, state);
   const collectedDependencies = state.dependencyRegistry.getDependencies(); // Compute the list of dependencies.
@@ -139,14 +138,14 @@ function collectDependencies(ast, options) {
   for (const { index, name, ...dependencyData } of collectedDependencies) {
     dependencies[index] = {
       name,
-      data: dependencyData
+      data: dependencyData,
     };
   }
 
   return {
     ast,
     dependencies,
-    dependencyMapName: nullthrows(state.dependencyMapIdentifier).name
+    dependencyMapName: nullthrows(state.dependencyMapIdentifier).name,
   };
 }
 
@@ -157,7 +156,7 @@ function collectImports(path, state) {
       {
         name: path.node.source.value,
         asyncType: null,
-        optional: false
+        optional: false,
       },
       path
     );
@@ -177,7 +176,7 @@ function processImportCall(path, state, options) {
       name,
       asyncType: options.asyncType,
       splitCondition: options.splitCondition,
-      optional: isOptionalDependency(name, path, state)
+      optional: isOptionalDependency(name, path, state),
     },
     path
   );
@@ -210,7 +209,7 @@ function processRequireCall(path, state) {
     {
       name,
       asyncType: null,
-      optional: isOptionalDependency(name, path, state)
+      optional: isOptionalDependency(name, path, state),
     },
     path
   );
@@ -361,7 +360,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -373,7 +372,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -385,7 +384,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -404,10 +403,10 @@ const DefaultDependencyTransformer = {
             _path$node$loc$start$ !== void 0
             ? _path$node$loc$start$
             : 0
-        )
+        ),
       })
     );
-  }
+  },
 };
 
 function createModuleIDExpression(dependency, state) {
@@ -433,7 +432,7 @@ class DefaultModuleDependencyRegistry {
         name: qualifier.name,
         asyncType: qualifier.asyncType,
         locs: [],
-        index: this._dependencies.size
+        index: this._dependencies.size,
       };
 
       if (qualifier.optional) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,23 +10,22 @@
 
 'use strict';
 
-const invariant = require('invariant');
-const nullthrows = require('nullthrows');
+import type {NodePath} from '@babel/traverse';
+import type {CallExpression, Identifier, StringLiteral} from '@babel/types';
+import type {
+  AllowOptionalDependencies,
+  AsyncDependencyType,
+} from 'metro/src/DeltaBundler/types.flow.js';
 
 const generate = require('@babel/generator').default;
 const template = require('@babel/template').default;
 const traverse = require('@babel/traverse').default;
 const types = require('@babel/types');
+const invariant = require('invariant');
+const nullthrows = require('nullthrows');
 
 const {isImport} = types;
 
-import type {NodePath} from '@babel/traverse';
-import type {CallExpression, Identifier, StringLiteral} from '@babel/types';
-import type {
-  AllowOptionalDependencies,
-  AsyncDependencyType,
-} from 'metro/src/DeltaBundler/types.flow.js';
-
 type ImportDependencyOptions = $ReadOnly<{
   asyncType: AsyncDependencyType,
   jsResource?: boolean,
@@ -71,7 +70,7 @@ export type State<TSplitCondition> = {
 
 export type Options<TSplitCondition = void> = $ReadOnly<{
   asyncRequireModulePath: string,
-  dependencyMapName?: string,
+  dependencyMapName: ?string,
   dynamicRequires: DynamicRequiresBehavior,
   inlineableCalls: $ReadOnlyArray<string>,
   keepRequireNames: boolean,
@@ -224,9 +223,8 @@ function collectDependencies<TSplitCondition = void>(
           options.dependencyMapName,
         );
       } else {
-        state.dependencyMapIdentifier = path.scope.generateUidIdentifier(
-          'dependencyMap',
-        );
+        state.dependencyMapIdentifier =
+          path.scope.generateUidIdentifier('dependencyMap');
       }
 
       state.dependencyCalls = new Set(['require', ...options.inlineableCalls]);
@@ -549,15 +547,15 @@ function createModuleNameLiteral(dependency: InternalDependency<mixed>) {
 }
 
 class DefaultModuleDependencyRegistry<TSplitCondition = void>
-  implements ModuleDependencyRegistry<TSplitCondition> {
+  implements ModuleDependencyRegistry<TSplitCondition>
+{
   _dependencies: Map<string, InternalDependency<TSplitCondition>> = new Map();
 
   registerDependency(
     qualifier: ImportQualifier,
   ): InternalDependency<TSplitCondition> {
-    let dependency: ?InternalDependency<TSplitCondition> = this._dependencies.get(
-      qualifier.name,
-    );
+    let dependency: ?InternalDependency<TSplitCondition> =
+      this._dependencies.get(qualifier.name);
 
     if (dependency == null) {
       const newDependency: MutableInternalDependency<TSplitCondition> = {

package/src/ModuleGraph/worker/generate.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,7 +20,7 @@ function generate(ast, filename, sourceCode) {
       filename,
       sourceFileName: filename,
       sourceMaps: true,
-      sourceMapTarget: filename
+      sourceMapTarget: filename,
     },
     sourceCode
   );

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,10 +10,10 @@
 
 'use strict';
 
-const babelGenerate = require('@babel/generator').default;
-
 import type {GeneratorResult} from '@babel/generator';
 
+const babelGenerate = require('@babel/generator').default;
+
 function generate(
   ast: BabelNode,
   filename: string,

package/src/ModuleGraph/worker/generateImportNames.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,9 +9,9 @@
  */
 "use strict";
 
-const nullthrows = require("nullthrows");
-
 const traverse = require("@babel/traverse").default;
+
+const nullthrows = require("nullthrows");
 /**
  * Select unused names for "metroImportDefault" and "metroImportAll", by
  * calling "generateUid".
@@ -25,11 +25,11 @@ function generateImportNames(ast) {
       importAll = path.scope.generateUid("$$_IMPORT_ALL");
       importDefault = path.scope.generateUid("$$_IMPORT_DEFAULT");
       path.stop();
-    }
+    },
   });
   return {
     importAll: nullthrows(importAll),
-    importDefault: nullthrows(importDefault)
+    importDefault: nullthrows(importDefault),
   };
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,16 +10,14 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
 const traverse = require('@babel/traverse').default;
+const nullthrows = require('nullthrows');
 
 /**
  * Select unused names for "metroImportDefault" and "metroImportAll", by
  * calling "generateUid".
  */
-function generateImportNames(
-  ast: BabelNode,
-): {
+function generateImportNames(ast: BabelNode): {
   importAll: string,
   importDefault: string,
 } {

package/src/ModuleGraph/worker/mergeSourceMaps.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,21 +7,22 @@
  * @format
  *
  */
-"use strict"; // $FlowExpectedError: TODO(t67543266): `source-map` is hard to type.
+"use strict";
 
+// $FlowExpectedError: TODO(t67543266): `source-map` is hard to type.
 const sourceMap = require("source-map");
 
 function mergeSourceMaps(file, originalMap, secondMap) {
   const merged = new sourceMap.SourceMapGenerator();
   const inputMap = new sourceMap.SourceMapConsumer(originalMap);
-  new sourceMap.SourceMapConsumer(secondMap).eachMapping(mapping => {
+  new sourceMap.SourceMapConsumer(secondMap).eachMapping((mapping) => {
     if (mapping.originalLine == null) {
       return;
     }
 
     const original = inputMap.originalPositionFor({
       line: mapping.originalLine,
-      column: mapping.originalColumn
+      column: mapping.originalColumn,
     });
 
     if (original.line == null) {
@@ -31,14 +32,14 @@ function mergeSourceMaps(file, originalMap, secondMap) {
     merged.addMapping({
       generated: {
         line: mapping.generatedLine,
-        column: mapping.generatedColumn
+        column: mapping.generatedColumn,
       },
       original: {
         line: original.line,
-        column: original.column || 0
+        column: original.column || 0,
       },
       source: file,
-      name: original.name || mapping.name
+      name: original.name || mapping.name,
     });
   });
   return { ...merged.toJSON(), sources: inputMap.sources };

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,11 +10,11 @@
 
 'use strict';
 
+import type {BasicSourceMap, MixedSourceMap} from 'metro-source-map';
+
 // $FlowExpectedError: TODO(t67543266): `source-map` is hard to type.
 const sourceMap = require('source-map');
 
-import type {MixedSourceMap, BasicSourceMap} from 'metro-source-map';
-
 function mergeSourceMaps(
   file: string,
   originalMap: MixedSourceMap,

package/src/Server/MultipartResponse.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,11 +15,7 @@ const BOUNDARY = "3beqjf3apnqeu3h5jqorms4i";
 
 class MultipartResponse {
   static wrap(req, res) {
-    if (
-      accepts(req)
-        .types()
-        .includes("multipart/mixed")
-    ) {
+    if (accepts(req).types().includes("multipart/mixed")) {
       return new MultipartResponse(res);
     } // Ugly hack, ideally wrap function should always return a proxy
     // object with the same interface
@@ -33,7 +29,7 @@ class MultipartResponse {
     this.res = res;
     this.headers = {};
     res.writeHead(200, {
-      "Content-Type": `multipart/mixed; boundary="${BOUNDARY}"`
+      "Content-Type": `multipart/mixed; boundary="${BOUNDARY}"`,
     });
     res.write(
       "If you are seeing this, your client does not support multipart response"
@@ -85,7 +81,7 @@ class MultipartResponse {
 
   static serializeHeaders(headers) {
     return Object.keys(headers)
-      .map(key => `${key}: ${headers[key]}`)
+      .map((key) => `${key}: ${headers[key]}`)
       .join(CRLF);
   }
 }

package/src/Server/symbolicate.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@
 const { greatestLowerBound } = require("metro-source-map/src/Consumer/search");
 
 const {
-  SourceMetadataMapConsumer
+  SourceMetadataMapConsumer,
 } = require("metro-symbolicate/src/Symbolication");
 
 function createFunctionNameGetter(module) {
@@ -22,16 +22,16 @@ function createFunctionNameGetter(module) {
       mappings: "",
       sources: ["dummy"],
       names: [],
-      x_facebook_sources: [[module.functionMap]]
+      x_facebook_sources: [[module.functionMap]],
     },
-    name => name
+    (name) => name
     /* no normalization needed */
   );
   return ({ line1Based, column0Based }) =>
     consumer.functionNameFor({
       line: line1Based,
       column: column0Based,
-      source: "dummy"
+      source: "dummy",
     });
 }
 
@@ -75,7 +75,7 @@ async function symbolicate(stack, maps, config) {
 
     const generatedPosInModule = {
       line1Based: frame.lineNumber - module.firstLine1Based + 1,
-      column0Based: frame.column
+      column0Based: frame.column,
     };
     const mappingIndex = greatestLowerBound(
       module.map,
@@ -107,7 +107,7 @@ async function symbolicate(stack, maps, config) {
       // $FlowFixMe: Length checks do not refine tuple unions.
       line1Based: mapping[2],
       // $FlowFixMe: Length checks do not refine tuple unions.
-      column0Based: mapping[3]
+      column0Based: mapping[3],
     };
   }
 
@@ -157,7 +157,7 @@ async function symbolicate(stack, maps, config) {
       methodName,
       file: module.path,
       lineNumber: originalPos.line1Based,
-      column: originalPos.column0Based
+      column: originalPos.column0Based,
     };
   }
 

package/src/Server/symbolicate.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,15 +9,19 @@
  */
 
 'use strict';
+import type {
+  MetroSourceMapSegmentTuple,
+  FBSourceFunctionMap,
+} from '../../../metro-source-map/src/source-map';
+
+import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 const {greatestLowerBound} = require('metro-source-map/src/Consumer/search');
 const {
   SourceMetadataMapConsumer,
 } = require('metro-symbolicate/src/Symbolication');
 
-import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
-
 export type StackFrameInput = {
   +file: ?string,
   +lineNumber: ?number,
@@ -124,7 +128,15 @@ async function symbolicate(
     };
   }
 
-  function findFunctionName(originalPos, module): ?string {
+  function findFunctionName(
+    originalPos: Position,
+    module: {
+      +firstLine1Based: number,
+      +functionMap: ?FBSourceFunctionMap,
+      +map: Array<MetroSourceMapSegmentTuple>,
+      +path: string,
+    },
+  ): ?string {
     if (module.functionMap) {
       let getFunctionName = functionNameGetters.get(module);
       if (!getFunctionName) {