From 2a62513ecdec6ffdbe4fdee9237612825319c44a Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 7 Jun 2023 19:02:29 -0700 Subject: [PATCH] Revert "update turbopack" (#50942) The builds are failing x-ref: https://github.com/vercel/next.js/actions/runs/5206362546/jobs/9392872573 x-ref: https://github.com/vercel/next.js/actions/runs/5206362546/jobs/9392873009 x-ref: https://github.com/vercel/next.js/actions/runs/5206362546/jobs/9392873120 Reverts vercel/next.js#50819 --- Cargo.lock | 115 ++++++++---------- Cargo.toml | 8 +- .../next-swc/crates/next-core/js/package.json | 4 +- .../crates/next-core/src/app_source.rs | 4 - .../crates/next-core/src/next_config.rs | 3 +- .../next-core/src/next_font/google/mod.rs | 4 +- .../crates/next-core/src/page_source.rs | 5 - .../next-swc/crates/next-core/src/router.rs | 3 +- pnpm-lock.yaml | 35 ++++-- 9 files changed, 86 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca5a601473..5460638eb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "serde", ] @@ -527,9 +527,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.50.35" +version = "0.50.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31f397ada59fbcd6cb7f0a9d5bab4a53bb7cfc3ee2277b9f93d0ea2c88704d6" +checksum = "b4ee27f9ffe528bb0a1e94d858d70217ce12076ef01978f73ce4ed50a20dedcc" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2033,16 +2033,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gimli" version = "0.26.2" @@ -2430,7 +2420,6 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "gif", "jpeg-decoder", "num-rational", "num-traits", @@ -3463,7 +3452,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "serde", @@ -5384,9 +5373,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.261.35" +version = "0.261.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56428a57e7898982bee4530923a85ba17ad2b555a1502bcdccf6dc7ae483621f" +checksum = "95cbbf554d5643f670e66ca9094dd375c7fc060106202b17da1729d36c1fb711" dependencies = [ "ahash", "anyhow", @@ -5452,9 +5441,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.214.26" +version = "0.214.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a20b862690e5c6c5e70fc0d56c156175514520c98e89220d408fc0e0d62759a" +checksum = "fc8061fcf233b059656a3c20e098971c6302346da23dc6cf21cb468335c27a1c" dependencies = [ "ahash", "anyhow", @@ -5558,9 +5547,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.76.41" +version = "0.76.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cd48cee857b467c1a7f3ff14ec26bfcdbe6a08f3218577e15d8157701da958" +checksum = "18c40087bc20b5e2611bef9a02924ed990f04a446f0afc0d9a748382f797f948" dependencies = [ "binding_macros", "swc", @@ -5845,9 +5834,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.181.26" +version = "0.181.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4006ddfdcdcf8eb3a83f077ae03b6ee5a94bd9d55d52198bbed2228a6acafcbe" +checksum = "f054b72aee9b9e92568c8045d8bd2f1622e7caed54a83c70613c36c25e209fd6" dependencies = [ "ahash", "arrayvec", @@ -5901,9 +5890,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.195.23" +version = "0.195.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa9f2862180c733b633572be7d42b690cf2d878280a199a9b5f7cfba2cfd89e" +checksum = "c71c3e40213af349ff5c873963cc1aa03add9b2d1a891dca94590aaed889c216" dependencies = [ "ahash", "anyhow", @@ -5956,9 +5945,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.218.21" +version = "0.218.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef09fbed21e8bcdf22bbfd88e5ec83c2acc2c831c39ca2fde01e1f040a85167" +checksum = "f359eeb44c37ae4fda275f02a8e718c750ad2b0c8ce2254aca624925be8c8943" dependencies = [ "swc_atoms", "swc_common", @@ -6082,9 +6071,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.187.21" +version = "0.187.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d27c12926427f235d149e60f9a9e67a2181fe1eb418c12b53b8e0778c5052a2" +checksum = "baa08d0945505263edb8f1fadc71a8afdf530f582d1a133c434055cc4d76298c" dependencies = [ "ahash", "dashmap", @@ -6180,9 +6169,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.177.21" +version = "0.177.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd32915040ed6ffdfeafb7a63276529df9ed83d8b6e7a6ce22d95ce98d137a21" +checksum = "340cc027a6e87966715005b94e3a7ac95baf76c80b8aedad8afdd1c134740c80" dependencies = [ "serde", "swc_atoms", @@ -7080,7 +7069,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "auto-hash-map", @@ -7111,7 +7100,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "cargo-lock", @@ -7123,7 +7112,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "bytes", @@ -7138,7 +7127,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "dotenvy", @@ -7152,7 +7141,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "indexmap", @@ -7169,7 +7158,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "auto-hash-map", @@ -7199,7 +7188,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "base16", "hex", @@ -7211,7 +7200,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7225,7 +7214,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "proc-macro2", "quote", @@ -7235,7 +7224,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "mimalloc", ] @@ -7243,7 +7232,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "auto-hash-map", @@ -7266,7 +7255,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "auto-hash-map", @@ -7278,7 +7267,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-recursion", @@ -7308,7 +7297,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "chromiumoxide", @@ -7338,7 +7327,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "auto-hash-map", "mdxjs", @@ -7379,7 +7368,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "clap 4.1.11", @@ -7403,7 +7392,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-trait", @@ -7431,7 +7420,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "clap 4.1.11", @@ -7444,7 +7433,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-trait", @@ -7466,7 +7455,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "indexmap", @@ -7490,7 +7479,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-compression", @@ -7525,7 +7514,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-trait", @@ -7558,7 +7547,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-trait", @@ -7581,7 +7570,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "indoc", @@ -7598,7 +7587,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "indexmap", @@ -7614,7 +7603,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "base64 0.21.0", @@ -7634,7 +7623,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "serde", @@ -7649,7 +7638,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "mdxjs", @@ -7664,7 +7653,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "async-stream", @@ -7699,7 +7688,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "serde", @@ -7715,7 +7704,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "swc_core", "turbo-tasks", @@ -7726,7 +7715,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" dependencies = [ "anyhow", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index fd6a9f4fb0..72aede3e58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,15 +38,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran # SWC crates # Keep consistent with preset_env_base through swc_core -swc_core = { version = "0.76.41" } +swc_core = { version = "0.76.37" } testing = { version = "0.33.13" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.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-230608.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" } # 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 a4907deb5a..6ab772adfb 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.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1", - "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3", + "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/packages/next-swc/crates/next-core/src/app_source.rs b/packages/next-swc/crates/next-core/src/app_source.rs index d5a2953d5f..e34da0cbb5 100644 --- a/packages/next-swc/crates/next-core/src/app_source.rs +++ b/packages/next-swc/crates/next-core/src/app_source.rs @@ -42,7 +42,6 @@ use turbopack_binding::{ }, env::ProcessEnvAssetVc, node::{ - debug::should_debug, execution_context::ExecutionContextVc, render::{ node_api_source::create_node_api_source, @@ -588,7 +587,6 @@ async fn create_app_page_source_for_route( .into(), fallback_page, render_data, - should_debug("app_source"), ); Ok(source.issue_context(app_dir, &format!("Next.js App Page Route {pathname}"))) @@ -632,7 +630,6 @@ async fn create_app_not_found_page_source( .into(), fallback_page, render_data, - should_debug("app_source"), ); Ok(source.issue_context(app_dir, "Next.js App Page Route /404")) @@ -676,7 +673,6 @@ async fn create_app_route_source_for_route( .cell() .into(), render_data, - should_debug("app_source"), ); Ok(source.issue_context(app_dir, &format!("Next.js App Route {pathname}"))) diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs index 57eebad31f..497cd6eec8 100644 --- a/packages/next-swc/crates/next-core/src/next_config.rs +++ b/packages/next-swc/crates/next-core/src/next_config.rs @@ -31,7 +31,6 @@ use turbopack_binding::{ styled_components::StyledComponentsTransformConfig, }, node::{ - debug::should_debug, evaluate::evaluate, execution_context::{ExecutionContext, ExecutionContextVc}, transforms::webpack::{WebpackLoaderItem, WebpackLoaderItemsVc}, @@ -689,7 +688,7 @@ pub async fn load_next_config_internal( None, vec![], config_changed, - should_debug("next_config"), + /* debug */ false, ) .await?; diff --git a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs index ba9ccda176..356339dcae 100644 --- a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs +++ b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs @@ -414,7 +414,7 @@ async fn get_mock_stylesheet( ecmascript::{ EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc, }, - node::{debug::should_debug, evaluate::evaluate, execution_context::ExecutionContext}, + node::{evaluate::evaluate, execution_context::ExecutionContext}, turbopack::evaluate_context::node_evaluate_asset_context, }, }; @@ -473,7 +473,7 @@ async fn get_mock_stylesheet( None, vec![], CompletionVc::immutable(), - should_debug("next_font::google"), + /* debug */ false, ) .await?; diff --git a/packages/next-swc/crates/next-core/src/page_source.rs b/packages/next-swc/crates/next-core/src/page_source.rs index 7ac9e53d2c..e83dec33b7 100644 --- a/packages/next-swc/crates/next-core/src/page_source.rs +++ b/packages/next-swc/crates/next-core/src/page_source.rs @@ -32,7 +32,6 @@ use turbopack_binding::{ }, env::ProcessEnvAssetVc, node::{ - debug::should_debug, execution_context::ExecutionContextVc, render::{ node_api_source::create_node_api_source, @@ -423,7 +422,6 @@ async fn create_page_source_for_file( .cell() .into(), render_data, - should_debug("page_source"), ) } else { let data_pathname = pathname_for_path(client_root, client_path, PathType::Data); @@ -467,7 +465,6 @@ async fn create_page_source_for_file( ssr_entry, fallback_page, render_data, - should_debug("page_source"), ), create_node_rendered_source( project_path, @@ -479,7 +476,6 @@ async fn create_page_source_for_file( ssr_data_entry, fallback_page, render_data, - should_debug("page_source"), ), create_page_loader( client_root, @@ -595,7 +591,6 @@ async fn create_not_found_page_source( ssr_entry, fallback_page, render_data, - should_debug("page_source"), ), page_loader, ]) diff --git a/packages/next-swc/crates/next-core/src/router.rs b/packages/next-swc/crates/next-core/src/router.rs index a5a58ee23d..23a0243868 100644 --- a/packages/next-swc/crates/next-core/src/router.rs +++ b/packages/next-swc/crates/next-core/src/router.rs @@ -30,7 +30,6 @@ use turbopack_binding::{ }, dev::DevChunkingContextVc, node::{ - debug::should_debug, evaluate::evaluate, execution_context::{ExecutionContext, ExecutionContextVc}, source_map::{trace_stack, StructuredError}, @@ -377,7 +376,7 @@ async fn route_internal( JsonValueVc::cell(serde_json::to_value(ServerInfo::try_from(&*server_addr)?)?), ], CompletionsVc::all(vec![next_config_changed, routes_changed]), - should_debug("router"), + /* debug */ false, ) .await?; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b3c1679db..7e377ff1ff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1014,8 +1014,8 @@ importers: '@types/react': 18.2.7 '@types/react-dom': 18.2.4 '@vercel/ncc': ^0.36.0 - '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1 - '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3 + '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3 anser: ^2.1.1 css.escape: ^1.5.1 find-up: ^6.3.0 @@ -1027,8 +1027,8 @@ importers: stacktrace-parser: ^0.1.10 strip-ansi: ^7.0.1 dependencies: - '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -5227,7 +5227,7 @@ packages: '@jest/schemas': 29.4.3 '@types/istanbul-lib-coverage': 2.0.3 '@types/istanbul-reports': 3.0.0 - '@types/node': 20.2.5 + '@types/node': 18.11.18 '@types/yargs': 17.0.10 chalk: 4.1.2 dev: true @@ -5991,7 +5991,7 @@ packages: dependencies: '@mdx-js/mdx': 2.2.1 source-map: 0.7.3 - webpack: 5.74.0_@swc+core@1.3.55 + webpack: 5.74.0 transitivePeerDependencies: - supports-color @@ -6665,6 +6665,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: true optional: true /@swc/core-darwin-x64/1.3.55: @@ -6673,6 +6674,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: true optional: true /@swc/core-linux-arm-gnueabihf/1.3.55: @@ -6681,6 +6683,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: true optional: true /@swc/core-linux-arm64-gnu/1.3.55: @@ -6689,6 +6692,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@swc/core-linux-arm64-musl/1.3.55: @@ -6697,6 +6701,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@swc/core-linux-x64-gnu/1.3.55: @@ -6705,6 +6710,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true /@swc/core-linux-x64-musl/1.3.55: @@ -6713,6 +6719,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true /@swc/core-win32-arm64-msvc/1.3.55: @@ -6721,6 +6728,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: true optional: true /@swc/core-win32-ia32-msvc/1.3.55: @@ -6729,6 +6737,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: true optional: true /@swc/core-win32-x64-msvc/1.3.55: @@ -6737,6 +6746,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: true optional: true /@swc/core/1.3.55_@swc+helpers@0.5.1: @@ -6761,6 +6771,7 @@ packages: '@swc/core-win32-arm64-msvc': 1.3.55 '@swc/core-win32-ia32-msvc': 1.3.55 '@swc/core-win32-x64-msvc': 1.3.55 + dev: true /@swc/helpers/0.4.14: resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} @@ -23692,6 +23703,7 @@ packages: source-map: 0.6.1 terser: 5.14.1 webpack: 5.74.0_@swc+core@1.3.55 + dev: true /terser-webpack-plugin/5.2.4_webpack@5.74.0: resolution: {integrity: sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==} @@ -25101,6 +25113,7 @@ packages: - '@swc/core' - esbuild - uglify-js + dev: true /websocket-driver/0.7.3: resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==} @@ -25511,9 +25524,9 @@ packages: /zwitch/2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1} - id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1' + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3} + id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25524,8 +25537,8 @@ packages: - webpack dev: false - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1} + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: