metro 0.63.0 → 0.64.0

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

@@ -12,10 +12,10 @@
 
 const babelGenerate = require('@babel/generator').default;
 
-import type {Ast} from '@babel/core';
+import type {GeneratorResult} from '@babel/generator';
 
 function generate(
-  ast: Ast,
+  ast: BabelNode,
   filename: string,
   sourceCode: string,
 ): GeneratorResult {

package/src/ModuleGraph/worker/generateImportNames.js

@@ -12,11 +12,11 @@
 const nullthrows = require("nullthrows");
 
 const traverse = require("@babel/traverse").default;
-
 /**
  * Select unused names for "metroImportDefault" and "metroImportAll", by
  * calling "generateUid".
  */
+
 function generateImportNames(ast) {
   let importDefault;
   let importAll;
@@ -24,6 +24,7 @@ function generateImportNames(ast) {
     Program(path) {
       importAll = path.scope.generateUid("$$_IMPORT_ALL");
       importDefault = path.scope.generateUid("$$_IMPORT_DEFAULT");
+      path.stop();
     }
   });
   return {

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

@@ -13,18 +13,15 @@
 const nullthrows = require('nullthrows');
 const traverse = require('@babel/traverse').default;
 
-import type {Ast} from '@babel/core';
-
 /**
  * Select unused names for "metroImportDefault" and "metroImportAll", by
  * calling "generateUid".
  */
 function generateImportNames(
-  ast: Ast,
+  ast: BabelNode,
 ): {
   importAll: string,
   importDefault: string,
-  ...
 } {
   let importDefault;
   let importAll;
@@ -33,6 +30,8 @@ function generateImportNames(
     Program(path) {
       importAll = path.scope.generateUid('$$_IMPORT_ALL');
       importDefault = path.scope.generateUid('$$_IMPORT_DEFAULT');
+
+      path.stop();
     },
   });
 

package/src/ModuleGraph/worker/mergeSourceMaps.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/Server/symbolicate.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;
 }
 
@@ -85,7 +90,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;
 }
 
@@ -96,6 +103,7 @@ function _iterableToArrayLimit(arr, i) {
   var _n = true;
   var _d = false;
   var _e = undefined;
+
   try {
     for (
       var _i = arr[Symbol.iterator](), _s;
@@ -103,6 +111,7 @@ function _iterableToArrayLimit(arr, i) {
       _n = true
     ) {
       _arr.push(_s.value);
+
       if (i && _arr.length === i) break;
     }
   } catch (err) {
@@ -115,6 +124,7 @@ function _iterableToArrayLimit(arr, i) {
       if (_d) throw _e;
     }
   }
+
   return _arr;
 }
 
@@ -130,6 +140,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -143,12 +154,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/Server.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;
 }
 
@@ -128,7 +135,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;
 }
 
@@ -140,6 +149,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -153,12 +163,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);
     });
   };
@@ -175,6 +188,7 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
+
   return obj;
 }
 
@@ -1246,10 +1260,9 @@ class Server {
 
       return requestProcessor;
     })();
-  }
-
-  // This function ensures that modules in source maps are sorted in the same
+  } // This function ensures that modules in source maps are sorted in the same
   // order as in a plain JS bundle.
+
   _getSortedModules(graph) {
     const modules = _toConsumableArray(graph.dependencies.values()); // Assign IDs to modules in a consistent order
 

package/src/Server.js.flow

@@ -83,6 +83,7 @@ type ProcessStartContext = {|
   +bundleOptions: BundleOptions,
   +graphId: GraphId,
   +graphOptions: GraphOptions,
+  // $FlowFixMe[value-as-type]
   +mres: MultipartResponse,
   +req: IncomingMessage,
   +revisionId?: ?RevisionId,

package/src/cli-utils.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/commands/build.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);
     });
   };
