metro 0.66.2 → 0.69.0

package/src/IncrementalBundler.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,18 +15,18 @@ const DeltaBundler = require("./DeltaBundler");
 
 const ResourceNotFoundError = require("./IncrementalBundler/ResourceNotFoundError");
 
-const crypto = require("crypto");
-
-const fs = require("fs");
-
 const getGraphId = require("./lib/getGraphId");
 
 const getPrependedScripts = require("./lib/getPrependedScripts");
 
-const path = require("path");
-
 const transformHelpers = require("./lib/transformHelpers");
 
+const crypto = require("crypto");
+
+const fs = require("fs");
+
+const path = require("path");
+
 function createRevisionId() {
   return crypto.randomBytes(8).toString("hex");
 }
@@ -73,7 +73,7 @@ class IncrementalBundler {
     transformOptions,
     otherOptions = {
       onProgress: null,
-      shallow: false
+      shallow: false,
     }
   ) {
     const absoluteEntryFiles = await this._getAbsoluteEntryFiles(entryFiles);
@@ -91,16 +91,16 @@ class IncrementalBundler {
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport,
-      shallow: otherOptions.shallow
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
+      shallow: otherOptions.shallow,
     });
 
     this._config.serializer.experimentalSerializerHook(graph, {
       added: graph.dependencies,
       modified: new Map(),
       deleted: new Set(),
-      reset: true
+      reset: true,
     });
 
     return graph;
@@ -111,7 +111,7 @@ class IncrementalBundler {
     transformOptions,
     otherOptions = {
       onProgress: null,
-      shallow: false
+      shallow: false,
     }
   ) {
     const absoluteEntryFiles = await this._getAbsoluteEntryFiles(entryFiles);
@@ -131,9 +131,9 @@ class IncrementalBundler {
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
-        experimentalImportBundleSupport: this._config.transformer
-          .experimentalImportBundleSupport,
-        shallow: otherOptions.shallow
+        experimentalImportBundleSupport:
+          this._config.transformer.experimentalImportBundleSupport,
+        shallow: otherOptions.shallow,
       }
     );
     return dependencies;
@@ -144,7 +144,7 @@ class IncrementalBundler {
     transformOptions,
     otherOptions = {
       onProgress: null,
-      shallow: false
+      shallow: false,
     }
   ) {
     const graph = await this.buildGraphForEntries(
@@ -161,7 +161,7 @@ class IncrementalBundler {
     );
     return {
       prepend,
-      graph
+      graph,
     };
   } // TODO T34760750 (alexkirsz) Eventually, I'd like to get to a point where
   // this class exposes only initializeGraph and updateGraph.
@@ -171,13 +171,13 @@ class IncrementalBundler {
     transformOptions,
     otherOptions = {
       onProgress: null,
-      shallow: false
+      shallow: false,
     }
   ) {
     const graphId = getGraphId(entryFile, transformOptions, {
       shallow: otherOptions.shallow,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
     });
     const revisionId = createRevisionId();
 
@@ -192,7 +192,7 @@ class IncrementalBundler {
         date: new Date(),
         graphId,
         graph,
-        prepend
+        prepend,
       };
     })();
 
