metro 0.66.2 → 0.69.0

package/src/integration_tests/basic_bundle/polyfill.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/integration_tests/execBundle.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.
@@ -17,7 +17,7 @@ const vm = require("vm");
 module.exports = function execBundle(code, context = {}) {
   // Verify the code can run on older VMs by parsing it as ES5 (versus ES6+).
   acorn.parse(code, {
-    ecmaVersion: 5
+    ecmaVersion: 5,
   });
   return vm.runInNewContext(code, context);
 };

package/src/integration_tests/execBundle.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/integration_tests/metro.config.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.
@@ -17,14 +17,14 @@ module.exports = {
   maxWorkers: 1,
   projectRoot: ROOT_PATH,
   reporter: {
-    update() {}
+    update() {},
   },
   watchFolders: [path.resolve(__dirname, "../../../")],
   server: {
-    port: 10028
+    port: 10028,
   },
   resolver: {
-    useWatchman: false
+    useWatchman: false,
   },
   transformer: {
     assetRegistryPath: path.join(ROOT_PATH, "AssetRegistry"),
@@ -39,10 +39,10 @@ module.exports = {
     getTransformOptions: async () => ({
       transform: {
         experimentalImportSupport: true,
-        inlineRequires: false
+        inlineRequires: false,
       },
       preloadedModules: false,
-      ramGroups: []
-    })
-  }
+      ramGroups: [],
+    }),
+  },
 };

