updated tsconfig and added dynamic imports

Author: taty2010

package-lock.json

@@ -1,4 +1,4 @@
-import type { Context } from '@netlify/edge-functions'
+// import type { Context } from '@netlify/edge-functions'
 import type { NextURL } from 'next/dist/server/web/next-url'
 import type { NextRequest as InternalNextRequest } from 'next/server'
 
@@ -23,7 +23,7 @@ export interface NextOptions {
  * Supercharge your Next middleware with Netlify Edge Functions
  */
 export class MiddlewareRequest extends Request {
-  context: Context
+  context: any
   originalRequest: Request
 
   constructor(private nextRequest: NextRequest) {

packages/next/src/middleware/request.ts

@@ -18,7 +18,7 @@
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
-    "destr": "^1.1.1",
+    "destr": "^2.0.1",
     "execa": "^5.1.1",
     "follow-redirects": "^1.15.2",
     "fs-extra": "^10.0.0",

packages/runtime/package.json

@@ -1,5 +1,3 @@
-import destr from 'destr'
-
 export const HANDLER_FUNCTION_NAME = '___netlify-handler'
 export const ODB_FUNCTION_NAME = '___netlify-odb-handler'
 export const API_FUNCTION_NAME = '___netlify-api-handler'
@@ -10,8 +8,10 @@ export const HANDLER_FUNCTION_TITLE = 'Next.js SSR handler'
 export const ODB_FUNCTION_TITLE = 'Next.js ISR handler'
 export const API_FUNCTION_TITLE = 'Next.js API handler'
 export const IMAGE_FUNCTION_TITLE = 'next/image handler'
-// These are paths in .next that shouldn't be publicly accessible
-export const HIDDEN_PATHS = destr(process.env.NEXT_KEEP_METADATA_FILES)
+
+const hiddenPaths = async() => {
+  const destr = await import('destr')
+  const paths = destr.destr(process.env.NEXT_KEEP_METADATA_FILES)
   ? []
   : [
       '/cache',
@@ -34,6 +34,11 @@ export const HIDDEN_PATHS = destr(process.env.NEXT_KEEP_METADATA_FILES)
       '/required-server-files.json',
       '/static-manifest.json',
     ]
+  return paths
+}
+
+// These are paths in .next that shouldn't be publicly accessible
+export const HIDDEN_PATHS = hiddenPaths()
 
 export const ODB_FUNCTION_PATH = `/.netlify/builders/${ODB_FUNCTION_NAME}`
 export const HANDLER_FUNCTION_PATH = `/.netlify/functions/${HANDLER_FUNCTION_NAME}`

packages/runtime/src/constants.ts

@@ -1,5 +1,4 @@
 import type { NetlifyConfig } from '@netlify/build'
-import destr from 'destr'
 import { readJSON, writeJSON } from 'fs-extra'
 import type { Header } from 'next/dist/lib/load-custom-routes'
 import type { NextConfigComplete } from 'next/dist/server/config-shared'
@@ -115,13 +114,13 @@ export const configureHandlerFunctions = async ({
   ignore: Array<string>
   apiLambdas: APILambda[]
   ssrLambdas: SSRLambda[]
-  splitApiRoutes: boolean
+  splitApiRoutes: any
 }) => {
   const config = await getRequiredServerFiles(publish)
   const files = config.files || []
   const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`))
-
-  if (!destr(process.env.DISABLE_IPX)) {
+  const destr = await import('destr')
+  if (!destr.destr(process.env.DISABLE_IPX)) {
     netlifyConfig.functions[IMAGE_FUNCTION_NAME] ||= {}
     netlifyConfig.functions[IMAGE_FUNCTION_NAME].node_bundler = 'nft'
   }

packages/runtime/src/helpers/config.ts

@@ -3,7 +3,6 @@ import { resolve, join } from 'path'
 
 import type { NetlifyConfig, NetlifyPluginConstants } from '@netlify/build'
 import { greenBright } from 'chalk'
-import destr from 'destr'
 import { copy, copyFile, emptyDir, ensureDir, readJSON, writeJSON, writeJson } from 'fs-extra'
 import type { PrerenderManifest } from 'next/dist/build'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin'
@@ -381,9 +380,9 @@ export const writeEdgeFunctions = async ({
   await copy(getEdgeTemplatePath('../edge-shared'), join(edgeFunctionRoot, 'edge-shared'))
   await writeJSON(join(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig)
   await copy(join(publish, 'prerender-manifest.json'), join(edgeFunctionRoot, 'edge-shared', 'prerender-manifest.json'))
-
+  const destr = await import('destr')
   // early return if edge is disabled
-  if (destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
+  if (destr.destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
     console.log('Environment variable NEXT_DISABLE_NETLIFY_EDGE has been set, skipping Netlify Edge Function creation.')
     return
   }
@@ -480,9 +479,9 @@ export const writeEdgeFunctions = async ({
   }
 
   if (
-    destr(process.env.NEXT_FORCE_EDGE_IMAGES) &&
-    !destr(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
-    !destr(process.env.DISABLE_IPX)
+    destr.destr(process.env.NEXT_FORCE_EDGE_IMAGES) &&
+    !destr.destr(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
+    !destr.destr(process.env.DISABLE_IPX)
   ) {
     usesEdge = true
     console.log(

packages/runtime/src/helpers/edge.ts

@@ -363,7 +363,8 @@ export const removeMetadataFiles = async (publish: string) => {
   // Limit concurrent deletions to number of cpus or 2 if there is only 1
   const limit = pLimit(Math.max(2, cpus().length))
 
-  const removePromises = HIDDEN_PATHS.map((HIDDEN_PATH) => {
+  // eslint-disable-next-line unicorn/no-await-expression-member
+  const removePromises = (await HIDDEN_PATHS).map((HIDDEN_PATH) => {
     const pathToDelete = join(publish, HIDDEN_PATH)
     return limit(() => remove(pathToDelete))
   })

packages/runtime/src/helpers/files.ts

@@ -1,4 +1,3 @@
-import destr from 'destr'
 import { existsSync } from 'fs-extra'
 import { join } from 'pathe'
 
@@ -17,8 +16,9 @@ import { join } from 'pathe'
  *
  * Disabled by default. Can be overriden using the NEXT_SPLIT_API_ROUTES env var.
  */
-export const splitApiRoutes = (featureFlags: Record<string, unknown>, publish: string): boolean => {
-  const isEnabled = destr(process.env.NEXT_SPLIT_API_ROUTES) ?? featureFlags.next_split_api_routes ?? false
+export const splitApiRoutes = async (featureFlags: Record<string, unknown>, publish: string) => {
+  const destr = await import('destr')
+  const isEnabled = destr.destr(process.env.NEXT_SPLIT_API_ROUTES) ?? featureFlags.next_split_api_routes ?? false
 
   if (isEnabled && !existsSync(join(publish, 'next-server.js.nft.json'))) {
     console.warn(
@@ -30,9 +30,10 @@ export const splitApiRoutes = (featureFlags: Record<string, unknown>, publish: s
   return isEnabled
 }
 
-export const bundleBasedOnNftFiles = (featureFlags: Record<string, unknown>): boolean => {
+export const bundleBasedOnNftFiles = async (featureFlags: Record<string, unknown>) => {
+  const destr = await import('destr')
   const isEnabled =
-    destr(process.env.NEXT_BUNDLE_BASED_ON_NFT_FILES) ?? featureFlags.next_bundle_based_on_nft_files ?? false
+    destr.destr(process.env.NEXT_BUNDLE_BASED_ON_NFT_FILES) ?? featureFlags.next_bundle_based_on_nft_files ?? false
 
   return isEnabled
 }

packages/runtime/src/helpers/flags.ts

@@ -1,14 +1,15 @@
 import type { NetlifyConfig, NetlifyPluginConstants } from '@netlify/build'
 import bridgeFile from '@vercel/node-bridge'
 import chalk from 'chalk'
-import destr from 'destr'
 import { copyFile, ensureDir, existsSync, readJSON, writeFile, writeJSON, stat } from 'fs-extra'
 import { PrerenderManifest } from 'next/dist/build'
 import type { ImageConfigComplete, RemotePattern } from 'next/dist/shared/lib/image-config'
 import { outdent } from 'outdent'
 import { join, relative, resolve, dirname, basename, extname } from 'pathe'
 import glob from 'tiny-glob'
 
+
+
 import {
   HANDLER_FUNCTION_NAME,
   ODB_FUNCTION_NAME,
@@ -21,7 +22,6 @@ import {
   API_FUNCTION_NAME,
   LAMBDA_WARNING_SIZE,
 } from '../constants'
-import { setBlobFiles } from '../templates/blobHandler'
 import { getApiHandler } from '../templates/getApiHandler'
 import { getHandler } from '../templates/getHandler'
 import { getResolverForPages, getResolverForSourceFiles } from '../templates/getPageResolver'
@@ -33,6 +33,7 @@ import { writeFunctionConfiguration } from './functionsMetaData'
 import { pack } from './pack'
 import { ApiRouteType } from './types'
 import { getFunctionNameForPage } from './utils'
+import { async } from 'node-stream-zip'
 
 export interface RouteConfig {
   functionName: string
@@ -211,8 +212,8 @@ export const setupImageFunction = async ({
   responseHeaders?: Record<string, string>
 }): Promise<void> => {
   const imagePath = imageconfig.path || '/_next/image'
-
-  if (destr(process.env.DISABLE_IPX)) {
+  const destr = await import('destr')
+  if (destr.destr(process.env.DISABLE_IPX)) {
     // If no image loader is specified, need to redirect to a 404 page since there's no
     // backing loader to serve local site images once deployed to Netlify
     if (!IS_LOCAL && imageconfig.loader === 'default') {
@@ -401,13 +402,15 @@ export const getSSRLambdas = async (publish: string, constants): Promise<SSRLamb
   const odbRoutes = ssrRoutes
 
   const ssrDependencies = await getSSRDependencies(publish)
+  const netliBlob = await import('../templates/blobHandler.mjs')
+
   // const testDeps = [
   //   '/Users/tatyananovell/Documents/next-runtime/demos/default/.next/server/app/blog/nick.rsc',
   //   '/Users/tatyananovell/Documents/next-runtime/demos/default/.next/server/app/blog/nick.html',
   //   '/Users/tatyananovell/Documents/next-runtime/demos/default/.next/server/app/blog/sarah.rsc',
   // ]
   // moving the ssrDeps to the Blob store so we can access them in templates/getHandler
-  setBlobFiles(constants, ssrDependencies)
+  await netliBlob.setBlobFiles(constants, ssrDependencies)
 
   return [
     {

packages/runtime/src/helpers/functions.ts

@@ -1,6 +1,5 @@
 import type { NetlifyConfig } from '@netlify/build'
 import { yellowBright } from 'chalk'
-import destr from 'destr'
 import { readJSON } from 'fs-extra'
 import type { NextConfig } from 'next'
 import type { PrerenderManifest, SsgRoute } from 'next/dist/build'
@@ -212,43 +211,47 @@ export const generateDynamicRewrites = ({
   const dynamicRewrites: NetlifyConfig['redirects'] = []
   const dynamicRoutesThatMatchMiddleware: Array<string> = []
 
-  dynamicRoutes.forEach((route) => {
-    if (isApiRoute(route.page) || is404Route(route.page, i18n)) {
-      return
-    }
-    if (route.page in prerenderedDynamicRoutes) {
-      if (matchesMiddleware(middleware, route.page)) {
-        dynamicRoutesThatMatchMiddleware.push(route.page)
-      } else if (isAppDirRoute(route.page, appPathRoutes)) {
-        dynamicRewrites.push(
-          ...redirectsForNextRoute({
-            route: route.page,
-            buildId,
-            basePath,
-            to: ODB_FUNCTION_PATH,
-            i18n,
-            dataRoute: prerenderedDynamicRoutes[route.page].dataRoute,
-            withData: true,
-          }),
-        )
-      } else if (
-        prerenderedDynamicRoutes[route.page].fallback === false &&
-        !is404Isr &&
-        !destr(process.env.LEGACY_FALLBACK_FALSE)
-      ) {
-        dynamicRewrites.push(...redirectsForNext404Route({ route: route.page, buildId, basePath, i18n }))
+  const dynamicR = async() => {
+    const destr = await import('destr')
+    dynamicRoutes.forEach((route) => {
+      if (isApiRoute(route.page) || is404Route(route.page, i18n)) {
+        return
+      }
+      if (route.page in prerenderedDynamicRoutes) {
+        if (matchesMiddleware(middleware, route.page)) {
+          dynamicRoutesThatMatchMiddleware.push(route.page)
+        } else if (isAppDirRoute(route.page, appPathRoutes)) {
+          dynamicRewrites.push(
+            ...redirectsForNextRoute({
+              route: route.page,
+              buildId,
+              basePath,
+              to: ODB_FUNCTION_PATH,
+              i18n,
+              dataRoute: prerenderedDynamicRoutes[route.page].dataRoute,
+              withData: true,
+            }),
+          )
+        } else if (
+          prerenderedDynamicRoutes[route.page].fallback === false &&
+          !is404Isr &&
+          !destr.destr(process.env.LEGACY_FALLBACK_FALSE)
+        ) {
+          dynamicRewrites.push(...redirectsForNext404Route({ route: route.page, buildId, basePath, i18n }))
+        } else {
+          dynamicRewrites.push(
+            ...redirectsForNextRoute({ route: route.page, buildId, basePath, to: ODB_FUNCTION_PATH, i18n }),
+          )
+        }
       } else {
+        // If the route isn't prerendered, it's SSR
         dynamicRewrites.push(
-          ...redirectsForNextRoute({ route: route.page, buildId, basePath, to: ODB_FUNCTION_PATH, i18n }),
+          ...redirectsForNextRoute({ route: route.page, buildId, basePath, to: HANDLER_FUNCTION_PATH, i18n }),
         )
       }
-    } else {
-      // If the route isn't prerendered, it's SSR
-      dynamicRewrites.push(
-        ...redirectsForNextRoute({ route: route.page, buildId, basePath, to: HANDLER_FUNCTION_PATH, i18n }),
-      )
-    }
-  })
+    })
+  }
+  dynamicR()
   return {
     dynamicRoutesThatMatchMiddleware,
     dynamicRewrites,

packages/runtime/src/helpers/redirects.ts

@@ -1,5 +1,4 @@
-import type { NetlifyConfig } from '@netlify/build'
-import type { Header } from '@netlify/build/types/config/netlify_config'
+import type { NetlifyConfig, Header } from '@netlify/build'
 import globby from 'globby'
 import type { ExperimentalConfig } from 'next/dist/server/config-shared'
 import type { ImageConfigComplete, RemotePattern } from 'next/dist/shared/lib/image-config'