fix: populate Netlify global before customer code (#1643)

* fix: populate Netlify global before customer code * Update tests/v2api.test.ts Co-authored-by: Eduardo Bouças <[email protected]> --------- Co-authored-by: Eduardo Bouças <[email protected]>
netlify · Nov 3, 2023 · 97992ee · 97992ee · github-actions · Nov 3, 2023
1 parent a01ecdb
commit 97992ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@babel/parser": "^7.22.5",
     "@babel/types": "7.23.0",
     "@netlify/binary-info": "^1.0.0",
-    "@netlify/serverless-functions-api": "^1.10.1",
+    "@netlify/serverless-functions-api": "^1.11.0",
     "@vercel/nft": "^0.23.0",
     "archiver": "^6.0.0",
     "common-path-prefix": "^3.0.0",

diff --git a/src/runtimes/node/utils/entry_file.ts b/src/runtimes/node/utils/entry_file.ts
@@ -31,13 +31,12 @@ const getEntryFileContents = (
 
   if (runtimeAPIVersion === 2) {
     return [
-      `import * as func from '${importPath}'`,
       `import * as bootstrap from './${BOOTSTRAP_FILE_NAME}'`,
+      `import * as func from '${importPath}'`,
 
       // See https://esbuild.github.io/content-types/#default-interop.
       'const funcModule = typeof func.default === "function" ? func : func.default',
 
-      `global.Netlify = bootstrap.getNetlifyGlobal()`,
       `export const handler = bootstrap.getLambdaHandler(funcModule)`,
     ].join(';')
   }

diff --git a/tests/fixtures-esm/v2-api-environment-variables/function.mjs b/tests/fixtures-esm/v2-api-environment-variables/function.mjs
@@ -1,3 +1,5 @@
+const baz = Netlify.env.get('baz')
+
 export default async () => {
   Netlify.env.set('bar', 'bar!')
 
@@ -10,5 +12,6 @@ export default async () => {
     foo: Netlify.env.has('foo'),
     bar: Netlify.env.get('bar'),
     env: Netlify.env.toObject(),
+    baz,
   })
 }
diff --git a/tests/v2api.test.ts b/tests/v2api.test.ts
@@ -480,6 +480,7 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
       })
 
       vi.stubEnv('foo', 'foo!')
+      vi.stubEnv('baz', 'baz!')
 
       const [{ name: archive, entryFilename }] = files
       const func = await importFunctionFile(`${tmpDir}/${archive}/${entryFilename}`)
@@ -494,6 +495,7 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
         env: expect.objectContaining({
           foo: 'foo!',
         }),
+        baz: 'baz!',
       })
       // bar got set and deleted again
       expect(parsed).not.toHaveProperty('bar')