Skip to content
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

Jump to bottom

turbopack: bind server to IPv6 loopback #47948

Merged
merged 4 commits into from
Apr 7, 2023
Merged

turbopack: bind server to IPv6 loopback #47948

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc45184
turbopack: pass dev server address to router
jridgewell Apr 5, 2023
87b56d7
Update turbopack
jridgewell Apr 6, 2023
f7d6063
turbopack: bind to IPv6 loopback address
jridgewell Apr 6, 2023
6f6c84e
Update snapshots
jridgewell Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 30 additions & 30 deletions packages/next-swc/Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions packages/next-swc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ swc_emotion = { version = "0.29.10" }
testing = { version = "0.31.31" }

# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230405.4" }
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230406.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230405.4" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230406.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230405.4" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230406.2" }

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-core/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-dev-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230321.3",
"@vercel/turbopack-dev-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230406.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
17 changes: 10 additions & 7 deletions packages/next-swc/crates/next-core/js/src/entry/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
import { Buffer } from "node:buffer";
import { createServer, makeRequest } from "@vercel/turbopack-next/ipc/server";
import { toPairs } from "@vercel/turbopack-next/internal/headers";
import { makeResolver, RouteResult } from "next/dist/server/lib/route-resolver";
import { makeResolver, RouteResult, ServerAddress } from "next/dist/server/lib/route-resolver";
import loadConfig from "next/dist/server/config";
import { PHASE_DEVELOPMENT_SERVER } from "next/dist/shared/lib/constants";

Expand Down Expand Up @@ -52,7 +52,8 @@ let resolveRouteMemo: Promise<
>;

async function getResolveRoute(
dir: string
dir: string,
serverAddr: Partial<ServerAddress>
): ReturnType<
typeof import("next/dist/server/lib/route-resolver").makeResolver
> {
Expand All @@ -63,20 +64,22 @@ async function getResolveRoute(
undefined,
true
);

return await makeResolver(dir, nextConfig, {
const middlewareCfg = {
files: middlewareChunkGroup.filter((f) => /\.[mc]?js$/.test(f)),
matcher: middlewareConfig.matcher,
});
}

return await makeResolver(dir, nextConfig, middlewareCfg, serverAddr);
}

export default async function route(
ipc: Ipc<RouterRequest, IpcOutgoingMessage>,
routerRequest: RouterRequest,
dir: string
dir: string,
serverAddr: Partial<ServerAddress>
) {
const [resolveRoute, server] = await Promise.all([
(resolveRouteMemo ??= getResolveRoute(dir)),
(resolveRouteMemo ??= getResolveRoute(dir, serverAddr)),
createServer(),
]);

Expand Down
5 changes: 5 additions & 0 deletions packages/next-swc/crates/next-core/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ async fn route_internal(
let Some(dir) = to_sys_path(project_path).await? else {
bail!("Next.js requires a disk path to check for valid routes");
};
let server_addr = server_addr.await?;
let result = evaluate(
router_asset,
project_path,
Expand All @@ -396,6 +397,10 @@ async fn route_internal(
vec![
JsonValueVc::cell(request),
JsonValueVc::cell(dir.to_string_lossy().into()),
JsonValueVc::cell(json!({
"hostname": server_addr.hostname(),
"port": server_addr.port(),
})),
],
CompletionsVc::all(vec![next_config_changed, routes_changed]),
/* debug */ false,
Expand Down
12 changes: 3 additions & 9 deletions packages/next-swc/crates/next-dev-tests/tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ fn test_skipped_fails(resource: PathBuf) {
async fn run_test(resource: PathBuf) -> JestRunResult {
register();

let is_debug_start = *DEBUG_START;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to keep that command...

But I can also readd it next time I need it

Copy link
Contributor Author

@jridgewell jridgewell Apr 6, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does the 127.0.0.1:3000 address matter for debugging?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's helpful to always have the same port


let resource = canonicalize(resource).unwrap();
assert!(resource.exists(), "{} does not exist", resource.display());
assert!(
Expand All @@ -195,11 +193,7 @@ async fn run_test(resource: PathBuf) -> JestRunResult {
let test_dir = resource.to_path_buf();
let workspace_root = cargo_workspace_root.parent().unwrap().parent().unwrap();
let project_dir = test_dir.join("input");
let requested_addr = if is_debug_start {
"127.0.0.1:3000".parse().unwrap()
} else {
get_free_local_addr().unwrap()
};
let requested_addr = get_free_local_addr().unwrap();

let mock_dir = resource.join("__httpmock__");
let mock_server_future = get_mock_server_future(&mock_dir);
Expand Down Expand Up @@ -475,8 +469,8 @@ async fn run_browser(addr: SocketAddr) -> Result<JestRunResult> {
}

fn get_free_local_addr() -> Result<SocketAddr, std::io::Error> {
let socket = TcpSocket::new_v4()?;
socket.bind("127.0.0.1:0".parse().unwrap())?;
let socket = TcpSocket::new_v6()?;
socket.bind("[::]:0".parse().unwrap())?;
socket.local_addr()
}

Expand Down