netlify-cli 12.9.2 → 12.10.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "12.9.2",
+  "version": "12.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "12.9.2",
+      "version": "12.10.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.9.2",
+  "version": "12.10.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

package/src/utils/deploy/deploy-site.mjs

@@ -56,7 +56,7 @@ export const deploySite = async (
   })
 
   const edgeFunctionsDistPath = await getDistPathIfExists({ rootDir })
-  const [{ files, filesShaMap }, { fnShaMap, functionSchedules, functions, functionsWithNativeModules }] =
+  const [{ files, filesShaMap }, { fnConfig, fnShaMap, functionSchedules, functions, functionsWithNativeModules }] =
     await Promise.all([
       hashFiles({
         assetType,
@@ -125,6 +125,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
       files,
       functions,
       function_schedules: functionSchedules,
+      functions_config: fnConfig,
       async: Object.keys(files).length > syncFileLimit,
       branch,
       draft,

package/src/utils/deploy/hash-fns.mjs

@@ -1,10 +1,12 @@
 import { readFile } from 'fs/promises'
-import path from 'path'
+import path, { join } from 'path'
 import { promisify } from 'util'
 
 import fromArray from 'from2-array'
 import pumpModule from 'pump'
 
+import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.mjs'
+
 import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs'
 
 const pump = promisify(pumpModule)
@@ -65,7 +67,12 @@ const getFunctionZips = async ({
 
   const { zipFunctions } = await import('@netlify/zip-it-and-ship-it')
 
-  return await zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig })
+  return await zipFunctions(directories, tmpDir, {
+    featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
+    basePath: rootDir,
+    configFileDirectories: [join('.netlify', INTERNAL_FUNCTIONS_FOLDER)],
+    config: functionsConfig,
+  })
 }
 
 const hashFns = async (
@@ -100,7 +107,7 @@ const hashFns = async (
     statusCb,
     tmpDir,
   })
-  const fileObjs = functionZips.map(({ path: functionPath, runtime }) => ({
+  const fileObjs = functionZips.map(({ displayName, path: functionPath, runtime }) => ({
     filepath: functionPath,
     root: tmpDir,
     relname: path.relative(tmpDir, functionPath),
@@ -110,7 +117,11 @@ const hashFns = async (
     assetType: 'function',
     normalizedPath: path.basename(functionPath, path.extname(functionPath)),
     runtime,
+    displayName,
   }))
+  const fnConfig = functionZips
+    .filter((func) => Boolean(func.displayName))
+    .reduce((funcs, curr) => ({ ...funcs, [curr.name]: { display_name: curr.displayName } }), {})
   const functionSchedules = functionZips
     .map(({ name, schedule }) => schedule && { name, cron: schedule })
     .filter(Boolean)
@@ -130,8 +141,7 @@ const hashFns = async (
   const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType })
 
   await pump(functionStream, hasher, manifestCollector)
-
-  return { functionSchedules, functions, functionsWithNativeModules, fnShaMap }
+  return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig }
 }
 
 export default hashFns