metro 0.82.4 → 0.83.0

package/src/index.d.ts

@@ -14,9 +14,10 @@ export * from './ModuleGraph/worker/collectDependencies';
 export * from './Server';
 export * from './lib/reporting';
 
+import type {AssetData} from './Asset';
 import type {ReadOnlyGraph} from './DeltaBundler/types';
 import type {ServerOptions, default as MetroServer} from './Server';
-import type {OutputOptions, RequestOptions} from './shared/types';
+import type {BuildOptions, OutputOptions, RequestOptions} from './shared/types';
 import type {HandleFunction} from 'connect';
 import type {EventEmitter} from 'events';
 import type {IncomingMessage, Server as HttpServer} from 'http';
@@ -29,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';
@@ -82,6 +82,10 @@ export interface RunServerOptions {
   };
 }
 
+export interface RunServerResult {
+  httpServer: HttpServer | HttpsServer;
+}
+
 export interface RunBuildOptions {
   entry: string;
   dev?: boolean;
@@ -93,10 +97,12 @@ export interface RunBuildOptions {
   output?: {
     build: (
       server: MetroServer,
-      options: RequestOptions,
+      requestOptions: RequestOptions,
+      buildOptions?: BuildOptions,
     ) => Promise<{
       code: string;
       map: string;
+      assets?: ReadonlyArray<AssetData>;
     }>;
     save: (
       entry: {
@@ -137,7 +143,7 @@ export function createConnectMiddleware(
 export function runServer(
   config: ConfigT,
   options: RunServerOptions,
-): Promise<HttpServer | HttpsServer>;
+): Promise<RunServerResult>;
 
 export function runBuild(
   config: ConfigT,
@@ -159,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

@@ -6,6 +6,7 @@ const makeServeCommand = require("./commands/serve");
 const MetroHmrServer = require("./HmrServer");
 const IncrementalBundler = require("./IncrementalBundler");
 const createWebsocketServer = require("./lib/createWebsocketServer");
+const JsonReporter = require("./lib/JsonReporter");
 const TerminalReporter = require("./lib/TerminalReporter");
 const MetroServer = require("./Server");
 const outputBundle = require("./shared/output/bundle");
@@ -24,6 +25,7 @@ const net = require("net");
 const nullthrows = require("nullthrows");
 const { parse } = require("url");
 exports.Terminal = Terminal;
+exports.JsonReporter = JsonReporter;
 exports.TerminalReporter = TerminalReporter;
 async function getConfig(config) {
   const defaultConfig = await getDefaultConfig(config.projectRoot);
@@ -204,7 +206,9 @@ exports.runServer = async (
       if (onReady) {
         onReady(httpServer);
       }
-      resolve(httpServer);
+      resolve({
+        httpServer,
+      });
     });
     httpServer.timeout = 0;
     httpServer.on("close", () => {
@@ -256,11 +260,13 @@ exports.runBuild = async (
     if (onBegin) {
       onBegin();
     }
-    const metroBundle = await output.build(metroServer, requestOptions);
+    const metroBundle = await output.build(metroServer, requestOptions, {
+      withAssets: assets,
+    });
     const result = {
       ...metroBundle,
     };
-    if (assets) {
+    if (assets && result.assets == null) {
       result.assets = await metroServer.getAssets({
         ...MetroServer.DEFAULT_BUNDLE_OPTIONS,
         ...requestOptions,

package/src/index.flow.js.flow

@@ -14,6 +14,7 @@
 import type {AssetData} from './Assets';
 import type {ReadOnlyGraph} from './DeltaBundler';
 import type {ServerOptions} from './Server';
+import type {BuildOptions} from './shared/types.flow';
 import type {OutputOptions, RequestOptions} from './shared/types.flow.js';
 import type {HandleFunction} from 'connect';
 import type {Server as HttpServer} from 'http';
@@ -35,6 +36,7 @@ const makeServeCommand = require('./commands/serve');
 const MetroHmrServer = require('./HmrServer');
 const IncrementalBundler = require('./IncrementalBundler');
 const createWebsocketServer = require('./lib/createWebsocketServer');
+const JsonReporter = require('./lib/JsonReporter');
 const TerminalReporter = require('./lib/TerminalReporter');
 const MetroServer = require('./Server');
 const outputBundle = require('./shared/output/bundle');
@@ -83,6 +85,10 @@ export type RunServerOptions = $ReadOnly<{
   }>,
 }>;
 
+export type RunServerResult = {
+  httpServer: HttpServer | HttpsServer,
+};
+
 type BuildGraphOptions = {
   entries: $ReadOnlyArray<string>,
   customTransformOptions?: CustomTransformOptions,
@@ -108,9 +114,11 @@ export type RunBuildOptions = {
     build: (
       MetroServer,
       RequestOptions,
+      void | BuildOptions,
     ) => Promise<{
       code: string,
       map: string,
+      assets?: $ReadOnlyArray<AssetData>,
       ...
     }>,
     save: (
@@ -143,6 +151,7 @@ type BuildCommandOptions = {} | null;
 type ServeCommandOptions = {} | null;
 
 exports.Terminal = Terminal;
+exports.JsonReporter = JsonReporter;
 exports.TerminalReporter = TerminalReporter;
 
 export type {AssetData} from './Assets';
@@ -265,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) {
@@ -314,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 (
@@ -428,10 +432,12 @@ exports.runBuild = async (
       onBegin();
     }
 
-    const metroBundle = await output.build(metroServer, requestOptions);
+    const metroBundle = await output.build(metroServer, requestOptions, {
+      withAssets: assets,
+    });
     const result: RunBuildResult = {...metroBundle};
 
-    if (assets) {
+    if (assets && result.assets == null) {
       result.assets = await metroServer.getAssets({
         ...MetroServer.DEFAULT_BUNDLE_OPTIONS,
         ...requestOptions,

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/integration_tests/basic_bundle/optional-dependencies/index.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.c = exports.b = exports.a = void 0;
+let shouldBeB, shouldBeC;
+try {
+  shouldBeB = require("./not-exists");
+} catch {
+  shouldBeB = require("./optional-b");
+}
+(function requireOptionalC() {
+  try {
+    shouldBeC = require("./optional-c");
+  } catch (e) {}
+})();
+const a = (exports.a = require("./required-a"));
+const b = (exports.b = shouldBeB);
+const c = (exports.c = shouldBeC);

package/src/integration_tests/basic_bundle/optional-dependencies/index.js.flow

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict
+ */
+
+'use strict';
+
+let shouldBeB: mixed, shouldBeC: mixed;
+try {
+  // $FlowExpectedError[cannot-resolve-module]
+  shouldBeB = require('./not-exists');
+} catch {
+  shouldBeB = require('./optional-b');
+}
+
+(function requireOptionalC() {
+  // This function is here to ensure that the `a` module is always required,
+  // even if it is not used in the code.
+  try {
+    shouldBeC = require('./optional-c');
+  } catch (e) {
+    // If the optional module is not found, we can ignore the error.
+    // This is to simulate an optional dependency that may or may not exist.
+  }
+})();
+
+export const a = require('./required-a');
+export const b = shouldBeB;
+export const c = shouldBeC;

package/src/integration_tests/basic_bundle/optional-dependencies/optional-b.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = "b";

package/src/integration_tests/basic_bundle/optional-dependencies/optional-b.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict
+ */
+
+module.exports = 'b';

package/src/integration_tests/basic_bundle/optional-dependencies/optional-c.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = "c";

package/src/integration_tests/basic_bundle/optional-dependencies/optional-c.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict
+ */
+
+module.exports = 'c';

package/src/integration_tests/basic_bundle/optional-dependencies/required-a.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = "a";

package/src/integration_tests/basic_bundle/optional-dependencies/required-a.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict
+ */
+
+module.exports = 'a';

package/src/lib/RamBundleParser.js.flow

@@ -11,6 +11,7 @@
 'use strict';
 
 const MAGIC_NUMBER = require('../shared/output/RamBundle/magic-number');
+
 const SIZEOF_UINT32 = 4;
 const HEADER_SIZE = 3;
 

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/createWebsocketServer.js.flow

@@ -10,6 +10,7 @@
  */
 
 import ws from 'ws';
+
 type WebsocketServiceInterface<T> = interface {
   +onClientConnect: (
     url: string,

package/src/lib/formatBundlingError.js.flow

@@ -26,7 +26,7 @@ const serializeError = require('serialize-error');
 
 export type CustomError = Error &
   interface {
-    type?: string,
+    +type?: string,
     filename?: string,
     lineNumber?: number,
     errors?: Array<{

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/isResolvedDependency.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.isResolvedDependency = isResolvedDependency;
+function isResolvedDependency(dep) {
+  return dep.absolutePath != null;
+}

package/src/lib/isResolvedDependency.js.flow

@@ -0,0 +1,18 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+import type {Dependency, ResolvedDependency} from '../DeltaBundler/types.flow';
+
+export function isResolvedDependency(
+  dep: Dependency,
+): dep is ResolvedDependency {
+  return dep.absolutePath != null;
+}

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",
@@ -79,10 +83,6 @@ async function calcTransformerOptions(
   );
   return {
     ...baseOptions,
-    inlinePlatform:
-      transform?.unstable_inlinePlatform != null
-        ? transform.unstable_inlinePlatform
-        : true,
     inlineRequires: transform?.inlineRequires || false,
     experimentalImportSupport: transform?.experimentalImportSupport || false,
     unstable_disableES6Transforms: