metro 0.63.0 → 0.64.0

package/src/node-haste/DependencyGraph.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);
     });
   };
@@ -92,6 +98,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -145,6 +152,7 @@ function getOrCreate(map, field) {
 }
 
 class DependencyGraph extends EventEmitter {
+  // $FlowFixMe[value-as-type]
   constructor(_ref) {
     let config = _ref.config,
       haste = _ref.haste,
@@ -199,7 +207,7 @@ class DependencyGraph extends EventEmitter {
     }
 
     return ignorePattern;
-  }
+  } // $FlowFixMe[value-as-type]
 
   static _createHaste(config, watch) {
     const haste = new JestHasteMap({
@@ -313,6 +321,7 @@ class DependencyGraph extends EventEmitter {
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       moduleMap: this._moduleMap,
+      nodeModulesPaths: this._config.resolver.nodeModulesPaths,
       preferNativePlatform: true,
       projectRoot: this._config.projectRoot,
       resolveAsset: (dirPath, assetName, extension) => {
@@ -364,7 +373,7 @@ class DependencyGraph extends EventEmitter {
     }
 
     return sha1;
-  }
+  } // $FlowFixMe[value-as-type]
 
   getWatcher() {
     return this._haste;

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

@@ -51,6 +51,7 @@ function getOrCreate<T>(
 class DependencyGraph extends EventEmitter {
   _assetExtensions: Set<string>;
   _config: ConfigT;
+  // $FlowFixMe[value-as-type]
   _haste: JestHasteMap;
   _hasteFS: HasteFS;
   _moduleCache: ModuleCache;
@@ -65,6 +66,7 @@ class DependencyGraph extends EventEmitter {
     initialModuleMap,
   }: {|
     +config: ConfigT,
+    // $FlowFixMe[value-as-type]
     +haste: JestHasteMap,
     +initialHasteFS: HasteFS,
     +initialModuleMap: ModuleMap,
@@ -113,6 +115,7 @@ class DependencyGraph extends EventEmitter {
     return ignorePattern;
   }
 
+  // $FlowFixMe[value-as-type]
   static _createHaste(config: ConfigT, watch?: boolean): JestHasteMap {
     const haste = new JestHasteMap({
       cacheDirectory: config.hasteMapCacheDirectory,
@@ -212,6 +215,7 @@ class DependencyGraph extends EventEmitter {
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       moduleMap: this._moduleMap,
+      nodeModulesPaths: this._config.resolver.nodeModulesPaths,
       preferNativePlatform: true,
       projectRoot: this._config.projectRoot,
       resolveAsset: (dirPath: string, assetName: string, extension: string) => {
@@ -266,6 +270,7 @@ class DependencyGraph extends EventEmitter {
     return sha1;
   }
 
+  // $FlowFixMe[value-as-type]
   getWatcher(): JestHasteMap {
     return this._haste;
   }

package/src/node-haste/Package.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/shared/output/RamBundle/as-assets.js

@@ -24,9 +24,8 @@ const writeFile = require("../writeFile");
 const writeSourceMap = require("./write-sourcemap");
 
 const _require = require("./util"),
-  joinModules = _require.joinModules;
+  joinModules = _require.joinModules; // must not start with a dot, as that won't go into the apk
 
-// must not start with a dot, as that won't go into the apk
 const MAGIC_RAM_BUNDLE_FILENAME = "UNBUNDLE";
 const MODULES_DIR = "js-modules";
 /**

package/src/shared/output/RamBundle/as-indexed-file.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/shared/output/RamBundle/util.js

@@ -17,8 +17,8 @@ const countLines = string => (string.match(newline) || []).length + 1;
 
 function lineToLineSourceMap(source) {
   let filename =
-    arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
-  // The first line mapping in our package is the base64vlq code for zeros (A).
+    arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; // The first line mapping in our package is the base64vlq code for zeros (A).
+
   const firstLine = "AAAA;"; // Most other lines in our mappings are all zeros (for module, column etc)
   // except for the lineno mapping: curLineno - prevLineno = 1; Which is C.
 

package/src/shared/output/RamBundle.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;
 }
 
@@ -66,6 +71,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -79,12 +85,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/shared/output/bundle.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);
     });
   };
@@ -43,6 +47,7 @@ function _asyncToGenerator(fn) {
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
+
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     if (enumerableOnly)
@@ -51,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]);
@@ -73,6 +80,7 @@ function _objectSpread(target) {
       });
     }
   }
+
   return target;
 }
 
@@ -87,6 +95,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 

package/src/ModuleGraph/worker/optimizeDependencies.js

@@ -1,122 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- *
- */
-"use strict";
-
-const traverse = require("@babel/traverse").default;
-
-const babelGenerate = require("@babel/generator").default;
-
-function optimizeDependencies(
-  ast,
-  dependencies,
-  dependencyMapName,
-  requireNames
-) {
-  const visited = new WeakSet();
-  const context = {
-    oldToNewIndex: new Map(),
-    dependencies: []
-  };
-  const visitor = {
-    CallExpression(path) {
-      const node = path.node;
-
-      if (visited.has(node)) {
-        return;
-      }
-
-      if (isRequireCall(node.callee, requireNames)) {
-        processRequireCall(node);
-        visited.add(node);
-      }
-    },
-
-    MemberExpression(path, state) {
-      const node = path.node;
-
-      if (visited.has(node)) {
-        return;
-      }
-
-      if (isDepMapAccess(node, dependencyMapName)) {
-        processDepMapAccess(context, node, dependencies);
-        visited.add(node);
-      }
-    }
-  };
-  traverse(ast, visitor);
-  return context.dependencies;
-}
-
-function isRequireCall(callee, requireNames) {
-  return callee.type === "Identifier" && requireNames.has(callee.name);
-}
-
-function processRequireCall(node) {
-  if (node.arguments.length != 2) {
-    throw new InvalidRequireCallError(
-      "Post-transform calls to require() expect 2 arguments, the first " +
-        "of which has the shape `_dependencyMapName[123]`, " +
-        `but this was found: \`${babelGenerate(node).code}\``
-    );
-  }
-
-  node.arguments = [node.arguments[0]];
-  return node;
-}
-
-function isDepMapAccess(node, depMapName) {
-  return (
-    node.computed &&
-    node.object.type === "Identifier" &&
-    node.object.name === depMapName &&
-    node.property.type === "NumericLiteral"
-  );
-}
-
-function processDepMapAccess(context, node, deps) {
-  const index = node.property.value;
-  const newIx = translateDependencyIndex(context, deps, index);
-
-  if (newIx !== node.property.value) {
-    node.property.value = newIx;
-  }
-}
-
-function translateDependencyIndex(context, deps, index) {
-  let newIndex = context.oldToNewIndex.get(index);
-
-  if (newIndex != null) {
-    return newIndex;
-  }
-
-  const dep = deps[index];
-
-  if (dep == null) {
-    throw new Error(
-      `${index} is not a known module index. Existing mappings: ${deps
-        .map((n, i) => `${i} => ${n.name}`)
-        .join(", ")}`
-    );
-  }
-
-  newIndex = context.dependencies.push(dep) - 1;
-  context.oldToNewIndex.set(index, newIndex);
-  return newIndex;
-}
-
-class InvalidRequireCallError extends Error {
-  constructor(message) {
-    super(message);
-  }
-}
-
-optimizeDependencies.InvalidRequireCallError = InvalidRequireCallError;
-module.exports = optimizeDependencies;

package/src/ModuleGraph/worker/optimizeDependencies.js.flow

@@ -1,128 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-const traverse = require('@babel/traverse').default;
-
-const babelGenerate = require('@babel/generator').default;
-
-import type {Ast} from '@babel/core';
-import type {TransformResultDependency} from 'metro/src/DeltaBundler';
-
-type Context = {
-  oldToNewIndex: Map<number, number>,
-  dependencies: Array<TransformResultDependency>,
-  ...
-};
-
-type Dependencies = $ReadOnlyArray<TransformResultDependency>;
-
-function optimizeDependencies(
-  ast: Ast,
-  dependencies: Dependencies,
-  dependencyMapName: string,
-  requireNames: Set<string>,
-): $ReadOnlyArray<TransformResultDependency> {
-  const visited = new WeakSet();
-  const context = {
-    oldToNewIndex: new Map(),
-    dependencies: [],
-  };
-  const visitor = {
-    CallExpression(path) {
-      const {node} = path;
-
-      if (visited.has(node)) {
-        return;
-      }
-      if (isRequireCall(node.callee, requireNames)) {
-        processRequireCall(node);
-        visited.add(node);
-      }
-    },
-    MemberExpression(path, state) {
-      const {node} = path;
-      if (visited.has(node)) {
-        return;
-      }
-      if (isDepMapAccess(node, dependencyMapName)) {
-        processDepMapAccess(context, node, dependencies);
-        visited.add(node);
-      }
-    },
-  };
-  traverse(ast, visitor);
-  return context.dependencies;
-}
-
-function isRequireCall(callee, requireNames: Set<string>): boolean {
-  return callee.type === 'Identifier' && requireNames.has(callee.name);
-}
-
-function processRequireCall(node) {
-  if (node.arguments.length != 2) {
-    throw new InvalidRequireCallError(
-      'Post-transform calls to require() expect 2 arguments, the first ' +
-        'of which has the shape `_dependencyMapName[123]`, ' +
-        `but this was found: \`${babelGenerate(node).code}\``,
-    );
-  }
-  node.arguments = [node.arguments[0]];
-  return node;
-}
-
-function isDepMapAccess(node, depMapName: string): boolean {
-  return (
-    node.computed &&
-    node.object.type === 'Identifier' &&
-    node.object.name === depMapName &&
-    node.property.type === 'NumericLiteral'
-  );
-}
-
-function processDepMapAccess(context: Context, node, deps: Dependencies): void {
-  const index = node.property.value;
-  const newIx = translateDependencyIndex(context, deps, index);
-  if (newIx !== node.property.value) {
-    node.property.value = newIx;
-  }
-}
-
-function translateDependencyIndex(
-  context: Context,
-  deps: Dependencies,
-  index: number,
-): number {
-  let newIndex = context.oldToNewIndex.get(index);
-  if (newIndex != null) {
-    return newIndex;
-  }
-  const dep = deps[index];
-  if (dep == null) {
-    throw new Error(
-      `${index} is not a known module index. Existing mappings: ${deps
-        .map((n: TransformResultDependency, i: number) => `${i} => ${n.name}`)
-        .join(', ')}`,
-    );
-  }
-  newIndex = context.dependencies.push(dep) - 1;
-  context.oldToNewIndex.set(index, newIndex);
-  return newIndex;
-}
-
-class InvalidRequireCallError extends Error {
-  constructor(message: string) {
-    super(message);
-  }
-}
-optimizeDependencies.InvalidRequireCallError = InvalidRequireCallError;
-
-module.exports = optimizeDependencies;