Streaming SSR: Fix RWJS_EXP_SSR_GRAPHQL_ENDPOINT logic (#9134)

Tobbe · web-flow · commit ae11f69df494 · 2023-09-04T22:56:30.000Z
Prefer `RWJS_EXP_SSR_GRAPHQL_ENDPOINT` if it's set. Fallback to
`proxiedApiUrl` if not.
diff --git a/packages/vite/src/streaming/registerGlobals.ts b/packages/vite/src/streaming/registerGlobals.ts
@@ -34,6 +34,9 @@ export const registerFwGlobals = () => {
         return apiPath
       } else {
         const proxiedApiUrl =
+          // NOTE: rwConfig.web.host defaults to "localhost", which is
+          //       troublesome in regards to IPv6/IPv4. So all the more
+          //       reason to set RWJS_EXP_SSR_GRAPHQL_ENDPOINT
           'http://' + rwConfig.web.host + ':' + rwConfig.web.port + apiPath
 
         if (
@@ -52,7 +55,7 @@ export const registerFwGlobals = () => {
           console.warn()
 
           console.warn(
-            'You can override this for by setting RWJS_EXP_SSR_GRAPHQL_ENDPOINT in your environment vars'
+            'You can override this for SSR by setting RWJS_EXP_SSR_GRAPHQL_ENDPOINT in your environment vars'
           )
           console.warn()
 
@@ -62,7 +65,7 @@ export const registerFwGlobals = () => {
         }
 
         return (
-          proxiedApiUrl || (process.env.RWJS_EXP_SSR_GRAPHQL_ENDPOINT as string)
+          (process.env.RWJS_EXP_SSR_GRAPHQL_ENDPOINT as string) ?? proxiedApiUrl
         )
       }
     })(),

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ export const registerFwGlobals = () => {`
`34`	`34`	`return apiPath`
`35`	`35`	`} else {`
`36`	`36`	`const proxiedApiUrl =`
	`37`	`+ // NOTE: rwConfig.web.host defaults to "localhost", which is`
	`38`	`+ // troublesome in regards to IPv6/IPv4. So all the more`
	`39`	`+ // reason to set RWJS_EXP_SSR_GRAPHQL_ENDPOINT`
`37`	`40`	`'http://' + rwConfig.web.host + ':' + rwConfig.web.port + apiPath`
`38`	`41`
`39`	`42`	`if (`
`@@ -52,7 +55,7 @@ export const registerFwGlobals = () => {`
`52`	`55`	`console.warn()`
`53`	`56`
`54`	`57`	`console.warn(`
`55`		`- 'You can override this for by setting RWJS_EXP_SSR_GRAPHQL_ENDPOINT in your environment vars'`
	`58`	`+ 'You can override this for SSR by setting RWJS_EXP_SSR_GRAPHQL_ENDPOINT in your environment vars'`
`56`	`59`	`)`
`57`	`60`	`console.warn()`
`58`	`61`
`@@ -62,7 +65,7 @@ export const registerFwGlobals = () => {`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`return (`
`65`		`- proxiedApiUrl \|\| (process.env.RWJS_EXP_SSR_GRAPHQL_ENDPOINT as string)`
	`68`	`+ (process.env.RWJS_EXP_SSR_GRAPHQL_ENDPOINT as string) ?? proxiedApiUrl`
`66`	`69`	`)`
`67`	`70`	`}`
`68`	`71`	`})(),`