Turbopack: Implement HMR in next-api

Cargo.toml

@@ -46,11 +46,11 @@ swc_core = { version = "0.79.70" }
 testing = { version = "0.33.24" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230829.2" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230829.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230829.2" }
 
 # General Deps
 

packages/next-swc/crates/next-api/src/middleware.rs

@@ -214,6 +214,6 @@ impl Endpoint for MiddlewareEndpoint {
 
     #[turbo_tasks::function]
     fn client_changed(self: Vc<Self>) -> Vc<Completion> {
-        Completion::new()
+        Completion::immutable()
     }
 }

packages/next-swc/crates/next-api/src/project.rs

@@ -586,7 +586,7 @@ impl Project {
         Ok(self
             .await?
             .versioned_content_map
-            .get(self.client_root().join(identifier)))
+            .get(self.client_relative_path().join(identifier)))
     }
 
     #[turbo_tasks::function]

packages/next-swc/crates/next-core/js/package.json

@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230829.2",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

packages/next-swc/crates/next-core/js/src/dev/client.ts

@@ -1,10 +1,15 @@
 import { connect } from '@vercel/turbopack-ecmascript-runtime/dev/client/hmr-client'
-import { connectHMR } from '@vercel/turbopack-ecmascript-runtime/dev/client/websocket'
+import {
+  connectHMR,
+  addMessageListener,
+  sendMessage,
+} from '@vercel/turbopack-ecmascript-runtime/dev/client/websocket'
 import { register, ReactDevOverlay } from '../overlay/client'
 
 export function initializeHMR(options: { assetPrefix: string }) {
   connect({
-    assetPrefix: options.assetPrefix,
+    addMessageListener,
+    sendMessage,
   })
   connectHMR({
     assetPrefix: options.assetPrefix,