metro 0.65.2 → 0.67.0

package/src/ModuleGraph/output/util.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,29 +9,30 @@
  */
 "use strict";
 
+const virtualModule = require("../module").virtual;
+
 const generate = require("../worker/generate");
 
 const mergeSourceMaps = require("../worker/mergeSourceMaps");
 
-const nullthrows = require("nullthrows");
-
 const reverseDependencyMapReferences = require("./reverse-dependency-map-references");
 
-const { addParamsToDefineCall } = require("metro-transform-plugins");
+const { parseSync, transformFromAstSync } = require("@babel/core");
 
-const virtualModule = require("../module").virtual; // flowlint-next-line untyped-import:off
+const HermesParser = require("hermes-parser"); // flowlint-next-line untyped-import:off
 
 const { passthroughSyntaxPlugins } = require("metro-react-native-babel-preset");
 
-const { transformSync } = require("@babel/core");
+const { addParamsToDefineCall } = require("metro-transform-plugins");
 
-// Transformed modules have the form
+const nullthrows = require("nullthrows"); // Transformed modules have the form
 //   __d(function(require, module, global, exports, dependencyMap) {
 //       /* code */
 //   });
 //
 // This function adds the numeric module ID, and an array with dependencies of
 // the dependencies of the module before the closing parenthesis.
+
 function addModuleIdsToModuleWrapper(module, idForPath) {
   const { dependencies, file } = module;
   const { code } = file; // calling `idForPath` on the module itself first gives us a lower module id
@@ -50,14 +51,23 @@ function addModuleIdsToModuleWrapper(module, idForPath) {
 
 exports.addModuleIdsToModuleWrapper = addModuleIdsToModuleWrapper;
 
+// TS detection conditions copied from metro-react-native-babel-preset
+function isTypeScriptSource(fileName) {
+  return !!fileName && fileName.endsWith(".ts");
+}
+
+function isTSXSource(fileName) {
+  return !!fileName && fileName.endsWith(".tsx");
+}
+
 function inlineModuleIds(
   module,
   idForPath,
   {
-    // $FlowFixMe[incompatible-type]
-    dependencyMapReservedName = undefined,
+    dependencyMapReservedName,
     globalPrefix,
-    ignoreMissingDependencyMapReference = false
+    ignoreMissingDependencyMapReference = false,
+    hermesParser = false,
   }
 ) {
   const { dependencies, file } = module;
@@ -73,7 +83,7 @@ function inlineModuleIds(
     return {
       fileId,
       moduleCode: code,
-      moduleMap: map
+      moduleMap: map,
     };
   }
 
@@ -108,7 +118,7 @@ function inlineModuleIds(
         return {
           fileId,
           moduleCode: code,
-          moduleMap: map
+          moduleMap: map,
         };
       } // If we're here, the module was probably generated by some code that
       // doesn't make the dependency map name externally configurable, or a
@@ -133,8 +143,9 @@ function inlineModuleIds(
         if (idStr.length > match.length) {
           // Stop the build rather than silently emit an incorrect source map.
           throw new Error(
-            `Module ID doesn't fit in available space; add ${idStr.length -
-              match.length} more characters to 'dependencyMapReservedName'.`
+            `Module ID doesn't fit in available space; add ${
+              idStr.length - match.length
+            } more characters to 'dependencyMapReservedName'.`
           );
         }
 
@@ -144,33 +155,42 @@ function inlineModuleIds(
     return {
       fileId,
       moduleCode: inlinedCode,
-      moduleMap: map
+      moduleMap: map,
     };
   }
 
+  const babelConfig = {
+    ast: true,
+    babelrc: false,
+    browserslistConfigFile: false,
+    code: false,
+    configFile: false,
+    plugins: [
+      ...passthroughSyntaxPlugins,
+      [
+        reverseDependencyMapReferences,
+        {
+          dependencyIds,
+          globalPrefix,
+        },
+      ],
+    ],
+  };
+  const sourceAst =
+    isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
+      ? parseSync(code, babelConfig)
+      : HermesParser.parse(code, {
+          babel: true,
+          sourceType: babelConfig.sourceType,
+        });
   const ast = nullthrows(
-    transformSync(code, {
-      ast: true,
-      babelrc: false,
-      code: false,
-      configFile: false,
-      plugins: [
-        ...passthroughSyntaxPlugins,
-        [
-          reverseDependencyMapReferences,
-          {
-            dependencyIds,
-            globalPrefix
-          }
-        ]
-      ]
-    }).ast
+    transformFromAstSync(sourceAst, code, babelConfig).ast
   );
   const { code: generatedCode, map: generatedMap } = generate(ast, path, "");
   return {
     fileId,
     moduleCode: generatedCode,
-    moduleMap: map && generatedMap && mergeSourceMaps(path, map, generatedMap)
+    moduleMap: map && generatedMap && mergeSourceMaps(path, map, generatedMap),
   };
 }
 
@@ -182,12 +202,13 @@ function inlineModuleIdsAndAddParamsToDefineCall(module, idForPath, options) {
   );
   return {
     moduleCode: addParamsToDefineCall(moduleCode, fileId),
-    moduleMap
+    moduleMap,
   };
 }
 
 exports.inlineModuleIds = inlineModuleIds;
-exports.inlineModuleIdsAndAddParamsToDefineCall = inlineModuleIdsAndAddParamsToDefineCall;
+exports.inlineModuleIdsAndAddParamsToDefineCall =
+  inlineModuleIdsAndAddParamsToDefineCall;
 
 function escapeRegex(str) {
   // From http://stackoverflow.com/questions/14076210/
@@ -215,7 +236,7 @@ function getModuleCodeAndMap(module, idForPath, options) {
       idForPath,
       {
         dependencyMapReservedName: options.dependencyMapReservedName,
-        globalPrefix: options.globalPrefix
+        globalPrefix: options.globalPrefix,
       }
     ));
   }
@@ -232,7 +253,7 @@ function getModuleCodeAndMap(module, idForPath, options) {
 
   return {
     moduleCode,
-    moduleMap
+    moduleMap,
   };
 }
 
@@ -261,7 +282,7 @@ exports.createIdForPathFn = () => {
 }; // creates a series of virtual modules with require calls to the passed-in
 // modules.
 
-exports.requireCallsTo = function*(modules, idForPath, getRunModuleStatement) {
+exports.requireCallsTo = function* (modules, idForPath, getRunModuleStatement) {
   for (const module of modules) {
     const id = idForPath(module.file);
     yield virtualModule(
@@ -293,11 +314,11 @@ function toModuleTransport(
   const { dependencies, file } = module;
   const { moduleCode, moduleMap } = getModuleCodeAndMap(
     module,
-    x => idsForPath(x).moduleId,
+    (x) => idsForPath(x).moduleId,
     {
       dependencyMapReservedName,
       enableIDInlining: true,
-      globalPrefix
+      globalPrefix,
     }
   );
   return {
@@ -307,7 +328,7 @@ function toModuleTransport(
     id: file.type === "module" ? nullthrows(idsForPath(file).localId) : -1,
     map: moduleMap,
     name: file.path,
-    sourcePath: file.path
+    sourcePath: file.path,
   };
 }
 

package/src/ModuleGraph/output/util.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,20 +10,19 @@
 
 'use strict';
 
+import type {Dependency, IdsForPathFn, Module} from '../types.flow';
+import type {BasicSourceMap} from 'metro-source-map';
+
+const virtualModule = require('../module').virtual;
 const generate = require('../worker/generate');
 const mergeSourceMaps = require('../worker/mergeSourceMaps');
-const nullthrows = require('nullthrows');
 const reverseDependencyMapReferences = require('./reverse-dependency-map-references');
-
-const {addParamsToDefineCall} = require('metro-transform-plugins');
-const virtualModule = require('../module').virtual;
-
+const {parseSync, transformFromAstSync} = require('@babel/core');
+const HermesParser = require('hermes-parser');
 // flowlint-next-line untyped-import:off
 const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
-const {transformSync} = require('@babel/core');
-
-import type {Dependency, IdsForPathFn, Module} from '../types.flow';
-import type {BasicSourceMap} from 'metro-source-map';
+const {addParamsToDefineCall} = require('metro-transform-plugins');
+const nullthrows = require('nullthrows');
 
 // Transformed modules have the form
 //   __d(function(require, module, global, exports, dependencyMap) {
@@ -55,20 +54,30 @@ function addModuleIdsToModuleWrapper(
 
 exports.addModuleIdsToModuleWrapper = addModuleIdsToModuleWrapper;
 
-type InlineModuleIdsOptions = {
+type InlineModuleIdsOptions = $ReadOnly<{
   dependencyMapReservedName: ?string,
   globalPrefix: string,
   ignoreMissingDependencyMapReference?: boolean,
-};
+  hermesParser?: boolean,
+}>;
+
+// TS detection conditions copied from metro-react-native-babel-preset
+function isTypeScriptSource(fileName) {
+  return !!fileName && fileName.endsWith('.ts');
+}
+
+function isTSXSource(fileName) {
+  return !!fileName && fileName.endsWith('.tsx');
+}
 
 function inlineModuleIds(
   module: Module,
   idForPath: ({path: string, ...}) => number,
   {
-    // $FlowFixMe[incompatible-type]
-    dependencyMapReservedName = undefined,
+    dependencyMapReservedName,
     globalPrefix,
     ignoreMissingDependencyMapReference = false,
+    hermesParser = false,
   }: InlineModuleIdsOptions,
 ): {
   moduleCode: string,
@@ -140,8 +149,9 @@ function inlineModuleIds(
         if (idStr.length > match.length) {
           // Stop the build rather than silently emit an incorrect source map.
           throw new Error(
-            `Module ID doesn't fit in available space; add ${idStr.length -
-              match.length} more characters to 'dependencyMapReservedName'.`,
+            `Module ID doesn't fit in available space; add ${
+              idStr.length - match.length
+            } more characters to 'dependencyMapReservedName'.`,
           );
         }
         return idStr.padEnd(match.length);
@@ -153,17 +163,29 @@ function inlineModuleIds(
       moduleMap: map,
     };
   }
+
+  const babelConfig = {
+    ast: true,
+    babelrc: false,
+    browserslistConfigFile: false,
+    code: false,
+    configFile: false,
+    plugins: [
+      ...passthroughSyntaxPlugins,
+      [reverseDependencyMapReferences, {dependencyIds, globalPrefix}],
+    ],
+  };
+
+  const sourceAst =
+    isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
+      ? parseSync(code, babelConfig)
+      : HermesParser.parse(code, {
+          babel: true,
+          sourceType: babelConfig.sourceType,
+        });
+
   const ast = nullthrows(
-    transformSync(code, {
-      ast: true,
-      babelrc: false,
-      code: false,
-      configFile: false,
-      plugins: [
-        ...passthroughSyntaxPlugins,
-        [reverseDependencyMapReferences, {dependencyIds, globalPrefix}],
-      ],
-    }).ast,
+    transformFromAstSync(sourceAst, code, babelConfig).ast,
   );
 
   const {code: generatedCode, map: generatedMap} = generate(ast, path, '');
@@ -193,7 +215,8 @@ function inlineModuleIdsAndAddParamsToDefineCall(
 }
 
 exports.inlineModuleIds = inlineModuleIds;
-exports.inlineModuleIdsAndAddParamsToDefineCall = inlineModuleIdsAndAddParamsToDefineCall;
+exports.inlineModuleIdsAndAddParamsToDefineCall =
+  inlineModuleIdsAndAddParamsToDefineCall;
 
 function escapeRegex(str: string): string {
   // From http://stackoverflow.com/questions/14076210/
@@ -276,7 +299,7 @@ exports.createIdForPathFn = (): (({path: string, ...}) => number) => {
 
 // creates a series of virtual modules with require calls to the passed-in
 // modules.
-exports.requireCallsTo = function*(
+exports.requireCallsTo = function* (
   modules: Iterable<Module>,
   idForPath: IdForPathFn,
   getRunModuleStatement: (id: number | string) => string,

package/src/ModuleGraph/silent-console.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.
@@ -21,6 +21,6 @@ const write = (_, __, callback) => callback();
 module.exports = new Console(
   new Writable({
     write,
-    writev: write
+    writev: write,
   })
 );

package/src/ModuleGraph/silent-console.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/test-helpers.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.
@@ -14,19 +14,19 @@ const { toMatchSnapshot } = require("jest-snapshot");
 
 const generateOptions = {
   concise: true,
-  sourceType: "module"
+  sourceType: "module",
 };
 
-const codeFromAst = ast => generate(ast, generateOptions).code;
+const codeFromAst = (ast) => generate(ast, generateOptions).code;
 
-const comparableCode = code => code.trim().replace(/\s+/g, " ");
+const comparableCode = (code) => code.trim().replace(/\s+/g, " ");
 
 function toEqualComparableCode(received, expected) {
   const comparableExpected = comparableCode(expected);
   const pass = received === comparableExpected;
   const options = {
     isNot: this.isNot,
-    promise: this.promise
+    promise: this.promise,
   };
   const message = pass
     ? () =>
@@ -61,7 +61,7 @@ function toEqualComparableCode(received, expected) {
   return {
     actual: received,
     message,
-    pass
+    pass,
   };
 } // See https://superuser.com/questions/380772/removing-ansi-color-codes-from-text-stream
 
@@ -87,5 +87,5 @@ module.exports = {
   codeFromAst,
   comparableCode,
   toEqualComparableCode,
-  toMatchCodeFrameSnapshot
+  toMatchCodeFrameSnapshot,
 };

package/src/ModuleGraph/types.flow.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.

package/src/ModuleGraph/types.flow.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.
@@ -11,9 +11,9 @@
 'use strict';
 
 import type {
-  MixedSourceMap,
-  FBSourceFunctionMap,
   BasicSourceMap,
+  FBSourceFunctionMap,
+  MixedSourceMap,
 } from 'metro-source-map';
 import type {TransformResultDependency} from 'metro/src/DeltaBundler';
 
@@ -98,7 +98,7 @@ export type PostProcessModules = (
 ) => $ReadOnlyArray<Module>;
 
 export type OutputFnArg = {|
-  dependencyMapReservedName?: string,
+  dependencyMapReservedName?: ?string,
   filename: string,
   globalPrefix: string,
   idsForPath: IdsForPathFn,
@@ -108,9 +108,8 @@ export type OutputFnArg = {|
   enableIDInlining: boolean,
   segmentID: number,
 |};
-export type OutputFn<
-  M: MixedSourceMap = MixedSourceMap,
-> = OutputFnArg => OutputResult<M>;
+export type OutputFn<M: MixedSourceMap = MixedSourceMap> =
+  OutputFnArg => OutputResult<M>;
 
 export type OutputResult<M: MixedSourceMap> = {|
   code: string | Buffer,
@@ -138,12 +137,15 @@ export type ConcreteTransformResult = {
   type: 'concrete',
   code: string,
   dependencies: $ReadOnlyArray<TransformResultDependency>,
-  dependencyMapName?: string,
   map: ?BasicSourceMap,
-  requireName: string,
   soundResources?: ?Array<string>,
+
+  // NOTE: requireName, importNames and dependencyMapName are only used by the
+  // optimizer. They are deleted when the transform result is serialized to
+  // JSON.
+  dependencyMapName?: string,
+  requireName?: string,
   importNames?: ImportNames,
-  isESModule?: true,
 };
 
 export type LinkedTransformResult = $ReadOnly<{
@@ -161,56 +163,69 @@ export type TransformedCodeFile = {|
   +file: string,
   +functionMap: ?FBSourceFunctionMap,
   +hasteID: ?string,
-  package?: PackageData,
+  +package?: PackageData,
   +transformed: TransformResults,
   +type: CodeFileTypes,
 |};
 
 export type ImageSize = {|+width: number, +height: number|};
 
-export type AssetFile = {|
-  /**
-   * The path of the asset that is shared by all potential variants
-   * of this asset. For example `foo/bar@3x.png` would have the
-   * asset path `foo/bar.png`.
-   */
-  +assetPath: string,
+export type AssetFileVariant = $ReadOnly<{
   /**
    * The content is encoded in Base64 so that it can be stored in JSON files,
    * that are used to communicate between different commands of a Buck
    * build worker, for example.
    */
-  +contentBase64: string,
-  /**
-   * Guessed from the file extension, for example `png` or `html`.
-   */
-  +contentType: string,
+  contentBase64: string,
   /**
    * Hash of the asset file content.
    */
-  +hash: string,
+  hash: string,
   /**
    * The path of the original file for this asset. For example
    * `foo/bar@3x.ios.png`. This is most useful for reporting purposes, such as
    * error messages.
    */
-  +filePath: string,
+  filePath: string,
   /**
    * If the asset is an image, this contain the size in physical pixels (ie.
-   * regarless of whether it's a `@2x` or `@3x` version of a smaller image).
+   * scale * logical pixels).
    */
-  +physicalSize: ?ImageSize,
+  physicalSize: ?ImageSize,
   /**
    * The platform this asset is designed for, for example `ios` if the file name
    * is `foo.ios.js`. `null` if the asset is not platform-specific.
    */
-  +platform: ?string,
+  platform: ?string,
   /**
    * The scale this asset is designed for, for example `2`
    * if the file name is `foo@2x.png`.
    */
-  +scale: number,
-|};
+  scale: number,
+}>;
+
+// A *virtual* asset file ( = one generated JS module in the bundle)
+// representing one or more asset variants ( = physical input files).
+export type AssetFile = $ReadOnly<{
+  /**
+   * The path of the asset that is shared by all potential variants
+   * of this asset. For example `foo/bar@3x.png` would have the
+   * asset path `foo/bar.png`.
+   */
+  assetPath: string,
+
+  /**
+   * Guessed from the file extension, for example `png` or `html`.
+   */
+  contentType: string,
+
+  /**
+   * The source files for this asset.
+   * TODO(moti): Guarantee that an AssetFile has *all* the source files for a
+   * given asset.
+   */
+  variants: $ReadOnlyArray<AssetFileVariant>,
+}>;
 
 export type TransformedSourceFile =
   | {|
@@ -240,7 +255,7 @@ export type AssetContents = {
 };
 export type AssetContentsByPath = {
   +[moduleFilePath: string]: $ReadOnlyArray<AssetContents>,
-  ...,
+  ...
 };
 
 export type ResolvedCodeFile = {|
@@ -282,4 +297,5 @@ export type ResolvedLibrary = {|
   +files: $ReadOnlyArray<ResolvedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
+  +isPartiallyResolved?: boolean,
 |};

package/src/ModuleGraph/worker/JsFileWrapping.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,23 +17,23 @@ var t = _interopRequireWildcard(require("@babel/types"));
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-function _getRequireWildcardCache() {
+function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
-  var cache = new WeakMap();
-  _getRequireWildcardCache = function() {
-    return cache;
-  };
-  return cache;
+  var cacheBabelInterop = new WeakMap();
+  var cacheNodeInterop = new WeakMap();
+  return (_getRequireWildcardCache = function (nodeInterop) {
+    return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
 }
 
-function _interopRequireWildcard(obj) {
-  if (obj && obj.__esModule) {
+function _interopRequireWildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
     return { default: obj };
   }
-  var cache = _getRequireWildcardCache();
+  var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {
     return cache.get(obj);
   }
@@ -41,7 +41,7 @@ function _interopRequireWildcard(obj) {
   var hasPropertyDescriptor =
     Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
       var desc = hasPropertyDescriptor
         ? Object.getOwnPropertyDescriptor(obj, key)
         : null;
@@ -90,7 +90,7 @@ function wrapModule(
   const requireName = renameRequires(ast);
   return {
     ast,
-    requireName
+    requireName,
   };
 }
 
@@ -114,7 +114,7 @@ function wrapJson(source, globalPrefix) {
   return [
     `${globalPrefix}__d(function(${moduleFactoryParameters.join(", ")}) {`,
     `  ${jsonToCommonJS(source)}`,
-    "});"
+    "});",
   ].join("\n");
 }
 
@@ -138,7 +138,7 @@ function buildParameters(importDefaultName, importAllName, dependencyMapName) {
     importAllName,
     "module",
     "exports",
-    dependencyMapName
+    dependencyMapName,
   ];
 } // Renaming requires should ideally only be done when generating for the target
 // that expects the custom require name in the optimize step.
@@ -157,7 +157,7 @@ function renameRequires(ast) {
       );
       newRequireName = body.scope.generateUid(WRAP_NAME);
       body.scope.rename("require", newRequireName);
-    }
+    },
   });
   return newRequireName;
 }
@@ -167,5 +167,5 @@ module.exports = {
   wrapJson,
   jsonToCommonJS,
   wrapModule,
-  wrapPolyfill
+  wrapPolyfill,
 };