chore: more cleanup related to going back to commonjs

Author: nickytonline

packages/runtime/src/constants.ts

@@ -1,3 +1,5 @@
+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'
@@ -9,31 +11,30 @@ 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'
 
-const hiddenPaths = async () => {
-  const destr = await import('destr')
-  const paths = destr.destr(process.env.NEXT_KEEP_METADATA_FILES)
+const hiddenPaths = () => {
+  const paths = destr(process.env.NEXT_KEEP_METADATA_FILES)
     ? []
     : [
-        '/cache',
-        '/server',
-        '/serverless',
-        '/trace',
-        '/traces',
-        '/routes-manifest.json',
-        '/build-manifest.json',
-        '/prerender-manifest.json',
-        '/react-loadable-manifest.json',
-        '/BUILD_ID',
-        '/app-build-manifest.json',
-        '/app-path-routes-manifest.json',
-        '/export-marker.json',
-        '/images-manifest.json',
-        '/next-server.js.nft.json',
-        '/package.json',
-        '/prerender-manifest.js',
-        '/required-server-files.json',
-        '/static-manifest.json',
-      ]
+      '/cache',
+      '/server',
+      '/serverless',
+      '/trace',
+      '/traces',
+      '/routes-manifest.json',
+      '/build-manifest.json',
+      '/prerender-manifest.json',
+      '/react-loadable-manifest.json',
+      '/BUILD_ID',
+      '/app-build-manifest.json',
+      '/app-path-routes-manifest.json',
+      '/export-marker.json',
+      '/images-manifest.json',
+      '/next-server.js.nft.json',
+      '/package.json',
+      '/prerender-manifest.js',
+      '/required-server-files.json',
+      '/static-manifest.json',
+    ]
   return paths
 }
 

packages/runtime/src/helpers/config.ts

@@ -1,4 +1,5 @@
 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'
@@ -114,13 +115,13 @@ export const configureHandlerFunctions = async ({
   ignore: Array<string>
   apiLambdas: APILambda[]
   ssrLambdas: SSRLambda[]
-  splitApiRoutes: boolean
+  splitApiRoutes: unknown
 }) => {
   const config = await getRequiredServerFiles(publish)
   const files = config.files || []
   const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`))
-  const destr = await import('destr')
-  if (!destr.destr(process.env.DISABLE_IPX)) {
+
+  if (!destr(process.env.DISABLE_IPX)) {
     netlifyConfig.functions[IMAGE_FUNCTION_NAME] ||= {}
     netlifyConfig.functions[IMAGE_FUNCTION_NAME].node_bundler = 'nft'
   }

packages/runtime/src/helpers/edge.ts

@@ -3,6 +3,7 @@ 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'
@@ -52,19 +53,19 @@ export interface FunctionManifest {
   version: 1
   functions: Array<
     | {
-        function: string
-        name?: string
-        path: string
-        cache?: 'manual'
-        generator: string
-      }
+      function: string
+      name?: string
+      path: string
+      cache?: 'manual'
+      generator: string
+    }
     | {
-        function: string
-        name?: string
-        pattern: string
-        cache?: 'manual'
-        generator: string
-      }
+      function: string
+      name?: string
+      pattern: string
+      cache?: 'manual'
+      generator: string
+    }
   >
   layers?: Array<{ name: `https://${string}/mod.ts`; flag: string }>
   import_map?: string
@@ -380,9 +381,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.destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
+  if (destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
     console.log('Environment variable NEXT_DISABLE_NETLIFY_EDGE has been set, skipping Netlify Edge Function creation.')
     return
   }
@@ -479,9 +480,9 @@ export const writeEdgeFunctions = async ({
   }
 
   if (
-    destr.destr(process.env.NEXT_FORCE_EDGE_IMAGES) &&
-    !destr.destr(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
-    !destr.destr(process.env.DISABLE_IPX)
+    destr(process.env.NEXT_FORCE_EDGE_IMAGES) &&
+    !destr(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
+    !destr(process.env.DISABLE_IPX)
   ) {
     usesEdge = true
     console.log(

packages/runtime/src/helpers/flags.ts

@@ -1,3 +1,4 @@
+import destr from 'destr'
 import { existsSync } from 'fs-extra'
 import { join } from 'pathe'
 
@@ -16,9 +17,8 @@ import { join } from 'pathe'
  *
  * Disabled by default. Can be overriden using the NEXT_SPLIT_API_ROUTES env var.
  */
-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
+export const splitApiRoutes = (featureFlags: Record<string, unknown>, publish: string) => {
+  const isEnabled = 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,10 +30,9 @@ export const splitApiRoutes = async (featureFlags: Record<string, unknown>, publ
   return isEnabled
 }
 
-export const bundleBasedOnNftFiles = async (featureFlags: Record<string, unknown>) => {
-  const destr = await import('destr')
+export const bundleBasedOnNftFiles = (featureFlags: Record<string, unknown>) => {
   const isEnabled =
-    destr.destr(process.env.NEXT_BUNDLE_BASED_ON_NFT_FILES) ?? featureFlags.next_bundle_based_on_nft_files ?? false
+    destr(process.env.NEXT_BUNDLE_BASED_ON_NFT_FILES) ?? featureFlags.next_bundle_based_on_nft_files ?? false
 
   return isEnabled
 }

packages/runtime/src/helpers/functions.ts

@@ -1,6 +1,7 @@
 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'
@@ -209,8 +210,8 @@ export const setupImageFunction = async ({
   responseHeaders?: Record<string, string>
 }): Promise<void> => {
   const imagePath = imageconfig.path || '/_next/image'
-  const destr = await import('destr')
-  if (destr.destr(process.env.DISABLE_IPX)) {
+
+  if (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') {

packages/runtime/src/helpers/redirects.ts

@@ -1,5 +1,6 @@
 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'
@@ -211,8 +212,7 @@ export const generateDynamicRewrites = ({
   const dynamicRewrites: NetlifyConfig['redirects'] = []
   const dynamicRoutesThatMatchMiddleware: Array<string> = []
 
-  const dynamicR = async () => {
-    const destr = await import('destr')
+  const dynamicR = () => {
     dynamicRoutes.forEach((route) => {
       if (isApiRoute(route.page) || is404Route(route.page, i18n)) {
         return
@@ -235,7 +235,7 @@ export const generateDynamicRewrites = ({
         } else if (
           prerenderedDynamicRoutes[route.page].fallback === false &&
           !is404Isr &&
-          !destr.destr(process.env.LEGACY_FALLBACK_FALSE)
+          !destr(process.env.LEGACY_FALLBACK_FALSE)
         ) {
           dynamicRewrites.push(...redirectsForNext404Route({ route: route.page, buildId, basePath, i18n }))
         } else {
@@ -350,10 +350,9 @@ export const generateRedirects = async ({
   if (middlewareMatches > 0) {
     console.log(
       yellowBright(outdent`
-        There ${
-          middlewareMatches === 1
-            ? `is one statically-generated or ISR route that matches`
-            : `are ${middlewareMatches} statically-generated or ISR routes that match`
+        There ${middlewareMatches === 1
+          ? `is one statically-generated or ISR route that matches`
+          : `are ${middlewareMatches} statically-generated or ISR routes that match`
         } a middleware function. Matched routes will always be served from the SSR function and will not use ISR or be served from the CDN.
         If this was not intended, ensure that your middleware only matches routes that you intend to use SSR.
       `),