metro 0.66.2 → 0.69.0

package/src/lib/parseOptionsFromUrl.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,28 +10,48 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-const parseCustomTransformOptions = require('./parseCustomTransformOptions');
+import type {BundleOptions} from '../shared/types.flow';
+
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
+const parseCustomTransformOptions = require('./parseCustomTransformOptions');
+const nullthrows = require('nullthrows');
 const path = require('path');
 const url = require('url');
 
-import type {BundleOptions} from '../shared/types.flow';
-
-const getBoolean = (query, opt, defaultValue) =>
+const getBoolean = (
+  query: {[string]: string},
+  opt:
+    | $TEMPORARY$string<'dev'>
+    | $TEMPORARY$string<'excludeSource'>
+    | $TEMPORARY$string<'inlineSourceMap'>
+    | $TEMPORARY$string<'minify'>
+    | $TEMPORARY$string<'modulesOnly'>
+    | $TEMPORARY$string<'runModule'>
+    | $TEMPORARY$string<'shallow'>,
+  defaultValue: boolean,
+) =>
   query[opt] == null
     ? defaultValue
     : query[opt] === 'true' || query[opt] === '1';
 
-const getNumber = (query, opt, defaultValue) => {
+const getNumber = (
+  query: {[string]: string},
+  opt: $TEMPORARY$string<'runtimeBytecodeVersion'>,
+  defaultValue: null,
+) => {
   const number = parseInt(query[opt], 10);
   return Number.isNaN(number) ? defaultValue : number;
 };
 
-const getBundleType = bundleType =>
+const getBundleType = (bundleType: string | $TEMPORARY$string<'map'>) =>
   bundleType === 'map' ? bundleType : 'bundle';
 
-const getTransformProfile = transformProfile =>
+const getTransformProfile = (
+  transformProfile:
+    | string
+    | $TEMPORARY$string<'hermes-canary'>
+    | $TEMPORARY$string<'hermes-stable'>,
+) =>
   transformProfile === 'hermes-stable' || transformProfile === 'hermes-canary'
     ? transformProfile
     : 'default';

package/src/lib/relativizeSourceMap.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/lib/relativizeSourceMap.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 path = require('path');
-
 import type {MixedSourceMap} from 'metro-source-map';
 
+const path = require('path');
+
 function relativizeSourceMapInline(
   sourceMap: MixedSourceMap,
   sourcesRoot: string,

package/src/lib/reporting.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.
@@ -11,12 +11,12 @@
 
 const chalk = require("chalk");
 
+const { Terminal } = require("metro-core");
+
 const stripAnsi = require("strip-ansi");
 
 const util = require("util");
 
-const { Terminal } = require("metro-core");
-
 /**
  * A standard way to log a warning to the terminal. This should not be called
  * from some arbitrary Metro logic, only from the reporters. Instead of
@@ -47,10 +47,10 @@ function logError(terminal, format, ...args) {
  */
 
 const nullReporter = {
-  update() {}
+  update() {},
 };
 module.exports = {
   logWarning,
   logError,
-  nullReporter
+  nullReporter,
 };

package/src/lib/reporting.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,11 +11,10 @@
 'use strict';
 
 const chalk = require('chalk');
+const {Terminal} = require('metro-core');
 const stripAnsi = require('strip-ansi');
 const util = require('util');
 
-const {Terminal} = require('metro-core');
-
 export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
 
 export type BundleDetails = {
@@ -45,6 +44,10 @@ export type ReportableEvent =
       error: Error,
       ...
     }
+  | {
+      type: 'initialize_done',
+      port: number,
+    }
   | {
       buildID: string,
       type: 'bundle_build_done',
@@ -119,6 +122,16 @@ export type ReportableEvent =
       data: Array<mixed>,
       mode: 'BRIDGE' | 'NOBRIDGE',
       ...
+    }
+  | {
+      type: 'transformer_load_started',
+    }
+  | {
+      type: 'transformer_load_done',
+    }
+  | {
+      type: 'transformer_load_failed',
+      error: Error,
     };
 
 /**

package/src/lib/splitBundleOptions.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.
@@ -23,7 +23,7 @@ function splitBundleOptions(options) {
       platform: options.platform,
       runtimeBytecodeVersion: options.runtimeBytecodeVersion,
       type: "module",
-      unstable_transformProfile: options.unstable_transformProfile
+      unstable_transformProfile: options.unstable_transformProfile,
     },
     serializerOptions: {
       excludeSource: options.excludeSource,
@@ -31,12 +31,12 @@ function splitBundleOptions(options) {
       modulesOnly: options.modulesOnly,
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
-      sourceUrl: options.sourceUrl
+      sourceUrl: options.sourceUrl,
     },
     graphOptions: {
-      shallow: options.shallow
+      shallow: options.shallow,
     },
-    onProgress: options.onProgress
+    onProgress: options.onProgress,
   };
 }
 

package/src/lib/splitBundleOptions.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/lib/transformHelpers.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.
@@ -29,7 +29,7 @@ async function calcTransformerOptions(
     minify: options.minify,
     platform: options.platform,
     runtimeBytecodeVersion: options.runtimeBytecodeVersion,
-    unstable_transformProfile: options.unstable_transformProfile
+    unstable_transformProfile: options.unstable_transformProfile,
   }; // When we're processing scripts, we don't need to calculate any
   // inlineRequires information, since scripts by definition don't have
   // requires().
@@ -38,18 +38,18 @@ async function calcTransformerOptions(
     return { ...baseOptions, type: "script" };
   }
 
-  const getDependencies = async path => {
+  const getDependencies = async (path) => {
     const dependencies = await deltaBundler.getDependencies([path], {
       resolve: await getResolveDependencyFn(bundler, options.platform),
       transform: await getTransformFn([path], bundler, deltaBundler, config, {
         ...options,
-        minify: false
+        minify: false,
       }),
       transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
         config.transformer.experimentalImportBundleSupport,
-      shallow: false
+      shallow: false,
     });
     return Array.from(dependencies.keys());
   };
@@ -59,7 +59,7 @@ async function calcTransformerOptions(
     {
       dev: options.dev,
       hot: options.hot,
-      platform: options.platform
+      platform: options.platform,
     },
     getDependencies
   );
@@ -71,7 +71,7 @@ async function calcTransformerOptions(
       transform.unstable_disableES6Transforms || false,
     nonInlinedRequires:
       transform.nonInlinedRequires || baseIgnoredInlineRequires,
-    type: "module"
+    type: "module",
   };
 }
 
@@ -97,14 +97,14 @@ async function getTransformFn(
     config,
     options
   );
-  return async path => {
+  return async (path) => {
     return await bundler.transformFile(path, {
       ...transformOptions,
       type: getType(transformOptions.type, path, config.resolver.assetExts),
       inlineRequires: removeInlineRequiresBlockListFromOptions(
         path,
         inlineRequires
-      )
+      ),
     });
   };
 }
@@ -131,5 +131,5 @@ async function getResolveDependencyFn(bundler, platform) {
 
 module.exports = {
   getTransformFn,
-  getResolveDependencyFn
+  getResolveDependencyFn,
 };

package/src/lib/transformHelpers.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,15 +10,15 @@
 
 'use strict';
 
-const path = require('path');
-
 import type Bundler from '../Bundler';
-import type {TransformOptions} from '../DeltaBundler/Worker';
-import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type DeltaBundler, {TransformFn} from '../DeltaBundler';
+import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
 
+const path = require('path');
+
 type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
 type TransformOptionsWithRawInlines = {|

package/src/node-haste/DependencyGraph/ModuleResolution.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,23 +9,53 @@
  */
 "use strict";
 
-const Resolver = require("metro-resolver");
+const { codeFrameColumns } = require("@babel/code-frame");
 
 const fs = require("fs");
 
 const invariant = require("invariant");
 
+const Resolver = require("metro-resolver");
+
 const path = require("path");
 
 const util = require("util");
 
-const { codeFrameColumns } = require("@babel/code-frame");
-
 class ModuleResolver {
-  static EMPTY_MODULE = require.resolve("./assets/empty-module.js");
-
+  // A module representing the project root, used as the origin when resolving `emptyModulePath`.
+  // An empty module, the result of resolving `emptyModulePath` from the project root.
   constructor(options) {
     this._options = options;
+    const { projectRoot, moduleCache } = this._options;
+    this._projectRootFakeModule = {
+      path: path.join(projectRoot, "_"),
+      getPackage: () =>
+        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+
+      isHaste() {
+        throw new Error("not implemented");
+      },
+
+      getName() {
+        throw new Error("not implemented");
+      },
+    };
+  }
+
+  _getEmptyModule() {
+    let emptyModule = this._cachedEmptyModule;
+
+    if (!emptyModule) {
+      emptyModule = this.resolveDependency(
+        this._projectRootFakeModule,
+        this._options.emptyModulePath,
+        false,
+        null
+      );
+      this._cachedEmptyModule = emptyModule;
+    }
+
+    return emptyModule;
   }
 
   _redirectRequire(fromModule, modulePath) {
@@ -51,7 +81,6 @@ class ModuleResolver {
           ); // Since the redirected path is still relative to the package root,
           // we have to transform it back to be module-relative (as it
           // originally was)
-          // $FlowFixMe[incompatible-type]
 
           if (redirectedPath !== false) {
             redirectedPath =
@@ -66,7 +95,7 @@ class ModuleResolver {
         }
       } else {
         const pck = path.isAbsolute(modulePath)
-          ? moduleCache.getModule(modulePath).getPackage()
+          ? moduleCache.getPackageOf(modulePath)
           : fromModule.getPackage();
 
         if (pck) {
@@ -87,15 +116,15 @@ class ModuleResolver {
         {
           ...this._options,
           originModulePath: fromModule.path,
-          redirectModulePath: modulePath =>
+          redirectModulePath: (modulePath) =>
             this._redirectRequire(fromModule, modulePath),
           allowHaste,
           platform,
-          resolveHasteModule: name =>
+          resolveHasteModule: (name) =>
             this._options.moduleMap.getModule(name, platform, true),
-          resolveHastePackage: name =>
+          resolveHastePackage: (name) =>
             this._options.moduleMap.getPackage(name, platform, true),
-          getPackageMainPath: this._getPackageMainPath
+          getPackageMainPath: this._getPackageMainPath,
         },
         moduleName,
         platform
@@ -114,7 +143,7 @@ class ModuleResolver {
             )}`,
             `  * ${Resolver.formatFileCandidates(
               this._removeRoot(candidates.dir)
-            )}`
+            )}`,
           ].join("\n")
         );
       }
@@ -122,8 +151,8 @@ class ModuleResolver {
       if (error instanceof Resolver.FailedToResolveNameError) {
         const { dirPaths, extraPaths } = error;
         const displayDirPaths = dirPaths
-          .filter(dirPath => this._options.dirExists(dirPath))
-          .map(dirPath => path.relative(this._options.projectRoot, dirPath))
+          .filter((dirPath) => this._options.dirExists(dirPath))
+          .map((dirPath) => path.relative(this._options.projectRoot, dirPath))
           .concat(extraPaths);
         const hint = displayDirPaths.length ? " or in these directories:" : "";
         throw new UnableToResolveError(
@@ -131,12 +160,7 @@ class ModuleResolver {
           moduleName,
           [
             `${moduleName} could not be found within the project${hint || "."}`,
-            ...displayDirPaths.map(dirPath => `  ${dirPath}`),
-            "\nIf you are sure the module exists, try these steps:",
-            " 1. Clear watchman watches: watchman watch-del-all",
-            " 2. Delete node_modules and run yarn install",
-            " 3. Reset Metro's cache: yarn start --reset-cache",
-            " 4. Remove the cache: rm -rf /tmp/metro-*"
+            ...displayDirPaths.map((dirPath) => `  ${dirPath}`),
           ].join("\n")
         );
       }
@@ -145,7 +169,7 @@ class ModuleResolver {
     }
   }
 
-  _getPackageMainPath = packageJsonPath => {
+  _getPackageMainPath = (packageJsonPath) => {
     const package_ = this._options.moduleCache.getPackage(packageJsonPath);
 
     return package_.getMain(this._options.mainFields);
@@ -168,10 +192,7 @@ class ModuleResolver {
         return this._options.moduleCache.getModule(arbitrary);
 
       case "empty":
-        const { moduleCache } = this._options;
-        const module_ = moduleCache.getModule(ModuleResolver.EMPTY_MODULE);
-        invariant(module_ != null, "empty module is not available");
-        return module_;
+        return this._getEmptyModule();
 
       default:
         resolution.type;
@@ -266,11 +287,11 @@ class UnableToResolveError extends Error {
       {
         start: {
           column: column + 1,
-          line: lineNumber + 1
-        }
+          line: lineNumber + 1,
+        },
       },
       {
-        forceColor: process.env.NODE_ENV !== "test"
+        forceColor: process.env.NODE_ENV !== "test",
       }
     );
   }
@@ -278,5 +299,5 @@ class UnableToResolveError extends Error {
 
 module.exports = {
   ModuleResolver,
-  UnableToResolveError
+  UnableToResolveError,
 };

package/src/node-haste/DependencyGraph/ModuleResolution.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,15 +10,7 @@
 
 'use strict';
 
-const Resolver = require('metro-resolver');
-
-const fs = require('fs');
-const invariant = require('invariant');
-const path = require('path');
-const util = require('util');
-
-const {codeFrameColumns} = require('@babel/code-frame');
-
+import type {ModuleMap} from './types';
 import type {
   CustomResolver,
   DoesFileExist,
@@ -28,6 +20,13 @@ import type {
   ResolveAsset,
 } from 'metro-resolver';
 
+const {codeFrameColumns} = require('@babel/code-frame');
+const fs = require('fs');
+const invariant = require('invariant');
+const Resolver = require('metro-resolver');
+const path = require('path');
+const util = require('util');
+
 export type DirExistsFn = (filePath: string) => boolean;
 
 export type Packageish = interface {
@@ -44,23 +43,6 @@ export type Moduleish = interface {
   getPackage(): ?Packageish,
 };
 
-/**
- * `jest-haste-map`'s interface for ModuleMap.
- */
-export type ModuleMap = {
-  getModule(
-    name: string,
-    platform: string | null,
-    supportsNativePlatform: ?boolean,
-  ): ?string,
-  getPackage(
-    name: string,
-    platform: string | null,
-    supportsNativePlatform: ?boolean,
-  ): ?string,
-  ...
-};
-
 export type ModuleishCache<TModule, TPackage> = interface {
   getPackage(
     name: string,
@@ -68,11 +50,14 @@ export type ModuleishCache<TModule, TPackage> = interface {
     supportsNativePlatform?: boolean,
   ): TPackage,
   getModule(path: string): TModule,
+  getPackageOf(modulePath: string): ?TPackage,
 };
 
 type Options<TModule, TPackage> = {|
   +dirExists: DirExistsFn,
+  +disableHierarchicalLookup: boolean,
   +doesFileExist: DoesFileExist,
+  +emptyModulePath: string,
   +extraNodeModules: ?Object,
   +isAssetFile: IsAssetFile,
   +mainFields: $ReadOnlyArray<string>,
@@ -88,14 +73,42 @@ type Options<TModule, TPackage> = {|
 
 class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
   _options: Options<TModule, TPackage>;
-
-  static EMPTY_MODULE: string = require.resolve('./assets/empty-module.js');
+  // A module representing the project root, used as the origin when resolving `emptyModulePath`.
+  _projectRootFakeModule: Moduleish;
+  // An empty module, the result of resolving `emptyModulePath` from the project root.
+  _cachedEmptyModule: ?TModule;
 
   constructor(options: Options<TModule, TPackage>) {
     this._options = options;
+    const {projectRoot, moduleCache} = this._options;
+    this._projectRootFakeModule = {
+      path: path.join(projectRoot, '_'),
+      getPackage: () =>
+        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+      isHaste() {
+        throw new Error('not implemented');
+      },
+      getName() {
+        throw new Error('not implemented');
+      },
+    };
+  }
+
+  _getEmptyModule() {
+    let emptyModule = this._cachedEmptyModule;
+    if (!emptyModule) {
+      emptyModule = this.resolveDependency(
+        this._projectRootFakeModule,
+        this._options.emptyModulePath,
+        false,
+        null,
+      );
+      this._cachedEmptyModule = emptyModule;
+    }
+    return emptyModule;
   }
 
-  _redirectRequire(fromModule: TModule, modulePath: string): string | false {
+  _redirectRequire(fromModule: Moduleish, modulePath: string): string | false {
     const moduleCache = this._options.moduleCache;
     try {
       if (modulePath.startsWith('.')) {
@@ -120,7 +133,6 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
           // Since the redirected path is still relative to the package root,
           // we have to transform it back to be module-relative (as it
           // originally was)
-          // $FlowFixMe[incompatible-type]
           if (redirectedPath !== false) {
             redirectedPath =
               './' +
@@ -134,7 +146,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
         }
       } else {
         const pck = path.isAbsolute(modulePath)
-          ? moduleCache.getModule(modulePath).getPackage()
+          ? moduleCache.getPackageOf(modulePath)
           : fromModule.getPackage();
 
         if (pck) {
@@ -150,7 +162,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
   }
 
   resolveDependency(
-    fromModule: TModule,
+    fromModule: Moduleish,
     moduleName: string,
     allowHaste: boolean,
     platform: string | null,
@@ -214,11 +226,6 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
           [
             `${moduleName} could not be found within the project${hint || '.'}`,
             ...displayDirPaths.map((dirPath: string) => `  ${dirPath}`),
-            '\nIf you are sure the module exists, try these steps:',
-            ' 1. Clear watchman watches: watchman watch-del-all',
-            ' 2. Delete node_modules and run yarn install',
-            " 3. Reset Metro's cache: yarn start --reset-cache",
-            ' 4. Remove the cache: rm -rf /tmp/metro-*',
           ].join('\n'),
         );
       }
@@ -246,10 +253,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
         invariant(arbitrary != null, 'invalid asset resolution');
         return this._options.moduleCache.getModule(arbitrary);
       case 'empty':
-        const {moduleCache} = this._options;
-        const module_ = moduleCache.getModule(ModuleResolver.EMPTY_MODULE);
-        invariant(module_ != null, 'empty module is not available');
-        return module_;
+        return this._getEmptyModule();
       default:
         (resolution.type: empty);
         throw new Error('invalid type');