package/src/lib/BatchProcessor.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.
@@ -62,7 +62,7 @@ class BatchProcessor {
 
       const jobs = this._queue.splice(0, this._options.maximumItems);
 
-      this._processBatch(jobs.map(job => job.item)).then(
+      this._processBatch(jobs.map((job) => job.item)).then(
         // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         this._onBatchResults.bind(this, jobs), // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         this._onBatchError.bind(this, jobs)
@@ -92,7 +92,7 @@ class BatchProcessor {
       this._queue.push({
         item,
         resolve,
-        reject
+        reject,
       });
 
       this._processQueueOnceReady();

package/src/lib/BatchProcessor.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/JsonReporter.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.
@@ -25,7 +25,7 @@ class JsonReporter {
     if (Object.prototype.toString.call(event.error) === "[object Error]") {
       event = Object.assign(event, {
         message: event.error.message,
-        stack: event.error.stack
+        stack: event.error.stack,
       });
     }
 

package/src/lib/JsonReporter.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/RamBundleParser.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/RamBundleParser.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/TerminalReporter.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,18 +9,18 @@
  */
 "use strict";
 
-const chalk = require("chalk");
-
 const logToConsole = require("./logToConsole");
 
-const path = require("path");
-
 const reporting = require("./reporting");
 
+const chalk = require("chalk");
+
 const throttle = require("lodash.throttle");
 
 const { AmbiguousModuleResolutionError } = require("metro-core");
 
+const path = require("path");
+
 const GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT =
   "The global cache is now disabled because %s";
 const DARK_BLOCK_CHAR = "\u2593";
@@ -39,7 +39,7 @@ class TerminalReporter {
    */
   constructor(terminal) {
     this._activeBundles = new Map();
-    this._scheduleUpdateBundleProgress = throttle(data => {
+    this._scheduleUpdateBundleProgress = throttle((data) => {
       this.update({ ...data, type: "bundle_transform_progressed_throttled" });
     }, 100);
     this.terminal = terminal;
@@ -56,7 +56,7 @@ class TerminalReporter {
       bundleDetails: { entryFile, bundleType, runtimeBytecodeVersion },
       transformedFileCount,
       totalFileCount,
-      ratio
+      ratio,
     },
     phase
   ) {
@@ -121,7 +121,7 @@ class TerminalReporter {
         {
           ...progress,
           ratio: 1,
-          transformedFileCount: progress.totalFileCount
+          transformedFileCount: progress.totalFileCount,
         },
         "done"
       );
@@ -165,7 +165,7 @@ class TerminalReporter {
       "                  ######### #########                 ",
       "                       #########                      ",
       "                                                      ",
-      "                                                      "
+      "                                                      ",
     ];
     const color = hasReducedPerformance ? chalk.red : chalk.blue;
     this.terminal.log(color(logo.join("\n")));
@@ -291,7 +291,7 @@ class TerminalReporter {
         "or fix them: \n\n" +
         Object.keys(he.duplicatesSet)
           .sort()
-          .map(dupFilePath => `  * \`${dupFilePath}\`\n`)
+          .map((dupFilePath) => `  * \`${dupFilePath}\`\n`)
           .join("");
       reporting.logError(this.terminal, message);
       return;
@@ -324,7 +324,7 @@ class TerminalReporter {
       lines.splice(lines.length - 1, 1);
     }
 
-    lines.forEach(line => {
+    lines.forEach((line) => {
       this.terminal.log(`transform[${origin}]: ${line}`);
     });
   }
@@ -347,7 +347,7 @@ class TerminalReporter {
     Object.assign(currentProgress, {
       ratio,
       transformedFileCount,
-      totalFileCount
+      totalFileCount,
     });
   }
   /**
@@ -368,7 +368,7 @@ class TerminalReporter {
           bundleDetails: event.bundleDetails,
           transformedFileCount: 0,
           totalFileCount: 1,
-          ratio: 0
+          ratio: 0,
         };
 
         this._activeBundles.set(event.buildID, bundleProgress);
@@ -392,7 +392,7 @@ class TerminalReporter {
       .map(([_, progress]) =>
         this._getBundleStatusMessage(progress, "in_progress")
       )
-      .filter(str => str != null)
+      .filter((str) => str != null)
       .join("\n");
   }
 

package/src/lib/TerminalReporter.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,21 +10,20 @@
 
 'use strict';
 
-const chalk = require('chalk');
-const logToConsole = require('./logToConsole');
-const path = require('path');
-const reporting = require('./reporting');
-const throttle = require('lodash.throttle');
-
-const {AmbiguousModuleResolutionError} = require('metro-core');
-
 import type {
   BundleDetails,
-  ReportableEvent,
   GlobalCacheDisabledReason,
+  ReportableEvent,
 } from './reporting';
 import type {Terminal} from 'metro-core';
 
+const logToConsole = require('./logToConsole');
+const reporting = require('./reporting');
+const chalk = require('chalk');
+const throttle = require('lodash.throttle');
+const {AmbiguousModuleResolutionError} = require('metro-core');
+const path = require('path');
+
 type BundleProgress = {
   bundleDetails: BundleDetails,
   transformedFileCount: number,

package/src/lib/bundleToBytecode.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,15 +9,14 @@
  */
 "use strict";
 
-const { getFileLength } = require("metro-hermes-compiler");
-
-// The magic number is used as a header for bytecode.
+const { getFileLength } = require("metro-hermes-compiler"); // The magic number is used as a header for bytecode.
 // It represents a Metro tunnel in binary.
 //
 // 11111111
 // 11100111
 // 11000011
 // 11000011
+
 const MAGIC_NUMBER = 0xffe7c3c3;
 
 function getFileHeader(moduleCount) {
@@ -71,13 +70,13 @@ function bundleToBytecode(bundle) {
   return {
     bytecode: Buffer.concat([
       getFileHeader(buffers.length),
-      ...buffers.flatMap(addModuleHeader)
+      ...buffers.flatMap(addModuleHeader),
     ]),
     metadata: {
       pre: bundle.pre ? bundle.pre.length : 0,
       post: bundle.post.length,
-      modules
-    }
+      modules,
+    },
   };
 }
 

package/src/lib/bundleToBytecode.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 {getFileLength} = require('metro-hermes-compiler');
-
 import type {
-  BytecodeBundle,
   BundleMetadata,
+  BytecodeBundle,
 } from 'metro-runtime/src/modules/types.flow';
 
+const {getFileLength} = require('metro-hermes-compiler');
+
 // The magic number is used as a header for bytecode.
 // It represents a Metro tunnel in binary.
 //
@@ -49,9 +49,10 @@ function addModuleHeader(buffer: Buffer): [Buffer, Buffer] {
  * ...
  *
  */
-function bundleToBytecode(
-  bundle: BytecodeBundle,
-): {|+bytecode: Buffer, +metadata: BundleMetadata|} {
+function bundleToBytecode(bundle: BytecodeBundle): {|
+  +bytecode: Buffer,
+  +metadata: BundleMetadata,
+|} {
   const buffers = [];
 
   if (bundle.pre.length) {

package/src/lib/bundleToString.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.
@@ -39,8 +39,8 @@ function bundleToString(bundle) {
     metadata: {
       pre: bundle.pre.length,
       post: bundle.post.length,
-      modules
-    }
+      modules,
+    },
   };
 }
 

package/src/lib/bundleToString.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.
@@ -18,9 +18,10 @@ import type {
 /**
  * Serializes a bundle into a plain JS bundle.
  */
-function bundleToString(
-  bundle: Bundle,
-): {|+code: string, +metadata: BundleMetadata|} {
+function bundleToString(bundle: Bundle): {|
+  +code: string,
+  +metadata: BundleMetadata,
+|} {
   let code = bundle.pre.length > 0 ? bundle.pre + '\n' : '';
   const modules = [];
 

package/src/lib/countLines.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,12 +9,8 @@
  */
 "use strict";
 
-const nullthrows = require("nullthrows");
+const newline = /\r\n?|\n|\u2028|\u2029/g;
 
-const reLine = /^/gm;
-
-function countLines(s) {
-  return nullthrows(s.match(reLine)).length;
-}
+const countLines = (string) => (string.match(newline) || []).length + 1;
 
 module.exports = countLines;

package/src/lib/countLines.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,12 +10,9 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
+const newline = /\r\n?|\n|\u2028|\u2029/g;
 
-const reLine = /^/gm;
-
-function countLines(s: string): number {
-  return nullthrows(s.match(reLine)).length;
-}
+const countLines = (string: string): number =>
+  (string.match(newline) || []).length + 1;
 
 module.exports = countLines;

package/src/lib/createModuleIdFactory.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.
@@ -12,7 +12,7 @@
 function createModuleIdFactory() {
   const fileToIdMap = new Map();
   let nextId = 0;
-  return path => {
+  return (path) => {
     let id = fileToIdMap.get(path);
 
     if (typeof id !== "number") {

package/src/lib/createModuleIdFactory.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/{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,18 +8,14 @@
  * @format
  */
 
-'use strict';
-
-import type {Server as HttpServer} from 'http';
-import type {Server as HttpsServer} from 'https';
-
+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,
@@ -28,14 +24,12 @@ type WebsocketServiceInterface<T> = interface {
 };
 
 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:
  *
@@ -45,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);
       }
@@ -88,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.