metro 0.66.0 → 0.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/generator": "^7.5.0",
-    "@babel/parser": "^7.0.0",
+    "@babel/core": "^7.14.0",
+    "@babel/generator": "^7.14.0",
+    "@babel/parser": "^7.14.0",
     "@babel/template": "^7.0.0",
-    "@babel/traverse": "^7.0.0",
+    "@babel/traverse": "^7.14.0",
     "@babel/types": "^7.0.0",
     "absolute-path": "^0.0.0",
     "accepts": "^1.3.7",
@@ -31,27 +31,27 @@
     "error-stack-parser": "^2.0.6",
     "fs-extra": "^1.0.0",
     "graceful-fs": "^4.1.3",
+    "hermes-parser": "0.5.0",
     "image-size": "^0.6.0",
     "invariant": "^2.2.4",
-    "jest-haste-map": "^26.5.2",
+    "jest-haste-map": "^27.3.1",
     "jest-worker": "^26.0.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-register": "0.66.0",
-    "metro-babel-transformer": "0.66.0",
-    "metro-cache": "0.66.0",
-    "metro-cache-key": "0.66.0",
-    "metro-config": "0.66.0",
-    "metro-core": "0.66.0",
-    "metro-hermes-compiler": "0.66.0",
-    "metro-inspector-proxy": "0.66.0",
-    "metro-minify-uglify": "0.66.0",
-    "metro-react-native-babel-preset": "0.66.0",
-    "metro-resolver": "0.66.0",
-    "metro-runtime": "0.66.0",
-    "metro-source-map": "0.66.0",
-    "metro-symbolicate": "0.66.0",
-    "metro-transform-plugins": "0.66.0",
-    "metro-transform-worker": "0.66.0",
+    "metro-babel-transformer": "0.68.0",
+    "metro-cache": "0.68.0",
+    "metro-cache-key": "0.68.0",
+    "metro-config": "0.68.0",
+    "metro-core": "0.68.0",
+    "metro-hermes-compiler": "0.68.0",
+    "metro-inspector-proxy": "0.68.0",
+    "metro-minify-uglify": "0.68.0",
+    "metro-react-native-babel-preset": "0.68.0",
+    "metro-resolver": "0.68.0",
+    "metro-runtime": "0.68.0",
+    "metro-source-map": "0.68.0",
+    "metro-symbolicate": "0.68.0",
+    "metro-transform-plugins": "0.68.0",
+    "metro-transform-worker": "0.68.0",
     "mime-types": "^2.1.27",
     "mkdirp": "^0.5.1",
     "node-fetch": "^2.2.0",
@@ -62,18 +62,18 @@
     "strip-ansi": "^6.0.0",
     "temp": "0.8.3",
     "throat": "^5.0.0",
-    "ws": "^1.1.5",
+    "ws": "^7.5.1",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "acorn": "^5.1.2",
-    "babel-jest": "^26.5.2",
+    "babel-jest": "^26.6.3",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-memory-fs": "0.66.0",
-    "metro-react-native-babel-preset": "0.66.0",
-    "metro-react-native-babel-transformer": "0.66.0",
+    "metro-memory-fs": "0.68.0",
+    "metro-react-native-babel-preset": "0.68.0",
+    "metro-react-native-babel-transformer": "0.68.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/Assets.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,6 +9,8 @@
  */
 "use strict";
 
+const { isAssetTypeAnImage } = require("./Bundler/util");
+
 const AssetPaths = require("./node-haste/lib/AssetPaths");
 
 const crypto = require("crypto");
@@ -21,8 +23,6 @@ const imageSize = require("image-size");
 
 const path = require("path");
 