@@ -206,11 +206,11 @@ class IncrementalBundler {
         added: revision.graph.dependencies,
         modified: new Map(),
         deleted: new Set(),
-        reset: true
+        reset: true,
       };
       return {
         revision,
-        delta
+        delta,
       };
     } catch (err) {
       // Evict a bad revision from the cache since otherwise
@@ -226,7 +226,7 @@ class IncrementalBundler {
   async updateGraph(revision, reset) {
     const delta = await this._deltaBundler.getDelta(revision.graph, {
       reset,
-      shallow: false
+      shallow: false,
     });
 
     this._config.serializer.experimentalSerializerHook(revision.graph, delta);
@@ -243,7 +243,7 @@ class IncrementalBundler {
         // Generate a new revision id, to be used to verify the next incremental
         // request.
         id: crypto.randomBytes(8).toString("hex"),
-        date: new Date()
+        date: new Date(),
       };
       const revisionPromise = Promise.resolve(revision);
 
@@ -254,7 +254,7 @@ class IncrementalBundler {
 
     return {
       revision,
-      delta
+      delta,
     };
   }
 
@@ -275,16 +275,24 @@ class IncrementalBundler {
   }
 
   async _getAbsoluteEntryFiles(entryFiles) {
-    const absoluteEntryFiles = entryFiles.map(entryFile =>
-      path.resolve(this._config.projectRoot, entryFile)
-    );
+    const absoluteEntryFiles = entryFiles.map((entryFile) => {
+      var _this$_config$server$;
+
+      return path.resolve(
+        (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
+          null && _this$_config$server$ !== void 0
+          ? _this$_config$server$
+          : this._config.projectRoot,
+        entryFile
+      );
+    });
     await Promise.all(
       absoluteEntryFiles.map(
-        entryFile =>
+        (entryFile) =>
           new Promise((resolve, reject) => {
             // This should throw an error if the file doesn't exist.
             // Using this instead of fs.exists to account for SimLinks.
-            fs.realpath(entryFile, err => {
+            fs.realpath(entryFile, (err) => {
               if (err) {
                 reject(new ResourceNotFoundError(entryFile));
               } else {
@@ -295,6 +303,10 @@ class IncrementalBundler {
       )
     );
     return absoluteEntryFiles;
+  } // Wait for the bundler to become ready.
+
+  async ready() {
+    await this._bundler.ready();
   }
 }
 

package/src/IncrementalBundler.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,26 +10,25 @@
 
 'use strict';
 
-const Bundler = require('./Bundler');
-const DeltaBundler = require('./DeltaBundler');
-const ResourceNotFoundError = require('./IncrementalBundler/ResourceNotFoundError');
-
-const crypto = require('crypto');
-const fs = require('fs');
-const getGraphId = require('./lib/getGraphId');
-const getPrependedScripts = require('./lib/getPrependedScripts');
-const path = require('path');
-const transformHelpers = require('./lib/transformHelpers');
-
+import type {DeltaResult, Graph, Module} from './DeltaBundler';
 import type {
+  Dependencies,
   Options as DeltaBundlerOptions,
   TransformInputOptions,
-  Dependencies,
 } from './DeltaBundler/types.flow';
-import type {DeltaResult, Module, Graph} from './DeltaBundler';
 import type {GraphId} from './lib/getGraphId';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
+const Bundler = require('./Bundler');
+const DeltaBundler = require('./DeltaBundler');
+const ResourceNotFoundError = require('./IncrementalBundler/ResourceNotFoundError');
+const getGraphId = require('./lib/getGraphId');
+const getPrependedScripts = require('./lib/getPrependedScripts');
+const transformHelpers = require('./lib/transformHelpers');
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
 export opaque type RevisionId: string = string;
 
 export type OutputGraph = Graph<>;
@@ -68,9 +67,8 @@ class IncrementalBundler {
   _revisionsById: Map<RevisionId, Promise<GraphRevision>> = new Map();
   _revisionsByGraphId: Map<GraphId, Promise<GraphRevision>> = new Map();
 
-  static revisionIdFromString: (
-    str: string,
-  ) => RevisionId = revisionIdFromString;
+  static revisionIdFromString: (str: string) => RevisionId =
+    revisionIdFromString;
 
   constructor(config: ConfigT, options?: IncrementalBundlerOptions) {
     this._config = config;
@@ -123,8 +121,8 @@ class IncrementalBundler {
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport,
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
       shallow: otherOptions.shallow,
     });
 
@@ -164,8 +162,8 @@ class IncrementalBundler {
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
-        experimentalImportBundleSupport: this._config.transformer
-          .experimentalImportBundleSupport,
+        experimentalImportBundleSupport:
+          this._config.transformer.experimentalImportBundleSupport,
         shallow: otherOptions.shallow,
       },
     );
@@ -218,8 +216,8 @@ class IncrementalBundler {
   }> {
     const graphId = getGraphId(entryFile, transformOptions, {
       shallow: otherOptions.shallow,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport,
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
     });
     const revisionId = createRevisionId();
     const revisionPromise = (async () => {
@@ -311,7 +309,10 @@ class IncrementalBundler {
     entryFiles: $ReadOnlyArray<string>,
   ): Promise<$ReadOnlyArray<string>> {
     const absoluteEntryFiles = entryFiles.map((entryFile: string) =>
-      path.resolve(this._config.projectRoot, entryFile),
+      path.resolve(
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
+        entryFile,
+      ),
     );
 
     await Promise.all(
@@ -333,6 +334,11 @@ class IncrementalBundler {
 
     return absoluteEntryFiles;
   }
+
+  // Wait for the bundler to become ready.
+  async ready(): Promise<void> {
+    await this._bundler.ready();
+  }
 }
 
 module.exports = IncrementalBundler;

package/src/ModuleGraph/module.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,8 +20,8 @@ const virtual = (code, filePath) => ({
     functionMap: null,
     path: filePath,
     type: "script",
-    libraryIdx: null
-  }
+    libraryIdx: null,
+  },
 });
 
 exports.virtual = virtual;

package/src/ModuleGraph/module.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/node-haste/HasteFS.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.
@@ -62,7 +62,7 @@ module.exports = class HasteFS {
 
 function buildDirectorySet(files) {
   const directories = new Set();
-  files.forEach(path => {
+  files.forEach((path) => {
     const parsedPath = parse(path);
     const root = parsedPath.root;
     let dir = parsedPath.dir;

package/src/ModuleGraph/node-haste/HasteFS.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/node-haste/Module.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/node-haste/Module.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/node-haste/ModuleCache.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/node-haste/ModuleCache.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 {PackageData, TransformedCodeFile} from '../types.flow';
+
 const Module = require('./Module');
 const Package = require('./Package');
 
-import type {PackageData, TransformedCodeFile} from '../types.flow';
-
 type GetClosestPackageFn = (filePath: string) => ?string;
 
 module.exports = class ModuleCache {

package/src/ModuleGraph/node-haste/Package.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.
@@ -113,13 +113,13 @@ function getReplacements(pkg) {
 
   if (typeof rn !== "object") {
     rn = {
-      [main]: rn
+      [main]: rn,
     };
   }
 
   if (typeof browser !== "object") {
     browser = {
-      [main]: browser
+      [main]: browser,
     };
   } // merge with "browser" as default,
   // "react-native" as override

package/src/ModuleGraph/node-haste/Package.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 {PackageData} from '../types.flow';
+
 const nullthrows = require('nullthrows');
 const path = require('path');
 
-import type {PackageData} from '../types.flow';
-
 module.exports = class Package {
   data: PackageData;
   path: string;

package/src/ModuleGraph/node-haste/node-haste.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/node-haste/node-haste.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.

package/src/ModuleGraph/node-haste/node-haste.js

@@ -1,5 +1,9 @@
+"use strict";
+
+var _jestHasteMap = require("jest-haste-map");
+
 /**
- * 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,7 +11,11 @@
  *
  * @format
  */
-"use strict";
+const {
+  ModuleResolver,
+} = require("../../node-haste/DependencyGraph/ModuleResolution");
+
+const parsePlatformFilePath = require("../../node-haste/lib/parsePlatformFilePath");
 
 const HasteFS = require("./HasteFS");
 
@@ -17,17 +25,9 @@ const ModuleCache = require("./ModuleCache");
 
 const defaults = require("metro-config/src/defaults/defaults");
 
-const parsePlatformFilePath = require("../../node-haste/lib/parsePlatformFilePath");
-
 const path = require("path");
 
-const {
-  ModuleResolver
-} = require("../../node-haste/DependencyGraph/ModuleResolution");
-
-const { ModuleMap } = require("jest-haste-map");
-
-const platforms = new Set(defaults.platforms);
+const NATIVE_PLATFORM = "native";
 const GENERIC_PLATFORM = "g";
 const PACKAGE_JSON = path.sep + "package.json";
 const NULL_MODULE = {
@@ -41,15 +41,21 @@ const NULL_MODULE = {
 
   getName() {
     throw new Error("not implemented");
-  }
+  },
 };
 const NODE_MODULES = path.sep + "node_modules" + path.sep;
 
-const isNodeModules = file => file.includes(NODE_MODULES); // This function maps the ModuleGraph data structure to jest-haste-map's ModuleMap
+const isNodeModules = (file) => file.includes(NODE_MODULES); // This function maps the ModuleGraph data structure to jest-haste-map's ModuleMap
 
-const createModuleMap = ({ files, moduleCache, sourceExts }) => {
+const createModuleMap = ({ files, moduleCache, sourceExts, platforms }) => {
+  const platformSet = new Set(
+    (platforms !== null && platforms !== void 0
+      ? platforms
+      : defaults.platforms
+    ).concat([NATIVE_PLATFORM])
+  );
   const map = new Map();
-  files.forEach(filePath => {
+  files.forEach((filePath) => {
     if (isNodeModules(filePath)) {
       return;
     }
@@ -71,7 +77,7 @@ const createModuleMap = ({ files, moduleCache, sourceExts }) => {
 
     const mapModule = map.get(id) || Object.create(null);
     const platform =
-      parsePlatformFilePath(filePath, platforms).platform || GENERIC_PLATFORM;
+      parsePlatformFilePath(filePath, platformSet).platform || GENERIC_PLATFORM;
     const existingModule = mapModule[platform]; // 0 = Module, 1 = Package in jest-haste-map
 
     mapModule[platform] = [filePath, module.type === "Package" ? 1 : 0];
@@ -79,12 +85,12 @@ const createModuleMap = ({ files, moduleCache, sourceExts }) => {
     if (existingModule && existingModule[0] !== filePath) {
       throw new Error(
         [
-          "@providesModule naming collision:", // $FlowFixMe[incompatible-type]
+          "@providesModule naming collision:",
           `  Duplicate module name: \`${id}\``,
           `  Paths: \`${filePath}\` collides with \`${existingModule[0]}\``,
           "",
           "This error is caused by a @providesModule declaration " +
-            "with the same name across two different files."
+            "with the same name across two different files.",
         ].join("\n")
       );
     }
@@ -94,14 +100,15 @@ const createModuleMap = ({ files, moduleCache, sourceExts }) => {
   return map;
 };
 
-exports.createResolveFn = function(options) {
+exports.createResolveFn = function (options) {
   const {
     assetExts,
     assetResolutions,
     extraNodeModules,
     transformedFiles,
     sourceExts,
-    platform
+    platform,
+    platforms,
   } = options;
   const files = Object.keys(transformedFiles);
 
@@ -117,30 +124,33 @@ exports.createResolveFn = function(options) {
 
   const hasteFS = new HasteFS(files);
   const moduleCache = new ModuleCache(
-    filePath => hasteFS.closest(filePath, "package.json"),
+    (filePath) => hasteFS.closest(filePath, "package.json"),
     getTransformedFile
   );
-  const assetExtensions = new Set(assetExts.map(asset => "." + asset));
+  const assetExtensions = new Set(assetExts.map((asset) => "." + asset));
 
-  const isAssetFile = file => assetExtensions.has(path.extname(file));
+  const isAssetFile = (file) => assetExtensions.has(path.extname(file));
 
   const moduleResolver = new ModuleResolver({
-    dirExists: filePath => hasteFS.dirExists(filePath),
-    doesFileExist: filePath => hasteFS.exists(filePath),
+    dirExists: (filePath) => hasteFS.dirExists(filePath),
+    disableHierarchicalLookup: options.disableHierarchicalLookup,
+    doesFileExist: (filePath) => hasteFS.exists(filePath),
+    emptyModulePath: options.emptyModulePath,
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
     // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
-    moduleMap: new ModuleMap({
+    moduleMap: new _jestHasteMap.ModuleMap({
       duplicates: new Map(),
       map: createModuleMap({
         files,
         moduleCache,
-        sourceExts
+        sourceExts,
+        platforms,
       }),
       mocks: new Map(),
-      rootDir: ""
+      rootDir: "",
     }),
     nodeModulesPaths: options.nodeModulesPaths,
     preferNativePlatform: true,
@@ -150,13 +160,13 @@ exports.createResolveFn = function(options) {
       const assets = [
         basePath + extension,
         ...assetResolutions.map(
-          resolution => basePath + "@" + resolution + "x" + extension
-        )
-      ].filter(candidate => hasteFS.exists(candidate));
+          (resolution) => basePath + "@" + resolution + "x" + extension
+        ),
+      ].filter((candidate) => hasteFS.exists(candidate));
       return assets.length ? assets : null;
     },
     resolveRequest: options.resolveRequest,
-    sourceExts
+    sourceExts,
   });
   return (id, sourcePath) => {
     const from =