From 6e5bb52276cb082da983b8c621ea03b2d837f977 Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Mon, 25 Oct 2021 16:40:45 +0100
Subject: [PATCH 1/2] fix: use platform-agnostic paths, and add test to be sure

---
 package.json             |  2 +-
 src/helpers/functions.js |  3 +--
 test/index.js            | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ad899a95f7..cd6d2d4fc4 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,8 @@
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
     "moize": "^6.1.0",
-    "node-stream-zip": "^1.15.0",
     "node-fetch": "^2.6.5",
+    "node-stream-zip": "^1.15.0",
     "outdent": "^0.8.0",
     "p-limit": "^3.1.0",
     "pathe": "^0.2.0",
diff --git a/src/helpers/functions.js b/src/helpers/functions.js
index 84eb019703..76211cd9ff 100644
--- a/src/helpers/functions.js
+++ b/src/helpers/functions.js
@@ -1,6 +1,5 @@
-const { join, relative } = require('path')
-
 const { copyFile, ensureDir, writeFile, writeJSON } = require('fs-extra')
+const { join, relative } = require('pathe')
 
 const { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, IMAGE_FUNCTION_NAME } = require('../constants')
 const getHandler = require('../templates/getHandler')
diff --git a/test/index.js b/test/index.js
index aca72c260b..f97cf1ca76 100644
--- a/test/index.js
+++ b/test/index.js
@@ -223,6 +223,30 @@ describe('onBuild()', () => {
     expect(readFileSync(handlerPagesFile, 'utf8')).toMatchSnapshot()
     expect(readFileSync(odbHandlerPagesFile, 'utf8')).toMatchSnapshot()
   })
+
+  test('generates entrypoints with correct references', async () => {
+    const handlerFile = path.join(
+      SAMPLE_PROJECT_DIR,
+      '.netlify',
+      'functions-internal',
+      HANDLER_FUNCTION_NAME,
+      `${HANDLER_FUNCTION_NAME}.js`,
+    )
+    const odbHandlerFile = path.join(
+      SAMPLE_PROJECT_DIR,
+      '.netlify',
+      'functions-internal',
+      ODB_FUNCTION_NAME,
+      `${ODB_FUNCTION_NAME}.js`,
+    )
+    expect(existsSync(handlerFile)).toBeTruthy()
+    expect(existsSync(odbHandlerFile)).toBeTruthy()
+
+    expect(readFileSync(handlerFile, 'utf8')).toMatch(`(config, "../../..", pageRoot, staticManifest)`)
+    expect(readFileSync(odbHandlerFile, 'utf8')).toMatch(`(config, "../../..", pageRoot, staticManifest)`)
+    expect(readFileSync(handlerFile, 'utf8')).toMatch(`require("../../../.next/required-server-files.json")`)
+    expect(readFileSync(odbHandlerFile, 'utf8')).toMatch(`require("../../../.next/required-server-files.json")`)
+  })
 })
 
 describe('onPostBuild', () => {

From 78ce9988bcaab43f1fb879c45269cd2bf3d76b65 Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Tue, 26 Oct 2021 09:40:36 +0100
Subject: [PATCH 2/2] chore: release 4.0.0-beta.3

Release-as: 4.0.0-beta.3