metro 0.82.5 → 0.83.0

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "metro",
-  "version": "0.82.5",
+  "version": "0.83.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
   "exports": {
     ".": "./src/index.js",
     "./package.json": "./package.json",
-    "./private/*": "./src/*.js",
-    "./src": "./src/index.js",
-    "./src/*.js": "./src/*.js",
-    "./src/*": "./src/*.js"
+    "./private/*": "./src/*.js"
   },
   "repository": {
     "type": "git",
@@ -42,18 +39,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.82.5",
-    "metro-cache": "0.82.5",
-    "metro-cache-key": "0.82.5",
-    "metro-config": "0.82.5",
-    "metro-core": "0.82.5",
-    "metro-file-map": "0.82.5",
-    "metro-resolver": "0.82.5",
-    "metro-runtime": "0.82.5",
-    "metro-source-map": "0.82.5",
-    "metro-symbolicate": "0.82.5",
-    "metro-transform-plugins": "0.82.5",
-    "metro-transform-worker": "0.82.5",
+    "metro-babel-transformer": "0.83.0",
+    "metro-cache": "0.83.0",
+    "metro-cache-key": "0.83.0",
+    "metro-config": "0.83.0",
+    "metro-core": "0.83.0",
+    "metro-file-map": "0.83.0",
+    "metro-resolver": "0.83.0",
+    "metro-runtime": "0.83.0",
+    "metro-source-map": "0.83.0",
+    "metro-symbolicate": "0.83.0",
+    "metro-transform-plugins": "0.83.0",
+    "metro-transform-worker": "0.83.0",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -72,14 +69,14 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.82.5",
-    "metro-memory-fs": "0.82.5",
+    "metro-babel-register": "0.83.0",
+    "metro-memory-fs": "*",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.18"
+    "node": ">=22.14"
   }
 }

package/src/DeltaBundler/DeltaCalculator.js

@@ -3,7 +3,11 @@
 var _Graph = require("./Graph");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");

package/src/DeltaBundler/Graph.js

@@ -9,7 +9,11 @@ var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 var _isResolvedDependency = require("../lib/isResolvedDependency");
 var _buildSubgraph = require("./buildSubgraph");
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const invariant = require("invariant");
 const nullthrows = require("nullthrows");

package/src/DeltaBundler/Transformer.js

@@ -2,7 +2,11 @@
 
 var _crypto = _interopRequireDefault(require("crypto"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const getTransformCacheKey = require("./getTransformCacheKey");
 const WorkerFarm = require("./WorkerFarm");
@@ -20,7 +24,6 @@ class Transformer {
     const {
       getTransformOptions: _getTransformOptions,
       transformVariants: _transformVariants,
-      workerPath: _workerPath,
       unstable_workerThreads: _workerThreads,
       ...transformerConfig
     } = this._config.transformer;

package/src/DeltaBundler/Transformer.js.flow

@@ -52,7 +52,6 @@ class Transformer {
     const {
       getTransformOptions: _getTransformOptions,
       transformVariants: _transformVariants,
-      workerPath: _workerPath,
       unstable_workerThreads: _workerThreads,
       ...transformerConfig
     } = this._config.transformer;

package/src/DeltaBundler/Worker.d.ts

@@ -18,16 +18,14 @@ type LogEntry = unknown;
 
 export type TransformOptions = JsTransformOptions;
 
-declare function transform(
-  filename: string,
-  transformOptions: JsTransformOptions,
-  projectRoot: string,
-  transformerConfig: TransformerConfig,
-  fileBuffer?: Buffer,
-): Promise<Data>;
-
 export interface Worker {
-  readonly transform: typeof transform;
+  readonly transform: (
+    filename: string,
+    transformOptions: JsTransformOptions,
+    projectRoot: string,
+    transformerConfig: TransformerConfig,
+    fileBuffer?: Buffer,
+  ) => Promise<Data>;
 }
 
 export interface TransformerConfig {

package/src/DeltaBundler/Worker.flow.js.flow

@@ -12,7 +12,7 @@
 'use strict';
 
 import type {TransformResult} from './types.flow';
-import type {LogEntry} from 'metro-core/src/Logger';
+import type {LogEntry} from 'metro-core/private/Logger';
 import type {
   JsTransformerConfig,
   JsTransformOptions,

package/src/DeltaBundler/WorkerFarm.js

@@ -6,7 +6,7 @@ class WorkerFarm {
   constructor(config, transformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
-    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
+    const absoluteWorkerPath = require.resolve("./Worker.js");
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
         absoluteWorkerPath,
@@ -27,7 +27,7 @@ class WorkerFarm {
       });
       this._worker = worker;
     } else {
-      this._worker = require.call(null, this._config.transformer.workerPath);
+      this._worker = require("./Worker");
     }
   }
   async kill() {

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -39,7 +39,7 @@ class WorkerFarm {
   constructor(config: ConfigT, transformerConfig: TransformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
-    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
+    const absoluteWorkerPath = require.resolve('./Worker.js');
 
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
@@ -63,11 +63,7 @@ class WorkerFarm {
 
       this._worker = worker;
     } else {
-      // eslint-disable-next-line no-useless-call
-      this._worker = (require.call(
-        null,
-        this._config.transformer.workerPath,
-      ): Worker);
+      this._worker = (require('./Worker'): Worker);
     }
   }
 

package/src/DeltaBundler/buildSubgraph.js

@@ -8,7 +8,11 @@ var _contextModule = require("../lib/contextModule");
 var _isResolvedDependency = require("../lib/isResolvedDependency");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function resolveDependencies(parentPath, dependencies, resolve) {
   const maybeResolvedDeps = new Map();

package/src/DeltaBundler/getTransformCacheKey.js

@@ -2,7 +2,7 @@
 
 const VERSION = require("../../package.json").version;
 const crypto = require("crypto");
-const getCacheKey = require("metro-cache-key");
+const { getCacheKey } = require("metro-cache-key");
 function getTransformCacheKey(opts) {
   const { transformerPath, transformerConfig } = opts.transformerConfig;
   const Transformer = require.call(null, transformerPath);

package/src/DeltaBundler/getTransformCacheKey.js.flow

@@ -16,7 +16,7 @@ import type {JsTransformerConfig} from 'metro-transform-worker';
 
 const VERSION = require('../../package.json').version;
 const crypto = require('crypto');
-const getCacheKey = require('metro-cache-key');
+const {getCacheKey} = require('metro-cache-key');
 
 type CacheKeyProvider = {
   getCacheKey?: JsTransformerConfig => string,

package/src/DeltaBundler/types.flow.js

@@ -2,5 +2,9 @@
 
 var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -15,10 +15,14 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
+    return {
+      default: e,
+    };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
+  var n = {
+      __proto__: null,
+    },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
@@ -28,7 +32,11 @@ function _interopRequireWildcard(e, r) {
   return (n.default = e), t && t.set(e, n), n;
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const WRAP_NAME = "$$_REQUIRE";
 const IIFE_PARAM = _template.default.expression(

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

@@ -15,7 +15,7 @@ import type {CallExpression, Identifier, StringLiteral} from '@babel/types';
 import type {
   AllowOptionalDependencies,
   AsyncDependencyType,
-} from 'metro/src/DeltaBundler/types.flow.js';
+} from 'metro/private/DeltaBundler/types.flow';
 
 import {isProgram} from '@babel/types';
 

package/src/Server/symbolicate.js

@@ -1,9 +1,11 @@
 "use strict";
 
-const { greatestLowerBound } = require("metro-source-map/src/Consumer/search");
+const {
+  greatestLowerBound,
+} = require("metro-source-map/private/Consumer/search");
 const {
   SourceMetadataMapConsumer,
-} = require("metro-symbolicate/src/Symbolication");
+} = require("metro-symbolicate/private/Symbolication");
 function createFunctionNameGetter(module) {
   const consumer = new SourceMetadataMapConsumer(
     {

package/src/Server/symbolicate.js.flow

@@ -17,10 +17,12 @@ import type {
 import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
 import type {ConfigT} from 'metro-config';
 
-const {greatestLowerBound} = require('metro-source-map/src/Consumer/search');
+const {
+  greatestLowerBound,
+} = require('metro-source-map/private/Consumer/search');
 const {
   SourceMetadataMapConsumer,
-} = require('metro-symbolicate/src/Symbolication');
+} = require('metro-symbolicate/private/Symbolication');
 
 export type StackFrameInput = {
   +file: ?string,

package/src/Server.js.flow

@@ -40,8 +40,8 @@ import type {ConfigT, RootPerfLogger} from 'metro-config';
 import type {
   ActionLogEntryData,
   ActionStartLogEntry,
-} from 'metro-core/src/Logger';
-import type {CustomResolverOptions} from 'metro-resolver/src/types';
+} from 'metro-core/private/Logger';
+import type {CustomResolverOptions} from 'metro-resolver/private/types';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
 import {SourcePathsMode} from './shared/types.flow';

package/src/commands/build.js

@@ -4,7 +4,11 @@ var _parseKeyValueParamArray = _interopRequireDefault(
   require("../cli/parseKeyValueParamArray")
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const { makeAsyncCommand } = require("../cli-utils");
 const TerminalReporter = require("../lib/TerminalReporter");

package/src/commands/serve.js

@@ -84,7 +84,10 @@ module.exports = () => ({
         resetCache: _resetCache,
         ...runServerOptions
       } = argv;
-      server = await MetroApi.runServer(config, runServerOptions);
+      ({ httpServer: server } = await MetroApi.runServer(
+        config,
+        runServerOptions
+      ));
       restarting = false;
     }
     const foundConfig = await resolveConfig(argv.config);

package/src/commands/serve.js.flow

@@ -107,7 +107,10 @@ module.exports = (): {
         resetCache: _resetCache,
         ...runServerOptions
       } = argv;
-      server = await MetroApi.runServer(config, runServerOptions);
+      ({httpServer: server} = await MetroApi.runServer(
+        config,
+        runServerOptions,
+      ));
 
       restarting = false;
     }

package/src/index.d.ts

@@ -30,8 +30,7 @@ import type {
   Middleware,
 } from 'metro-config';
 import type {Duplex} from 'stream';
-
-import Yargs = require('yargs');
+import type Yargs from 'yargs';
 
 export {loadConfig, mergeConfig, resolveConfig} from 'metro-config';
 export {Terminal} from 'metro-core';
@@ -83,6 +82,10 @@ export interface RunServerOptions {
   };
 }
 
+export interface RunServerResult {
+  httpServer: HttpServer | HttpsServer;
+}
+
 export interface RunBuildOptions {
   entry: string;
   dev?: boolean;
@@ -140,7 +143,7 @@ export function createConnectMiddleware(
 export function runServer(
   config: ConfigT,
   options: RunServerOptions,
-): Promise<HttpServer | HttpsServer>;
+): Promise<RunServerResult>;
 
 export function runBuild(
   config: ConfigT,
@@ -162,6 +165,6 @@ interface AttachMetroCLIOptions {
 }
 
 export function attachMetroCli(
-  yargs: typeof Yargs,
+  yargs: Yargs.Argv,
   options?: AttachMetroCLIOptions,
-): typeof Yargs;
+): Yargs.Argv;

package/src/index.flow.js

@@ -206,7 +206,9 @@ exports.runServer = async (
       if (onReady) {
         onReady(httpServer);
       }
-      resolve(httpServer);
+      resolve({
+        httpServer,
+      });
     });
     httpServer.timeout = 0;
     httpServer.on("close", () => {

package/src/index.flow.js.flow

@@ -85,6 +85,10 @@ export type RunServerOptions = $ReadOnly<{
   }>,
 }>;
 
+export type RunServerResult = {
+  httpServer: HttpServer | HttpsServer,
+};
+
 type BuildGraphOptions = {
   entries: $ReadOnlyArray<string>,
   customTransformOptions?: CustomTransformOptions,
@@ -270,7 +274,7 @@ exports.runServer = async (
     websocketEndpoints = {},
     watch,
   }: RunServerOptions = {},
-): Promise<HttpServer | HttpsServer> => {
+): Promise<RunServerResult> => {
   await earlyPortCheck(host, config.server.port);
 
   if (secure != null || secureCert != null || secureKey != null) {
@@ -319,73 +323,68 @@ exports.runServer = async (
   } else {
     httpServer = http.createServer(serverApp);
   }
-  return new Promise(
-    (
-      resolve: (result: HttpServer | HttpsServer) => void,
-      reject: mixed => mixed,
-    ) => {
-      httpServer.on('error', error => {
-        endMiddleware().finally(() => {
-          onError?.(error);
-          reject(error);
-        });
+  return new Promise((resolve, reject) => {
+    httpServer.on('error', error => {
+      endMiddleware().finally(() => {
+        onError?.(error);
+        reject(error);
       });
+    });
 
-      httpServer.listen(config.server.port, host, () => {
-        const {address, port, family} = httpServer.address();
-        config.reporter.update({
-          type: 'server_listening',
-          address,
-          port, // Assigned port if configured with port 0
-          family,
-        });
-
-        websocketEndpoints = {
-          ...websocketEndpoints,
-          '/hot': createWebsocketServer({
-            websocketServer: new MetroHmrServer(
-              metroServer.getBundler(),
-              metroServer.getCreateModuleId(),
-              config,
-            ),
-          }),
-        };
-
-        httpServer.on('upgrade', (request, socket, head) => {
-          const {pathname} = parse(request.url);
-          if (pathname != null && websocketEndpoints[pathname]) {
-            websocketEndpoints[pathname].handleUpgrade(
-              request,
-              socket,
-              head,
-              ws => {
-                websocketEndpoints[pathname].emit('connection', ws, request);
-              },
-            );
-          } else {
-            socket.destroy();
-          }
-        });
-
-        if (onReady) {
-          onReady(httpServer);
-        }
+    httpServer.listen(config.server.port, host, () => {
+      const {address, port, family} = httpServer.address();
+      config.reporter.update({
+        type: 'server_listening',
+        address,
+        port, // Assigned port if configured with port 0
+        family,
+      });
 
-        resolve(httpServer);
+      websocketEndpoints = {
+        ...websocketEndpoints,
+        '/hot': createWebsocketServer({
+          websocketServer: new MetroHmrServer(
+            metroServer.getBundler(),
+            metroServer.getCreateModuleId(),
+            config,
+          ),
+        }),
+      };
+
+      httpServer.on('upgrade', (request, socket, head) => {
+        const {pathname} = parse(request.url);
+        if (pathname != null && websocketEndpoints[pathname]) {
+          websocketEndpoints[pathname].handleUpgrade(
+            request,
+            socket,
+            head,
+            ws => {
+              websocketEndpoints[pathname].emit('connection', ws, request);
+            },
+          );
+        } else {
+          socket.destroy();
+        }
       });
 
-      // Disable any kind of automatic timeout behavior for incoming
-      // requests in case it takes the packager more than the default
-      // timeout of 120 seconds to respond to a request.
-      httpServer.timeout = 0;
+      if (onReady) {
+        onReady(httpServer);
+      }
+
+      resolve({httpServer});
+    });
+
+    // Disable any kind of automatic timeout behavior for incoming
+    // requests in case it takes the packager more than the default
+    // timeout of 120 seconds to respond to a request.
+    httpServer.timeout = 0;
 
-      httpServer.on('close', () => {
-        endMiddleware()?.finally(() => {
-          onClose?.();
-        });
+    httpServer.on('close', () => {
+      endMiddleware()?.finally(() => {
+        onClose?.();
       });
-    },
-  );
+    });
+  });
 };
 
 exports.runBuild = async (

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js

@@ -2,6 +2,10 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-import.js

@@ -2,6 +2,10 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/import-export/index.js

@@ -30,7 +30,11 @@ var _exportPrimitiveDefault = _interopRequireWildcard(
 var _export3 = _interopRequireDefault(require("./export-3"));
 var _export4 = require("./export-4");
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
@@ -43,10 +47,14 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
+    return {
+      default: e,
+    };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
+  var n = {
+      __proto__: null,
+    },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {

package/src/lib/contextModule.js

@@ -9,7 +9,11 @@ var _crypto = _interopRequireDefault(require("crypto"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function toHash(value) {
   return _crypto.default.createHash("sha1").update(value).digest("hex");

package/src/lib/contextModuleTemplates.js

@@ -17,10 +17,14 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
+    return {
+      default: e,
+    };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
+  var n = {
+      __proto__: null,
+    },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {

package/src/lib/createWebsocketServer.js

@@ -2,7 +2,11 @@
 
 var _ws = _interopRequireDefault(require("ws"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 module.exports = function createWebsocketServer({ websocketServer }) {
   const wss = new _ws.default.Server({

package/src/lib/getAppendScripts.js

@@ -2,7 +2,11 @@
 
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
 const {

package/src/lib/getGraphId.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const canonicalize = require("metro-core/src/canonicalize");
+const canonicalize = require("metro-core/private/canonicalize");
 function getGraphId(
   entryFile,
   options,

package/src/lib/getGraphId.js.flow

@@ -14,7 +14,7 @@
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {ResolverInputOptions} from '../shared/types.flow';
 
-const canonicalize = require('metro-core/src/canonicalize');
+const canonicalize = require('metro-core/private/canonicalize');
 
 export opaque type GraphId: string = string;
 

package/src/lib/getPrependedScripts.js

@@ -2,12 +2,16 @@
 
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const countLines = require("./countLines");
 const getPreludeCode = require("./getPreludeCode");
 const transformHelpers = require("./transformHelpers");
-const defaults = require("metro-config/src/defaults/defaults");
+const defaults = require("metro-config/private/defaults/defaults");
 async function getPrependedScripts(
   config,
   options,

package/src/lib/getPrependedScripts.js.flow

@@ -15,14 +15,14 @@ import type Bundler from '../Bundler';
 import type DeltaBundler, {Module} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {ResolverInputOptions} from '../shared/types.flow';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config/private/configTypes.flow';
 
 import CountingSet from './CountingSet';
 
 const countLines = require('./countLines');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
-const defaults = require('metro-config/src/defaults/defaults');
+const defaults = require('metro-config/private/defaults/defaults');
 
 async function getPrependedScripts(
   config: ConfigT,

package/src/lib/transformHelpers.js

@@ -2,10 +2,14 @@
 
 var _contextModuleTemplates = require("./contextModuleTemplates");
 var _isAssetFile = _interopRequireDefault(
-  require("metro-resolver/src/utils/isAssetFile")
+  require("metro-resolver/private/utils/isAssetFile")
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const baseIgnoredInlineRequires = [
   "React",

package/src/lib/transformHelpers.js.flow

@@ -25,7 +25,7 @@ import type {ConfigT} from 'metro-config';
 import type {Type} from 'metro-transform-worker';
 
 import {getContextModuleTemplate} from './contextModuleTemplates';
-import isAssetFile from 'metro-resolver/src/utils/isAssetFile';
+import isAssetFile from 'metro-resolver/private/utils/isAssetFile';
 
 type InlineRequiresRaw =
   | $ReadOnly<{blockList: $ReadOnly<{[string]: true, ...}>, ...}>

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -4,7 +4,7 @@ const { codeFrameColumns } = require("@babel/code-frame");
 const fs = require("fs");
 const invariant = require("invariant");
 const Resolver = require("metro-resolver");
-const createDefaultContext = require("metro-resolver/src/createDefaultContext");
+const createDefaultContext = require("metro-resolver/private/createDefaultContext");
 const path = require("path");
 const util = require("util");
 class ModuleResolver {

package/src/node-haste/DependencyGraph/ModuleResolution.js.flow

@@ -25,13 +25,13 @@ import type {
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
-import type {PackageForModule, PackageJson} from 'metro-resolver/src/types';
+import type {PackageForModule, PackageJson} from 'metro-resolver/private/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
 const fs = require('fs');
 const invariant = require('invariant');
 const Resolver = require('metro-resolver');
-const createDefaultContext = require('metro-resolver/src/createDefaultContext');
+const createDefaultContext = require('metro-resolver/private/createDefaultContext');
 const path = require('path');
 const util = require('util');
 

package/src/node-haste/DependencyGraph/createFileMap.js

@@ -12,10 +12,14 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
+    return {
+      default: e,
+    };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
+  var n = {
+      __proto__: null,
+    },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {

package/src/node-haste/DependencyGraph.js

@@ -11,7 +11,7 @@ const {
   Logger: { createActionStartEntry, createActionEndEntry, log },
   PackageResolutionError,
 } = require("metro-core");
-const canonicalize = require("metro-core/src/canonicalize");
+const canonicalize = require("metro-core/private/canonicalize");
 const { InvalidPackageError } = require("metro-resolver");
 const nullthrows = require("nullthrows");
 const path = require("path");

package/src/node-haste/DependencyGraph.js.flow

@@ -37,7 +37,7 @@ const {
   Logger: {createActionStartEntry, createActionEndEntry, log},
   PackageResolutionError,
 } = require('metro-core');
-const canonicalize = require('metro-core/src/canonicalize');
+const canonicalize = require('metro-core/private/canonicalize');
 const {InvalidPackageError} = require('metro-resolver');
 const nullthrows = require('nullthrows');
 const path = require('path');

package/src/node-haste/Module.js

@@ -2,7 +2,11 @@
 
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 class Module {
   constructor(file, moduleCache) {

package/src/node-haste/Package.js.flow

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {PackageJson} from 'metro-resolver/src/types';
+import type {PackageJson} from 'metro-resolver/private/types';
 
 const fs = require('fs');
 const path = require('path');

package/src/shared/output/RamBundle/util.js

@@ -2,7 +2,11 @@
 
 var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const invariant = require("invariant");
 function lineToLineSourceMap(source, filename = "") {