Merge branch 'main' into mk/dev-watch

Author: nickytonline

package-lock.json

@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.7.0",
+    "@netlify/build": "^29.7.1",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.7.0",
+    "@netlify/build": "^29.7.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

packages/runtime/package.json

@@ -6,7 +6,7 @@ import type { NextConfigComplete } from 'next/dist/server/config-shared'
 import { join, dirname, relative } from 'pathe'
 import slash from 'slash'
 
-import { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME } from '../constants'
+import { HANDLER_FUNCTION_NAME, IMAGE_FUNCTION_NAME, ODB_FUNCTION_NAME } from '../constants'
 
 import type { RoutesManifest } from './types'
 import { escapeStringRegexp } from './utils'
@@ -107,18 +107,16 @@ export const configureHandlerFunctions = async ({
   const files = config.files || []
   const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`))
 
-  /* eslint-disable no-underscore-dangle */
   if (!destr(process.env.DISABLE_IPX)) {
-    netlifyConfig.functions._ipx ||= {}
-    netlifyConfig.functions._ipx.node_bundler = 'nft'
+    netlifyConfig.functions[IMAGE_FUNCTION_NAME] ||= {}
+    netlifyConfig.functions[IMAGE_FUNCTION_NAME].node_bundler = 'nft'
   }
 
   // If the user has manually added the module to included_files, then don't exclude it
   const excludedModules = DEFAULT_EXCLUDED_MODULES.filter(
     (moduleName) => !hasManuallyAddedModule({ netlifyConfig, moduleName }),
   )
 
-  /* eslint-enable no-underscore-dangle */
   ;[HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, '_api_*'].forEach((functionName) => {
     netlifyConfig.functions[functionName] ||= { included_files: [], external_node_modules: [] }
     netlifyConfig.functions[functionName].node_bundler = 'nft'

packages/runtime/src/helpers/config.ts

@@ -10,6 +10,8 @@ import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middlew
 import type { RouteHas } from 'next/dist/lib/load-custom-routes'
 import { outdent } from 'outdent'
 
+import { IMAGE_FUNCTION_NAME } from '../constants'
+
 import { getRequiredServerFiles, NextConfig } from './config'
 import { makeLocaleOptional, stripLookahead, transformCaptureGroups } from './matchers'
 import { RoutesManifest } from './types'
@@ -465,7 +467,7 @@ export const writeEdgeFunctions = async ({
     await ensureDir(edgeFunctionDir)
     await copyEdgeSourceFile({ edgeFunctionDir, file: 'ipx.ts', target: 'index.ts' })
     await copyFile(
-      join('.netlify', 'functions-internal', '_ipx', 'imageconfig.json'),
+      join('.netlify', 'functions-internal', IMAGE_FUNCTION_NAME, 'imageconfig.json'),
       join(edgeFunctionDir, 'imageconfig.json'),
     )
     manifest.functions.push({