metro 0.63.0 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -29,30 +29,29 @@
     "debug": "^2.2.0",
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
-    "fbjs": "^1.0.0",
     "fs-extra": "^1.0.0",
     "graceful-fs": "^4.1.3",
     "image-size": "^0.6.0",
     "invariant": "^2.2.4",
-    "jest-haste-map": "^26.0.1",
+    "jest-haste-map": "^26.5.2",
     "jest-worker": "^26.0.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-register": "0.63.0",
-    "metro-babel-transformer": "0.63.0",
-    "metro-cache": "0.63.0",
-    "metro-cache-key": "0.63.0",
-    "metro-config": "0.63.0",
-    "metro-core": "0.63.0",
-    "metro-hermes-compiler": "0.63.0",
-    "metro-inspector-proxy": "0.63.0",
-    "metro-minify-uglify": "0.63.0",
-    "metro-react-native-babel-preset": "0.63.0",
-    "metro-resolver": "0.63.0",
-    "metro-runtime": "0.63.0",
-    "metro-source-map": "0.63.0",
-    "metro-symbolicate": "0.63.0",
-    "metro-transform-plugins": "0.63.0",
-    "metro-transform-worker": "0.63.0",
+    "metro-babel-register": "0.64.0",
+    "metro-babel-transformer": "0.64.0",
+    "metro-cache": "0.64.0",
+    "metro-cache-key": "0.64.0",
+    "metro-config": "0.64.0",
+    "metro-core": "0.64.0",
+    "metro-hermes-compiler": "0.64.0",
+    "metro-inspector-proxy": "0.64.0",
+    "metro-minify-uglify": "0.64.0",
+    "metro-react-native-babel-preset": "0.64.0",
+    "metro-resolver": "0.64.0",
+    "metro-runtime": "0.64.0",
+    "metro-source-map": "0.64.0",
+    "metro-symbolicate": "0.64.0",
+    "metro-transform-plugins": "0.64.0",
+    "metro-transform-worker": "0.64.0",
     "mime-types": "^2.1.27",
     "mkdirp": "^0.5.1",
     "node-fetch": "^2.2.0",
@@ -70,9 +69,10 @@
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "acorn": "^5.1.2",
     "dedent": "^0.7.0",
-    "metro-memory-fs": "0.63.0",
-    "metro-react-native-babel-preset": "0.63.0",
-    "metro-react-native-babel-transformer": "0.63.0",
+    "jest-snapshot": "^26.5.2",
+    "metro-memory-fs": "0.64.0",
+    "metro-react-native-babel-preset": "0.64.0",
+    "metro-react-native-babel-transformer": "0.64.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/Assets.js

@@ -55,7 +55,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;
 }
 
@@ -76,6 +78,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -89,12 +92,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);
     });
   };
@@ -268,10 +274,10 @@ function _getAssetData() {
   ) {
     let platform =
       arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    let publicPath = arguments.length > 4 ? arguments[4] : undefined;
-    // If the path of the asset is outside of the projectRoot, we don't want to
+    let publicPath = arguments.length > 4 ? arguments[4] : undefined; // If the path of the asset is outside of the projectRoot, we don't want to
     // use `path.join` since this will generate an incorrect URL path. In that
     // case we just concatenate the publicPath with the relative path.
+
     let assetUrlPath = localPath.startsWith("..")
       ? publicPath.replace(/\/$/, "") + "/" + path.dirname(localPath)
       : path.join(publicPath, path.dirname(localPath)); // On Windows, change backslashes to slashes to get proper URL path from file path.

package/src/Bundler/util.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,6 +70,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 
@@ -73,18 +78,20 @@ function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
 
-const template = require("@babel/template").default;
-
 const babelTypes = require("@babel/types");
 
 const babylon = require("@babel/parser");
 
-const assetPropertyBlacklist = new Set(["files", "fileSystemLocation", "path"]);
+const nullthrows = require("nullthrows");
+
+const template = require("@babel/template").default;
+
+const assetPropertyBlockList = new Set(["files", "fileSystemLocation", "path"]);
 
 function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
   const properDescriptor = filterObject(
     assetDescriptor,
-    assetPropertyBlacklist
+    assetPropertyBlockList
   ); // {...}
 
   const descriptorAst = babylon.parseExpression(
@@ -92,7 +99,7 @@ function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
   );
   const t = babelTypes; // require('AssetRegistry').registerAsset({...})
 
-  const buildRequire = template(`
+  const buildRequire = template.statement(`
     module.exports = require(ASSET_REGISTRY_PATH).registerAsset(DESCRIPTOR_AST)
   `);
   return t.file(
@@ -133,9 +140,9 @@ function generateRemoteAssetCodeFileAst(
 
   const URI = t.stringLiteral(remoteServer); // Size numbers.
 
-  const WIDTH = t.numericLiteral(assetDescriptor.width);
-  const HEIGHT = t.numericLiteral(assetDescriptor.height);
-  const buildRequire = template(`
+  const WIDTH = t.numericLiteral(nullthrows(assetDescriptor.width));
+  const HEIGHT = t.numericLiteral(nullthrows(assetDescriptor.height));
+  const buildRequire = template.statement(`
     module.exports = {
       "width": WIDTH,
       "height": HEIGHT,
@@ -170,10 +177,10 @@ function isAssetTypeAnImage(type) {
   );
 }
 
-function filterObject(object, blacklist) {
+function filterObject(object, blockList) {
   const copied = Object.assign({}, object);
 
-  for (const key of blacklist) {
+  for (const key of blockList) {
     delete copied[key];
   }
 

package/src/Bundler/util.js.flow

@@ -10,13 +10,14 @@
 
 'use strict';
 
-const template = require('@babel/template').default;
 const babelTypes = require('@babel/types');
 const babylon = require('@babel/parser');
+const nullthrows = require('nullthrows');
+const template = require('@babel/template').default;
 
 import type {AssetDataFiltered, AssetDataWithoutFiles} from '../Assets';
 import type {ModuleTransportLike} from '../shared/types.flow';
-import type {Ast} from '@babel/core';
+import type {File} from '@babel/types';
 
 // Structure of the object: dir.name.scale = asset
 export type RemoteFileMap = {
@@ -47,15 +48,15 @@ type SubTree<T: ModuleTransportLike> = (
   moduleTransportsByPath: Map<string, T>,
 ) => Iterable<number>;
 
-const assetPropertyBlacklist = new Set(['files', 'fileSystemLocation', 'path']);
+const assetPropertyBlockList = new Set(['files', 'fileSystemLocation', 'path']);
 
 function generateAssetCodeFileAst(
   assetRegistryPath: string,
   assetDescriptor: AssetDataWithoutFiles,
-): Ast {
+): File {
   const properDescriptor = filterObject(
     assetDescriptor,
-    assetPropertyBlacklist,
+    assetPropertyBlockList,
   );
 
   // {...}
@@ -65,7 +66,7 @@ function generateAssetCodeFileAst(
   const t = babelTypes;
 
   // require('AssetRegistry').registerAsset({...})
-  const buildRequire = template(`
+  const buildRequire = template.statement(`
     module.exports = require(ASSET_REGISTRY_PATH).registerAsset(DESCRIPTOR_AST)
   `);
 
@@ -89,7 +90,7 @@ function generateRemoteAssetCodeFileAst(
   assetDescriptor: AssetDataWithoutFiles,
   remoteServer: string,
   remoteFileMap: RemoteFileMap,
-): ?Ast {
+): ?File {
   const t = babelTypes;
 
   const file = remoteFileMap[assetDescriptor.fileSystemLocation];
@@ -111,10 +112,10 @@ function generateRemoteAssetCodeFileAst(
   const URI = t.stringLiteral(remoteServer);
 
   // Size numbers.
-  const WIDTH = t.numericLiteral(assetDescriptor.width);
-  const HEIGHT = t.numericLiteral(assetDescriptor.height);
+  const WIDTH = t.numericLiteral(nullthrows(assetDescriptor.width));
+  const HEIGHT = t.numericLiteral(nullthrows(assetDescriptor.height));
 
-  const buildRequire = template(`
+  const buildRequire = template.statement(`
     module.exports = {
       "width": WIDTH,
       "height": HEIGHT,
@@ -153,10 +154,10 @@ function isAssetTypeAnImage(type: string): boolean {
 
 function filterObject(
   object: AssetDataWithoutFiles,
-  blacklist: Set<string>,
+  blockList: Set<string>,
 ): AssetDataFiltered {
   const copied = Object.assign({}, object);
-  for (const key of blacklist) {
+  for (const key of blockList) {
     delete copied[key];
   }
   return copied;

package/src/Bundler.js

@@ -17,6 +17,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -30,12 +31,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/DeltaBundler/DeltaCalculator.js

@@ -17,6 +17,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -30,12 +31,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);
     });
   };
@@ -52,6 +56,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -62,13 +67,13 @@ const _require = require("./traverseDependencies"),
 
 const _require2 = require("events"),
   EventEmitter = _require2.EventEmitter;
-
 /**
  * This class is in charge of calculating the delta of changed modules that
  * happen between calls. To do so, it subscribes to file changes, so it can
  * traverse the files that have been changed between calls and avoid having to
  * traverse the whole dependency tree for trivial small changes.
  */
+
 class DeltaCalculator extends EventEmitter {
   constructor(entryPoints, dependencyGraph, options) {
     super();

package/src/DeltaBundler/Serializers/baseBytecodeBundle.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;
 }
 
@@ -59,6 +62,7 @@ function _arrayWithHoles(arr) {
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -67,12 +71,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]);
@@ -89,6 +95,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -103,6 +110,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -142,7 +150,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/DeltaBundler/Serializers/baseJSBundle.js

@@ -60,7 +60,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;
 }
 
@@ -71,6 +73,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -78,6 +81,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -90,6 +94,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 

package/src/DeltaBundler/Serializers/getAllFiles.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;
 }
 
@@ -57,6 +59,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -70,12 +73,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/DeltaBundler/Serializers/getAssets.js

@@ -17,6 +17,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -30,12 +31,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/DeltaBundler/Serializers/getRamBundleInfo.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;
 }
 
@@ -57,6 +59,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -70,12 +73,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/DeltaBundler/Serializers/helpers/bytecode.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/DeltaBundler/Serializers/helpers/getSourceMapInfo.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/DeltaBundler/Serializers/helpers/processBytecodeModules.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/DeltaBundler/Serializers/helpers/processModules.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;
 }