fix: give precedence to functions from Frameworks API

Author: eduardoboucas

packages/build/src/plugins_core/functions/index.ts

@@ -92,7 +92,7 @@ const zipFunctionsAndLogResults = async ({
     // Printing an empty line before bundling output.
     log(logs, '')
 
-    const sourceDirectories = [frameworkFunctionsSrc, internalFunctionsSrc, functionsSrc].filter(Boolean)
+    const sourceDirectories = [internalFunctionsSrc, frameworkFunctionsSrc, functionsSrc].filter(Boolean)
     const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters)
 
     validateCustomRoutes(results)

packages/build/tests/functions/fixtures/functions_user_internal_and_frameworks/.netlify/functions-internal/frameworks-internal-conflict.mjs

@@ -0,0 +1,5 @@
+export default () => new Response("Generated in the internal functions directory")
+
+export const config = {
+  path: "/frameworks-internal-conflict/internal"
+}

packages/build/tests/functions/fixtures/functions_user_internal_and_frameworks/frameworks_api_seed/functions/frameworks-internal-conflict.mjs

@@ -0,0 +1,5 @@
+export default () => new Response("Generated by the Frameworks API")
+
+export const config = {
+  path: "/frameworks-internal-conflict/frameworks"
+}

packages/build/tests/functions/fixtures/functions_user_internal_and_frameworks/frameworks_api_seed/functions/frameworks-user-conflict.mjs

@@ -0,0 +1,5 @@
+export default () => new Response("Generated by the Frameworks API")
+
+export const config = {
+  path: "/frameworks-user-conflict/frameworks"
+}

packages/build/tests/functions/fixtures/functions_user_internal_and_frameworks/netlify/functions/frameworks-user-conflict.mjs

@@ -0,0 +1,5 @@
+export default () => new Response("Generated by the user")
+
+export const config = {
+  path: "/frameworks-user-conflict/user"
+}

packages/build/tests/functions/snapshots/tests.js.md

@@ -423,12 +423,16 @@ Generated by [AVA](https://avajs.dev).
     ────────────────────────────────────────────────────────────────␊
     ␊
     Packaging Functions from .netlify/functions-internal directory:␊
+     - frameworks-internal-conflict.mjs␊
      - server-internal.mjs␊
     ␊
     Packaging Functions generated by your framework:␊
+     - frameworks-internal-conflict.mjs␊
+     - frameworks-user-conflict.mjs␊
      - server.mjs␊
     ␊
     Packaging Functions from netlify/functions directory:␊
+     - frameworks-user-conflict.mjs␊
      - user.ts␊
     ␊
     ␊

packages/build/tests/functions/snapshots/tests.js.snap

@@ -1,4 +1,4 @@
-import { readdir, rm, stat, writeFile } from 'fs/promises'
+import { readdir, readFile, rm, stat, writeFile } from 'fs/promises'
 import { resolve } from 'path'
 import { version as nodeVersion } from 'process'
 import { fileURLToPath } from 'url'
@@ -149,6 +149,19 @@ test('Functions: loads functions from the `.netlify/functions-internal` director
   t.true(functionsDist.includes('user.zip'))
   t.true(functionsDist.includes('server-internal.zip'))
 
+  const manifest = await readFile(resolve(fixture.repositoryRoot, '.netlify/functions/manifest.json'), 'utf8')
+  const { functions } = JSON.parse(manifest)
+
+  t.is(functions.length, 5)
+
+  // The Frameworks API takes precedence over the legacy internal directory.
+  const frameworksInternalConflict = functions.find(({ name }) => name === 'frameworks-internal-conflict')
+  t.is(frameworksInternalConflict.routes[0].pattern, '/frameworks-internal-conflict/frameworks')
+
+  // User code takes precedence over the Frameworks API.
+  const frameworksUserConflict = functions.find(({ name }) => name === 'frameworks-user-conflict')
+  t.is(frameworksUserConflict.routes[0].pattern, '/frameworks-user-conflict/user')
+
   t.snapshot(normalizeOutput(output))
 })