[do-not-merge] cjs blobs test

cypress/e2e/default/dynamic-routes.cy.ts

@@ -61,12 +61,13 @@ describe('Dynamic Routing', () => {
       expect(res.body).to.contain('Under the Dome')
     })
   })
-  it('renders fallback page via ODB on a non-prerendered dynamic route with fallback: true', () => {
+  it('does not render fallback page via ODB on a non-prerendered dynamic route with fallback: true', () => {
+    // unfortunately there is a problem with `fallback: true` in ODB context - the fallback would be cached indefinitely
+    // so visits to those pages would always render the fallback first and browser client would later re-render with correct
+    // content. As this is not ideal the `fallback: true` is treated as `fallback: blocking`.
     cy.request({ url: '/getStaticProps/withFallback/3/', headers: { 'x-nf-debug-logging': '1' } }).then((res) => {
       expect(res.status).to.eq(200)
-      // expect 'odb' until https://github.com/netlify/pillar-runtime/issues/438 is fixed
       expect(res.headers).to.have.property('x-nf-render-mode', 'odb')
-      // expect 'Bitten' until the above is fixed and we can test for fallback 'Loading...' message
       expect(res.body).to.contain('Bitten')
     })
   })
@@ -115,12 +116,14 @@ describe('Dynamic Routing', () => {
       },
     )
   })
-  it('renders fallback page via ODB on a non-prerendered dynamic route with revalidate and fallback: true', () => {
+  it('does not render fallback page via ODB on a non-prerendered dynamic route with revalidate and fallback: true', () => {
+    // unfortunately there is a problem with `fallback: true` in ODB context - the fallback would be cached indefinitely
+    // so visits to those pages would always render the fallback first and browser client would later re-render with correct
+    // content. As this is not ideal the `fallback: true` is treated as `fallback: blocking`.
     cy.request({ url: '/getStaticProps/withRevalidate/withFallback/3/', headers: { 'x-nf-debug-logging': '1' } }).then(
       (res) => {
         expect(res.status).to.eq(200)
         expect(res.headers).to.have.property('x-nf-render-mode', 'odb ttl=60')
-        // expect 'Bitten' until https://github.com/netlify/pillar-runtime/issues/438 is fixed
         expect(res.body).to.contain('Bitten')
       },
     )

packages/runtime/package.json

@@ -12,6 +12,7 @@
     "manifest.yml"
   ],
   "dependencies": {
+    "@netlify/blobs": "^2.2.0",
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.6.0",
     "@netlify/ipx": "^1.4.5",

packages/runtime/src/constants.ts

@@ -33,6 +33,7 @@ export const HIDDEN_PATHS = destr(process.env.NEXT_KEEP_METADATA_FILES)
       '/prerender-manifest.js',
       '/required-server-files.json',
       '/static-manifest.json',
+      '/blobs-manifest.json',
     ]
 
 export const ODB_FUNCTION_PATH = `/.netlify/builders/${ODB_FUNCTION_NAME}`

packages/runtime/src/helpers/config.ts

@@ -37,6 +37,9 @@ const defaultFailBuild = (message: string, { error }): never => {
 export const getNextConfig = async function getNextConfig({
   publish,
   failBuild = defaultFailBuild,
+}: {
+  publish: string
+  failBuild?: (message: string, { error }) => never
 }): Promise<NextConfig> {
   try {
     const { config, appDir, ignore }: RequiredServerFiles = await readJSON(join(publish, 'required-server-files.json'))