archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preset_env followup [1/2] (vercel/turbo#478)

Browse source 
Addresses some feedback from vercel/turbo#380. Together with a following PR to use swc_core (currently blocked on https://github.com/swc-project/swc/pull/6083 and a subsequent publish), will address vercel/turbo#474.

* Remove unnecessary Result type
* Remove unnecessary @swc/helpers
This commit is contained in:
Will Binns-Smith 2022-10-10 05:46:36 -07:00 committed by GitHub
parent ed769521f9
commit 9bc858fddd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/next-swc/crates/next-core/src/next_client/context.rs
View file

@ -27,8 +27,8 @@ use crate::{
};
#[turbo_tasks::function]
pub fn get_client_environment(browserslist_query: &str) -> Result<EnvironmentVc> {
Ok(EnvironmentVc::new(
pub fn get_client_environment(browserslist_query: &str) -> EnvironmentVc {
EnvironmentVc::new(
Value::new(ExecutionEnvironment::Browser(
BrowserEnvironment {
dom: true,
@ -39,7 +39,7 @@ pub fn get_client_environment(browserslist_query: &str) -> Result<EnvironmentVc>
.into(),
)),
Value::new(EnvironmentIntention::Client),
))
)
}
#[turbo_tasks::function]
@ -80,7 +80,7 @@ pub async fn get_client_module_options_context(
pub fn get_client_asset_context(
project_root: FileSystemPathVc,
browserslist_query: &str,
) -> Result<AssetContextVc> {
) -> AssetContextVc {
let environment = get_client_environment(browserslist_query);
let resolve_options_context = get_client_resolve_options_context();
let module_options_context = get_client_module_options_context(project_root, environment);
@ -93,7 +93,7 @@ pub fn get_client_asset_context(
)
.into();
Ok(context)
context
}
#[turbo_tasks::function]
@ -144,9 +144,9 @@ pub fn get_resolved_client_runtime_entries(
project_root: FileSystemPathVc,
env: ProcessEnvVc,
browserslist_query: &str,
) -> Result<EcmascriptChunkPlaceablesVc> {
) -> EcmascriptChunkPlaceablesVc {
let context = get_client_asset_context(project_root, browserslist_query);
let entries = get_client_runtime_entries(project_root, env);
Ok(entries.resolve_entries(context))
entries.resolve_entries(context)
}