From 08d3258762963d249e43dbde7e68084bac72b8e4 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 25 Aug 2023 16:22:35 +0200 Subject: [PATCH] update turbopack (#54558) * https://github.com/vercel/turbo/pull/5723 * https://github.com/vercel/turbo/pull/5714 * https://github.com/vercel/turbo/pull/5705 * https://github.com/vercel/turbo/pull/5739 * https://github.com/vercel/turbo/pull/5785 * https://github.com/vercel/turbo/pull/5783 * https://github.com/vercel/turbo/pull/5738 * https://github.com/vercel/turbo/pull/5795 * https://github.com/vercel/turbo/pull/5794 * https://github.com/vercel/turbo/pull/5800 * https://github.com/vercel/turbo/pull/5786 Closes WEB-1446 --- Cargo.lock | 74 ++++----- Cargo.toml | 6 +- .../next-swc/crates/next-core/js/package.json | 4 +- pnpm-lock.yaml | 18 +-- test/development/basic/next-rs-api.test.ts | 143 ++++++++++-------- 5 files changed, 128 insertions(+), 117 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c02f4b2dac36..6bd7704782998 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -412,7 +412,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "serde", ] @@ -3633,7 +3633,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "serde", @@ -7306,7 +7306,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-trait", @@ -7338,7 +7338,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "cargo-lock", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "bytes", @@ -7365,7 +7365,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "dotenvs", @@ -7379,7 +7379,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7396,7 +7396,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "auto-hash-map", @@ -7426,7 +7426,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "base16", "hex", @@ -7438,7 +7438,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7452,7 +7452,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "proc-macro2", "quote", @@ -7462,7 +7462,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "mimalloc", ] @@ -7470,7 +7470,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "auto-hash-map", @@ -7493,7 +7493,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "auto-hash-map", @@ -7506,7 +7506,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-recursion", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "chromiumoxide", @@ -7567,7 +7567,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "auto-hash-map", "mdxjs", @@ -7610,7 +7610,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7632,7 +7632,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "clap 4.1.11", @@ -7656,7 +7656,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-recursion", @@ -7685,7 +7685,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "clap 4.1.11", @@ -7698,7 +7698,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-trait", @@ -7720,7 +7720,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7744,7 +7744,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-compression", @@ -7781,7 +7781,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-trait", @@ -7815,7 +7815,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "serde", "serde_json", @@ -7826,7 +7826,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-trait", @@ -7849,7 +7849,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indoc", @@ -7866,7 +7866,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7882,7 +7882,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "base64 0.21.0", @@ -7902,7 +7902,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "serde", @@ -7917,7 +7917,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "mdxjs", @@ -7932,7 +7932,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "async-stream", @@ -7967,7 +7967,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "serde", @@ -7983,7 +7983,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "swc_core", "turbo-tasks", @@ -7994,7 +7994,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "once_cell", @@ -8012,7 +8012,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230816.1#ca4834e0a03b9b9cc1cb56ea7a797d9c3d1e53c5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230825.2#faf918f24fee368fbf32cb99464a202c90068ee1" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index d9339299fc534..6f6f951200ef6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,11 +46,11 @@ swc_core = { version = "0.79.70" } testing = { version = "0.33.24" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230816.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.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-230816.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230816.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" } # General Deps diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json index aa9e7d235faa8..b3a8d1ff67bae 100644 --- a/packages/next-swc/crates/next-core/js/package.json +++ b/packages/next-swc/crates/next-core/js/package.json @@ -10,8 +10,8 @@ "check": "tsc --noEmit" }, "dependencies": { - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1", - "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2", + "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06a7399294ffb..777874b598845 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1521,11 +1521,11 @@ importers: packages/next-swc/crates/next-core/js: dependencies: '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2(react-refresh@0.12.0)(webpack@5.86.0)' '@vercel/turbopack-node': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2' anser: specifier: ^2.1.1 version: 2.1.1 @@ -27185,9 +27185,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -27198,8 +27198,8 @@ packages: - webpack dev: false - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: diff --git a/test/development/basic/next-rs-api.test.ts b/test/development/basic/next-rs-api.test.ts index e11dd213958ce..9986e9b12f1e7 100644 --- a/test/development/basic/next-rs-api.test.ts +++ b/test/development/basic/next-rs-api.test.ts @@ -460,77 +460,88 @@ describe('next.rs api', () => { projectUpdateSubscription ) const oldContent = await next.readFile(file) - await next.patchFile(file, content) - let foundUpdates: string[] | false = false - let foundServerSideChange = false - let done = false - const result2 = await Promise.race( - [ - (async () => { - const merged = raceIterators(subscriptions) - for await (const item of merged) { - if (done) return - if (item.type === 'partial') { - expect(item.instruction).toEqual({ - type: 'ChunkListUpdate', - merged: [ - expect.objectContaining({ - chunks: expect.toBeObject(), - entries: expect.toBeObject(), - }), - ], - }) - const updates = Object.keys( - item.instruction.merged[0].entries - ) - expect(updates).not.toBeEmpty() - - foundUpdates = foundUpdates || [] - foundUpdates.push( - ...Object.keys(item.instruction.merged[0].entries) - ) - } - } - })(), - serverSideSubscription && + let ok = false + try { + await next.patchFile(file, content) + let foundUpdates: string[] | false = false + let foundServerSideChange = false + let done = false + const result2 = await Promise.race( + [ (async () => { - for await (const { - issues, - diagnostics, - } of serverSideSubscription) { + const merged = raceIterators(subscriptions) + for await (const item of merged) { if (done) return - expect(issues).toBeArray() - expect(diagnostics).toBeArray() - foundServerSideChange = true + if (item.type === 'partial') { + expect(item.instruction).toEqual({ + type: 'ChunkListUpdate', + merged: [ + expect.objectContaining({ + chunks: expect.toBeObject(), + entries: expect.toBeObject(), + }), + ], + }) + const updates = Object.keys( + item.instruction.merged[0].entries + ) + expect(updates).not.toBeEmpty() + + foundUpdates = foundUpdates || [] + foundUpdates.push( + ...Object.keys(item.instruction.merged[0].entries) + ) + } } })(), - updateComplete.then( - (u) => new Promise((r) => setTimeout(() => r(u), 1000)) - ), - new Promise((r) => setTimeout(() => r('timeout'), 30000)), - ].filter((x) => x) - ) - done = true - expect(result2).toMatchObject({ - done: false, - value: { - duration: expect.toBePositive(), - tasks: expect.toBePositive(), - }, - }) - if (expectedUpdate === false) { - expect(foundUpdates).toBe(false) - } else { - expect(foundUpdates).toEqual([ - expect.stringContaining(expectedUpdate), - ]) + serverSideSubscription && + (async () => { + for await (const { + issues, + diagnostics, + } of serverSideSubscription) { + if (done) return + expect(issues).toBeArray() + expect(diagnostics).toBeArray() + foundServerSideChange = true + } + })(), + updateComplete.then( + (u) => new Promise((r) => setTimeout(() => r(u), 1000)) + ), + new Promise((r) => setTimeout(() => r('timeout'), 30000)), + ].filter((x) => x) + ) + done = true + expect(result2).toMatchObject({ + done: false, + value: { + duration: expect.toBePositive(), + tasks: expect.toBePositive(), + }, + }) + if (typeof expectedUpdate === 'boolean') { + expect(foundUpdates).toBe(false) + } else { + expect( + typeof foundUpdates === 'boolean' + ? foundUpdates + : Array.from(new Set(foundUpdates)) + ).toEqual([expect.stringContaining(expectedUpdate)]) + } + expect(foundServerSideChange).toBe(expectedServerSideChange) + ok = true + } finally { + try { + const { next: updateComplete2 } = await drainAndGetNext( + projectUpdateSubscription + ) + await next.patchFile(file, oldContent) + await updateComplete2 + } catch (e) { + if (ok) throw e + } } - expect(foundServerSideChange).toBe(expectedServerSideChange) - const { next: updateComplete2 } = await drainAndGetNext( - projectUpdateSubscription - ) - await next.patchFile(file, oldContent) - await updateComplete2 }) } })