From ee6cc6d9c2a6e9012354d15e8baa468aa8b4c1f4 Mon Sep 17 00:00:00 2001 From: Leah <8845940+ForsakenHarmony@users.noreply.github.com> Date: Wed, 10 Jan 2024 19:14:36 +0100 Subject: [PATCH] feat(turbopack): support named client references properly (#59578) ### What? Makes sure `import * as mod from 'client-mod'` works properly by actually adding the exports to the emitted module. Depends on: https://github.com/vercel/turbo/pull/6787 ### Turbopack Updates * https://github.com/vercel/turbo/pull/6965 * https://github.com/vercel/turbo/pull/6974 * https://github.com/vercel/turbo/pull/6787 Closes PACK-2110 --- Cargo.lock | 68 +++++++------- Cargo.toml | 6 +- ...cmascript_client_reference_proxy_module.rs | 92 ++++++++++++++----- .../server_component_module.rs | 24 ++++- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +- 6 files changed, 134 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88d4175c7f..c77f0e2e69 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" 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.3#05b59b2502e259837020e531659e33aa8d9c9f8e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240110.4#35ade4e85b17a076fb4e6287e519c26b087d0bef" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 91a48c211c..b9c39784c0 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.3" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" } # [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.3" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.3" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" } # General Deps diff --git a/packages/next-swc/crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs b/packages/next-swc/crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs index d9f0b8784f..2d46831dd9 100644 --- a/packages/next-swc/crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs +++ b/packages/next-swc/crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs @@ -65,41 +65,89 @@ impl EcmascriptClientReferenceProxyModule { } #[turbo_tasks::function] - async fn proxy_module(self: Vc) -> Result> { - let this = self.await?; + async fn proxy_module(&self) -> Result> { let mut code = CodeBuilder::default(); - // Adapted from - // next.js/packages/next/src/build/webpack/loaders/next-flight-loader/index.ts - writedoc!( - code, - r#" - import {{ createProxy }} from 'next/dist/build/webpack/loaders/next-flight-loader/module-proxy' + let server_module_path = &*self.server_module_ident.path().to_string().await?; - const proxy = createProxy({server_module_path}) + // Adapted from https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354 + if let EcmascriptExports::EsmExports(exports) = &*self.client_module.get_exports().await? { + let exports = exports.expand_exports().await?; - // Accessing the __esModule property and exporting $$typeof are required here. - // The __esModule getter forces the proxy target to create the default export - // and the $$typeof value is for rendering logic to determine if the module - // is a client boundary. - const {{ __esModule, $$typeof }} = proxy; + if !exports.dynamic_exports.is_empty() { + // TODO: throw? warn? + } - export {{ __esModule, $$typeof }}; - export default proxy; - "#, - server_module_path = StringifyJs(&this.server_module_ident.path().to_string().await?) - )?; + writedoc!( + code, + r#" + import {{ registerClientReference }} from "react-server-dom-turbopack/server.edge"; + "#, + )?; + + for export_name in exports.exports.keys() { + if export_name == "default" { + writedoc!( + code, + r#" + export default registerClientReference( + function() {{ throw new Error({call_err}); }}, + {server_module_path}, + "default", + ); + "#, + call_err = StringifyJs(&format!( + "Attempted to call the default export of {server_module_path} from \ + the server, but it's on the client. It's not possible to invoke a \ + client function from the server, it can only be rendered as a \ + Component or passed to props of a Client Component." + )), + server_module_path = StringifyJs(server_module_path), + )?; + } else { + writedoc!( + code, + r#" + export const {export_name} = registerClientReference( + function() {{ throw new Error({call_err}); }}, + {server_module_path}, + {export_name_str}, + ); + "#, + export_name = export_name, + call_err = StringifyJs(&format!( + "Attempted to call {export_name}() from the server but {export_name} \ + is on the client. It's not possible to invoke a client function from \ + the server, it can only be rendered as a Component or passed to \ + props of a Client Component." + )), + server_module_path = StringifyJs(server_module_path), + export_name_str = StringifyJs(export_name), + )?; + } + } + } else { + writedoc!( + code, + r#" + const {{ createClientModuleProxy }} = require("react-server-dom-turbopack/server.edge"); + + __turbopack_export_namespace__(createClientModuleProxy({server_module_path})); + "#, + server_module_path = StringifyJs(server_module_path) + )?; + }; let code = code.build(); let proxy_module_content = AssetContent::file(File::from(code.source_code().clone()).into()); let proxy_source = VirtualSource::new( - this.server_module_ident.path().join("proxy.ts".to_string()), + self.server_module_ident.path().join("proxy.js".to_string()), proxy_module_content, ); - let proxy_module = this + let proxy_module = self .server_asset_context .process( Vc::upcast(proxy_source), @@ -168,7 +216,7 @@ impl ChunkableModule for EcmascriptClientReferenceProxyModule { async fn as_chunk_item( self: Vc, chunking_context: Vc>, - ) -> Result>> { + ) -> Result>> { let item = self.proxy_module().as_chunk_item(chunking_context); let ecmascript_item = Vc::try_resolve_downcast::>(item) .await? diff --git a/packages/next-swc/crates/next-core/src/next_server_component/server_component_module.rs b/packages/next-swc/crates/next-core/src/next_server_component/server_component_module.rs index b70659a88f..8eb7a26fbe 100644 --- a/packages/next-swc/crates/next-core/src/next_server_component/server_component_module.rs +++ b/packages/next-swc/crates/next-core/src/next_server_component/server_component_module.rs @@ -1,3 +1,5 @@ +use std::collections::BTreeMap; + use anyhow::{bail, Context, Result}; use indoc::formatdoc; use turbo_tasks::Vc; @@ -10,7 +12,10 @@ use turbopack_binding::turbopack::{ module::Module, reference::ModuleReferences, }, - ecmascript::chunk::EcmascriptChunkType, + ecmascript::{ + chunk::EcmascriptChunkType, + references::esm::{EsmExport, EsmExports}, + }, turbopack::ecmascript::{ chunk::{ EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable, @@ -97,8 +102,21 @@ impl ChunkableModule for NextServerComponentModule { impl EcmascriptChunkPlaceable for NextServerComponentModule { #[turbo_tasks::function] fn get_exports(&self) -> Vc { - // TODO This should be EsmExports - EcmascriptExports::Value.cell() + let exports = BTreeMap::from([( + "default".to_string(), + EsmExport::ImportedNamespace(Vc::upcast(NextServerComponentModuleReference::new( + Vc::upcast(self.module), + ))), + )]); + + EcmascriptExports::EsmExports( + EsmExports { + exports, + star_exports: Default::default(), + } + .cell(), + ) + .cell() } } diff --git a/packages/next/package.json b/packages/next/package.json index a993240caf..6c76bf30f8 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.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e410817320..53203fa3f7 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.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)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4(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.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' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4(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.4} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: