metro 0.77.0 → 0.78.0

package/src/index.flow.js.flow

@@ -16,8 +16,7 @@ import type {CustomResolverOptions} from 'metro-resolver';
 import type {ReadOnlyGraph} from './DeltaBundler';
 import type {ServerOptions} from './Server';
 import type {OutputOptions, RequestOptions} from './shared/types.flow.js';
-import type EventEmitter from 'events';
-import type {IncomingMessage, Server as HttpServer} from 'http';
+import type {Server as HttpServer} from 'http';
 import type {Server as HttpsServer} from 'https';
 import type {
   ConfigT,
@@ -26,7 +25,6 @@ import type {
   Middleware,
 } from 'metro-config/src/configTypes.flow';
 import type {CustomTransformOptions} from 'metro-transform-worker';
-import type {Duplex} from 'stream';
 import typeof Yargs from 'yargs';
 
 const makeBuildCommand = require('./commands/build');
@@ -49,7 +47,6 @@ const {
   resolveConfig,
 } = require('metro-config');
 const {Terminal} = require('metro-core');
-const {InspectorProxy} = require('metro-inspector-proxy');
 const net = require('net');
 const {parse} = require('url');
 
@@ -65,21 +62,11 @@ export type RunMetroOptions = {
   waitForBundler?: boolean,
 };
 
-interface WebsocketServer extends EventEmitter {
-  handleUpgrade<T = WebsocketServer>(
-    request: IncomingMessage,
-    socket: Duplex,
-    upgradeHead: Buffer,
-    callback: (client: T, request: IncomingMessage) => void,
-  ): void;
-}
-
 export type RunServerOptions = $ReadOnly<{
   hasReducedPerformance?: boolean,
   host?: string,
   onError?: (Error & {code?: string}) => void,
   onReady?: (server: HttpServer | HttpsServer) => void,
-  runInspectorProxy?: boolean,
   secureServerOptions?: Object,
   secure?: boolean, // deprecated
   secureCert?: string, // deprecated
@@ -88,7 +75,7 @@ export type RunServerOptions = $ReadOnly<{
   waitForBundler?: boolean,
   watch?: boolean,
   websocketEndpoints?: $ReadOnly<{
-    [path: string]: WebsocketServer,
+    [path: string]: ws$WebSocketServer,
   }>,
 }>;
 
@@ -262,7 +249,7 @@ exports.runServer = async (
     waitForBundler = false,
     websocketEndpoints = {},
     watch,
-  }: RunServerOptions,
+  }: RunServerOptions = {},
 ): Promise<HttpServer | HttpsServer> => {
   await earlyPortCheck(host, config.server.port);
 
@@ -292,11 +279,6 @@ exports.runServer = async (
     serverApp.use(handler);
   }
 
-  let inspectorProxy: ?InspectorProxy = null;
-  if (config.server.runInspectorProxy) {
-    inspectorProxy = new InspectorProxy(config.projectRoot);
-  }
-
   let httpServer;
 
   if (secure || secureServerOptions != null) {
@@ -333,9 +315,6 @@ exports.runServer = async (
 
         websocketEndpoints = {
           ...websocketEndpoints,
-          ...(inspectorProxy
-            ? {...inspectorProxy.createWebSocketListeners(httpServer)}
-            : {}),
           '/hot': createWebsocketServer({
             websocketServer: new MetroHmrServer(
               metroServer.getBundler(),
@@ -361,14 +340,6 @@ exports.runServer = async (
           }
         });
 
-        if (inspectorProxy) {
-          // TODO(hypuk): Refactor inspectorProxy.processRequest into separate request handlers
-          // so that we could provide routes (/json/list and /json/version) here.
-          // Currently this causes Metro to give warning about T31407894.
-          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-          serverApp.use(inspectorProxy.processRequest.bind(inspectorProxy));
-        }
-
         resolve(httpServer);
       });
 

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

@@ -0,0 +1,21 @@
+"use strict";
+
+var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+
+global.x = _doesNotExist.default;

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

@@ -0,0 +1,17 @@
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not-exist';
+
+// $FlowExpectedError[cannot-resolve-module]
+import DoesNotExist from './does-not-exist';
+
+global.x = (DoesNotExist: DoesNotExistT);

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _doesNotExist = require("./does-not'\"-exist");
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+global.x = _doesNotExist.aaaaaaaaaa;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js.flow

@@ -0,0 +1,29 @@
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not\'"-exist';
+
+import {
+  aaaaaaaaaa,
+  bbbbbbbbbb,
+  cccccccccc,
+  dddddddddd,
+  eeeeeeeeee,
+  ffffffffff,
+  gggggggggg,
+  hhhhhhhhhh,
+  iiiiiiiiii,
+  // $FlowExpectedError[cannot-resolve-module]
+} from './does-not\'"-exist';
+
+global.x = (aaaaaaaaaa: DoesNotExistT);

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

@@ -0,0 +1,18 @@
+"use strict";
+
+var _doesNotExist = require("./does-not-exist");
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+global.x = _doesNotExist.aaaaaaaaaa;

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

@@ -0,0 +1,29 @@
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not-exist';
+
+import {
+  aaaaaaaaaa,
+  bbbbbbbbbb,
+  cccccccccc,
+  dddddddddd,
+  eeeeeeeeee,
+  ffffffffff,
+  gggggggggg,
+  hhhhhhhhhh,
+  iiiiiiiiii,
+  // $FlowExpectedError[cannot-resolve-module]
+} from './does-not-exist';
+
+global.x = (aaaaaaaaaa: DoesNotExistT);

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js

@@ -0,0 +1,18 @@
+"use strict";
+
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require("./foo" /* ./foo */);
+
+global.x = DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js.flow

@@ -0,0 +1,17 @@
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './foo';
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require('./foo' /* ./foo */);
+
+global.x = (DoesNotExist: DoesNotExistT);

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

@@ -0,0 +1,17 @@
+"use strict";
+
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require("./does-not-exist");
+global.x = DoesNotExist;

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

@@ -0,0 +1,17 @@
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not-exist';
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require('./does-not-exist');
+
+global.x = (DoesNotExist: DoesNotExistT);

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _doesNotExist = require("./does-not'\"-exist");
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+
+global.x = _doesNotExist.DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js.flow

@@ -0,0 +1,19 @@
+/**
+ * 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
+ */
+
+/* eslint-disable no-unused-vars */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not\'"-exist';
+
+// $FlowExpectedError[cannot-resolve-module]
+import {DoesNotExist} from './does-not\'"-exist';
+
+global.x = (DoesNotExist: DoesNotExistT);

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

@@ -0,0 +1,21 @@
+"use strict";
+
+var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+
+global.x = _doesNotExist.default;

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

@@ -0,0 +1,17 @@
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not-exist';
+
+// $FlowExpectedError[cannot-resolve-module]
+import DoesNotExist from './does-not-exist';
+
+global.x = (DoesNotExist: DoesNotExistT);

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

@@ -0,0 +1,17 @@
+"use strict";
+
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require("./does-not-exist");
+global.x = DoesNotExist;

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

@@ -0,0 +1,17 @@
+/**
+ * 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
+ */
+
+// $FlowExpectedError[cannot-resolve-module]
+import type DoesNotExistT from './does-not-exist';
+
+// $FlowExpectedError[cannot-resolve-module]
+const DoesNotExist = require('./does-not-exist');
+
+global.x = (DoesNotExist: DoesNotExistT);

package/src/integration_tests/metro.config.js

@@ -32,14 +32,16 @@ module.exports = {
       "metro-runtime/src/modules/asyncRequire"
     ),
     babelTransformerPath: require.resolve(
-      "metro-react-native-babel-transformer"
+      "@react-native/metro-babel-transformer"
     ),
     enableBabelRCLookup: false,
     enableBabelRuntime: false,
-    getTransformOptions: async () => ({
+    getTransformOptions: async (entryFiles) => ({
       transform: {
         experimentalImportSupport: true,
-        inlineRequires: false,
+        inlineRequires: entryFiles.some((filePath) =>
+          filePath.includes("inline-requires")
+        ),
       },
       preloadedModules: false,
       ramGroups: [],

package/src/lib/createWebsocketServer.js

@@ -35,6 +35,7 @@ module.exports = function createWebsocketServer({ websocketServer }) {
     const url = req.url;
     const sendFn = (...args) => {
       if (connected) {
+        // $FlowFixMe[incompatible-call]
         ws.send(...args);
       }
     };
@@ -44,6 +45,7 @@ module.exports = function createWebsocketServer({ websocketServer }) {
       return;
     }
     ws.on("error", (e) => {
+      // $FlowFixMe[incompatible-call]
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
     ws.on("close", () => {

package/src/lib/createWebsocketServer.js.flow

@@ -19,7 +19,7 @@ type WebsocketServiceInterface<T> = interface {
   +onClientError?: (client: T, e: ErrorEvent) => mixed,
   +onClientMessage?: (
     client: T,
-    message: string,
+    message: string | Buffer | ArrayBuffer | Array<Buffer>,
     sendFn: (data: string) => void,
   ) => mixed,
 };
@@ -42,7 +42,7 @@ type HMROptions<TClient> = {
 
 module.exports = function createWebsocketServer<TClient: Object>({
   websocketServer,
-}: HMROptions<TClient>): typeof ws.Server {
+}: HMROptions<TClient>): ws.Server {
   const wss = new ws.Server({
     noServer: true,
   });
@@ -53,6 +53,7 @@ module.exports = function createWebsocketServer<TClient: Object>({
 
     const sendFn = (...args: Array<string>) => {
       if (connected) {
+        // $FlowFixMe[incompatible-call]
         ws.send(...args);
       }
     };
@@ -65,6 +66,7 @@ module.exports = function createWebsocketServer<TClient: Object>({
     }
 
     ws.on('error', e => {
+      // $FlowFixMe[incompatible-call]
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
 
@@ -79,5 +81,6 @@ module.exports = function createWebsocketServer<TClient: Object>({
         websocketServer.onClientMessage(client, message, sendFn);
     });
   });
+
   return wss;
 };

package/src/lib/transformHelpers.js

@@ -166,10 +166,10 @@ function getType(type, filePath, assetExts) {
 }
 async function getResolveDependencyFn(bundler, platform, resolverOptions) {
   const dependencyGraph = await await bundler.getDependencyGraph();
-  return (from, to) =>
+  return (from, dependency) =>
     dependencyGraph.resolveDependency(
       from,
-      to,
+      dependency,
       platform ?? null,
       resolverOptions
     );

package/src/lib/transformHelpers.js.flow

@@ -16,6 +16,7 @@ import type DeltaBundler, {TransformFn} from '../DeltaBundler';
 import type {
   BundlerResolution,
   TransformInputOptions,
+  TransformResultDependency,
 } from '../DeltaBundler/types.flow';
 import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
@@ -204,13 +205,15 @@ async function getResolveDependencyFn(
   bundler: Bundler,
   platform: ?string,
   resolverOptions: ResolverInputOptions,
-): Promise<(from: string, to: string) => BundlerResolution> {
+): Promise<
+  (from: string, dependency: TransformResultDependency) => BundlerResolution,
+> {
   const dependencyGraph = await await bundler.getDependencyGraph();
 
-  return (from: string, to: string) =>
+  return (from: string, dependency: TransformResultDependency) =>
     dependencyGraph.resolveDependency(
       from,
-      to,
+      dependency,
       platform ?? null,
       resolverOptions,
     );