metro 0.63.0 → 0.64.0

package/src/ModuleGraph/node-haste/Package.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/ModuleGraph/node-haste/node-haste.flow.js.flow

@@ -63,10 +63,8 @@ type HasteMapOptions = {|
   preferNativePlatform: true,
 |};
 
-/* eslint-disable flowtype/object-type-delimiter */
 declare class HasteMap {
   // node-haste/DependencyGraph/HasteMap.js
   build(): Promise<Object>;
   constructor(options: HasteMapOptions): void;
 }
-/* eslint-enable flowtype/object-type-delimiter */

package/src/ModuleGraph/node-haste/node-haste.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;
 }
 
@@ -183,6 +185,7 @@ exports.createResolveFn = function(options) {
       mocks: new Map(),
       rootDir: ""
     }),
+    nodeModulesPaths: options.nodeModulesPaths,
     preferNativePlatform: true,
     projectRoot: "",
     resolveAsset: (dirPath, assetName, extension) => {

package/src/ModuleGraph/node-haste/node-haste.js.flow

@@ -29,14 +29,15 @@ import type {Extensions, Path} from './node-haste.flow';
 import type {CustomResolver} from 'metro-resolver';
 
 type ResolveOptions = {|
+  +platform: string,
+  +sourceExts: Extensions,
   assetExts: Extensions,
   assetResolutions: $ReadOnlyArray<string>,
   extraNodeModules: {[id: string]: string, ...},
   mainFields: $ReadOnlyArray<string>,
+  nodeModulesPaths: $ReadOnlyArray<string>,
   resolveRequest?: ?CustomResolver,
-  +sourceExts: Extensions,
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
-  +platform: string,
 |};
 
 const platforms = new Set(defaults.platforms);
@@ -147,6 +148,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
       mocks: new Map(),
       rootDir: '',
     }),
+    nodeModulesPaths: options.nodeModulesPaths,
     preferNativePlatform: true,
     projectRoot: '',
     resolveAsset: (

package/src/ModuleGraph/output/indexed-ram-bundle.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;
 }
 
@@ -109,7 +114,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;
 }
 
@@ -120,6 +127,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -127,6 +135,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -139,6 +148,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 

package/src/ModuleGraph/output/multiple-files-ram-bundle.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;
 }
 
@@ -109,7 +114,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;
 }
 
@@ -120,6 +127,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -127,6 +135,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -139,6 +148,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 

package/src/ModuleGraph/output/reverse-dependency-map-references.js

@@ -9,6 +9,18 @@
  */
 "use strict";
 
