metro 0.65.2 → 0.67.0

package/src/lib/{attachWebsocketServer.js → createWebsocketServer.js}

@@ -1,5 +1,13 @@
+"use strict";
+
+var _ws = _interopRequireDefault(require("ws"));
+
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+
 /**
- * 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,10 +15,9 @@
  *
  * @format
  */
-"use strict";
 
 /**
- * Attach a websocket server to an already existing HTTP[S] server, and forward
+ * Returns a WebSocketServer to be attached to an existing HTTP instance. It forwards
  * the received events on the given "websocketServer" parameter. It must be an
  * object with the following fields:
  *
@@ -19,20 +26,13 @@
  *   - onClientMessage
  *   - onClientDisconnect
  */
-module.exports = function attachWebsocketServer({
-  httpServer,
-  websocketServer,
-  path
-}) {
-  const WebSocketServer = require("ws").Server;
-
-  const wss = new WebSocketServer({
-    server: httpServer,
-    path
+module.exports = function createWebsocketServer({ websocketServer }) {
+  const wss = new _ws.default.Server({
+    noServer: true,
   });
-  wss.on("connection", async ws => {
+  wss.on("connection", async (ws, req) => {
     let connected = true;
-    const url = ws.upgradeReq.url;
+    const url = req.url;
 
     const sendFn = (...args) => {
       if (connected) {
@@ -47,7 +47,7 @@ module.exports = function attachWebsocketServer({
       return;
     }
 
-    ws.on("error", e => {
+    ws.on("error", (e) => {
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
     ws.on("close", () => {
@@ -55,9 +55,10 @@ module.exports = function attachWebsocketServer({
         websocketServer.onClientDisconnect(client);
       connected = false;
     });
-    ws.on("message", message => {
+    ws.on("message", (message) => {
       websocketServer.onClientMessage &&
         websocketServer.onClientMessage(client, message, sendFn);
     });
   });
+  return wss;
 };

package/src/lib/{attachWebsocketServer.js.flow → createWebsocketServer.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.
@@ -8,35 +8,28 @@
  * @format
  */
 
-'use strict';
-
-import type {Server as HttpServer} from 'http';
-import type {Server as HttpsServer} from 'https';
-
-type WebsocketServiceInterface<T> = {
+import ws from 'ws';
+type WebsocketServiceInterface<T> = interface {
   +onClientConnect: (
     url: string,
     sendFn: (data: string) => void,
   ) => Promise<?T>,
   +onClientDisconnect?: (client: T) => mixed,
-  +onClientError?: (client: T, e: Error) => mixed,
+  +onClientError?: (client: T, e: ErrorEvent) => mixed,
   +onClientMessage?: (
     client: T,
     message: string,
     sendFn: (data: string) => void,
   ) => mixed,
-  ...
 };
 
 type HMROptions<TClient> = {
-  httpServer: HttpServer | HttpsServer,
   websocketServer: WebsocketServiceInterface<TClient>,
-  path: string,
   ...
 };
 
 /**
- * Attach a websocket server to an already existing HTTP[S] server, and forward
+ * Returns a WebSocketServer to be attached to an existing HTTP instance. It forwards
  * the received events on the given "websocketServer" parameter. It must be an
  * object with the following fields:
  *
@@ -46,22 +39,18 @@ type HMROptions<TClient> = {
  *   - onClientDisconnect
  */
 
-module.exports = function attachWebsocketServer<TClient: Object>({
-  httpServer,
+module.exports = function createWebsocketServer<TClient: Object>({
   websocketServer,
-  path,
-}: HMROptions<TClient>): void {
-  const WebSocketServer = require('ws').Server;
-  const wss = new WebSocketServer({
-    server: httpServer,
-    path,
+}: HMROptions<TClient>): typeof ws.Server {
+  const wss = new ws.Server({
+    noServer: true,
   });
 
-  wss.on('connection', async ws => {
+  wss.on('connection', async (ws, req) => {
     let connected = true;
-    const url = ws.upgradeReq.url;
+    const url = req.url;
 
-    const sendFn = (...args) => {
+    const sendFn = (...args: Array<string>) => {
       if (connected) {
         ws.send(...args);
       }
@@ -89,4 +78,5 @@ module.exports = function attachWebsocketServer<TClient: Object>({
         websocketServer.onClientMessage(client, message, sendFn);
     });
   });
+  return wss;
 };

package/src/lib/debounceAsyncQueue.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.
@@ -21,7 +21,7 @@ function debounceAsyncQueue(fn, delay) {
     callbacks = [];
     executing = true;
     const res = await fn();
-    currentCallbacks.forEach(c => c(res));
+    currentCallbacks.forEach((c) => c(res));
     executing = false;
 
     if (callbacks.length > 0) {

package/src/lib/debounceAsyncQueue.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/formatBundlingError.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,26 +9,26 @@
  */
 "use strict";
 
-const ErrorStackParser = require("error-stack-parser");
-
 const GraphNotFoundError = require("../IncrementalBundler/GraphNotFoundError");
 
 const ResourceNotFoundError = require("../IncrementalBundler/ResourceNotFoundError");
 
 const RevisionNotFoundError = require("../IncrementalBundler/RevisionNotFoundError");
 
-const fs = require("fs");
-
-const serializeError = require("serialize-error");
-
 const {
-  UnableToResolveError
+  UnableToResolveError,
 } = require("../node-haste/DependencyGraph/ModuleResolution");
 
 const { codeFrameColumns } = require("@babel/code-frame");
 
+const ErrorStackParser = require("error-stack-parser");
+
+const fs = require("fs");
+
 const { AmbiguousModuleResolutionError } = require("metro-core");
 
+const serializeError = require("serialize-error");
+
 function formatBundlingError(error) {
   if (error instanceof AmbiguousModuleResolutionError) {
     const he = error.hasteError;
@@ -39,16 +39,16 @@ function formatBundlingError(error) {
       "fix them: \n\n" +
       Object.keys(he.duplicatesSet)
         .sort()
-        .map(dupFilePath => `${dupFilePath}`)
+        .map((dupFilePath) => `${dupFilePath}`)
         .join("\n\n");
     return {
       type: "AmbiguousModuleResolutionError",
       message,
       errors: [
         {
-          description: message
-        }
-      ]
+          description: message,
+        },
+      ],
     };
   }
 
@@ -61,27 +61,27 @@ function formatBundlingError(error) {
       {
         description: error.message,
         filename: error.filename,
-        lineNumber: error.lineNumber
-      }
+        lineNumber: error.lineNumber,
+      },
     ];
     return serializeError(error);
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
       errors: [],
-      message: error.message
+      message: error.message,
     };
   } else {
     const stack = ErrorStackParser.parse(error);
@@ -97,11 +97,11 @@ function formatBundlingError(error) {
         {
           start: {
             column,
-            line
-          }
+            line,
+          },
         },
         {
-          forceColor: true
+          forceColor: true,
         }
       );
     } catch {}
@@ -109,7 +109,7 @@ function formatBundlingError(error) {
     return {
       type: "InternalError",
       errors: [],
-      message: `Metro has encountered an error: ${error.message}: ${fileName} (${line}:${column})\n\n${codeFrame}`
+      message: `Metro has encountered an error: ${error.message}: ${fileName} (${line}:${column})\n\n${codeFrame}`,
     };
   }
 }

package/src/lib/formatBundlingError.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,34 +10,32 @@
 
 'use strict';
 
-const ErrorStackParser = require('error-stack-parser');
+import type {FormattedError} from 'metro-runtime/src/modules/types.flow';
+
 const GraphNotFoundError = require('../IncrementalBundler/GraphNotFoundError');
 const ResourceNotFoundError = require('../IncrementalBundler/ResourceNotFoundError');
 const RevisionNotFoundError = require('../IncrementalBundler/RevisionNotFoundError');
-
-const fs = require('fs');
-const serializeError = require('serialize-error');
-
 const {
   UnableToResolveError,
 } = require('../node-haste/DependencyGraph/ModuleResolution');
 const {codeFrameColumns} = require('@babel/code-frame');
+const ErrorStackParser = require('error-stack-parser');
+const fs = require('fs');
 const {AmbiguousModuleResolutionError} = require('metro-core');
+const serializeError = require('serialize-error');
 
-import type {FormattedError} from 'metro-runtime/src/modules/types.flow';
-
-export type CustomError = Error & {
-  type?: string,
-  filename?: string,
-  lineNumber?: number,
-  errors?: Array<{
-    description: string,
-    filename: string,
-    lineNumber: number,
-    ...
-  }>,
-  ...
-};
+export type CustomError = Error &
+  interface {
+    type?: string,
+    filename?: string,
+    lineNumber?: number,
+    errors?: Array<{
+      description: string,
+      filename: string,
+      lineNumber: number,
+      ...
+    }>,
+  };
 
 function formatBundlingError(error: CustomError): FormattedError {
   if (error instanceof AmbiguousModuleResolutionError) {

package/src/lib/getAppendScripts.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,26 +9,25 @@
  */
 "use strict";
 
-const countLines = require("./countLines");
-
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
 
+const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
+
+const countLines = require("./countLines");
+
 const nullthrows = require("nullthrows");
 
 const path = require("path");
 
-const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
-
 function getAppendScripts(entryPoint, modules, importBundleNames, options) {
   const output = [];
 
   if (importBundleNames.size) {
     const importBundleNamesObject = Object.create(null);
-    importBundleNames.forEach(absolutePath => {
+    importBundleNames.forEach((absolutePath) => {
       const bundlePath = path.relative(options.projectRoot, absolutePath);
-      importBundleNamesObject[
-        options.createModuleId(absolutePath)
-      ] = bundlePath.slice(0, -path.extname(bundlePath).length);
+      importBundleNamesObject[options.createModuleId(absolutePath)] =
+        bundlePath.slice(0, -path.extname(bundlePath).length);
     });
     const code = `(function(){var $$=${options.getRunModuleStatement(
       options.createModuleId(options.asyncRequireModulePath)
@@ -46,10 +45,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 
@@ -57,7 +56,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
     const paths = [...options.runBeforeMainModule, entryPoint];
 
     for (const path of paths) {
-      if (modules.some(module => module.path === path)) {
+      if (modules.some((module) => module.path === path)) {
         const code = options.getRunModuleStatement(
           options.createModuleId(path)
         );
@@ -72,10 +71,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
               data: {
                 code,
                 lineCount: countLines(code),
-                map: []
-              }
-            }
-          ]
+                map: [],
+              },
+            },
+          ],
         });
       }
     }
@@ -86,7 +85,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
       ? getInlineSourceMappingURL(
           sourceMapString(modules, {
             processModuleFilter: () => true,
-            excludeSource: false
+            excludeSource: false,
           })
         )
       : nullthrows(options.sourceMapUrl);
@@ -102,10 +101,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 
@@ -122,10 +121,10 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           data: {
             code,
             lineCount: countLines(code),
-            map: []
-          }
-        }
-      ]
+            map: [],
+          },
+        },
+      ],
     });
   }
 

package/src/lib/getAppendScripts.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,13 +10,13 @@
 
 'use strict';
 
-const countLines = require('./countLines');
+import type {Module} from '../DeltaBundler';
+
 const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
+const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
+const countLines = require('./countLines');
 const nullthrows = require('nullthrows');
 const path = require('path');
-const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
-
-import type {Module} from '../DeltaBundler';
 
 type Options<T: number | string> = {
   +asyncRequireModulePath: string,
@@ -43,9 +43,8 @@ function getAppendScripts<T: number | string>(
     const importBundleNamesObject = Object.create(null);
     importBundleNames.forEach(absolutePath => {
       const bundlePath = path.relative(options.projectRoot, absolutePath);
-      importBundleNamesObject[
-        options.createModuleId(absolutePath)
-      ] = bundlePath.slice(0, -path.extname(bundlePath).length);
+      importBundleNamesObject[options.createModuleId(absolutePath)] =
+        bundlePath.slice(0, -path.extname(bundlePath).length);
     });
     const code = `(function(){var $$=${options.getRunModuleStatement(
       options.createModuleId(options.asyncRequireModulePath),

package/src/lib/getGraphId.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.
@@ -35,8 +35,8 @@ function getGraphId(
         experimentalImportBundleSupport,
         shallow,
         unstable_transformProfile:
-          options.unstable_transformProfile || "default"
-      }
+          options.unstable_transformProfile || "default",
+      },
     },
     canonicalize
   );

package/src/lib/getGraphId.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,9 +10,9 @@
 
 'use strict';
 
-const canonicalize = require('metro-core/src/canonicalize');
+import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 
-import type {TransformInputOptions} from './transformHelpers';
+const canonicalize = require('metro-core/src/canonicalize');
 
 export opaque type GraphId: string = string;
 

package/src/lib/getMaxWorkers.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,7 +11,7 @@
 
 const os = require("os");
 
-module.exports = workers => {
+module.exports = (workers) => {
   const cores = os.cpus().length;
   return typeof workers === "number" && Number.isInteger(workers)
     ? Math.min(cores, workers > 0 ? workers : 1)

package/src/lib/getMaxWorkers.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/getPreludeCode.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,7 +15,7 @@ function getPreludeCode({ extraVars, isDev, globalPrefix }) {
     `__DEV__=${String(isDev)}`,
     ...formatExtraVars(extraVars),
     "process=this.process||{}",
-    `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`
+    `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`,
   ];
   return `var ${vars.join(",")};${processEnv(
     isDev ? "development" : "production"

package/src/lib/getPreludeCode.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.