metro 0.63.0 → 0.64.0

package/src/lib/BatchProcessor.js

@@ -10,7 +10,6 @@
 "use strict";
 
 const invariant = require("invariant");
-
 /**
  * We batch items together trying to minimize their processing, for example as
  * network queries. For that we wait a small moment before processing a batch.
@@ -18,6 +17,7 @@ const invariant = require("invariant");
  * if we have many items pending in a short amount of time, we can start
  * processing right away.
  */
+
 class BatchProcessor {
   constructor(options, processBatch) {
     this._options = options;

package/src/lib/TerminalReporter.js

@@ -31,6 +31,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -38,6 +39,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -50,6 +52,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 
@@ -93,12 +96,15 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -107,12 +113,14 @@ function ownKeys(object, enumerableOnly) {
       });
     keys.push.apply(keys, symbols);
   }
+
   return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
+
     if (i % 2) {
       ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
@@ -129,6 +137,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -143,6 +152,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 

package/src/lib/attachWebsocketServer.js

@@ -17,6 +17,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -30,17 +31,19 @@ function _asyncToGenerator(fn) {
       args = arguments;
     return new Promise(function(resolve, reject) {
       var gen = fn.apply(self, args);
+
       function _next(value) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
       }
+
       function _throw(err) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
       }
+
       _next(undefined);
     });
   };
 }
-
 /**
  * Attach a websocket server to an already existing HTTP[S] server, and forward
  * the received events on the given "websocketServer" parameter. It must be an
@@ -51,6 +54,7 @@ function _asyncToGenerator(fn) {
  *   - onClientMessage
  *   - onClientDisconnect
  */
+
 module.exports = function attachWebsocketServer(_ref) {
   let httpServer = _ref.httpServer,
     websocketServer = _ref.websocketServer,

package/src/lib/bundleToBytecode.js

@@ -31,6 +31,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -38,6 +39,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -50,6 +52,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 
@@ -93,20 +96,21 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 
 const _require = require("metro-hermes-compiler"),
-  getFileLength = _require.getFileLength;
-
-// The magic number is used as a header for bytecode.
+  getFileLength = _require.getFileLength; // 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) {

package/src/lib/bundleToString.js

@@ -36,7 +36,9 @@ function _unsupportedIterableToArray(o, minLen) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 
@@ -47,6 +49,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -54,6 +57,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -66,16 +70,17 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
-
 /**
  * Serializes a bundle into a plain JS bundle.
  */
+
 function bundleToString(bundle) {
   let code = bundle.pre.length > 0 ? bundle.pre + "\n" : "";
   const modules = [];

package/src/lib/debounceAsyncQueue.js

@@ -18,6 +18,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -31,12 +32,15 @@ function _asyncToGenerator(fn) {
       args = arguments;
     return new Promise(function(resolve, reject) {
       var gen = fn.apply(self, args);
+
       function _next(value) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
       }
+
       function _throw(err) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
       }
+
       _next(undefined);
     });
   };

package/src/lib/getAppendScripts.js

@@ -45,7 +45,9 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 

package/src/lib/getPreludeCode.js

@@ -45,7 +45,9 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 

package/src/lib/getPrependedScripts.js

@@ -45,12 +45,15 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -59,12 +62,14 @@ function ownKeys(object, enumerableOnly) {
       });
     keys.push.apply(keys, symbols);
   }
+
   return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
+
     if (i % 2) {
       ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
@@ -81,6 +86,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -95,6 +101,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -106,6 +113,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -119,12 +127,15 @@ function _asyncToGenerator(fn) {
       args = arguments;
     return new Promise(function(resolve, reject) {
       var gen = fn.apply(self, args);
+
       function _next(value) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
       }
+
       function _throw(err) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
       }
+
       _next(undefined);
     });
   };

package/src/lib/logToConsole.js

@@ -60,9 +60,8 @@ module.exports = function(terminal, level) {
       _key++
     ) {
       data[_key - 2] = arguments[_key];
-    }
+    } // Remove excess whitespace at the end of a log message, if possible.
 
