fix: fixes an issue where the nft tracing was not picking up the runtime node_modules (#74)

* chore: log nft file list

* chore: log metadata

* chore: update

* chore: update

* chore: fix

* chore: update

* chore: fix

* chore: update

* chore: final fix

* chore: cleanup

Author: lukasholzer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/next-runtime",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.19",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",

src/build/functions/server.ts

@@ -1,7 +1,7 @@
 import { NetlifyPluginOptions } from '@netlify/build'
 import { nodeFileTrace } from '@vercel/nft'
 import { cp, rm, writeFile } from 'fs/promises'
-import { join, resolve } from 'node:path'
+import { join, relative, resolve } from 'node:path'
 import {
   PLUGIN_DIR,
   PLUGIN_NAME,
@@ -27,13 +27,27 @@ export const createServerHandler = async ({
       join(PLUGIN_DIR, 'dist/run/handlers/cache.cjs'),
       join(PLUGIN_DIR, 'dist/run/handlers/next.cjs'),
     ],
-    { base: PLUGIN_DIR, ignore: ['package.json', 'node_modules/next/**'] },
+    // base in this case is the directory where it should stop looking up.
+    // by setting this to `/` we get absolute paths and don't have to worry about wrongly chaining it
+    {
+      base: '/',
+      ignore: ['**/node_modules/next/**'],
+    },
   )
 
   // copy the handler dependencies
   await Promise.all(
     [...fileList].map(async (path) => {
-      await cp(resolve(PLUGIN_DIR, path), resolve(SERVER_HANDLER_DIR, path), { recursive: true })
+      // we have to use a fake cwd that points to the actual repository root. On the deployed version this will be the build directory
+      // As in the integration tests the node_modules are not located in the tmp directory
+      const cwd = process.env.NETLIFY_FAKE_TEST_CWD || process.cwd()
+      const absPath = `/${path}`
+      // if the file that got traced is inside the plugin directory resolve it with the plugin directory
+      // if it is a node_module resolve it with the process working directory.
+      const relPath = relative(path.includes(PLUGIN_NAME) ? PLUGIN_DIR : cwd, absPath)
+      await cp(absPath, resolve(SERVER_HANDLER_DIR, relPath), {
+        recursive: true,
+      })
     }),
   )
 

tests/utils/fixture.ts

@@ -95,6 +95,11 @@ export async function runPlugin(
   ctx: FixtureTestContext,
   constants: Partial<NetlifyPluginConstants> = {},
 ) {
+  // this is needed as the node_modules of the runtime are not copied over to the temp directory
+  // so in this case we use the NETLIFY_FAKE_TEST_CWD || process.cwd() that will fallback to the actual cwd on production
+  const repoRoot = fileURLToPath(new URL('../../', import.meta.url))
+  vi.stubEnv('NETLIFY_FAKE_TEST_CWD', repoRoot)
+
   const { onBuild } = await import('../../src/index.js')
   await onBuild({
     constants: {