Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
131 changes: 73 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ rand = "0.9.0"
rayon = "1.10.0"
regex = "1.10.6"
regress = "0.10.4"
reqwest = { version = "0.12.22", default-features = false }
reqwest = { version = "0.12.24", default-features = false }
ringmap = "0.1.3"
roaring = "0.10.10"
rstest = "0.16.0"
Expand Down Expand Up @@ -451,7 +451,7 @@ urlencoding = "2.1.2"
uuid = "1.18.1"
vergen = { version = "9.0.6", features = ["cargo"] }
vergen-gitcl = { version = "1.0.8", features = ["cargo"] }
webbrowser = "0.8.7"
webbrowser = "1.0.6"
inventory = "0.3.21"

[patch.crates-io]
Expand Down
9 changes: 6 additions & 3 deletions crates/next-core/src/next_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use turbo_tasks::{
trace::TraceRawVcs,
};
use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fetch::FetchClient;
use turbo_tasks_fetch::FetchClientConfig;
use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{
ConditionItem, ConditionPath, LoaderRuleItem, WebpackRules,
Expand Down Expand Up @@ -1914,7 +1914,10 @@ impl NextConfig {
}

#[turbo_tasks::function]
pub async fn fetch_client(&self, env: Vc<Box<dyn ProcessEnv>>) -> Result<Vc<FetchClient>> {
pub async fn fetch_client(
&self,
env: Vc<Box<dyn ProcessEnv>>,
) -> Result<Vc<FetchClientConfig>> {
// Support both an env var and the experimental flag to provide more flexibility to
// developers on locked down systems, depending on if they want to configure this on a
// per-system or per-project basis.
Expand All @@ -1928,7 +1931,7 @@ impl NextConfig {
})
.or(self.experimental.turbopack_use_system_tls_certs)
.unwrap_or(false);
Ok(FetchClient {
Ok(FetchClientConfig {
tls_built_in_webpki_certs: !use_system_tls_certs,
tls_built_in_native_certs: use_system_tls_certs,
}
Expand Down
17 changes: 10 additions & 7 deletions crates/next-core/src/next_font/google/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{Completion, FxIndexMap, ResolvedVc, Vc};
use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::{CommandLineProcessEnv, ProcessEnv};
use turbo_tasks_fetch::{FetchClient, HttpResponseBody};
use turbo_tasks_fetch::{FetchClientConfig, HttpResponseBody};
use turbo_tasks_fs::{
DiskFileSystem, File, FileContent, FileSystem, FileSystemPath,
json::parse_json_with_source_context,
Expand Down Expand Up @@ -183,7 +183,7 @@ pub struct NextFontGoogleCssModuleReplacer {
project_path: FileSystemPath,
execution_context: ResolvedVc<ExecutionContext>,
next_mode: ResolvedVc<NextMode>,
fetch_client: ResolvedVc<FetchClient>,
fetch_client: ResolvedVc<FetchClientConfig>,
}

#[turbo_tasks::value_impl]
Expand All @@ -193,7 +193,7 @@ impl NextFontGoogleCssModuleReplacer {
project_path: FileSystemPath,
execution_context: ResolvedVc<ExecutionContext>,
next_mode: ResolvedVc<NextMode>,
fetch_client: ResolvedVc<FetchClient>,
fetch_client: ResolvedVc<FetchClientConfig>,
) -> Vc<Self> {
Self::cell(NextFontGoogleCssModuleReplacer {
project_path,
Expand Down Expand Up @@ -376,13 +376,16 @@ struct NextFontGoogleFontFileOptions {
#[turbo_tasks::value(shared)]
pub struct NextFontGoogleFontFileReplacer {
project_path: FileSystemPath,
fetch_client: ResolvedVc<FetchClient>,
fetch_client: ResolvedVc<FetchClientConfig>,
}

#[turbo_tasks::value_impl]
impl NextFontGoogleFontFileReplacer {
#[turbo_tasks::function]
pub fn new(project_path: FileSystemPath, fetch_client: ResolvedVc<FetchClient>) -> Vc<Self> {
pub fn new(
project_path: FileSystemPath,
fetch_client: ResolvedVc<FetchClientConfig>,
) -> Vc<Self> {
Self::cell(NextFontGoogleFontFileReplacer {
project_path,
fetch_client,
Expand Down Expand Up @@ -670,7 +673,7 @@ fn font_file_options_from_query_map(query: &RcStr) -> Result<NextFontGoogleFontF
}

async fn fetch_real_stylesheet(
fetch_client: Vc<FetchClient>,
fetch_client: Vc<FetchClientConfig>,
stylesheet_url: RcStr,
css_virtual_path: FileSystemPath,
) -> Result<Option<Vc<RcStr>>> {
Expand All @@ -680,7 +683,7 @@ async fn fetch_real_stylesheet(
}

async fn fetch_from_google_fonts(
fetch_client: Vc<FetchClient>,
fetch_client: Vc<FetchClientConfig>,
url: RcStr,
virtual_path: FileSystemPath,
) -> Result<Option<Vc<HttpResponseBody>>> {
Expand Down
Loading
Loading