metro 0.81.3 → 0.82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.81.3",
+  "version": "0.82.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -32,7 +32,7 @@
     "chalk": "^4.0.0",
     "ci-info": "^2.0.0",
     "connect": "^3.6.5",
-    "debug": "^2.2.0",
+    "debug": "^4.4.0",
     "error-stack-parser": "^2.0.6",
     "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
@@ -42,18 +42,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.81.3",
-    "metro-cache": "0.81.3",
-    "metro-cache-key": "0.81.3",
-    "metro-config": "0.81.3",
-    "metro-core": "0.81.3",
-    "metro-file-map": "0.81.3",
-    "metro-resolver": "0.81.3",
-    "metro-runtime": "0.81.3",
-    "metro-source-map": "0.81.3",
-    "metro-symbolicate": "0.81.3",
-    "metro-transform-plugins": "0.81.3",
-    "metro-transform-worker": "0.81.3",
+    "metro-babel-transformer": "0.82.0",
+    "metro-cache": "0.82.0",
+    "metro-cache-key": "0.82.0",
+    "metro-config": "0.82.0",
+    "metro-core": "0.82.0",
+    "metro-file-map": "0.82.0",
+    "metro-resolver": "0.82.0",
+    "metro-runtime": "0.82.0",
+    "metro-source-map": "0.82.0",
+    "metro-symbolicate": "0.82.0",
+    "metro-transform-plugins": "0.82.0",
+    "metro-transform-worker": "0.82.0",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -71,8 +71,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.81.3",
-    "metro-memory-fs": "0.81.3",
+    "metro-babel-register": "0.82.0",
+    "metro-memory-fs": "0.82.0",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Bundler.js

@@ -11,15 +11,10 @@ class Bundler {
         config.reporter.update({
           type: "transformer_load_started",
         });
-        this._transformer = new Transformer(
-          config,
-          config.watcher.unstable_lazySha1
-            ? {
-                unstable_getOrComputeSha1: (filePath) =>
-                  this._depGraph.unstable_getOrComputeSha1(filePath),
-              }
-            : (...args) => this._depGraph.getSha1(...args)
-        );
+        this._transformer = new Transformer(config, {
+          getOrComputeSha1: (filePath) =>
+            this._depGraph.getOrComputeSha1(filePath),
+        });
         config.reporter.update({
           type: "transformer_load_done",
         });

package/src/Bundler.js.flow

@@ -36,17 +36,10 @@ class Bundler {
       .ready()
       .then(() => {
         config.reporter.update({type: 'transformer_load_started'});
-        this._transformer = new Transformer(
-          config,
-          config.watcher.unstable_lazySha1
-            ? // This object-form API is expected to replace passing a function
-              // once lazy SHA1 is stable. This will be a breaking change.
-              {
-                unstable_getOrComputeSha1: filePath =>
-                  this._depGraph.unstable_getOrComputeSha1(filePath),
-              }
-            : (...args) => this._depGraph.getSha1(...args),
-        );
+        this._transformer = new Transformer(config, {
+          getOrComputeSha1: filePath =>
+            this._depGraph.getOrComputeSha1(filePath),
+        });
         config.reporter.update({type: 'transformer_load_done'});
       })
       .catch(error => {

package/src/DeltaBundler/Transformer.js

@@ -11,14 +11,11 @@ const fs = require("fs");
 const { Cache, stableHash } = require("metro-cache");
 const path = require("path");
 class Transformer {
-  constructor(config, getSha1FnOrOpts) {
+  constructor(config, opts) {
     this._config = config;
     this._config.watchFolders.forEach(verifyRootExists);
     this._cache = new Cache(config.cacheStores);
-    this._getSha1 =
-      typeof getSha1FnOrOpts === "function"
-        ? getSha1FnOrOpts
-        : getSha1FnOrOpts.unstable_getOrComputeSha1;
+    this._getSha1 = opts.getOrComputeSha1;
     const {
       getTransformOptions: _getTransformOptions,
       transformVariants: _transformVariants,
@@ -95,13 +92,9 @@ class Transformer {
       content = fileBuffer;
     } else {
       const result = await this._getSha1(filePath);
-      if (typeof result === "string") {
-        sha1 = result;
-      } else {
-        sha1 = result.sha1;
-        if (result.content) {
-          content = result.content;
-        }
+      sha1 = result.sha1;
+      if (result.content) {
+        content = result.content;
       }
     }
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, "hex")]);

package/src/DeltaBundler/Transformer.js.flow

@@ -24,30 +24,24 @@ const fs = require('fs');
 const {Cache, stableHash} = require('metro-cache');
 const path = require('path');
 
-type LazySha1Fn = string => Promise<{content?: Buffer, sha1: string}>;
-type EagerSha1Fn = string => string;
+type GetOrComputeSha1Fn = string => Promise<{content?: Buffer, sha1: string}>;
 
 class Transformer {
   _config: ConfigT;
   _cache: Cache<TransformResult<>>;
   _baseHash: string;
-  _getSha1: EagerSha1Fn | LazySha1Fn;
+  _getSha1: GetOrComputeSha1Fn;
   _workerFarm: WorkerFarm;
 
   constructor(
     config: ConfigT,
-    getSha1FnOrOpts:
-      | $ReadOnly<{unstable_getOrComputeSha1: LazySha1Fn}>
-      | EagerSha1Fn,
+    opts: $ReadOnly<{getOrComputeSha1: GetOrComputeSha1Fn}>,
   ) {
     this._config = config;
 
     this._config.watchFolders.forEach(verifyRootExists);
     this._cache = new Cache(config.cacheStores);
-    this._getSha1 =
-      typeof getSha1FnOrOpts === 'function'
-        ? getSha1FnOrOpts
-        : getSha1FnOrOpts.unstable_getOrComputeSha1;
+    this._getSha1 = opts.getOrComputeSha1;
 
     // Remove the transformer config params that we don't want to pass to the
     // transformer. We should change the config object and move them away so we
@@ -147,13 +141,9 @@ class Transformer {
       content = fileBuffer;
     } else {
       const result = await this._getSha1(filePath);
-      if (typeof result === 'string') {
-        sha1 = result;
-      } else {
-        sha1 = result.sha1;
-        if (result.content) {
-          content = result.content;
-        }
+      sha1 = result.sha1;
+      if (result.content) {
+        content = result.content;
       }
     }
 

package/src/Server.js

@@ -450,7 +450,7 @@ class Server {
     const depGraph = await this._bundler.getBundler().getDependencyGraph();
     const filePath = path.join(rootDir, relativePathname);
     try {
-      depGraph.getSha1(filePath);
+      await depGraph.getOrComputeSha1(filePath);
     } catch {
       res.writeHead(404);
       res.end();

package/src/Server.js.flow

@@ -630,7 +630,7 @@ class Server {
     const depGraph = await this._bundler.getBundler().getDependencyGraph();
     const filePath = path.join(rootDir, relativePathname);
     try {
-      depGraph.getSha1(filePath);
+      await depGraph.getOrComputeSha1(filePath);
     } catch {
       res.writeHead(404);
       res.end();

package/src/node-haste/DependencyGraph.d.ts

@@ -34,7 +34,7 @@ export default class DependencyGraph extends EventEmitter {
   ): Promise<DependencyGraph>;
 
   getAllFiles(): string[];
-  getSha1(filename: string): string;
+  getOrComputeSha1(filename: string): Promise<{sha1: string; content?: Buffer}>;
   getWatcher(): EventEmitter;
   end(): void;
 

package/src/node-haste/DependencyGraph.js

@@ -24,13 +24,6 @@ function getOrCreateMap(map, field) {
   }
   return subMap;
 }
-const missingSha1Error = (mixedPath) =>
-  new Error(`Failed to get the SHA-1 for: ${mixedPath}.
-  Potential causes:
-    1) The file is not watched. Ensure it is under the configured \`projectRoot\` or \`watchFolders\`.
-    2) Check \`blockList\` in your metro.config.js and make sure it isn't excluding the file path.
-    3) The file may have been deleted since it was resolved - try refreshing your app.
-    4) Otherwise, this is a bug in Metro or the configured resolver - please report it.`);
 class DependencyGraph extends EventEmitter {
   constructor(config, options) {
     super();
@@ -183,17 +176,15 @@ class DependencyGraph extends EventEmitter {
   getAllFiles() {
     return nullthrows(this._fileSystem).getAllFiles();
   }
-  getSha1(filename) {
-    const sha1 = this._fileSystem.getSha1(filename);
-    if (!sha1) {
-      throw missingSha1Error(filename);
-    }
-    return sha1;
-  }
-  async unstable_getOrComputeSha1(mixedPath) {
+  async getOrComputeSha1(mixedPath) {
     const result = await this._fileSystem.getOrComputeSha1(mixedPath);
     if (!result || !result.sha1) {
-      throw missingSha1Error(mixedPath);
+      throw new Error(`Failed to get the SHA-1 for: ${mixedPath}.
+      Potential causes:
+        1) The file is not watched. Ensure it is under the configured \`projectRoot\` or \`watchFolders\`.
+        2) Check \`blockList\` in your metro.config.js and make sure it isn't excluding the file path.
+        3) The file may have been deleted since it was resolved - try refreshing your app.
+        4) Otherwise, this is a bug in Metro or the configured resolver - please report it.`);
     }
     return result;
   }

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

@@ -55,14 +55,6 @@ function getOrCreateMap<T>(
   return subMap;
 }
 
-const missingSha1Error = (mixedPath: string) =>
-  new Error(`Failed to get the SHA-1 for: ${mixedPath}.
-  Potential causes:
-    1) The file is not watched. Ensure it is under the configured \`projectRoot\` or \`watchFolders\`.
-    2) Check \`blockList\` in your metro.config.js and make sure it isn't excluding the file path.
-    3) The file may have been deleted since it was resolved - try refreshing your app.
-    4) Otherwise, this is a bug in Metro or the configured resolver - please report it.`);
-
 class DependencyGraph extends EventEmitter {
   _config: ConfigT;
   _haste: MetroFileMap;
@@ -264,23 +256,20 @@ class DependencyGraph extends EventEmitter {
     return nullthrows(this._fileSystem).getAllFiles();
   }
 
-  getSha1(filename: string): string {
-    const sha1 = this._fileSystem.getSha1(filename);
-    if (!sha1) {
-      throw missingSha1Error(filename);
-    }
-    return sha1;
-  }
-
   /**
    * Used when watcher.unstable_lazySha1 is true
    */
-  async unstable_getOrComputeSha1(
+  async getOrComputeSha1(
     mixedPath: string,
   ): Promise<{content?: Buffer, sha1: string}> {
     const result = await this._fileSystem.getOrComputeSha1(mixedPath);
     if (!result || !result.sha1) {
-      throw missingSha1Error(mixedPath);
+      throw new Error(`Failed to get the SHA-1 for: ${mixedPath}.
+      Potential causes:
+        1) The file is not watched. Ensure it is under the configured \`projectRoot\` or \`watchFolders\`.
+        2) Check \`blockList\` in your metro.config.js and make sure it isn't excluding the file path.
+        3) The file may have been deleted since it was resolved - try refreshing your app.
+        4) Otherwise, this is a bug in Metro or the configured resolver - please report it.`);
     }
     return result;
   }