Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra authored Oct 25, 2022
1 parent 0ea69f3 commit 25663df
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
1 change: 0 additions & 1 deletion crates/next-core/src/next_client/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ pub fn get_client_chunking_context(
)
.hot_module_replacment()
.build()
.into()
}

#[turbo_tasks::function]
Expand Down
3 changes: 1 addition & 2 deletions crates/next-core/src/nodejs/node_api_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ impl ContentSource for NodeApiContentSource {
.cell(),
*body,
))
.cell()
.into());
.cell());
} else {
return Ok(ContentSourceResult::NeedData {
source: self_vc.into(),
Expand Down
10 changes: 5 additions & 5 deletions crates/next-core/src/nodejs/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ impl NodeJsPoolProcess {
cmd.current_dir(cwd);
cmd.arg(entrypoint);
cmd.arg(&marker.marker);
cmd.arg(&OperationMarker::STEP);
cmd.arg(&OperationMarker::SUCCESS);
cmd.arg(&OperationMarker::ERROR);
cmd.arg(OperationMarker::STEP);
cmd.arg(OperationMarker::SUCCESS);
cmd.arg(OperationMarker::ERROR);
cmd.env_clear();
cmd.env(
"PATH",
Expand Down Expand Up @@ -227,7 +227,7 @@ impl NodeJsPool {
self.cwd.as_path(),
&self.env,
self.entrypoint.as_path(),
&*marker,
&marker,
);
let fresh = spawn_blocking(move || NodeJsPoolProcess::start(cmd, marker)).await?;
(fresh, permit)
Expand Down Expand Up @@ -283,7 +283,7 @@ impl NodeJsOperation {
let read = child.read_until(b'\n', buf)?;
total_read += read;

match child.marker.read_event(&buf) {
match child.marker.read_event(buf) {
Some((read, event)) => {
buf.truncate(buf.len() - read);
break Ok((total_read - read, event));
Expand Down
3 changes: 1 addition & 2 deletions crates/next-core/src/server_rendered_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ async fn create_server_rendered_source_for_file(
intermediate_output_path.join("chunks"),
get_client_assets_path(server_root, Value::new(ContextType::Pages { pages_dir })),
)
.build()
.into();
.build();

Ok(if *is_api_path.await? {
create_node_api_source(
Expand Down

0 comments on commit 25663df

Please sign in to comment.