diff --git a/Cargo.lock b/Cargo.lock index 9699803cfd067b..a3e75faf09243f 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-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "serde", "smallvec", @@ -1225,7 +1225,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.10.1", + "phf 0.11.2", "serde", "smallvec", ] @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "serde", @@ -3688,9 +3688,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] @@ -3699,7 +3697,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", + "phf_macros", "phf_shared 0.11.2", ] @@ -3733,20 +3731,6 @@ dependencies = [ "rand", ] -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "phf_macros" version = "0.11.2" @@ -3941,12 +3925,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" version = "1.0.79" @@ -5450,9 +5428,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.90.31" +version = "0.90.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abbb96671d9fb89f051609242b6acb9ddde9e6ff6325f49fce453d96a4c533" +checksum = "fe7651ba172f4a82cd6f27b73e51d363e9b32aa97b9f6aab2e63e58f4df9ea62" dependencies = [ "binding_macros", "swc", @@ -6108,9 +6086,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.163.19" +version = "0.163.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed183e0eb761a1eddd9ef2232612bcd6790a9fb8b6dd1885b2a9ea0a2f93752c" +checksum = "27a864b81fc36e2933f60015fc6df62e244339acde78e06e4640ec5656584f82" dependencies = [ "arrayvec", "indexmap 2.2.3", @@ -7196,7 +7174,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-trait", @@ -7227,7 +7205,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "cargo-lock", @@ -7239,7 +7217,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "bytes", @@ -7253,7 +7231,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "dotenvs", @@ -7267,7 +7245,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "lazy_static", @@ -7283,7 +7261,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "auto-hash-map", @@ -7315,7 +7293,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "base16", "hex", @@ -7327,7 +7305,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "proc-macro-error", @@ -7340,7 +7318,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "proc-macro2", "quote", @@ -7350,7 +7328,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "mimalloc", ] @@ -7358,7 +7336,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "auto-hash-map", @@ -7383,7 +7361,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-recursion", @@ -7413,7 +7391,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "auto-hash-map", "mdxjs", @@ -7453,7 +7431,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7476,7 +7454,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "clap", @@ -7493,7 +7471,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-recursion", @@ -7522,7 +7500,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7549,7 +7527,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-compression", @@ -7585,7 +7563,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-trait", @@ -7620,7 +7598,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "serde", "serde_json", @@ -7631,7 +7609,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-trait", @@ -7655,7 +7633,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indoc", @@ -7671,7 +7649,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7687,7 +7665,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "base64 0.21.4", @@ -7706,7 +7684,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "serde", @@ -7721,7 +7699,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "mdxjs", @@ -7736,7 +7714,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "async-stream", @@ -7770,7 +7748,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7790,7 +7768,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7808,7 +7786,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "serde", @@ -7824,7 +7802,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "swc_core", "turbo-tasks", @@ -7835,7 +7813,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "crossbeam-channel", @@ -7851,7 +7829,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605-14.x-hotfix.1#385f2704dc6819cf803d7c0a5bc8b7afe5279952" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240416.1#c8fd56653ae3be19a158319e931422f1203d6cfa" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index bddebc02555cdd..ffabdcc19f398a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.90.30", features = [ testing = { version = "0.35.22" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240605-14.x-hotfix.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240416.1" } # [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-240605-14.x-hotfix.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240416.1" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240605-14.x-hotfix.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240416.1" } # General Deps diff --git a/packages/next-swc/crates/next-api/src/versioned_content_map.rs b/packages/next-swc/crates/next-api/src/versioned_content_map.rs index b566534a00715d..f2deaaf8e13d9a 100644 --- a/packages/next-swc/crates/next-api/src/versioned_content_map.rs +++ b/packages/next-swc/crates/next-api/src/versioned_content_map.rs @@ -28,23 +28,26 @@ pub struct OutputAssetsOperation(Vc); )] struct MapEntry { assets_operation: Vc, - emit_operation: Vc, + side_effects: Vc, } #[turbo_tasks::value(transparent)] struct OptionMapEntry(Option); -type VersionedContentMapInner = HashMap, MapEntry>; +type PathToOutputOperation = HashMap, Vc>; +type OutputOperationToSideEffects = HashMap, Vc>; #[turbo_tasks::value] pub struct VersionedContentMap { - map: State, + map_path_to_op: State, + map_op_to_side_effects: State, } impl ValueDefault for VersionedContentMap { fn value_default() -> Vc { VersionedContentMap { - map: State::new(HashMap::new()), + map_path_to_op: State::new(HashMap::new()), + map_op_to_side_effects: State::new(HashMap::new()), } .cell() } @@ -66,30 +69,45 @@ impl VersionedContentMap { assets_operation: Vc, client_relative_path: Vc, client_output_path: Vc, - ) -> Result<()> { - let assets_operation = *assets_operation.await?; - // Make sure all written client assets are up-to-date - let emit_operation = - emit_client_assets(assets_operation, client_relative_path, client_output_path); - let assets = assets_operation.await?; + ) -> Result> { + let this = self.await?; + let side_effects = + self.output_side_effects(assets_operation, client_relative_path, client_output_path); + let assets = *assets_operation.await?; + this.map_op_to_side_effects + .update_conditionally(|map| map.insert(assets, side_effects) != Some(side_effects)); + Ok(side_effects) + } + + #[turbo_tasks::function] + async fn output_side_effects( + self: Vc, + assets_operation: Vc, + client_relative_path: Vc, + client_output_path: Vc, + ) -> Result> { + let assets = *assets_operation.await?; let entries: Vec<_> = assets + .await? .iter() - .map(|&asset| async move { - Ok(( - asset.ident().path().resolve().await?, - MapEntry { - assets_operation, - emit_operation, - }, - )) - }) + .map(|&asset| async move { Ok((asset.ident().path().resolve().await?, assets)) }) .try_join() .await?; - self.await?.map.update_conditionally(move |map| { - map.extend(entries); - true + self.await?.map_path_to_op.update_conditionally(move |map| { + let mut changed = false; + for (k, v) in entries { + if map.insert(k, v) != Some(v) { + changed = true; + } + } + changed }); - Ok(()) + // Make sure all written client assets are up-to-date + Ok(emit_client_assets( + assets, + client_relative_path, + client_output_path, + )) } #[turbo_tasks::function] @@ -125,12 +143,14 @@ impl VersionedContentMap { let result = self.raw_get(path).await?; if let Some(MapEntry { assets_operation, - emit_operation, + side_effects, }) = *result { // NOTE(alexkirsz) This is necessary to mark the task as active again. Vc::connect(assets_operation); - Vc::connect(emit_operation); + Vc::connect(side_effects); + + side_effects.await?; for &asset in assets_operation.await?.iter() { if asset.ident().path().resolve().await? == path { @@ -145,7 +165,7 @@ impl VersionedContentMap { #[turbo_tasks::function] pub async fn keys_in_path(&self, root: Vc) -> Result>> { let keys = { - let map = self.map.get(); + let map = self.map_path_to_op.get(); map.keys().copied().collect::>() }; let root = &root.await?; @@ -159,10 +179,23 @@ impl VersionedContentMap { #[turbo_tasks::function] async fn raw_get(&self, path: Vc) -> Result> { - let result = { - let map = self.map.get(); + let assets = { + let map = self.map_path_to_op.get(); map.get(&path).copied() }; - Ok(Vc::cell(result)) + let Some(assets) = assets else { + return Ok(Vc::cell(None)); + }; + let side_effects = { + let map = self.map_op_to_side_effects.get(); + map.get(&assets).copied() + }; + let Some(side_effects) = side_effects else { + return Ok(Vc::cell(None)); + }; + Ok(Vc::cell(Some(MapEntry { + assets_operation: assets, + side_effects, + }))) } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c30bee4a1e145e..34766e461afe4e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -744,7 +744,7 @@ importers: packages/eslint-config-next: dependencies: '@next/eslint-plugin-next': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../eslint-plugin-next '@rushstack/eslint-patch': specifier: ^1.3.3 @@ -791,7 +791,7 @@ importers: dependencies: next: specifier: '*' - version: link:../next + version: 14.2.1(@babel/core@7.22.5)(@opentelemetry/api@1.4.1)(@playwright/test@1.19.2)(react-dom@18.2.0)(react@18.2.0)(sass@1.54.0) devDependencies: '@types/fontkit': specifier: 2.0.0 @@ -806,7 +806,7 @@ importers: packages/next: dependencies: '@next/env': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../next-env '@swc/helpers': specifier: 0.5.5 @@ -927,16 +927,16 @@ importers: specifier: 1.2.0 version: 1.2.0 '@next/polyfill-module': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../next-polyfill-module '@next/polyfill-nomodule': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../next-polyfill-nomodule '@next/react-refresh-utils': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../react-refresh-utils '@next/swc': - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../next-swc '@opentelemetry/api': specifier: 1.6.0 @@ -1068,11 +1068,11 @@ importers: specifier: 0.26.4 version: 0.26.4 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240417.2 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240417.2' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240416.1 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240416.1' acorn: - specifier: 8.11.3 - version: 8.11.3 + specifier: 8.5.0 + version: 8.5.0 amphtml-validator: specifier: 1.0.35 version: 1.0.35 @@ -1551,7 +1551,7 @@ importers: version: 1.0.20 devDependencies: next: - specifier: 14.2.5 + specifier: 14.3.0-canary.4 version: link:../next outdent: specifier: 0.8.0 @@ -1678,7 +1678,6 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/highlight': 7.22.20 - dev: true /@babel/code-frame@7.22.13: resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} @@ -2133,7 +2132,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 - dev: true /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==} @@ -2158,7 +2156,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.5) - dev: true /@babel/plugin-proposal-export-namespace-from@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==} @@ -2170,7 +2167,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.5) - dev: true /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.22.5): resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==} @@ -2194,7 +2190,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.5) - dev: true /@babel/plugin-proposal-nullish-coalescing-operator@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==} @@ -2217,7 +2212,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.5) - dev: true /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==} @@ -2268,7 +2262,6 @@ packages: '@babel/core': 7.22.5 '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 - dev: true /@babel/plugin-proposal-private-property-in-object@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==} @@ -2282,7 +2275,6 @@ packages: '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.5) - dev: true /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.5): resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} @@ -2756,7 +2748,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-simple-access': 7.22.5 babel-plugin-dynamic-import-node: 2.3.3 - dev: true /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==} @@ -2980,7 +2971,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) '@babel/types': 7.22.5 - dev: true /@babel/plugin-transform-react-jsx@7.22.15(@babel/core@7.22.5): resolution: {integrity: sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==} @@ -3301,7 +3291,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.22.15 '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.22.5) - dev: true /@babel/preset-typescript@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==} @@ -4489,7 +4478,6 @@ packages: '@types/node': 20.2.5 '@types/yargs': 16.0.9 chalk: 4.1.2 - dev: true /@jest/types@29.5.0: resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==} @@ -5366,6 +5354,91 @@ packages: resolution: {integrity: sha512-HAPjR3bnCsdXBsATpDIP5WCrw0JcACwhhrwIAQhiR46n+jm+a2F8kBsfseAuWtSyQ+H3Yebt2k43B5dy+04yMA==} dev: true + /@next/env@14.2.1: + resolution: {integrity: sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA==} + dev: false + + /@next/swc-darwin-arm64@14.2.1: + resolution: {integrity: sha512-kGjnjcIJehEcd3rT/3NAATJQndAEELk0J9GmGMXHSC75TMnvpOhONcjNHbjtcWE5HUQnIHy5JVkatrnYm1QhVw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@next/swc-darwin-x64@14.2.1: + resolution: {integrity: sha512-dAdWndgdQi7BK2WSXrx4lae7mYcOYjbHJUhvOUnJjMNYrmYhxbbvJ2xElZpxNxdfA6zkqagIB9He2tQk+l16ew==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-gnu@14.2.1: + resolution: {integrity: sha512-2ZctfnyFOGvTkoD6L+DtQtO3BfFz4CapoHnyLTXkOxbZkVRgg3TQBUjTD/xKrO1QWeydeo8AWfZRg8539qNKrg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-musl@14.2.1: + resolution: {integrity: sha512-jazZXctiaanemy4r+TPIpFP36t1mMwWCKMsmrTRVChRqE6putyAxZA4PDujx0SnfvZHosjdkx9xIq9BzBB5tWg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-gnu@14.2.1: + resolution: {integrity: sha512-VjCHWCjsAzQAAo8lkBOLEIkBZFdfW+Z18qcQ056kL4KpUYc8o59JhLDCBlhg+hINQRgzQ2UPGma2AURGOH0+Qg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-musl@14.2.1: + resolution: {integrity: sha512-7HZKYKvAp4nAHiHIbY04finRqjeYvkITOGOurP1aLMexIFG/1+oCnqhGogBdc4lao/lkMW1c+AkwWSzSlLasqw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-arm64-msvc@14.2.1: + resolution: {integrity: sha512-YGHklaJ/Cj/F0Xd8jxgj2p8po4JTCi6H7Z3Yics3xJhm9CPIqtl8erlpK1CLv+HInDqEWfXilqatF8YsLxxA2Q==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-ia32-msvc@14.2.1: + resolution: {integrity: sha512-o+ISKOlvU/L43ZhtAAfCjwIfcwuZstiHVXq/BDsZwGqQE0h/81td95MPHliWCnFoikzWcYqh+hz54ZB2FIT8RA==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-x64-msvc@14.2.1: + resolution: {integrity: sha512-GmRoTiLcvCLifujlisknv4zu9/C4i9r0ktsA8E51EMqJL4bD4CpO7lDYr7SrUxCR0tS4RVcrqKmCak24T0ohaw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false + optional: true + /@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3: resolution: {integrity: sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==} requiresBuild: true @@ -5851,7 +5924,6 @@ packages: /@opentelemetry/api@1.4.1: resolution: {integrity: sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==} engines: {node: '>=8.0.0'} - dev: true /@opentelemetry/api@1.6.0: resolution: {integrity: sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==} @@ -5944,7 +6016,6 @@ packages: - bufferutil - supports-color - utf-8-validate - dev: true /@playwright/test@1.41.2: resolution: {integrity: sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==} @@ -6877,13 +6948,11 @@ packages: /@types/istanbul-lib-coverage@2.0.4: resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} - dev: true /@types/istanbul-lib-report@3.0.0: resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} dependencies: '@types/istanbul-lib-coverage': 2.0.4 - dev: true /@types/istanbul-reports@3.0.0: resolution: {integrity: sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==} @@ -6895,7 +6964,6 @@ packages: resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} dependencies: '@types/istanbul-lib-report': 3.0.0 - dev: true /@types/jest@29.5.5: resolution: {integrity: sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==} @@ -7150,7 +7218,6 @@ packages: /@types/stack-utils@2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} - dev: true /@types/string-hash@1.1.1: resolution: {integrity: sha512-ijt3zdHi2DmZxQpQTmozXszzDo78V4R3EdvX0jFMfnMH2ZzQSmCbaWOMPGXFUYSzSIdStv78HDjg32m5dxc+tA==} @@ -7212,13 +7279,11 @@ packages: /@types/yargs-parser@21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} - dev: true /@types/yargs@16.0.9: resolution: {integrity: sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==} dependencies: '@types/yargs-parser': 21.0.0 - dev: true /@types/yargs@17.0.10: resolution: {integrity: sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==} @@ -7231,7 +7296,6 @@ packages: requiresBuild: true dependencies: '@types/node': 20.2.5 - dev: true optional: true /@typescript-eslint/eslint-plugin@6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.2.2): @@ -7521,8 +7585,8 @@ packages: dependencies: '@mapbox/node-pre-gyp': 1.0.5 '@rollup/pluginutils': 4.2.1 - acorn: 8.11.3 - acorn-import-attributes: 1.9.2(acorn@8.11.3) + acorn: 8.10.0 + acorn-import-attributes: 1.9.2(acorn@8.10.0) async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 @@ -7697,23 +7761,23 @@ packages: /acorn-globals@7.0.1: resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==} dependencies: - acorn: 8.11.3 + acorn: 8.5.0 acorn-walk: 8.2.0 dev: true - /acorn-import-assertions@1.9.0(acorn@8.11.3): + /acorn-import-assertions@1.9.0(acorn@8.10.0): resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} peerDependencies: acorn: ^8 dependencies: - acorn: 8.11.3 + acorn: 8.10.0 - /acorn-import-attributes@1.9.2(acorn@8.11.3): + /acorn-import-attributes@1.9.2(acorn@8.10.0): resolution: {integrity: sha512-O+nfJwNolEA771IYJaiLWK1UAwjNsQmZbTRqqwBYxCgVQTmpFEMvBw6LOIQV0Me339L5UMVYFyRohGnGlQDdIQ==} peerDependencies: acorn: ^8 dependencies: - acorn: 8.11.3 + acorn: 8.10.0 dev: true /acorn-jsx@5.3.2(acorn@7.4.1): @@ -7724,18 +7788,25 @@ packages: acorn: 7.4.1 dev: true - /acorn-jsx@5.3.2(acorn@8.11.3): + /acorn-jsx@5.3.2(acorn@8.10.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.11.3 + acorn: 8.10.0 + + /acorn-jsx@5.3.2(acorn@8.5.0): + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + acorn: 8.5.0 /acorn-loose@8.3.0: resolution: {integrity: sha512-75lAs9H19ldmW+fAbyqHdjgdCrz0pWGXKmnqFoh8PyVd1L2RIb4RzYrSjmopeqv3E1G3/Pimu6GgLlrGbrkF7w==} engines: {node: '>=0.4.0'} dependencies: - acorn: 8.11.3 + acorn: 8.5.0 dev: true /acorn-node@1.8.2: @@ -7766,8 +7837,8 @@ packages: hasBin: true dev: true - /acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + /acorn@8.10.0: + resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true @@ -7804,7 +7875,6 @@ packages: debug: 4.1.1 transitivePeerDependencies: - supports-color - dev: true /agentkeepalive@3.4.1: resolution: {integrity: sha512-MPIwsZU9PP9kOrZpyu2042kYA8Fdt/AedQYkYXucHgF9QoD9dXVp0ypuGnHXSR0hTstBxdt85Xkh4JolYfK5wg==} @@ -7981,7 +8051,6 @@ packages: /ansi-styles@5.2.0: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} - dev: true /ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} @@ -8447,7 +8516,6 @@ packages: resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==} dependencies: object.assign: 4.1.4 - dev: true /babel-plugin-istanbul@6.1.1: resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} @@ -8499,7 +8567,6 @@ packages: pkg-up: 3.1.0 reselect: 4.1.8 resolve: 1.22.4 - dev: true /babel-plugin-polyfill-corejs2@0.4.3(@babel/core@7.22.5): resolution: {integrity: sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==} @@ -8860,7 +8927,6 @@ packages: /buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} - dev: true /buffer-equal-constant-time@1.0.1: resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} @@ -9543,7 +9609,6 @@ packages: /colors@1.4.0: resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} engines: {node: '>=0.1.90'} - dev: true /columnify@1.5.4: resolution: {integrity: sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==} @@ -9591,7 +9656,6 @@ packages: /commander@8.3.0: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} - dev: true /comment-json@3.0.3: resolution: {integrity: sha512-P7XwYkC3qjIK45EAa9c5Y3lR7SMXhJqwFdWg3niAIAcbk3zlpKDdajV8Hyz/Y3sGNn3l+YNMl8A2N/OubSArHg==} @@ -10630,7 +10694,6 @@ packages: optional: true dependencies: ms: 2.1.2 - dev: true /debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} @@ -10898,7 +10961,6 @@ packages: /diff-sequences@27.5.1: resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} @@ -11472,7 +11534,6 @@ packages: /escape-string-regexp@2.0.0: resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==} engines: {node: '>=8'} - dev: true /escape-string-regexp@4.0.0: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} @@ -12034,8 +12095,8 @@ packages: resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) eslint-visitor-keys: 3.4.1 dev: false @@ -12043,8 +12104,8 @@ packages: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) eslint-visitor-keys: 3.4.3 dev: true @@ -12282,7 +12343,6 @@ packages: jest-matcher-utils: 27.5.1 jest-message-util: 27.5.1 jest-regex-util: 27.5.1 - dev: true /expect@27.5.1: resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==} @@ -12411,7 +12471,6 @@ packages: '@types/yauzl': 2.10.3 transitivePeerDependencies: - supports-color - dev: true /extsprintf@1.3.0: resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==} @@ -12504,7 +12563,6 @@ packages: resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} dependencies: pend: 1.2.0 - dev: true /fflate@0.7.4: resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==} @@ -12600,7 +12658,6 @@ packages: dependencies: json5: 0.5.1 path-exists: 3.0.0 - dev: true /find-cache-dir@2.1.0: resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==} @@ -13966,7 +14023,6 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color - dev: true /https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} @@ -14119,8 +14175,8 @@ packages: /import-in-the-middle@1.4.2: resolution: {integrity: sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==} dependencies: - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) cjs-module-lexer: 1.2.2 module-details-from-path: 1.0.3 dev: true @@ -14316,7 +14372,6 @@ packages: /ip@2.0.0: resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==} - dev: true /ipaddr.js@1.9.0: resolution: {integrity: sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==} @@ -15229,7 +15284,6 @@ packages: diff-sequences: 27.5.1 jest-get-type: 27.5.1 pretty-format: 27.5.1 - dev: true /jest-diff@29.7.0: resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==} @@ -15334,7 +15388,6 @@ packages: /jest-get-type@27.5.1: resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true /jest-get-type@29.6.3: resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} @@ -15425,7 +15478,6 @@ packages: jest-diff: 27.5.1 jest-get-type: 27.5.1 pretty-format: 27.5.1 - dev: true /jest-matcher-utils@27.5.1: resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==} @@ -15435,7 +15487,6 @@ packages: jest-diff: 27.5.1 jest-get-type: 27.5.1 pretty-format: 27.5.1 - dev: true /jest-matcher-utils@29.7.0: resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==} @@ -15460,7 +15511,6 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 stack-utils: 2.0.6 - dev: true /jest-message-util@29.7.0: resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==} @@ -15530,7 +15580,6 @@ packages: /jest-regex-util@27.5.1: resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true /jest-regex-util@29.4.3: resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==} @@ -15872,7 +15921,6 @@ packages: /jpeg-js@0.4.3: resolution: {integrity: sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==} - dev: true /js-base64@2.5.1: resolution: {integrity: sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==} @@ -15953,7 +16001,7 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.11.3 + acorn: 8.10.0 acorn-globals: 7.0.1 cssom: 0.5.0 cssstyle: 2.3.0 @@ -16041,7 +16089,6 @@ packages: /json5@0.5.1: resolution: {integrity: sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==} hasBin: true - dev: true /json5@1.0.2: resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} @@ -16055,7 +16102,6 @@ packages: hasBin: true dependencies: minimist: 1.2.6 - dev: true /json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} @@ -17361,8 +17407,8 @@ packages: /micromark-extension-mdxjs@0.3.0: resolution: {integrity: sha512-NQuiYA0lw+eFDtSG4+c7ao3RG9dM4P0Kx/sn8OLyPhxtIc6k+9n14k5VfLxRKfAxYRTo8c5PLZPaRNmslGWxJw==} dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.5.0 + acorn-jsx: 5.3.2(acorn@8.5.0) micromark: 2.11.4 micromark-extension-mdx-expression: 0.3.2 micromark-extension-mdx-jsx: 0.3.3 @@ -17375,8 +17421,8 @@ packages: /micromark-extension-mdxjs@1.0.0: resolution: {integrity: sha512-TZZRZgeHvtgm+IhtgC2+uDMR7h8eTKF0QUX9YsgoL9+bADBpBY6SiLvWqnBlLbCEevITmTqmEuY3FoxMKVs1rQ==} dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.5.0 + acorn-jsx: 5.3.2(acorn@8.5.0) micromark-extension-mdx-expression: 1.0.4 micromark-extension-mdx-jsx: 1.0.3 micromark-extension-mdx-md: 1.0.0 @@ -17620,7 +17666,6 @@ packages: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} hasBin: true - dev: true /mimic-fn@1.2.0: resolution: {integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==} @@ -17996,6 +18041,51 @@ packages: resolution: {integrity: sha1-yobR/ogoFpsBICCOPchCS524NCw=} dev: true + /next@14.2.1(@babel/core@7.22.5)(@opentelemetry/api@1.4.1)(@playwright/test@1.19.2)(react-dom@18.2.0)(react@18.2.0)(sass@1.54.0): + resolution: {integrity: sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + sass: + optional: true + dependencies: + '@next/env': 14.2.1 + '@opentelemetry/api': 1.4.1 + '@playwright/test': 1.19.2 + '@swc/helpers': 0.5.5 + busboy: 1.6.0 + caniuse-lite: 1.0.30001579 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + sass: 1.54.0 + styled-jsx: 5.1.1(@babel/core@7.22.5)(react@18.2.0) + optionalDependencies: + '@next/swc-darwin-arm64': 14.2.1 + '@next/swc-darwin-x64': 14.2.1 + '@next/swc-linux-arm64-gnu': 14.2.1 + '@next/swc-linux-arm64-musl': 14.2.1 + '@next/swc-linux-x64-gnu': 14.2.1 + '@next/swc-linux-x64-musl': 14.2.1 + '@next/swc-win32-arm64-msvc': 14.2.1 + '@next/swc-win32-ia32-msvc': 14.2.1 + '@next/swc-win32-x64-msvc': 14.2.1 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + dev: false + /nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true @@ -19179,7 +19269,6 @@ packages: /pend@1.2.0: resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} - dev: true /performance-now@2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} @@ -19241,7 +19330,6 @@ packages: /pirates@4.0.4: resolution: {integrity: sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==} engines: {node: '>= 6'} - dev: true /pirates@4.0.5: resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==} @@ -19252,7 +19340,6 @@ packages: hasBin: true dependencies: pngjs: 4.0.1 - dev: true /pixrem@5.0.0: resolution: {integrity: sha512-ugJ4Imy92u55zeznaN/5d7iqOBIZjZ7q10/T+dcd0IuFtbLlsGDvAUabFu1cafER+G9f0T1WtTqvzm4KAdcDgQ==} @@ -19282,7 +19369,6 @@ packages: engines: {node: '>=8'} dependencies: find-up: 3.0.0 - dev: true /platform@1.3.6: resolution: {integrity: sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==} @@ -19322,7 +19408,6 @@ packages: - bufferutil - supports-color - utf-8-validate - dev: true /playwright-core@1.41.2: resolution: {integrity: sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==} @@ -19354,12 +19439,10 @@ packages: /pngjs@4.0.1: resolution: {integrity: sha512-rf5+2/ioHeQxR6IxuYNYGFytUyG3lma/WW1nsmjeHlWwtb2aByla6dkVc8pmJ9nplzkTA0q2xx7mMWrOTqT4Gg==} engines: {node: '>=8.0.0'} - dev: true /pngjs@6.0.0: resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==} engines: {node: '>=12.13.0'} - dev: true /posix-character-classes@0.1.1: resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==} @@ -20598,7 +20681,6 @@ packages: ansi-regex: 5.0.1 ansi-styles: 5.2.0 react-is: 17.0.2 - dev: true /pretty-format@29.5.0: resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==} @@ -20648,7 +20730,6 @@ packages: /progress@2.0.3: resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} engines: {node: '>=0.4.0'} - dev: true /promise-inflight@1.0.1: resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} @@ -20726,7 +20807,6 @@ packages: graceful-fs: 4.2.11 retry: 0.12.0 signal-exit: 3.0.7 - dev: true /property-information@5.6.0: resolution: {integrity: sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==} @@ -20794,7 +20874,6 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: true /prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} @@ -21051,7 +21130,6 @@ packages: /react-is@17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - dev: true /react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} @@ -21741,7 +21819,6 @@ packages: /reselect@4.1.8: resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==} - dev: true /resolve-cwd@3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} @@ -21897,7 +21974,6 @@ packages: /retry@0.12.0: resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} engines: {node: '>= 4'} - dev: true /retry@0.13.1: resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} @@ -22532,7 +22608,6 @@ packages: /smart-buffer@4.2.0: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - dev: true /snake-case@3.0.4: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} @@ -22595,7 +22670,6 @@ packages: socks: 2.7.1 transitivePeerDependencies: - supports-color - dev: true /socks@2.7.1: resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==} @@ -22603,7 +22677,6 @@ packages: dependencies: ip: 2.0.0 smart-buffer: 4.2.0 - dev: true /sort-keys@2.0.0: resolution: {integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=} @@ -22651,7 +22724,6 @@ packages: resolution: {integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==} dependencies: source-map: 0.5.7 - dev: true /source-map-support@0.5.13: resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} @@ -22816,14 +22888,12 @@ packages: engines: {node: '>=10'} dependencies: escape-string-regexp: 2.0.0 - dev: true /stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} dependencies: escape-string-regexp: 2.0.0 - dev: true /stacktrace-parser@0.1.10: resolution: {integrity: sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==} @@ -23591,7 +23661,7 @@ packages: hasBin: true dependencies: '@jridgewell/source-map': 0.3.3 - acorn: 8.11.3 + acorn: 8.10.0 commander: 2.20.0 source-map-support: 0.5.20 @@ -23600,7 +23670,7 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - acorn: 8.11.3 + acorn: 8.5.0 commander: 2.20.0 source-map: 0.7.4 source-map-support: 0.5.20 @@ -24896,7 +24966,7 @@ packages: hasBin: true dependencies: '@discoveryjs/json-ext': 0.5.7 - acorn: 8.11.3 + acorn: 8.5.0 acorn-walk: 8.2.0 commander: 7.2.0 debounce: 1.2.1 @@ -24980,8 +25050,8 @@ packages: '@webassemblyjs/ast': 1.11.6 '@webassemblyjs/wasm-edit': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) browserslist: 4.22.2 chrome-trace-event: 1.0.2 enhanced-resolve: 5.16.0 @@ -25316,7 +25386,6 @@ packages: optional: true utf-8-validate: optional: true - dev: true /xdg-basedir@3.0.0: resolution: {integrity: sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ==} @@ -25449,13 +25518,11 @@ packages: dependencies: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 - dev: true /yazl@2.5.1: resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==} dependencies: buffer-crc32: 0.2.13 - dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} @@ -25476,8 +25543,8 @@ 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-240417.2': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240417.2} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240416.1': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240416.1} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: diff --git a/test/turbopack-dev-tests-manifest.json b/test/turbopack-dev-tests-manifest.json index 82341f204a35c9..3162c396c2852c 100644 --- a/test/turbopack-dev-tests-manifest.json +++ b/test/turbopack-dev-tests-manifest.json @@ -977,13 +977,12 @@ "ReactRefreshRequire app provides fresh value for exports.* in parents", "ReactRefreshRequire app provides fresh value for module.exports in parents", "ReactRefreshRequire app runs dependencies before dependents", - "ReactRefreshRequire app stops update propagation after module-level errors" - ], - "failed": [ + "ReactRefreshRequire app stops update propagation after module-level errors", "ReactRefreshRequire app propagates a hot update to closest accepted module", "ReactRefreshRequire app propagates hot update to all inverse dependencies", "ReactRefreshRequire app re-runs accepted modules" ], + "failed": [], "pending": [ "ReactRefreshRequire app propagates a module that stops accepting in next version" ], @@ -1326,13 +1325,12 @@ "ReactRefreshRequire provides fresh value for exports.* in parents", "ReactRefreshRequire provides fresh value for module.exports in parents", "ReactRefreshRequire runs dependencies before dependents", - "ReactRefreshRequire stops update propagation after module-level errors" - ], - "failed": [ + "ReactRefreshRequire stops update propagation after module-level errors", "ReactRefreshRequire propagates a hot update to closest accepted module", "ReactRefreshRequire propagates hot update to all inverse dependencies", "ReactRefreshRequire re-runs accepted modules" ], + "failed": [], "pending": [], "flakey": [], "runtimeError": false