+var _invariant = _interopRequireDefault(require("invariant"));
+
+var _nullthrows = _interopRequireDefault(require("nullthrows"));
+
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj
+      };
+}
+
 function reverseDependencyMapReferences(_ref) {
   let t = _ref.types;
   return {
@@ -17,28 +29,40 @@ function reverseDependencyMapReferences(_ref) {
         const node = path.node;
 
         if (node.callee.name === `${state.opts.globalPrefix}__d`) {
-          const lastArg = node.arguments[0].params.slice(-1)[0];
+          // $FlowFixMe Flow error uncovered by typing Babel more strictly
+          const lastArg = node.arguments[0].params.slice(-1)[0]; // $FlowFixMe Flow error uncovered by typing Babel more strictly
+
           const depMapName = lastArg && lastArg.name;
 
-          if (!depMapName) {
+          if (depMapName == null) {
             return;
           }
 
-          const scope = path.get("arguments.0.body").scope;
-          const binding = scope.getBinding(depMapName);
+          const body = path.get("arguments.0.body");
+          (0, _invariant.default)(
+            !Array.isArray(body),
+            "meetro: Expected `body` to be a single path."
+          );
+          const scope = body.scope;
+          const binding = (0, _nullthrows.default)(
+            scope.getBinding(depMapName)
+          );
           binding.referencePaths.forEach(_ref2 => {
             let parentPath = _ref2.parentPath;
-            const memberNode = parentPath.node;
+            const memberNode =
+              parentPath === null || parentPath === void 0
+                ? void 0
+                : parentPath.node;
 
             if (
+              memberNode != null &&
               memberNode.type === "MemberExpression" &&
               memberNode.property.type === "NumericLiteral"
             ) {
-              parentPath.replaceWith(
-                t.numericLiteral(
-                  state.opts.dependencyIds[memberNode.property.value]
-                )
+              const numericLiteral = t.numericLiteral(
+                state.opts.dependencyIds[memberNode.property.value]
               );
+              (0, _nullthrows.default)(parentPath).replaceWith(numericLiteral);
             }
           });
         }

package/src/ModuleGraph/output/reverse-dependency-map-references.js.flow

@@ -10,8 +10,11 @@
 
 'use strict';
 
-import type {Path} from '@babel/traverse';
-import type {Types} from '@babel/types';
+import type {NodePath} from '@babel/traverse';
+import typeof * as Types from '@babel/types';
+import type {CallExpression} from '@babel/types';
+import invariant from 'invariant';
+import nullthrows from 'nullthrows';
 
 type State = {|
   opts: {|
@@ -25,35 +28,47 @@ function reverseDependencyMapReferences({
 }: {
   types: Types,
   ...
-}): {|visitor: {|CallExpression: (path: Path, state: State) => void|}|} {
+}): {|
+  visitor: {|
+    CallExpression: (path: NodePath<CallExpression>, state: State) => void,
+  |},
+|} {
   return {
     visitor: {
-      CallExpression(path: Path, state: State) {
+      CallExpression(path: NodePath<CallExpression>, state: State) {
         const {node} = path;
 
         if (node.callee.name === `${state.opts.globalPrefix}__d`) {
+          // $FlowFixMe Flow error uncovered by typing Babel more strictly
           const lastArg = node.arguments[0].params.slice(-1)[0];
-          const depMapName = lastArg && lastArg.name;
+          // $FlowFixMe Flow error uncovered by typing Babel more strictly
+          const depMapName: ?string = lastArg && lastArg.name;
 
-          if (!depMapName) {
+          if (depMapName == null) {
             return;
           }
 
-          const scope = path.get('arguments.0.body').scope;
-          const binding = scope.getBinding(depMapName);
+          const body = path.get('arguments.0.body');
+          invariant(
+            !Array.isArray(body),
+            'meetro: Expected `body` to be a single path.',
+          );
+
+          const scope = body.scope;
+          const binding = nullthrows(scope.getBinding(depMapName));
 
           binding.referencePaths.forEach(({parentPath}) => {
-            const memberNode = parentPath.node;
+            const memberNode = parentPath?.node;
 
             if (
+              memberNode != null &&
               memberNode.type === 'MemberExpression' &&
               memberNode.property.type === 'NumericLiteral'
             ) {
-              parentPath.replaceWith(
-                t.numericLiteral(
-                  state.opts.dependencyIds[memberNode.property.value],
-                ),
+              const numericLiteral = t.numericLiteral(
+                state.opts.dependencyIds[memberNode.property.value],
               );
+              nullthrows(parentPath).replaceWith(numericLiteral);
             }
           });
         }

package/src/ModuleGraph/output/util.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;
 }
 
@@ -94,7 +99,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;
 }
 
@@ -115,15 +122,14 @@ const _require2 = require("metro-react-native-babel-preset"),
   passthroughSyntaxPlugins = _require2.passthroughSyntaxPlugins;
 
 const _require3 = require("@babel/core"),
-  transformSync = _require3.transformSync;
-
-// Transformed modules have the form
+  transformSync = _require3.transformSync; // Transformed modules have the form
 //   __d(function(require, module, global, exports, dependencyMap) {
 //       /* code */
 //   });
 //
 // This function adds the numeric module ID, and an array with dependencies of
 // the dependencies of the module before the closing parenthesis.
+
 function addModuleIdsToModuleWrapper(module, idForPath) {
   const dependencies = module.dependencies,
     file = module.file;
@@ -143,14 +149,14 @@ function addModuleIdsToModuleWrapper(module, idForPath) {
 
 exports.addModuleIdsToModuleWrapper = addModuleIdsToModuleWrapper;
 
-function inlineModuleIds(module, idForPath) {
-  let _ref =
-      arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-    _ref$dependencyMapRes = _ref.dependencyMapReservedName,
+function inlineModuleIds(module, idForPath, _ref) {
+  let _ref$dependencyMapRes = _ref.dependencyMapReservedName,
     dependencyMapReservedName =
       _ref$dependencyMapRes === void 0 ? undefined : _ref$dependencyMapRes,
-    globalPrefix = _ref.globalPrefix;
-
+    globalPrefix = _ref.globalPrefix,
+    _ref$ignoreMissingDep = _ref.ignoreMissingDependencyMapReference,
+    ignoreMissingDependencyMapReference =
+      _ref$ignoreMissingDep === void 0 ? false : _ref$ignoreMissingDep;
   const dependencies = module.dependencies,
     file = module.file;
   const code = file.code,
@@ -165,7 +171,8 @@ function inlineModuleIds(module, idForPath) {
   if (!dependencyIds.length) {
     // Nothing to inline in this module.
     return {
-      moduleCode: addParamsToDefineCall(code, fileId),
+      fileId,
+      moduleCode: code,
       moduleMap: map
     };
   }
@@ -197,9 +204,16 @@ function inlineModuleIds(module, idForPath) {
      *    integer printed as a simple sequence of digits.
      */
     if (!code.includes(dependencyMapReservedName)) {
-      // If we're here, the module was probably generated by some code that
+      if (ignoreMissingDependencyMapReference) {
+        return {
+          fileId,
+          moduleCode: code,
+          moduleMap: map
+        };
+      } // If we're here, the module was probably generated by some code that
       // doesn't make the dependency map name externally configurable, or a
       // mock that needs to be updated.
+
       throw new Error(
         `Module has dependencies but does not use the preconfigured dependency map name '${dependencyMapReservedName}': ${file.path}\n` +
           "This is an internal error in Metro."
@@ -228,12 +242,14 @@ function inlineModuleIds(module, idForPath) {
       }
     );
     return {
-      moduleCode: addParamsToDefineCall(inlinedCode, fileId),
+      fileId,
+      moduleCode: inlinedCode,
       moduleMap: map
     };
   }
 
-  const _transformSync = transformSync(code, {
+  const ast = nullthrows(
+    transformSync(code, {
       ast: true,
       babelrc: false,
       code: false,
@@ -247,31 +263,45 @@ function inlineModuleIds(module, idForPath) {
           }
         ]
       ])
-    }),
-    ast = _transformSync.ast;
+    }).ast
+  );
 
   const _generate = generate(ast, path, ""),
     generatedCode = _generate.code,
     generatedMap = _generate.map;
 
   return {
-    moduleCode: addParamsToDefineCall(generatedCode, fileId),
+    fileId,
+    moduleCode: generatedCode,
     moduleMap: map && generatedMap && mergeSourceMaps(path, map, generatedMap)
   };
 }
 
-function escapeRegex(str) {
-  // From http://stackoverflow.com/questions/14076210/
-  return str.replace(/([.?*+\^$\[\]\\(){}|\-])/g, "\\$1");
+function inlineModuleIdsAndAddParamsToDefineCall(module, idForPath, options) {
+  const _inlineModuleIds = inlineModuleIds(module, idForPath, options),
+    fileId = _inlineModuleIds.fileId,
+    moduleCode = _inlineModuleIds.moduleCode,
+    moduleMap = _inlineModuleIds.moduleMap;
+
+  return {
+    moduleCode: addParamsToDefineCall(moduleCode, fileId),
+    moduleMap
+  };
 }
 
 exports.inlineModuleIds = inlineModuleIds;
+exports.inlineModuleIdsAndAddParamsToDefineCall = inlineModuleIdsAndAddParamsToDefineCall;
 
+function escapeRegex(str) {
+  // From http://stackoverflow.com/questions/14076210/
+  return str.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+}
 /**
  * 1. Adds the module ids to a file if the file is a module. If it's not (e.g.
  *    a script) it just keeps it as-is.
  * 2. Packs the function map into the file's source map, if one exists.
  */
+
 function getModuleCodeAndMap(module, idForPath, options) {
   const file = module.file;
   let moduleCode, moduleMap;
@@ -283,13 +313,17 @@ function getModuleCodeAndMap(module, idForPath, options) {
     moduleCode = addModuleIdsToModuleWrapper(module, idForPath);
     moduleMap = file.map;
   } else {
-    var _inlineModuleIds = inlineModuleIds(module, idForPath, {
-      dependencyMapReservedName: options.dependencyMapReservedName,
-      globalPrefix: options.globalPrefix
-    });
+    var _inlineModuleIdsAndAd = inlineModuleIdsAndAddParamsToDefineCall(
+      module,
+      idForPath,
+      {
+        dependencyMapReservedName: options.dependencyMapReservedName,
+        globalPrefix: options.globalPrefix
+      }
+    );
 
-    moduleCode = _inlineModuleIds.moduleCode;
-    moduleMap = _inlineModuleIds.moduleMap;
+    moduleCode = _inlineModuleIdsAndAd.moduleCode;
+    moduleMap = _inlineModuleIdsAndAd.moduleMap;
   }
 
   if (moduleMap && moduleMap.sources) {