Fix non-deterministic builds between project directories (#8869)

packages/bundlers/default/src/DefaultBundler.js

@@ -1031,6 +1031,8 @@ function createIdealGraph(
     }
   }
 
+  let modifiedSourceBundles = new Set();
+
   // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
   for (let bundleGroupId of bundleGraph.getNodeIdsConnectedFrom(rootNodeId)) {
     // Find shared bundles in this bundle group.
@@ -1081,6 +1083,7 @@ function createIdealGraph(
         for (let sourceBundleId of sourceBundles) {
           let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
           invariant(sourceBundle !== 'root');
+          modifiedSourceBundles.add(sourceBundle);
           bundleToRemove.sourceBundles.delete(sourceBundleId);
           for (let asset of bundleToRemove.assets) {
             sourceBundle.assets.add(asset);
@@ -1119,6 +1122,23 @@ function createIdealGraph(
       }
     }
   }
+
+  // Fix asset order in source bundles as they are likely now incorrect after shared bundle deletion
+  if (modifiedSourceBundles.size > 0) {
+    let assetOrderMap = new Map(assets.map((a, index) => [a, index]));
+
+    for (let bundle of modifiedSourceBundles) {
+      bundle.assets = new Set(
+        [...bundle.assets].sort((a, b) => {
+          let aIndex = nullthrows(assetOrderMap.get(a));
+          let bIndex = nullthrows(assetOrderMap.get(b));
+
+          return aIndex - bIndex;
+        }),
+      );
+    }
+  }
+
   function deleteBundle(bundleRoot: BundleRoot) {
     bundleGraph.removeNode(nullthrows(bundles.get(bundleRoot.id)));
     bundleRoots.delete(bundleRoot);

packages/transformers/js/core/src/dependency_collector.rs

@@ -129,7 +129,12 @@ impl<'a> DependencyCollector<'a> {
       }
       _ => Some(format!(
         "{:x}",
-        hash!(format!("{}:{}:{}", self.config.filename, specifier, kind))
+        hash!(format!(
+          "{}:{}:{}",
+          self.get_project_relative_filename(),
+          specifier,
+          kind
+        ))
       )),
     };
 
@@ -1245,21 +1250,22 @@ impl<'a> DependencyCollector<'a> {
     }
   }
 
-  fn get_import_meta_url(&mut self) -> ast::Expr {
-    use ast::*;
-
-    // Get a relative path from the project root.
-    let filename = if let Some(relative) =
-      pathdiff::diff_paths(&self.config.filename, &self.config.project_root)
-    {
+  fn get_project_relative_filename(&self) -> String {
+    if let Some(relative) = pathdiff::diff_paths(&self.config.filename, &self.config.project_root) {
       relative.to_slash_lossy()
     } else if let Some(filename) = Path::new(&self.config.filename).file_name() {
       String::from(filename.to_string_lossy())
     } else {
       String::from("unknown.js")
-    };
+    }
+  }
+
+  fn get_import_meta_url(&mut self) -> ast::Expr {
+    use ast::*;
 
-    Expr::Lit(Lit::Str(format!("file:///{}", filename).into()))
+    Expr::Lit(Lit::Str(
+      format!("file:///{}", self.get_project_relative_filename()).into(),
+    ))
   }
 
   fn get_import_meta(&mut self) -> ast::Expr {