@@ -110,6 +119,7 @@ module.exports = () => ({
   command: "build <entry>",
   description:
     "Generates a JavaScript bundle containing the specified entrypoint and its descendants",
+  // $FlowFixMe[value-as-type]
   builder: yargs => {
     yargs.option("project-roots", {
       alias: "P",

package/src/commands/build.js.flow

@@ -25,6 +25,7 @@ const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
 module.exports = (): ({|
+  // $FlowFixMe[value-as-type]
   builder: (yargs: Yargs) => void,
   command: string,
   description: string,
@@ -35,6 +36,7 @@ module.exports = (): ({|
   description:
     'Generates a JavaScript bundle containing the specified entrypoint and its descendants',
 
+  // $FlowFixMe[value-as-type]
   builder: (yargs: Yargs): void => {
     yargs.option('project-roots', {
       alias: 'P',

package/src/commands/dependencies.js

@@ -16,6 +16,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     reject(error);
     return;
   }
+
   if (info.done) {
     resolve(value);
   } else {
@@ -29,12 +30,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/commands/serve.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);
     });
   };
@@ -57,6 +61,7 @@ const _require3 = require("util"),
 module.exports = () => ({
   command: "serve",
   description: "Starts Metro on the given port, building bundles on the fly",
+  // $FlowFixMe[value-as-type]
   builder: yargs => {
     yargs.option("project-roots", {
       alias: "P",

package/src/commands/serve.js.flow

@@ -21,6 +21,7 @@ import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
 
 module.exports = (): ({|
+  // $FlowFixMe[value-as-type]
   builder: (yargs: Yargs) => void,
   command: $TEMPORARY$string<'serve'>,
   description: string,
@@ -30,6 +31,7 @@ module.exports = (): ({|
 
   description: 'Starts Metro on the given port, building bundles on the fly',
 
+  // $FlowFixMe[value-as-type]
   builder: (yargs: Yargs): void => {
     yargs.option('project-roots', {
       alias: 'P',

package/src/index.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);
     });
   };
@@ -417,7 +426,10 @@ exports.buildGraph = /*#__PURE__*/ (function() {
   };
 })();
 
-exports.attachMetroCli = function(yargs) {
+exports.attachMetroCli = function(
+  // $FlowFixMe[value-as-type]
+  yargs
+) {
   let _ref8 =
       arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref8$build = _ref8.build,

package/src/index.js.flow

@@ -372,6 +372,7 @@ exports.buildGraph = async function(
 };
 
 exports.attachMetroCli = function(
+  // $FlowFixMe[value-as-type]
   yargs: Yargs,
   {
     build = {},
@@ -383,6 +384,7 @@ exports.attachMetroCli = function(
     dependencies: any,
     ...
   } = {},
+  // $FlowFixMe[value-as-type]
 ): Yargs {
   if (build) {
     const {command, description, builder, handler} = makeBuildCommand();

package/src/integration_tests/basic_bundle/import-export/index.js

@@ -41,15 +41,21 @@ var _export3 = _interopRequireDefault(require("./export-3"));
 var _export4 = require("./export-4");
 
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj
+      };
 }
 
 function _getRequireWildcardCache() {
   if (typeof WeakMap !== "function") return null;
   var cache = new WeakMap();
+
   _getRequireWildcardCache = function() {
     return cache;
   };
+
   return cache;
 }
 
@@ -57,21 +63,29 @@ function _interopRequireWildcard(obj) {
   if (obj && obj.__esModule) {
     return obj;
   }
+
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj
+    };
   }
+
   var cache = _getRequireWildcardCache();
+
   if (cache && cache.has(obj)) {
     return cache.get(obj);
   }
+
   var newObj = {};
   var hasPropertyDescriptor =
     Object.defineProperty && Object.getOwnPropertyDescriptor;
+
   for (var key in obj) {
     if (Object.prototype.hasOwnProperty.call(obj, key)) {
       var desc = hasPropertyDescriptor
         ? Object.getOwnPropertyDescriptor(obj, key)
         : null;
+
       if (desc && (desc.get || desc.set)) {
         Object.defineProperty(newObj, key, desc);
       } else {
@@ -79,10 +93,13 @@ function _interopRequireWildcard(obj) {
       }
     }
   }
+
   newObj.default = obj;
+
   if (cache) {
     cache.set(obj, newObj);
   }
+
   return newObj;
 }
 

package/src/integration_tests/execBundle.js

@@ -16,8 +16,8 @@ const vm = require("vm");
 
 module.exports = function execBundle(code) {
   let context =
-    arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  // Verify the code can run on older VMs by parsing it as ES5 (versus ES6+).
+    arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; // Verify the code can run on older VMs by parsing it as ES5 (versus ES6+).
+
   acorn.parse(code, {
     ecmaVersion: 5
   });

package/src/integration_tests/metro.config.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);
     });
   };