fix: use platform-agnostic paths, and add test to be sure (#736)

* fix: use platform-agnostic paths, and add test to be sure

* chore: release 4.0.0-beta.3

Release-as: 4.0.0-beta.3

Author: ascorbic

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",

src/helpers/config.js

@@ -1,6 +1,7 @@
 // @ts-check
 const { readJSON } = require('fs-extra')
 const { join, dirname, relative } = require('pathe')
+const slash = require('slash')
 
 const defaultFailBuild = (message, { error }) => {
   throw new Error(`${message}\n${error && error.stack}`)
@@ -131,7 +132,7 @@ exports.configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) =>
       `${publish}/serverless/**`,
       `${publish}/*.json`,
       `${publish}/BUILD_ID`,
-      ...ignore.map((path) => `!${path}`),
+      ...ignore.map((path) => `!${slash(path)}`),
     )
 
     const nextRoot = resolveModuleRoot('next')

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')

test/index.js

@@ -1,4 +1,4 @@
-const { writeJSON, unlink, existsSync, readFileSync, copy, ensureDir } = require('fs-extra')
+const { writeJSON, unlink, existsSync, readFileSync, copy, ensureDir, readJson } = require('fs-extra')
 const path = require('path')
 const process = require('process')
 const os = require('os')
@@ -41,10 +41,19 @@ const changeCwd = function (cwd) {
 const onBuildHasRun = (netlifyConfig) =>
   Boolean(netlifyConfig.functions[HANDLER_FUNCTION_NAME]?.included_files?.some((file) => file.includes('BUILD_ID')))
 
+const rewriteAppDir = async function () {
+  const manifest = path.join('.next', 'required-server-files.json')
+  const manifestContent = await readJson(manifest)
+  manifestContent.appDir = process.cwd()
+
+  await writeJSON(manifest, manifestContent)
+}
+
 // Move .next from sample project to current directory
 const moveNextDist = async function () {
   await stubModules(['next', 'sharp'])
   await copy(path.join(SAMPLE_PROJECT_DIR, '.next'), path.join(process.cwd(), '.next'))
+  await rewriteAppDir()
 }
 
 const stubModules = async function (modules) {
@@ -231,6 +240,25 @@ describe('onBuild()', () => {
     expect(readFileSync(handlerPagesFile, 'utf8')).toMatchSnapshot()
     expect(readFileSync(odbHandlerPagesFile, 'utf8')).toMatchSnapshot()
   })
+
+  test('generates entrypoints with correct references', async () => {
+    await moveNextDist()
+    await plugin.onBuild(defaultArgs)
+
+    const handlerFile = path.join(
+      constants.INTERNAL_FUNCTIONS_SRC,
+      HANDLER_FUNCTION_NAME,
+      `${HANDLER_FUNCTION_NAME}.js`,
+    )
+    const odbHandlerFile = path.join(constants.INTERNAL_FUNCTIONS_SRC, 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', () => {