Fix where we do the override

ballercat · Mar 7, 2024 · 644be37 · 644be37
1 parent 3e810e6
commit 644be37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/recipes/nextjs-graphql-example/.jambox/default.tape.zip b/recipes/nextjs-graphql-example/.jambox/default.tape.zip
diff --git a/recipes/nextjs-graphql-example/pages/server-render.js b/recipes/nextjs-graphql-example/pages/server-render.js
@@ -48,7 +48,10 @@ export default function ServerRenderPage({data: initialData}) {
       </div>
       <div>
         {data ? (
-          <img src={data.pokemon.image} alt={data.pokemon.name} />
+          <>
+            <h2>{data.pokemon.name}</h2>
+            <img src={data.pokemon.image} alt={data.pokemon.name} />
+          </>
         ) : loading ? (
           <p>Loading…</p>
         ) : (

diff --git a/src/entrypoint.mjs b/src/entrypoint.mjs
@@ -9,7 +9,6 @@ import launchServer from './server-launcher.mjs';
 import Config from './Config.mjs';
 import { parseArgs, JAMBOX_FLAGS } from './parse-args.mjs';
 import { createDebug } from './diagnostics.js';
-import * as Undici from 'undici';
 
 const debug = createDebug();
 
@@ -63,14 +62,6 @@ export default async function cli(options) {
     };
   }
 
-  // Configure "native" `fetch` (e.g. `globalThis.fetch` in Node.js)
-  // to work with the `global-agent` proxy
-  // @see: https://github.com/gajus/global-agent/issues/52#issuecomment-1134525621
-  const ProxyAgent = Undici.ProxyAgent;
-  const setGlobalDispatcher = Undici.setGlobalDispatcher;
-
-  setGlobalDispatcher(new ProxyAgent(info.proxy.http));
-
   // Launch a (node) script
   spawn(entrypoint, args, {
     cwd,

diff --git a/src/script-helper.js b/src/script-helper.js
@@ -1,2 +1,12 @@
+const undici = require('undici');
 const globalAgent = require('global-agent');
+
 globalAgent.bootstrap();
+
+// Configure "native" `fetch` (e.g. `globalThis.fetch` in Node.js)
+// to work with the `global-agent` proxy
+// @see: https://github.com/gajus/global-agent/issues/52#issuecomment-1134525621
+const ProxyAgent = undici.ProxyAgent;
+const setGlobalDispatcher = undici.setGlobalDispatcher;
+
+setGlobalDispatcher(new ProxyAgent(process.env.GLOBAL_AGENT_HTTP_PROXY));