From 990d0a9ab8f2132dd6f3311f8e5b9556d275c3e9 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 10 Jan 2024 18:45:29 +0100 Subject: [PATCH] update turbopack (#60478) * https://github.com/vercel/turbo/pull/6978 * https://github.com/vercel/turbo/pull/6968 * https://github.com/vercel/turbo/pull/6922 --- Cargo.lock | 68 +++++++++---------- Cargo.toml | 6 +- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +-- .../app-dir/app-external/app-external.test.ts | 7 +- 5 files changed, 44 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44b68cdc86..88d4175c7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "serde", "smallvec", @@ -3515,7 +3515,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "serde", @@ -7635,7 +7635,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-trait", @@ -7667,7 +7667,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "cargo-lock", @@ -7679,7 +7679,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "bytes", @@ -7694,7 +7694,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "dotenvs", @@ -7708,7 +7708,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7725,7 +7725,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "auto-hash-map", @@ -7756,7 +7756,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "base16", "hex", @@ -7768,7 +7768,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7782,7 +7782,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "proc-macro2", "quote", @@ -7792,7 +7792,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "mimalloc", ] @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "auto-hash-map", @@ -7825,7 +7825,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-recursion", @@ -7857,7 +7857,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "auto-hash-map", "mdxjs", @@ -7898,7 +7898,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7922,7 +7922,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "clap 4.4.2", @@ -7940,7 +7940,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-recursion", @@ -7970,7 +7970,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-trait", @@ -7997,7 +7997,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8021,7 +8021,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-compression", @@ -8058,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-trait", @@ -8093,7 +8093,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "serde", "serde_json", @@ -8104,7 +8104,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-trait", @@ -8127,7 +8127,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indoc", @@ -8144,7 +8144,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8160,7 +8160,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "base64 0.21.4", @@ -8180,7 +8180,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "serde", @@ -8195,7 +8195,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "mdxjs", @@ -8210,7 +8210,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "async-stream", @@ -8245,7 +8245,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "serde", @@ -8261,7 +8261,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "swc_core", "turbo-tasks", @@ -8272,7 +8272,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "crossbeam-channel", @@ -8287,7 +8287,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.2#c51d4a00ac0b9d4cd2a21725fcc8a204569ba820" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.3#05b59b2502e259837020e531659e33aa8d9c9f8e" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 718b83884a..91a48c211c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ testing = { version = "0.35.14" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.3" } # [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-240110.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.3" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.3" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 442f7bc687..5aa01cd1ce 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -194,7 +194,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.2", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3241fc880f..ccc83a3b14 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1083,8 +1083,8 @@ importers: specifier: 0.26.2 version: 0.26.2 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.2 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.2(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25688,9 +25688,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-240110.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-240110.2} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.2' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.3' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: diff --git a/test/e2e/app-dir/app-external/app-external.test.ts b/test/e2e/app-dir/app-external/app-external.test.ts index ccaa863693..479e8f2fba 100644 --- a/test/e2e/app-dir/app-external/app-external.test.ts +++ b/test/e2e/app-dir/app-external/app-external.test.ts @@ -262,12 +262,7 @@ createNextDescribe( browser.elementByCss('#dual-pkg-outout button').click() await check(async () => { const text = await browser.elementByCss('#dual-pkg-outout p').text() - if (process.env.TURBOPACK) { - // The prefer esm won't effect turbopack resolving - expect(text).toBe('dual-pkg-optout:mjs') - } else { - expect(text).toBe('dual-pkg-optout:cjs') - } + expect(text).toBe('dual-pkg-optout:cjs') return 'success' }, /success/) })