metro 0.83.0 → 0.83.2

package/src/lib/TerminalReporter.js

@@ -1,18 +1,48 @@
 "use strict";
 
-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");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _logToConsole = _interopRequireDefault(require("./logToConsole"));
+var reporting = _interopRequireWildcard(require("./reporting"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _lodash = _interopRequireDefault(require("lodash.throttle"));
+var _metroCore = require("metro-core");
+var _path = _interopRequireDefault(require("path"));
+function _getRequireWildcardCache(e) {
+  if ("function" != typeof WeakMap) return null;
+  var r = new WeakMap(),
+    t = new WeakMap();
+  return (_getRequireWildcardCache = function (e) {
+    return e ? t : r;
+  })(e);
+}
+function _interopRequireWildcard(e, r) {
+  if (!r && e && e.__esModule) return e;
+  if (null === e || ("object" != typeof e && "function" != typeof e))
+    return { default: e };
+  var t = _getRequireWildcardCache(r);
+  if (t && t.has(e)) return t.get(e);
+  var n = { __proto__: null },
+    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var u in e)
+    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
+      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
+      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+    }
+  return ((n.default = e), t && t.set(e, n), n);
+}
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const DARK_BLOCK_CHAR = "\u2593";
 const LIGHT_BLOCK_CHAR = "\u2591";
 const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
 class TerminalReporter {
   constructor(terminal) {
     this._activeBundles = new Map();
-    this._scheduleUpdateBundleProgress = throttle((data) => {
+    this._scheduleUpdateBundleProgress = (0, _lodash.default)((data) => {
       this.update({
         ...data,
         type: "bundle_transform_progressed_throttled",
@@ -28,32 +58,32 @@ class TerminalReporter {
       ratio,
       isPrefetch,
     },
-    phase
+    phase,
   ) {
     if (isPrefetch) {
       bundleType = "PREBUNDLE";
     }
-    const localPath = path.relative(".", entryFile);
+    const localPath = _path.default.relative(".", entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
     const bundleTypeColor =
       phase === "done"
-        ? chalk.green
+        ? _chalk.default.green
         : phase === "failed"
-        ? chalk.red
-        : chalk.yellow;
+          ? _chalk.default.red
+          : _chalk.default.yellow;
     const progress =
       phase === "in_progress"
-        ? chalk.green.bgGreen(DARK_BLOCK_CHAR.repeat(filledBar)) +
-          chalk.bgWhite.white(
-            LIGHT_BLOCK_CHAR.repeat(MAX_PROGRESS_BAR_CHAR_WIDTH - filledBar)
+        ? _chalk.default.green.bgGreen(DARK_BLOCK_CHAR.repeat(filledBar)) +
+          _chalk.default.bgWhite.white(
+            LIGHT_BLOCK_CHAR.repeat(MAX_PROGRESS_BAR_CHAR_WIDTH - filledBar),
           ) +
-          chalk.bold(` ${(100 * ratio).toFixed(1)}% `) +
-          chalk.dim(`(${transformedFileCount}/${totalFileCount})`)
+          _chalk.default.bold(` ${(100 * ratio).toFixed(1)}% `) +
+          _chalk.default.dim(`(${transformedFileCount}/${totalFileCount})`)
         : "";
     return (
       bundleTypeColor.inverse.bold(` ${bundleType.toUpperCase()} `) +
-      chalk.reset.dim(` ${path.dirname(localPath)}/`) +
-      chalk.bold(path.basename(localPath)) +
+      _chalk.default.reset.dim(` ${_path.default.dirname(localPath)}/`) +
+      _chalk.default.bold(_path.default.basename(localPath)) +
       " " +
       progress
     );
@@ -67,7 +97,7 @@ class TerminalReporter {
           ratio: 1,
           transformedFileCount: progress.totalFileCount,
         },
-        "done"
+        "done",
       );
       this.terminal.log(msg);
       this._activeBundles.delete(buildID);
@@ -98,30 +128,38 @@ class TerminalReporter {
       "",
       "",
     ];
-    const color = hasReducedPerformance ? chalk.red : chalk.blue;
+    const color = hasReducedPerformance
+      ? _chalk.default.red
+      : _chalk.default.blue;
     this.terminal.log(color(logo.join("\n")));
   }
   _logInitializingFailed(port, error) {
     if (error.code === "EADDRINUSE") {
       this.terminal.log(
-        chalk.bgRed.bold(" ERROR "),
-        chalk.red("Metro can't listen on port", chalk.bold(String(port)))
+        _chalk.default.bgRed.bold(" ERROR "),
+        _chalk.default.red(
+          "Metro can't listen on port",
+          _chalk.default.bold(String(port)),
+        ),
       );
       this.terminal.log(
-        "Most likely another process is already using this port"
+        "Most likely another process is already using this port",
       );
       this.terminal.log("Run the following command to find out which process:");
-      this.terminal.log("\n  ", chalk.bold("lsof -i :" + port), "\n");
+      this.terminal.log("\n  ", _chalk.default.bold("lsof -i :" + port), "\n");
       this.terminal.log("Then, you can either shut down the other process:");
-      this.terminal.log("\n  ", chalk.bold("kill -9 <PID>"), "\n");
+      this.terminal.log("\n  ", _chalk.default.bold("kill -9 <PID>"), "\n");
       this.terminal.log("or run Metro on different port.");
     } else {
-      this.terminal.log(chalk.bgRed.bold(" ERROR "), chalk.red(error.message));
+      this.terminal.log(
+        _chalk.default.bgRed.bold(" ERROR "),
+        _chalk.default.red(error.message),
+      );
       const errorAttributes = JSON.stringify(error);
       if (errorAttributes !== "{}") {
-        this.terminal.log(chalk.red(errorAttributes));
+        this.terminal.log(_chalk.default.red(errorAttributes));
       }
-      this.terminal.log(chalk.red(error.stack));
+      this.terminal.log(_chalk.default.red(error.stack));
     }
   }
   _log(event) {
@@ -160,7 +198,7 @@ class TerminalReporter {
         this._logHmrClientError(event.error);
         break;
       case "client_log":
-        logToConsole(this.terminal, event.level, event.mode, ...event.data);
+        (0, _logToConsole.default)(this.terminal, event.level, ...event.data);
         break;
       case "unstable_server_log":
         const logFn = {
@@ -172,20 +210,25 @@ class TerminalReporter {
         logFn(this.terminal, String(format), ...args);
         break;
       case "dep_graph_loading":
-        const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
+        const color = event.hasReducedPerformance
+          ? _chalk.default.red
+          : _chalk.default.blue;
         const version = "v" + require("../../package.json").version;
         this.terminal.log(
           color.bold(
             " ".repeat(19 - version.length / 2),
-            "Welcome to Metro " + chalk.white(version) + "\n"
-          ) + chalk.dim("              Fast - Scalable - Integrated\n\n")
+            "Welcome to Metro " + _chalk.default.white(version) + "\n",
+          ) +
+            _chalk.default.dim(
+              "              Fast - Scalable - Integrated\n\n",
+            ),
         );
         if (event.hasReducedPerformance) {
           this.terminal.log(
-            chalk.red(
+            _chalk.default.red(
               "Metro is operating with reduced performance.\n" +
-                "Please fix the problem above and restart Metro.\n\n"
-            )
+                "Please fix the problem above and restart Metro.\n\n",
+            ),
           );
         }
         break;
@@ -198,7 +241,7 @@ class TerminalReporter {
     }
   }
   _logBundlingError(error) {
-    if (error instanceof AmbiguousModuleResolutionError) {
+    if (error instanceof _metroCore.AmbiguousModuleResolutionError) {
       const he = error.hasteError;
       const message =
         "ambiguous resolution: module `" +
@@ -243,9 +286,9 @@ class TerminalReporter {
     const ratio = Math.min(
       Math.max(
         Math.pow(transformedFileCount / Math.max(totalFileCount, 10), 2),
-        currentProgress.ratio
+        currentProgress.ratio,
       ),
-      0.999
+      0.999,
     );
     Object.assign(currentProgress, {
       ratio,
@@ -283,7 +326,7 @@ class TerminalReporter {
   _getStatusMessage() {
     return Array.from(this._activeBundles.entries())
       .map(([_, progress]) =>
-        this._getBundleStatusMessage(progress, "in_progress")
+        this._getBundleStatusMessage(progress, "in_progress"),
       )
       .concat([this._interactionStatus])
       .filter((str) => str != null)
@@ -294,7 +337,7 @@ class TerminalReporter {
       this.terminal,
       "A WebSocket client got a connection error. Please reload your device " +
         "to get HMR working again: %s",
-      e
+      e,
     );
   }
   _logWarning(message) {
@@ -314,14 +357,14 @@ class TerminalReporter {
         case "success":
           if (this._prevHealthCheckResult) {
             this.terminal.log(
-              chalk.green(`Watcher ${watcherName} is now healthy.`)
+              _chalk.default.green(`Watcher ${watcherName} is now healthy.`),
             );
           }
           break;
         case "error":
           reporting.logWarning(
             this.terminal,
-            "Failed to perform watcher health check. Check whether the project root is writable."
+            "Failed to perform watcher health check. Check whether the project root is writable.",
           );
           break;
         case "timeout":
@@ -332,7 +375,7 @@ class TerminalReporter {
           reporting.logWarning(
             this.terminal,
             `Watcher ${watcherName} failed to detect a file change within ${result.timeout}ms.` +
-              why
+              why,
           );
           break;
       }
@@ -348,25 +391,21 @@ class TerminalReporter {
             : `unknown warning (type: ${typeof status.warning})`;
         reporting.logWarning(
           this.terminal,
-          `Watchman \`${status.command}\` returned a warning: ${warning}`
+          `Watchman \`${status.command}\` returned a warning: ${warning}`,
         );
         break;
       case "watchman_slow_command":
         this.terminal.log(
-          chalk.dim(
-            `Waiting for Watchman \`${status.command}\` (${Math.round(
-              status.timeElapsed / 1000
-            )}s)...`
-          )
+          _chalk.default.dim(
+            `Waiting for Watchman \`${status.command}\` (${Math.round(status.timeElapsed / 1000)}s)...`,
+          ),
         );
         break;
       case "watchman_slow_command_complete":
         this.terminal.log(
-          chalk.green(
-            `Watchman \`${status.command}\` finished after ${(
-              status.timeElapsed / 1000
-            ).toFixed(1)}s.`
-          )
+          _chalk.default.green(
+            `Watchman \`${status.command}\` finished after ${(status.timeElapsed / 1000).toFixed(1)}s.`,
+          ),
         );
         break;
     }
@@ -381,4 +420,4 @@ class TerminalReporter {
     this.terminal.status(this._getStatusMessage());
   }
 }
-module.exports = TerminalReporter;
+exports.default = TerminalReporter;

package/src/lib/TerminalReporter.js.flow

@@ -9,18 +9,16 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {BundleDetails, ReportableEvent} from './reporting';
 import type {Terminal} from 'metro-core';
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
-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');
+import logToConsole from './logToConsole';
+import * as reporting from './reporting';
+import chalk from 'chalk';
+import throttle from 'lodash.throttle';
+import {AmbiguousModuleResolutionError} from 'metro-core';
+import path from 'path';
 
 type BundleProgress = {
   bundleDetails: BundleDetails,
@@ -72,7 +70,7 @@ const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
  * We try to print useful information to the terminal for interactive builds.
  * This implements the `Reporter` interface from the './reporting' module.
  */
-class TerminalReporter {
+export default class TerminalReporter {
   /**
    * The bundle builds for which we are actively maintaining the status on the
    * terminal, ie. showing a progress bar. There can be several bundles being
@@ -261,7 +259,7 @@ class TerminalReporter {
         this._logHmrClientError(event.error);
         break;
       case 'client_log':
-        logToConsole(this.terminal, event.level, event.mode, ...event.data);
+        logToConsole(this.terminal, event.level, ...event.data);
         break;
       case 'unstable_server_log':
         const logFn = {
@@ -274,6 +272,7 @@ class TerminalReporter {
         break;
       case 'dep_graph_loading':
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
+        // eslint-disable-next-line import/no-commonjs
         const version = 'v' + require('../../package.json').version;
         this.terminal.log(
           color.bold(
@@ -543,5 +542,3 @@ class TerminalReporter {
     this.terminal.status(this._getStatusMessage());
   }
 }
-
-module.exports = TerminalReporter;

package/src/lib/bundleToString.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = bundleToString;
 function bundleToString(bundle) {
   let code = bundle.pre.length > 0 ? bundle.pre + "\n" : "";
   const modules = [];
@@ -24,4 +28,3 @@ function bundleToString(bundle) {
     },
   };
 }
-module.exports = bundleToString;

package/src/lib/bundleToString.js.flow

@@ -9,17 +9,12 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {
-  Bundle,
-  BundleMetadata,
-} from 'metro-runtime/src/modules/types.flow';
+import type {Bundle, BundleMetadata} from 'metro-runtime/src/modules/types';
 
 /**
  * Serializes a bundle into a plain JS bundle.
  */
-function bundleToString(bundle: Bundle): {
+export default function bundleToString(bundle: Bundle): {
   +code: string,
   +metadata: BundleMetadata,
 } {
@@ -50,5 +45,3 @@ function bundleToString(bundle: Bundle): {
     metadata: {pre: bundle.pre.length, post: bundle.post.length, modules},
   };
 }
-
-module.exports = bundleToString;

package/src/lib/contextModule.js

@@ -9,11 +9,7 @@ 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");
@@ -30,14 +26,14 @@ function deriveAbsolutePathFromContext(from, context) {
         new RegExp(context.filter.pattern, context.filter.flags).toString(),
       ]
         .filter(Boolean)
-        .join(" ")
+        .join(" "),
     )
   );
 }
 function fileMatchesContext(testPath, context) {
   const filePath = _path.default.relative(
     (0, _nullthrows.default)(context.from),
-    testPath
+    testPath,
   );
   const filter = context.filter;
   if (

package/src/lib/contextModuleTemplates.js

@@ -17,21 +17,17 @@ 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)) {
       var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
       i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
     }
-  return (n.default = e), t && t.set(e, n), n;
+  return ((n.default = e), t && t.set(e, n), n);
 }
 function createFileMap(modulePath, files, processModule) {
   let mapString = "\n";
@@ -47,9 +43,7 @@ function createFileMap(modulePath, files, processModule) {
         filePath = `./${filePath}`;
       }
       const key = JSON.stringify(filePath);
-      mapString += `  ${key}: { enumerable: true, get() { return ${processModule(
-        file
-      )}; } },\n`;
+      mapString += `  ${key}: { enumerable: true, get() { return ${processModule(file)}; } },\n`;
     });
   return `Object.defineProperties({}, {${mapString}})`;
 }
@@ -75,14 +69,10 @@ function getLoadableContextModuleTemplate(
   modulePath,
   files,
   importSyntax,
-  getContextTemplate
+  getContextTemplate,
 ) {
   return `// All of the requested modules are loaded behind enumerable getters.
-const map = ${createFileMap(
-    modulePath,
-    files,
-    (moduleId) => `${importSyntax}(${JSON.stringify(moduleId)})`
-  )};
+const map = ${createFileMap(modulePath, files, (moduleId) => `${importSyntax}(${JSON.stringify(moduleId)})`)};
 
 function metroContext(request) {
   ${getContextTemplate}
@@ -114,14 +104,14 @@ function getContextModuleTemplate(mode, modulePath, files) {
           "  // Here Promise.resolve().then() is used instead of new Promise() to prevent",
           "  // uncaught exception popping up in devtools",
           "  return Promise.resolve().then(() => map[request]);",
-        ].join("\n")
+        ].join("\n"),
       );
     case "sync":
       return getLoadableContextModuleTemplate(
         modulePath,
         files,
         "require",
-        "  return map[request];"
+        "  return map[request];",
       );
     case "lazy":
     case "lazy-once":
@@ -129,7 +119,7 @@ function getContextModuleTemplate(mode, modulePath, files) {
         modulePath,
         files,
         "import",
-        "  return map[request];"
+        "  return map[request];",
       );
     default:
       throw new Error(`Metro context mode "${mode}" is unimplemented`);

package/src/lib/countLines.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
 const newline = /\r\n?|\n|\u2028|\u2029/g;
 const countLines = (string) => (string.match(newline) || []).length + 1;
-module.exports = countLines;
+var _default = (exports.default = countLines);

package/src/lib/countLines.js.flow

@@ -9,11 +9,9 @@
  * @oncall react_native
  */
 
-'use strict';
-
 const newline = /\r\n?|\n|\u2028|\u2029/g;
 
 const countLines = (string: string): number =>
   (string.match(newline) || []).length + 1;
 
-module.exports = countLines;
+export default countLines;

package/src/lib/createWebsocketServer.js

@@ -1,14 +1,14 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = createWebsocketServer;
 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 }) {
+function createWebsocketServer({ websocketServer }) {
   const wss = new _ws.default.Server({
     noServer: true,
   });
@@ -39,4 +39,4 @@ module.exports = function createWebsocketServer({ websocketServer }) {
     });
   });
   return wss;
-};
+}

package/src/lib/createWebsocketServer.js.flow

@@ -41,7 +41,7 @@ type HMROptions<TClient> = {
  *   - onClientDisconnect
  */
 
-module.exports = function createWebsocketServer<TClient: Object>({
+export default function createWebsocketServer<TClient: Object>({
   websocketServer,
 }: HMROptions<TClient>): ws.Server {
   const wss = new ws.Server({
@@ -54,7 +54,7 @@ module.exports = function createWebsocketServer<TClient: Object>({
 
     const sendFn = (...args: Array<string>) => {
       if (connected) {
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         ws.send(...args);
       }
     };
@@ -67,7 +67,7 @@ module.exports = function createWebsocketServer<TClient: Object>({
     }
 
     ws.on('error', e => {
-      // $FlowFixMe[incompatible-call]
+      // $FlowFixMe[incompatible-type]
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
 
@@ -84,4 +84,4 @@ module.exports = function createWebsocketServer<TClient: Object>({
   });
 
   return wss;
-};
+}

package/src/lib/debounceAsyncQueue.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = debounceAsyncQueue;
 function debounceAsyncQueue(fn, delay) {
   let timeout;
   let waiting = false;
@@ -32,4 +36,3 @@ function debounceAsyncQueue(fn, delay) {
       }
     });
 }
-module.exports = debounceAsyncQueue;

package/src/lib/debounceAsyncQueue.js.flow

@@ -9,11 +9,9 @@
  * @oncall react_native
  */
 
-'use strict';
-
 // Debounces calls with the given delay, and queues the next call while the
 // previous one hasn't completed so that no two calls can execute concurrently.
-function debounceAsyncQueue<T>(
+export default function debounceAsyncQueue<T>(
   fn: () => Promise<T>,
   delay: number,
 ): () => Promise<T> {
@@ -51,5 +49,3 @@ function debounceAsyncQueue<T>(
       }
     });
 }
-
-module.exports = debounceAsyncQueue;