Unverified Commit 9813208f authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: convert HashMap to IndexMap for deterministic tasks (#84641)

### What?

Ensure more deterministic builds
parent ad90a674
use anyhow::Result; use anyhow::Result;
use next_core::{next_manifests::LoadableManifest, util::NextRuntime}; use next_core::{next_manifests::LoadableManifest, util::NextRuntime};
use rustc_hash::FxHashMap; use turbo_tasks::{FxIndexMap, ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks::{ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
...@@ -21,7 +20,7 @@ pub async fn create_react_loadable_manifest( ...@@ -21,7 +20,7 @@ pub async fn create_react_loadable_manifest(
) -> Result<Vc<OutputAssets>> { ) -> Result<Vc<OutputAssets>> {
let dynamic_import_entries = &*dynamic_import_entries.await?; 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() { for (_, (module_id, chunk_output)) in dynamic_import_entries.into_iter() {
let chunk_output = chunk_output.await?; let chunk_output = chunk_output.await?;
......
use std::{collections::HashMap, mem::take}; use std::mem::take;
use anyhow::Result; use anyhow::Result;
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_rcstr::{RcStr, rcstr}; 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 turbo_tasks_fs::{FileContent, FileJsonContent, FileSystemPath, FileSystemPathOption};
use turbopack_core::{ use turbopack_core::{
asset::Asset, asset::Asset,
...@@ -287,7 +287,7 @@ pub async fn tsconfig_resolve_options( ...@@ -287,7 +287,7 @@ pub async fn tsconfig_resolve_options(
None None
}; };
let mut all_paths = HashMap::new(); let mut all_paths = FxIndexMap::default();
for (content, source) in configs.iter().rev() { for (content, source) in configs.iter().rev() {
if let FileJsonContent::Content(json) = &*content.await? if let FileJsonContent::Content(json) = &*content.await?
&& let JsonValue::Object(paths) = &json["compilerOptions"]["paths"] && let JsonValue::Object(paths) = &json["compilerOptions"]["paths"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment