fix: always look for internal edge functions (#5302)

Author: eduardoboucas

src/lib/edge-functions/internal.cjs

@@ -1,6 +1,6 @@
 // @ts-check
 const { promises: fs } = require('fs')
-const path = require('path')
+const { dirname, join, resolve } = require('path')
 const { cwd } = require('process')
 const { pathToFileURL } = require('url')
 
@@ -30,16 +30,16 @@ const getImportMap = async (importMapPath) => {
 }
 
 const getInternalFunctions = async () => {
-  const internalPath = path.join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
+  const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
-    const stats = await fs.stat(internalPath)
+    const stats = await fs.stat(path)
 
     if (!stats.isDirectory()) {
       throw new Error('Path is not a directory')
     }
 
-    const manifestPath = path.join(internalPath, 'manifest.json')
+    const manifestPath = join(path, 'manifest.json')
     // eslint-disable-next-line import/no-dynamic-require, n/global-require
     const manifest = require(manifestPath)
 
@@ -49,11 +49,11 @@ const getInternalFunctions = async () => {
 
     const data = {
       functions: manifest.functions,
-      path: internalPath,
+      path,
     }
 
     if (manifest.import_map) {
-      const importMapPath = path.resolve(path.dirname(manifestPath), manifest.import_map)
+      const importMapPath = resolve(dirname(manifestPath), manifest.import_map)
       const importMap = await getImportMap(importMapPath)
 
       if (importMap !== null) {
@@ -71,7 +71,7 @@ const getInternalFunctions = async () => {
   } catch {
     return {
       functions: [],
-      path: null,
+      path,
     }
   }
 }

tests/integration/100.command.dev.test.cjs

@@ -751,6 +751,12 @@ test('should respect in-source configuration from edge functions', async (t) =>
         handler: () => new Response('Hello world'),
         name: 'hello',
       })
+      .withEdgeFunction({
+        config: () => ({ path: '/internal-1' }),
+        handler: () => new Response('Hello from an internal function'),
+        internal: true,
+        name: 'internal',
+      })
 
     await builder.buildAsync()
 
@@ -760,6 +766,11 @@ test('should respect in-source configuration from edge functions', async (t) =>
       t.is(res1.statusCode, 200)
       t.is(res1.body, 'Hello world')
 
+      const res2 = await got(`http://localhost:${port}/internal-1`, { throwHttpErrors: false })
+
+      t.is(res2.statusCode, 200)
+      t.is(res2.body, 'Hello from an internal function')
+
       // wait for file watcher to be up and running, which might take a little
       // if we do not wait, the next file change will not be picked up
       await pause(500)
@@ -770,18 +781,33 @@ test('should respect in-source configuration from edge functions', async (t) =>
           handler: () => new Response('Hello world'),
           name: 'hello',
         })
+        .withEdgeFunction({
+          config: () => ({ path: '/internal-2' }),
+          handler: () => new Response('Hello from an internal function'),
+          internal: true,
+          name: 'internal',
+        })
         .buildAsync()
 
       await waitForLogMatching('Reloaded edge function')
 
-      const res2 = await got(`http://localhost:${port}/hello-1`, { throwHttpErrors: false })
+      const res3 = await got(`http://localhost:${port}/hello-1`, { throwHttpErrors: false })
+
+      t.is(res3.statusCode, 404)
+
+      const res4 = await got(`http://localhost:${port}/hello-2`, { throwHttpErrors: false })
+
+      t.is(res4.statusCode, 200)
+      t.is(res4.body, 'Hello world')
+
+      const res5 = await got(`http://localhost:${port}/internal-1`, { throwHttpErrors: false })
 
-      t.is(res2.statusCode, 404)
+      t.is(res5.statusCode, 404)
 
-      const res3 = await got(`http://localhost:${port}/hello-2`, { throwHttpErrors: false })
+      const res6 = await got(`http://localhost:${port}/internal-2`, { throwHttpErrors: false })
 
-      t.is(res3.statusCode, 200)
-      t.is(res3.body, 'Hello world')
+      t.is(res6.statusCode, 200)
+      t.is(res6.body, 'Hello from an internal function')
     })
   })
 })