Turbopack support for Blitz

blitz-js · Mar 16, 2024 · f2c4f96 · f2c4f96
1 parent 20309bc
commit f2c4f96
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 9 deletions.
diff --git a/packages/blitz-rpc/src/server/loader/client/loader-client.ts b/packages/blitz-rpc/src/server/loader/client/loader-client.ts
@@ -17,8 +17,21 @@ export async function loader(this: Loader, input: string): Promise<string> {
   const id = this.resource
   const root = this.rootContext
 
-  const isSSR = this._compiler.name === "server"
-  if (!isSSR) {
+  // Webpack has `_compiler` property. Turbopack does not.
+  const webpackCompilerName = this._compiler?.name
+  if (webpackCompilerName) {
+    const isSSR = webpackCompilerName === "server"
+    if (!isSSR) {
+      return await transformBlitzRpcResolverClient(
+        input,
+        toPosixPath(id),
+        toPosixPath(root),
+        this.query,
+      )
+    }
+    // Handle Turbopack / other bundlers case.
+    // The decision of which environment to run the loader in is decided by the loader configuration instead.
+  } else {
     return await transformBlitzRpcResolverClient(
       input,
       toPosixPath(id),

diff --git a/packages/blitz-rpc/src/server/loader/server/loader-server-resolvers.ts b/packages/blitz-rpc/src/server/loader/server/loader-server-resolvers.ts
@@ -16,8 +16,21 @@ export async function loader(this: Loader, input: string): Promise<string> {
   const id = this.resource
   const root = this.rootContext
 
-  const isSSR = this._compiler.name === "server"
-  if (isSSR) {
+  // Webpack has `_compiler` property. Turbopack does not.
+  const webpackCompilerName = this._compiler?.name
+  if (webpackCompilerName) {
+    const isSSR = webpackCompilerName === "server"
+    if (isSSR) {
+      return await transformBlitzRpcResolverServer(
+        input,
+        toPosixPath(id),
+        toPosixPath(root),
+        this.query,
+      )
+    }
+    // Handle Turbopack / other bundlers case.
+    // The decision of which environment to run the loader in is decided by the loader configuration instead.
+  } else {
     return await transformBlitzRpcResolverServer(
       input,
       toPosixPath(id),

diff --git a/packages/blitz-rpc/src/server/loader/server/loader-server.ts b/packages/blitz-rpc/src/server/loader/server/loader-server.ts
@@ -1,4 +1,4 @@
-import {join} from "path"
+import {join, relative} from "path"
 import {promises} from "fs"
 import {
   assertPosixPath,
@@ -18,12 +18,33 @@ export async function loader(this: Loader, input: string): Promise<string> {
   const root = this.rootContext
   const rpcFolders = this.query.includeRPCFolders ? this.query.includeRPCFolders : []
 
-  const isSSR = this._compiler.name === "server"
-  if (isSSR) {
+  // Webpack has `_compiler` property. Turbopack does not.
+  const webpackCompilerName = this._compiler?.name
+  if (webpackCompilerName) {
+    const isSSR = webpackCompilerName === "server"
+    if (isSSR) {
+      this.cacheable(false)
+
+      const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
+
+      return await transformBlitzRpcServer(
+        this.context,
+        input,
+        toPosixPath(id),
+        toPosixPath(root),
+        resolvers,
+        this.query,
+      )
+    }
+    // Handle Turbopack / other bundlers case.
+    // The decision of which environment to run the loader in is decided by the loader configuration instead.
+  } else {
     this.cacheable(false)
 
     const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
+
     return await transformBlitzRpcServer(
+      this.context,
       input,
       toPosixPath(id),
       toPosixPath(root),
@@ -42,6 +63,7 @@ function slash(str: string) {
 }
 
 export async function transformBlitzRpcServer(
+  context: string,
   src: string,
   id: string,
   root: string,
@@ -67,7 +89,7 @@ export async function transformBlitzRpcServer(
 
     code += `__internal_addBlitzRpcResolver('${routePath}','${slash(
       resolverFilePath,
-    )}',() => ${importStrategy}('${slash(resolverFilePath)}'));`
+    )}',() => ${importStrategy}('${slash(relative(context, resolverFilePath))}'));`
     code += "\n"
   }
 

diff --git a/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts b/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts
@@ -9,10 +9,11 @@ export interface LoaderOptions {
 }
 
 export interface Loader {
-  _compiler?: {
+  _compiler: {
     name: string
   }
   rootContext: string
+  context: string
   resource: string
   cacheable: (enabled: boolean) => void
   query: LoaderOptions