Skip to content

Commit 9813208

Browse files
authored
Turbopack: convert HashMap to IndexMap for deterministic tasks (#84641)
### What? Ensure more deterministic builds
1 parent ad90a67 commit 9813208

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

crates/next-api/src/loadable_manifest.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use anyhow::Result;
22
use next_core::{next_manifests::LoadableManifest, util::NextRuntime};
3-
use rustc_hash::FxHashMap;
4-
use turbo_tasks::{ResolvedVc, TryFlatJoinIterExt, Vc};
3+
use turbo_tasks::{FxIndexMap, ResolvedVc, TryFlatJoinIterExt, Vc};
54
use turbo_tasks_fs::{File, FileContent, FileSystemPath};
65
use turbopack_core::{
76
asset::AssetContent,
@@ -21,7 +20,7 @@ pub async fn create_react_loadable_manifest(
2120
) -> Result<Vc<OutputAssets>> {
2221
let dynamic_import_entries = &*dynamic_import_entries.await?;
2322

24-
let mut loadable_manifest: FxHashMap<String, LoadableManifest> = FxHashMap::default();
23+
let mut loadable_manifest: FxIndexMap<String, LoadableManifest> = FxIndexMap::default();
2524

2625
for (_, (module_id, chunk_output)) in dynamic_import_entries.into_iter() {
2726
let chunk_output = chunk_output.await?;

turbopack/crates/turbopack-resolve/src/typescript.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use std::{collections::HashMap, mem::take};
1+
use std::mem::take;
22

33
use anyhow::Result;
44
use serde_json::Value as JsonValue;
55
use turbo_rcstr::{RcStr, rcstr};
6-
use turbo_tasks::{ResolvedVc, ValueDefault, Vc, fxindexset};
6+
use turbo_tasks::{FxIndexMap, ResolvedVc, ValueDefault, Vc, fxindexset};
77
use turbo_tasks_fs::{FileContent, FileJsonContent, FileSystemPath, FileSystemPathOption};
88
use turbopack_core::{
99
asset::Asset,
@@ -287,7 +287,7 @@ pub async fn tsconfig_resolve_options(
287287
None
288288
};
289289

290-
let mut all_paths = HashMap::new();
290+
let mut all_paths = FxIndexMap::default();
291291
for (content, source) in configs.iter().rev() {
292292
if let FileJsonContent::Content(json) = &*content.await?
293293
&& let JsonValue::Object(paths) = &json["compilerOptions"]["paths"]

0 commit comments

Comments
 (0)