Skip to content

Turbopack: convert HashMap to IndexMap for deterministic tasks #84641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

Turbopack: convert HashMap to IndexMap for deterministic tasks #84641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions crates/next-api/src/loadable_manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use anyhow::Result;
use next_core::{next_manifests::LoadableManifest, util::NextRuntime};
use rustc_hash::FxHashMap;
use turbo_tasks::{ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks::{FxIndexMap, ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{
asset::AssetContent,
Expand All @@ -21,7 +20,7 @@ pub async fn create_react_loadable_manifest(
) -> Result<Vc<OutputAssets>> {
let dynamic_import_entries = &*dynamic_import_entries.await?;

let mut loadable_manifest: FxHashMap<String, LoadableManifest> = FxHashMap::default();
let mut loadable_manifest: FxIndexMap<String, LoadableManifest> = FxIndexMap::default();

for (_, (module_id, chunk_output)) in dynamic_import_entries.into_iter() {
let chunk_output = chunk_output.await?;
Expand Down
6 changes: 3 additions & 3 deletions turbopack/crates/turbopack-resolve/src/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use std::{collections::HashMap, mem::take};
use std::mem::take;

use anyhow::Result;
use serde_json::Value as JsonValue;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueDefault, Vc, fxindexset};
use turbo_tasks::{FxIndexMap, ResolvedVc, ValueDefault, Vc, fxindexset};
use turbo_tasks_fs::{FileContent, FileJsonContent, FileSystemPath, FileSystemPathOption};
use turbopack_core::{
asset::Asset,
Expand Down Expand Up @@ -287,7 +287,7 @@ pub async fn tsconfig_resolve_options(
None
};

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