fix!: execute user and integrations edge functions in the correct ord…

…er (#5624)

* fix: correctly execute user and integrations edge functions in the right order

* chore: fix types

* chore: add test for order of edge-functions

* chore: enable featureflag

.eslintrc.cjs

@@ -4,6 +4,7 @@ module.exports = {
   extends: '@netlify/eslint-config-node',
   plugins: ['sort-destructure-keys'],
   parserOptions: {
+    ecmaVersion: '2020',
     babelOptions: {
       parserOpts: {
         sourceType: 'unambiguous',
@@ -80,6 +81,7 @@ module.exports = {
     {
       files: ['src/**/*.mjs', 'bin/**/*.mjs'],
       parserOptions: {
+        ecmaVersion: '2020',
         sourceType: 'module',
         babelOptions: {
           parserOpts: {

.gitignore

@@ -18,7 +18,7 @@ vendor
 .DS_STORE
 
 # Local Netlify folder
-.netlify
+/.netlify
 
 # site
 test-site

src/lib/edge-functions/proxy.mjs

@@ -79,11 +79,12 @@ export const initializeProxy = async ({
   const server = prepareServer({
     config,
     configPath,
-    directories: [internalFunctionsPath, userFunctionsPath].filter(Boolean),
+    directory: userFunctionsPath,
     env: configEnv,
     getUpdatedConfig,
     importMaps: [importMap].filter(Boolean),
     inspectSettings,
+    internalDirectory: internalFunctionsPath,
     internalFunctions,
     port: isolatePort,
     projectDir,
@@ -153,11 +154,12 @@ export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
 const prepareServer = async ({
   config,
   configPath,
-  directories,
+  directory,
   env: configEnv,
   getUpdatedConfig,
   importMaps,
   inspectSettings,
+  internalDirectory,
   internalFunctions,
   port,
   projectDir,
@@ -187,9 +189,10 @@ const prepareServer = async ({
       bundler,
       config,
       configPath,
-      directories,
+      directories: [directory].filter(Boolean),
       env: configEnv,
       getUpdatedConfig,
+      internalDirectories: [internalDirectory].filter(Boolean),
       internalFunctions,
       projectDir,
       runIsolate,