Use this.rootContext instead of webpack internals

Ensures the root context is read from the public API that webpack exposes. This is the first step for Turbopack support as Turbopack includes `this.rootContext` as well
blitz-js · Mar 15, 2024 · 20309bc · 20309bc
1 parent 744242f
commit 20309bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 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
@@ -14,11 +14,10 @@ import {getResolverConfig} from "../../parsers/parse-rpc-config"
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
 
 export async function loader(this: Loader, input: string): Promise<string> {
-  const compiler = this._compiler!
   const id = this.resource
-  const root = this._compiler!.context
+  const root = this.rootContext
 
-  const isSSR = compiler.name === "server"
+  const isSSR = this._compiler.name === "server"
   if (!isSSR) {
     return await transformBlitzRpcResolverClient(
       input,

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
@@ -13,11 +13,10 @@ import {posix} from "path"
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
 
 export async function loader(this: Loader, input: string): Promise<string> {
-  const compiler = this._compiler!
   const id = this.resource
-  const root = this._compiler!.context
+  const root = this.rootContext
 
-  const isSSR = compiler.name === "server"
+  const isSSR = this._compiler.name === "server"
   if (isSSR) {
     return await transformBlitzRpcResolverServer(
       input,

diff --git a/packages/blitz-rpc/src/server/loader/server/loader-server.ts b/packages/blitz-rpc/src/server/loader/server/loader-server.ts
@@ -14,12 +14,11 @@ import {
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
 
 export async function loader(this: Loader, input: string): Promise<string> {
-  const compiler = this._compiler!
   const id = this.resource
-  const root = this._compiler!.context
+  const root = this.rootContext
   const rpcFolders = this.query.includeRPCFolders ? this.query.includeRPCFolders : []
 
-  const isSSR = compiler.name === "server"
+  const isSSR = this._compiler.name === "server"
   if (isSSR) {
     this.cacheable(false)
 

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