-const { isAssetTypeAnImage } = require("./Bundler/util");
-
 const readDir = denodeify(fs.readdir);
 const readFile = denodeify(fs.readFile);
 const hashFiles = denodeify(function hashFilesCb(files, hash, callback) {
@@ -45,9 +45,9 @@ const hashFiles = denodeify(function hashFilesCb(files, hash, callback) {
 
 function buildAssetMap(dir, files, platform) {
   const platforms = new Set(platform != null ? [platform] : []);
-  const assets = files.map(file => AssetPaths.tryParse(file, platforms));
+  const assets = files.map((file) => AssetPaths.tryParse(file, platforms));
   const map = new Map();
-  assets.forEach(function(asset, i) {
+  assets.forEach(function (asset, i) {
     if (asset == null) {
       return;
     }
@@ -59,7 +59,7 @@ function buildAssetMap(dir, files, platform) {
     if (!record) {
       record = {
         scales: [],
-        files: []
+        files: [],
       };
       map.set(assetKey, record);
     }
@@ -134,7 +134,7 @@ async function getAbsoluteAssetInfo(assetPath, platform = null) {
     hash: hasher.digest("hex"),
     name,
     scales,
-    type
+    type,
   };
 }
 
@@ -173,7 +173,7 @@ async function getAssetData(
     files: assetInfo.files,
     hash: assetInfo.hash,
     name: assetInfo.name,
-    type: assetInfo.type
+    type: assetInfo.type,
   };
   return await applyAssetDataPlugins(assetDataPlugins, assetData);
 }
@@ -259,5 +259,5 @@ function pathBelongsToRoots(pathToCheck, roots) {
 module.exports = {
   getAsset,
   getAssetData,
-  getAssetFiles
+  getAssetFiles,
 };

package/src/Assets.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,21 +10,19 @@
 
 'use strict';
 
-const AssetPaths = require('./node-haste/lib/AssetPaths');
+import type {AssetPath} from './node-haste/lib/AssetPaths';
 
+const {isAssetTypeAnImage} = require('./Bundler/util');
+const AssetPaths = require('./node-haste/lib/AssetPaths');
 const crypto = require('crypto');
 const denodeify = require('denodeify');
 const fs = require('fs');
 const imageSize = require('image-size');
 const path = require('path');
 
-const {isAssetTypeAnImage} = require('./Bundler/util');
-
 const readDir = denodeify(fs.readdir);
 const readFile = denodeify(fs.readFile);
 
-import type {AssetPath} from './node-haste/lib/AssetPaths';
-
 export type AssetInfo = {|
   +files: Array<string>,
   +hash: string,
@@ -92,7 +90,7 @@ function buildAssetMap(
     AssetPaths.tryParse(file, platforms),
   );
   const map = new Map();
-  assets.forEach(function(asset: ?AssetPath, i: number) {
+  assets.forEach(function (asset: ?AssetPath, i: number) {
     if (asset == null) {
       return;
     }

package/src/Bundler/util.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,14 +9,14 @@
  */
 "use strict";
 
-const babelTypes = require("@babel/types");
-
 const babylon = require("@babel/parser");
 
-const nullthrows = require("nullthrows");
-
 const template = require("@babel/template").default;
 
+const babelTypes = require("@babel/types");
+
+const nullthrows = require("nullthrows"); // Structure of the object: dir.name.scale = asset
+
 const assetPropertyBlockList = new Set(["files", "fileSystemLocation", "path"]);
 
 function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
@@ -37,8 +37,8 @@ function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
     t.program([
       buildRequire({
         ASSET_REGISTRY_PATH: t.stringLiteral(assetRegistryPath),
-        DESCRIPTOR_AST: descriptorAst
-      })
+        DESCRIPTOR_AST: descriptorAst,
+      }),
     ])
   );
 }
@@ -92,8 +92,8 @@ function generateRemoteAssetCodeFileAst(
         Object.keys(descriptor)
           .map(Number)
           .sort((a, b) => a - b)
-          .map(scale => t.numericLiteral(scale))
-      )
+          .map((scale) => t.numericLiteral(scale))
+      ),
     })
   );
 } // Test extension against all types supported by image-size module.
@@ -122,13 +122,13 @@ function createRamBundleGroups(ramGroups, groupableModules, subtree) {
   // by path or (numeric) module id;
   const byPath = new Map();
   const byId = new Map();
-  groupableModules.forEach(m => {
+  groupableModules.forEach((m) => {
     byPath.set(m.sourcePath, m);
     byId.set(m.id, m.sourcePath);
   }); // build a map of group root IDs to an array of module IDs in the group
 
   const result = new Map(
-    ramGroups.map(modulePath => {
+    ramGroups.map((modulePath) => {
       const root = byPath.get(modulePath);
 
       if (root == null) {
@@ -137,7 +137,7 @@ function createRamBundleGroups(ramGroups, groupableModules, subtree) {
 
       return [
         root.id, // `subtree` yields the IDs of all transitive dependencies of a module
-        new Set(subtree(root, byPath))
+        new Set(subtree(root, byPath)),
       ];
     })
   );
@@ -155,11 +155,13 @@ function createRamBundleGroups(ramGroups, groupableModules, subtree) {
     const doubles = filter(all, ([, parents]) => parents.length > 1);
 
     for (const [moduleId, parents] of doubles) {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       const parentNames = parents.map(byId.get, byId);
       const lastName = parentNames.pop();
       throw new Error(
-        `Module ${byId.get(moduleId) ||
-          moduleId} belongs to groups ${parentNames.join(", ")}, and ${String(
+        `Module ${
+          byId.get(moduleId) || moduleId
+        } belongs to groups ${parentNames.join(", ")}, and ${String(
           lastName
         )}. Ensure that each module is only part of one group.`
       );
@@ -194,5 +196,5 @@ module.exports = {
   createRamBundleGroups,
   generateAssetCodeFileAst,
   generateRemoteAssetCodeFileAst,
-  isAssetTypeAnImage
+  isAssetTypeAnImage,
 };

package/src/Bundler/util.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,15 +10,15 @@
 
 'use strict';
 
-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 {File} from '@babel/types';
 
+const babylon = require('@babel/parser');
+const template = require('@babel/template').default;
+const babelTypes = require('@babel/types');
+const nullthrows = require('nullthrows');
+
 // Structure of the object: dir.name.scale = asset
 export type RemoteFileMap = {
   [string]: {
@@ -28,9 +28,9 @@ export type RemoteFileMap = {
         hash: string,
         ...
       },
-      ...,
+      ...
     },
-    ...,
+    ...
   },
   __proto__: null,
   ...
@@ -203,11 +203,13 @@ function createRamBundleGroups<T: ModuleTransportLike>(
     // find all module IDs that are part of more than one group
     const doubles = filter(all, ([, parents]) => parents.length > 1);
     for (const [moduleId, parents] of doubles) {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       const parentNames = parents.map(byId.get, byId);
       const lastName = parentNames.pop();
       throw new Error(
-        `Module ${byId.get(moduleId) ||
-          moduleId} belongs to groups ${parentNames.join(', ')}, and ${String(
+        `Module ${
+          byId.get(moduleId) || moduleId
+        } belongs to groups ${parentNames.join(', ')}, and ${String(
           lastName,
         )}. Ensure that each module is only part of one group.`,
       );

package/src/Bundler.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,23 +9,32 @@
  */
 "use strict";
 
-const DependencyGraph = require("./node-haste/DependencyGraph");
-
 const Transformer = require("./DeltaBundler/Transformer");
 
+const DependencyGraph = require("./node-haste/DependencyGraph");
+
 class Bundler {
   constructor(config, options) {
     this._depGraphPromise = DependencyGraph.load(config, options);
-
-    this._depGraphPromise
-      .then(dependencyGraph => {
+    this._readyPromise = this._depGraphPromise
+      .then((dependencyGraph) => {
+        config.reporter.update({
+          type: "transformer_load_started",
+        });
         this._transformer = new Transformer(
-          config,
+          config, // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           dependencyGraph.getSha1.bind(dependencyGraph)
         );
+        config.reporter.update({
+          type: "transformer_load_done",
+        });
       })
-      .catch(error => {
+      .catch((error) => {
         console.error("Failed to construct transformer: ", error);
+        config.reporter.update({
+          type: "transformer_load_failed",
+          error,
+        });
       });
   }
 
@@ -34,7 +43,7 @@ class Bundler {
 
     this._transformer.end();
 
-    dependencyGraph.getWatcher().end();
+    dependencyGraph.end();
   }
 
   async getDependencyGraph() {
@@ -46,6 +55,10 @@ class Bundler {
     // TODO: Remove this ugly hack!
     await this._depGraphPromise;
     return this._transformer.transformFile(filePath, transformOptions);
+  } // Waits for the bundler to become ready.
+
+  async ready() {
+    await this._readyPromise;
   }
 }
 

package/src/Bundler.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,13 +10,13 @@
 
 'use strict';
 
-const DependencyGraph = require('./node-haste/DependencyGraph');
-const Transformer = require('./DeltaBundler/Transformer');
-
-import type {TransformOptions} from './DeltaBundler/Worker';
 import type {TransformResultWithSource} from './DeltaBundler';
+import type {TransformOptions} from './DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
+const Transformer = require('./DeltaBundler/Transformer');
+const DependencyGraph = require('./node-haste/DependencyGraph');
+
 export type BundlerOptions = $ReadOnly<{|
   hasReducedPerformance?: boolean,
   watch?: boolean,
@@ -24,20 +24,28 @@ export type BundlerOptions = $ReadOnly<{|
 
 class Bundler {
   _depGraphPromise: Promise<DependencyGraph>;
+  _readyPromise: Promise<void>;
   _transformer: Transformer;
 
   constructor(config: ConfigT, options?: BundlerOptions) {
     this._depGraphPromise = DependencyGraph.load(config, options);
 
-    this._depGraphPromise
+    this._readyPromise = this._depGraphPromise
       .then((dependencyGraph: DependencyGraph) => {
+        config.reporter.update({type: 'transformer_load_started'});
         this._transformer = new Transformer(
           config,
+          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           dependencyGraph.getSha1.bind(dependencyGraph),
         );
+        config.reporter.update({type: 'transformer_load_done'});
       })
       .catch(error => {
         console.error('Failed to construct transformer: ', error);
+        config.reporter.update({
+          type: 'transformer_load_failed',
+          error,
+        });
       });
   }
 
@@ -45,7 +53,7 @@ class Bundler {
     const dependencyGraph = await this._depGraphPromise;
 
     this._transformer.end();
-    dependencyGraph.getWatcher().end();
+    dependencyGraph.end();
   }
 
   async getDependencyGraph(): Promise<DependencyGraph> {
@@ -62,6 +70,11 @@ class Bundler {
 
     return this._transformer.transformFile(filePath, transformOptions);
   }
+
+  // Waits for the bundler to become ready.
+  async ready(): Promise<void> {
+    await this._readyPromise;
+  }
 }
 
 module.exports = Bundler;

package/src/DeltaBundler/DeltaCalculator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,17 +12,17 @@
 const {
   initialTraverseDependencies,
   reorderGraph,
-  traverseDependencies
+  traverseDependencies,
 } = require("./traverseDependencies");
 
 const { EventEmitter } = require("events");
-
 /**
  * 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 {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
@@ -34,7 +34,8 @@ class DeltaCalculator extends EventEmitter {
     this._graph = {
       dependencies: new Map(),
       entryPoints,
-      importBundleNames: new Set()
+      importBundleNames: new Set(),
+      transformOptions: this._options.transformOptions,
     };
 
     this._dependencyGraph
@@ -55,7 +56,8 @@ class DeltaCalculator extends EventEmitter {
     this._graph = {
       dependencies: new Map(),
       entryPoints: this._graph.entryPoints,
-      importBundleNames: new Set()
+      importBundleNames: new Set(),
+      transformOptions: this._options.transformOptions,
     };
     this._modifiedFiles = new Set();
     this._deletedFiles = new Set();
@@ -95,8 +97,8 @@ class DeltaCalculator extends EventEmitter {
       // processed (since we haven't actually created any delta). If we do not
       // do so, asking for a delta after an error will produce an empty Delta,
       // which is not correct.
-      modifiedFiles.forEach(file => this._modifiedFiles.add(file));
-      deletedFiles.forEach(file => this._deletedFiles.add(file)); // If after an error the number of modules has changed, we could be in
+      modifiedFiles.forEach((file) => this._modifiedFiles.add(file));
+      deletedFiles.forEach((file) => this._deletedFiles.add(file)); // If after an error the number of modules has changed, we could be in
       // a weird state. As a safe net we clean the dependency modules to force
       // a clean traversal of the graph next time.
 
@@ -111,13 +113,13 @@ class DeltaCalculator extends EventEmitter {
 
     if (reset) {
       reorderGraph(this._graph, {
-        shallow
+        shallow,
       });
       return {
         added: this._graph.dependencies,
         modified: new Map(),
         deleted: new Set(),
-        reset: true
+        reset: true,
       };
     }
 
@@ -167,16 +169,16 @@ class DeltaCalculator extends EventEmitter {
         added,
         modified: new Map(),
         deleted: new Set(),
-        reset: true
+        reset: true,
       };
     } // If a file has been deleted, we want to invalidate any other file that
     // depends on it, so we can process it and correctly return an error.
 
-    deletedFiles.forEach(filePath => {
+    deletedFiles.forEach((filePath) => {
       const module = this._graph.dependencies.get(filePath);
 
       if (module) {
-        module.inverseDependencies.forEach(path => {
+        module.inverseDependencies.forEach((path) => {
           // Only mark the inverse dependency as modified if it's not already
           // marked as deleted (in that case we can just ignore it).
           if (!deletedFiles.has(path)) {
@@ -186,7 +188,7 @@ class DeltaCalculator extends EventEmitter {
       }
     }); // We only want to process files that are in the bundle.
 
-    const modifiedDependencies = Array.from(modifiedFiles).filter(filePath =>
+    const modifiedDependencies = Array.from(modifiedFiles).filter((filePath) =>
       this._graph.dependencies.has(filePath)
     ); // No changes happened. Return empty delta.
 
@@ -195,7 +197,7 @@ class DeltaCalculator extends EventEmitter {
         added: new Map(),
         modified: new Map(),
         deleted: new Set(),
-        reset: false
+        reset: false,
       };
     }
 
@@ -208,7 +210,7 @@ class DeltaCalculator extends EventEmitter {
       added,
       modified,
       deleted,
-      reset: false
+      reset: false,
     };
   }
 }

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,9 @@
 
 'use strict';
 
+import type DependencyGraph from '../node-haste/DependencyGraph';
+import type {DeltaResult, Graph, Options} from './types.flow';
+
 const {
   initialTraverseDependencies,
   reorderGraph,
@@ -17,9 +20,6 @@ const {
 } = require('./traverseDependencies');
 const {EventEmitter} = require('events');
 
-import type DependencyGraph from '../node-haste/DependencyGraph';
-import type {DeltaResult, Graph, Options} from './types.flow';
-
 /**
  * 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
@@ -50,6 +50,7 @@ class DeltaCalculator<T> extends EventEmitter {
       dependencies: new Map(),
       entryPoints,
       importBundleNames: new Set(),
+      transformOptions: this._options.transformOptions,
     };
 
     this._dependencyGraph
@@ -72,6 +73,7 @@ class DeltaCalculator<T> extends EventEmitter {
       dependencies: new Map(),
       entryPoints: this._graph.entryPoints,
       importBundleNames: new Set(),
+      transformOptions: this._options.transformOptions,
     };
     this._modifiedFiles = new Set();
     this._deletedFiles = new Set();
@@ -226,9 +228,9 @@ class DeltaCalculator<T> extends EventEmitter {
     });
 
     // We only want to process files that are in the bundle.
-    const modifiedDependencies = Array.from(
-      modifiedFiles,
-    ).filter((filePath: string) => this._graph.dependencies.has(filePath));
+    const modifiedDependencies = Array.from(modifiedFiles).filter(
+      (filePath: string) => this._graph.dependencies.has(filePath),
+    );
 
     // No changes happened. Return empty delta.
     if (modifiedDependencies.length === 0) {