From 761428b8a4ef757262ac95ca9be35fd137ac410a Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Sun, 17 Oct 2021 09:38:55 +0100
Subject: [PATCH] feat: persistent builders for all

---
 package-lock.json                |  1 -
 package.json                     |  1 -
 src/constants.js                 |  4 ----
 src/helpers/config.js            |  4 ++--
 src/helpers/functions.js         |  4 ++--
 test/__snapshots__/index.js.snap | 18 +++++++++---------
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4792afccd9..e317e3f3a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
         "@netlify/ipx": "^0.0.7",
         "@vercel/node": "^1.11.2-canary.4",
         "chalk": "^4.1.2",
-        "destr": "^1.1.0",
         "fs-extra": "^10.0.0",
         "moize": "^6.1.0",
         "outdent": "^0.8.0",
diff --git a/package.json b/package.json
index 081f5248dd..e2ec0530ef 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
     "@netlify/ipx": "^0.0.7",
     "@vercel/node": "^1.11.2-canary.4",
     "chalk": "^4.1.2",
-    "destr": "^1.1.0",
     "fs-extra": "^10.0.0",
     "moize": "^6.1.0",
     "outdent": "^0.8.0",
diff --git a/src/constants.js b/src/constants.js
index c5fcdcdeff..6225993605 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,9 +1,6 @@
-const destr = require('destr')
-
 const HANDLER_FUNCTION_NAME = '___netlify-handler'
 const ODB_FUNCTION_NAME = '___netlify-odb-handler'
 const IMAGE_FUNCTION_NAME = '_ipx'
-const ODB_PATH = destr(process.env.EXPERIMENTAL_PERSISTENT_BUILDERS) ? 'builders' : 'functions'
 
 // These are paths in .next that shouldn't be publicly accessible
 const HIDDEN_PATHS = [
@@ -23,5 +20,4 @@ module.exports = {
   IMAGE_FUNCTION_NAME,
   HANDLER_FUNCTION_NAME,
   ODB_FUNCTION_NAME,
-  ODB_PATH,
 }
diff --git a/src/helpers/config.js b/src/helpers/config.js
index 19e8a9ab56..bc703e3527 100644
--- a/src/helpers/config.js
+++ b/src/helpers/config.js
@@ -7,9 +7,9 @@ const defaultFailBuild = (message, { error }) => {
   throw new Error(`${message}\n${error && error.stack}`)
 }
 
-const { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, HIDDEN_PATHS, ODB_PATH } = require('../constants')
+const { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, HIDDEN_PATHS } = require('../constants')
 
-const ODB_FUNCTION_PATH = `/.netlify/${ODB_PATH}/${ODB_FUNCTION_NAME}`
+const ODB_FUNCTION_PATH = `/.netlify/builders/${ODB_FUNCTION_NAME}`
 const HANDLER_FUNCTION_PATH = `/.netlify/functions/${HANDLER_FUNCTION_NAME}`
 
 const CATCH_ALL_REGEX = /\/\[\.{3}(.*)](.json)?$/
diff --git a/src/helpers/functions.js b/src/helpers/functions.js
index b345826c27..84eb019703 100644
--- a/src/helpers/functions.js
+++ b/src/helpers/functions.js
@@ -2,7 +2,7 @@ const { join, relative } = require('path')
 
 const { copyFile, ensureDir, writeFile, writeJSON } = require('fs-extra')
 
-const { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, IMAGE_FUNCTION_NAME, ODB_PATH } = require('../constants')
+const { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, IMAGE_FUNCTION_NAME } = require('../constants')
 const getHandler = require('../templates/getHandler')
 const { getPageResolver } = require('../templates/getPageResolver')
 
@@ -78,7 +78,7 @@ exports.setupImageFunction = async ({
     },
     {
       from: `${basePath}/${IMAGE_FUNCTION_NAME}/*`,
-      to: `/.netlify/${ODB_PATH}/${IMAGE_FUNCTION_NAME}`,
+      to: `/.netlify/builders/${IMAGE_FUNCTION_NAME}`,
       status: 200,
     },
   )
diff --git a/test/__snapshots__/index.js.snap b/test/__snapshots__/index.js.snap
index b6d5f1b315..f4a7b8d35b 100644
--- a/test/__snapshots__/index.js.snap
+++ b/test/__snapshots__/index.js.snap
@@ -81,7 +81,7 @@ Array [
   Object {
     "from": "/_ipx/*",
     "status": 200,
-    "to": "/.netlify/functions/_ipx",
+    "to": "/.netlify/builders/_ipx",
   },
   Object {
     "force": true,
@@ -162,42 +162,42 @@ Array [
   Object {
     "from": "/getStaticProps/withFallback/:slug/*",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/_next/data/build-id/getStaticProps/withFallback/:slug/*",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/getStaticProps/withFallback/:id",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/_next/data/build-id/getStaticProps/withFallback/:id.json",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/getStaticProps/withFallbackBlocking/:id",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/_next/data/build-id/getStaticProps/withFallbackBlocking/:id.json",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/getStaticProps/withRevalidate/withFallback/:id",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/_next/data/build-id/getStaticProps/withRevalidate/withFallback/:id.json",
     "status": 200,
-    "to": "/.netlify/functions/___netlify-odb-handler",
+    "to": "/.netlify/builders/___netlify-odb-handler",
   },
   Object {
     "from": "/*",