metro 0.80.3 → 0.80.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.80.3",
+  "version": "0.80.4",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -34,19 +34,19 @@
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.80.3",
-    "metro-cache": "0.80.3",
-    "metro-cache-key": "0.80.3",
-    "metro-config": "0.80.3",
-    "metro-core": "0.80.3",
-    "metro-file-map": "0.80.3",
-    "metro-minify-terser": "0.80.3",
-    "metro-resolver": "0.80.3",
-    "metro-runtime": "0.80.3",
-    "metro-source-map": "0.80.3",
-    "metro-symbolicate": "0.80.3",
-    "metro-transform-plugins": "0.80.3",
-    "metro-transform-worker": "0.80.3",
+    "metro-babel-transformer": "0.80.4",
+    "metro-cache": "0.80.4",
+    "metro-cache-key": "0.80.4",
+    "metro-config": "0.80.4",
+    "metro-core": "0.80.4",
+    "metro-file-map": "0.80.4",
+    "metro-minify-terser": "0.80.4",
+    "metro-resolver": "0.80.4",
+    "metro-runtime": "0.80.4",
+    "metro-source-map": "0.80.4",
+    "metro-symbolicate": "0.80.4",
+    "metro-transform-plugins": "0.80.4",
+    "metro-transform-worker": "0.80.4",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -67,8 +67,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.80.3",
-    "metro-memory-fs": "0.80.3",
+    "metro-babel-register": "0.80.4",
+    "metro-memory-fs": "0.80.4",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/DeltaBundler/Graph.js

@@ -318,7 +318,7 @@ class Graph {
       }
     }
 
-    // Diff dependencies (1/2): remove dependencies that have changed or been removed.
+    // Diff dependencies (1/3): remove dependencies that have changed or been removed.
     let dependenciesRemoved = false;
     for (const [key, prevDependency] of previousDependencies) {
       const curDependency = currentDependencies.get(key);
@@ -331,7 +331,7 @@ class Graph {
       }
     }
 
-    // Diff dependencies (2/2): add dependencies that have changed or been added.
+    // Diff dependencies (2/3): add dependencies that have changed or been added.
     let dependenciesAdded = false;
     if (!commitOptions.onlyRemove) {
       for (const [key, curDependency] of currentDependencies) {
@@ -352,11 +352,21 @@ class Graph {
         }
       }
     }
+
+    // Diff dependencies (3/3): detect changes in the ordering of dependency
+    // keys, which must be committed even if no other changes were made.
+    const previousDependencyKeys = [...previousDependencies.keys()];
+    const dependencyKeysChangedOrReordered =
+      currentDependencies.size !== previousDependencies.size ||
+      [...currentDependencies.keys()].some(
+        (currentKey, index) => currentKey !== previousDependencyKeys[index]
+      );
     if (
       previousModule != null &&
       !transformOutputMayDiffer(previousModule, nextModule) &&
       !dependenciesRemoved &&
-      !dependenciesAdded
+      !dependenciesAdded &&
+      !dependencyKeysChangedOrReordered
     ) {
       // We have not operated on nextModule, so restore previousModule
       // to aid diffing. Don't add this path to delta.touched.

package/src/DeltaBundler/Graph.js.flow

@@ -421,7 +421,7 @@ export class Graph<T = MixedOutput> {
       }
     }
 
-    // Diff dependencies (1/2): remove dependencies that have changed or been removed.
+    // Diff dependencies (1/3): remove dependencies that have changed or been removed.
     let dependenciesRemoved = false;
     for (const [key, prevDependency] of previousDependencies) {
       const curDependency = currentDependencies.get(key);
@@ -434,7 +434,7 @@ export class Graph<T = MixedOutput> {
       }
     }
 
-    // Diff dependencies (2/2): add dependencies that have changed or been added.
+    // Diff dependencies (2/3): add dependencies that have changed or been added.
     let dependenciesAdded = false;
     if (!commitOptions.onlyRemove) {
       for (const [key, curDependency] of currentDependencies) {
@@ -456,11 +456,21 @@ export class Graph<T = MixedOutput> {
       }
     }
 
+    // Diff dependencies (3/3): detect changes in the ordering of dependency
+    // keys, which must be committed even if no other changes were made.
+    const previousDependencyKeys = [...previousDependencies.keys()];
+    const dependencyKeysChangedOrReordered =
+      currentDependencies.size !== previousDependencies.size ||
+      [...currentDependencies.keys()].some(
+        (currentKey, index) => currentKey !== previousDependencyKeys[index],
+      );
+
     if (
       previousModule != null &&
       !transformOutputMayDiffer(previousModule, nextModule) &&
       !dependenciesRemoved &&
-      !dependenciesAdded
+      !dependenciesAdded &&
+      !dependencyKeysChangedOrReordered
     ) {
       // We have not operated on nextModule, so restore previousModule
       // to aid diffing. Don't add this path to delta.touched.

package/src/node-haste/DependencyGraph.js

@@ -190,14 +190,6 @@ class DependencyGraph extends EventEmitter {
     return nullthrows(this._fileSystem).getAllFiles();
   }
   getSha1(filename) {
-    // TODO If it looks like we're trying to get the sha1 from a file located
-    // within a Zip archive, then we instead compute the sha1 for what looks
-    // like the Zip archive itself.
-
-    const splitIndex = filename.indexOf(".zip/");
-    const containerName =
-      splitIndex !== -1 ? filename.slice(0, splitIndex + 4) : filename;
-
     // Prior to unstable_enableSymlinks:
     // Calling realpath allows us to get a hash for a given path even when
     // it's a symlink to a file, which prevents Metro from crashing in such a
@@ -208,8 +200,8 @@ class DependencyGraph extends EventEmitter {
     //
     // This is unnecessary with a symlink-aware fileSystem implementation.
     const resolvedPath = this._config.resolver.unstable_enableSymlinks
-      ? containerName
-      : fs.realpathSync(containerName);
+      ? filename
+      : fs.realpathSync(filename);
     const sha1 = this._fileSystem.getSha1(resolvedPath);
     if (!sha1) {
       throw new ReferenceError(`SHA-1 for file ${filename} (${resolvedPath}) is not computed.

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

@@ -248,14 +248,6 @@ class DependencyGraph extends EventEmitter {
   }
 
   getSha1(filename: string): string {
-    // TODO If it looks like we're trying to get the sha1 from a file located
-    // within a Zip archive, then we instead compute the sha1 for what looks
-    // like the Zip archive itself.
-
-    const splitIndex = filename.indexOf('.zip/');
-    const containerName =
-      splitIndex !== -1 ? filename.slice(0, splitIndex + 4) : filename;
-
     // Prior to unstable_enableSymlinks:
     // Calling realpath allows us to get a hash for a given path even when
     // it's a symlink to a file, which prevents Metro from crashing in such a
@@ -266,8 +258,8 @@ class DependencyGraph extends EventEmitter {
     //
     // This is unnecessary with a symlink-aware fileSystem implementation.
     const resolvedPath = this._config.resolver.unstable_enableSymlinks
-      ? containerName
-      : fs.realpathSync(containerName);
+      ? filename
+      : fs.realpathSync(filename);
 
     const sha1 = this._fileSystem.getSha1(resolvedPath);