-    // Remove excess whitespace at the end of a log message, if possible.
     const lastItem = data[data.length - 1];
 
     if (typeof lastItem === "string") {

package/src/lib/parseOptionsFromUrl.js

@@ -11,6 +11,7 @@
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -19,12 +20,14 @@ function ownKeys(object, enumerableOnly) {
       });
     keys.push.apply(keys, symbols);
   }
+
   return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
+
     if (i % 2) {
       ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
@@ -41,6 +44,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -55,6 +59,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 

package/src/lib/reporting.js

@@ -17,13 +17,13 @@ const util = require("util");
 
 const _require = require("metro-core"),
   Terminal = _require.Terminal;
-
 /**
  * A standard way to log a warning to the terminal. This should not be called
  * from some arbitrary Metro logic, only from the reporters. Instead of
  * calling this, add a new type of ReportableEvent instead, and implement a
  * proper handler in the reporter(s).
  */
+
 function logWarning(terminal, format) {
   for (
     var _len = arguments.length,

package/src/lib/splitBundleOptions.js

@@ -8,10 +8,10 @@
  * @format
  */
 "use strict";
-
 /**
  * Splits a BundleOptions object into smaller, more manageable parts.
  */
+
 function splitBundleOptions(options) {
   return {
     entryFile: options.entryFile,

package/src/lib/transformHelpers.js

@@ -11,10 +11,14 @@
 
 function _objectWithoutProperties(source, excluded) {
   if (source == null) return {};
+
   var target = _objectWithoutPropertiesLoose(source, excluded);
+
   var key, i;
+
   if (Object.getOwnPropertySymbols) {
     var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
     for (i = 0; i < sourceSymbolKeys.length; i++) {
       key = sourceSymbolKeys[i];
       if (excluded.indexOf(key) >= 0) continue;
@@ -22,6 +26,7 @@ function _objectWithoutProperties(source, excluded) {
       target[key] = source[key];
     }
   }
+
   return target;
 }
 
@@ -30,16 +35,19 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   var target = {};
   var sourceKeys = Object.keys(source);
   var key, i;
+
   for (i = 0; i < sourceKeys.length; i++) {
     key = sourceKeys[i];
     if (excluded.indexOf(key) >= 0) continue;
     target[key] = source[key];
   }
+
   return target;
 }
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -48,12 +56,14 @@ function ownKeys(object, enumerableOnly) {
       });
     keys.push.apply(keys, symbols);
   }
+
   return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
+
     if (i % 2) {
       ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
@@ -70,6 +80,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -84,6 +95,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -95,6 +107,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -108,12 +121,15 @@ function _asyncToGenerator(fn) {
       args = arguments;
     return new Promise(function(resolve, reject) {
       var gen = fn.apply(self, args);
+
       function _next(value) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
       }
+
       function _throw(err) {
         asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
       }
+
       _next(undefined);
     });
   };
@@ -217,9 +233,9 @@ function _calcTransformerOptions() {
   return _calcTransformerOptions.apply(this, arguments);
 }
 
-function removeInlineRequiresBlacklistFromOptions(path, inlineRequires) {
+function removeInlineRequiresBlockListFromOptions(path, inlineRequires) {
   if (typeof inlineRequires === "object") {
-    return !(path in inlineRequires.blacklist);
+    return !(path in inlineRequires.blockList);
   }
 
   return inlineRequires;
@@ -262,7 +278,7 @@ function _getTransformFn() {
                 path,
                 config.resolver.assetExts
               ),
-              inlineRequires: removeInlineRequiresBlacklistFromOptions(
+              inlineRequires: removeInlineRequiresBlockListFromOptions(
                 path,
                 inlineRequires
               )

package/src/lib/transformHelpers.js.flow

@@ -18,7 +18,7 @@ import type DeltaBundler, {TransformFn} from '../DeltaBundler';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
 
-type InlineRequiresRaw = {+blacklist: {[string]: true, ...}, ...} | boolean;
+type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
 export type TransformInputOptions = $Diff<
   TransformOptions,
@@ -99,12 +99,12 @@ async function calcTransformerOptions(
   };
 }
 
-function removeInlineRequiresBlacklistFromOptions(
+function removeInlineRequiresBlockListFromOptions(
   path: string,
   inlineRequires: InlineRequiresRaw,
 ): boolean {
   if (typeof inlineRequires === 'object') {
-    return !(path in inlineRequires.blacklist);
+    return !(path in inlineRequires.blockList);
   }
 
   return inlineRequires;
@@ -129,7 +129,7 @@ async function getTransformFn(
     return await bundler.transformFile(path, {
       ...transformOptions,
       type: getType(transformOptions.type, path, config.resolver.assetExts),
-      inlineRequires: removeInlineRequiresBlacklistFromOptions(
+      inlineRequires: removeInlineRequiresBlockListFromOptions(
         path,
         inlineRequires,
       ),

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -45,12 +45,15 @@ function _arrayWithoutHoles(arr) {
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
+
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
   return arr2;
 }
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -59,12 +62,14 @@ function ownKeys(object, enumerableOnly) {
       });
     keys.push.apply(keys, symbols);
   }
+
   return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
+
     if (i % 2) {
       ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
@@ -81,6 +86,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -95,6 +101,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -145,6 +152,7 @@ class ModuleResolver {
           ); // Since the redirected path is still relative to the package root,
           // we have to transform it back to be module-relative (as it
           // originally was)
+          // $FlowFixMe[incompatible-type]
 
           if (redirectedPath !== false) {
             redirectedPath =
@@ -229,7 +237,7 @@ class ModuleResolver {
           [`${moduleName} could not be found within the project${hint || "."}`]
             .concat(
               _toConsumableArray(
-                displayDirPaths.map(dirPath => `  ${path.dirname(dirPath)}`)
+                displayDirPaths.map(dirPath => `  ${dirPath}`)
               ),
               [
                 "\nIf you are sure the module exists, try these steps:",
@@ -246,11 +254,11 @@ class ModuleResolver {
       throw error;
     }
   }
-
   /**
    * FIXME: get rid of this function and of the reliance on `TModule`
    * altogether, return strongly typed resolutions at the top-level instead.
    */
+
   _getFileResolvedModule(resolution) {
     switch (resolution.type) {
       case "sourceFile":

package/src/node-haste/DependencyGraph/ModuleResolution.js.flow

@@ -80,9 +80,10 @@ type Options<TModule, TPackage> = {|
   +isAssetFile: IsAssetFile,
   +mainFields: $ReadOnlyArray<string>,
   +moduleCache: ModuleishCache<TModule, TPackage>,
-  +projectRoot: string,
-  +preferNativePlatform: boolean,
   +moduleMap: ModuleMap,
+  +nodeModulesPaths: $ReadOnlyArray<string>,
+  +preferNativePlatform: boolean,
+  +projectRoot: string,
   +resolveAsset: ResolveAsset,
   +resolveRequest: ?CustomResolver,
   +sourceExts: $ReadOnlyArray<string>,
@@ -122,6 +123,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
           // Since the redirected path is still relative to the package root,
           // we have to transform it back to be module-relative (as it
           // originally was)
+          // $FlowFixMe[incompatible-type]
           if (redirectedPath !== false) {
             redirectedPath =
               './' +
@@ -208,14 +210,13 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
           .concat(extraPaths);
 
         const hint = displayDirPaths.length ? ' or in these directories:' : '';
+
         throw new UnableToResolveError(
           fromModule.path,
           moduleName,
           [
             `${moduleName} could not be found within the project${hint || '.'}`,
-            ...displayDirPaths.map(
-              (dirPath: string) => `  ${path.dirname(dirPath)}`,
-            ),
+            ...displayDirPaths.map((dirPath: string) => `  ${dirPath}`),
             '\nIf you are sure the module exists, try these steps:',
             ' 1. Clear watchman watches: watchman watch-del-all',
             ' 2. Delete node_modules and run yarn install',