netlify-cli 12.9.2 → 12.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.9.2",
+  "version": "12.11.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -76,12 +76,12 @@
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.5.2",
-    "@netlify/config": "^20.3.2",
+    "@netlify/build": "^29.5.5",
+    "@netlify/config": "^20.3.3",
     "@netlify/edge-bundler": "^8.4.0",
-    "@netlify/framework-info": "^9.7.1",
+    "@netlify/framework-info": "^9.8.1",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.4.1",
+    "@netlify/zip-it-and-ship-it": "^8.5.0",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
@@ -149,7 +149,7 @@
     "netlify-redirect-parser": "^14.1.1",
     "netlify-redirector": "^0.4.0",
     "node-fetch": "^2.6.0",
-    "node-version-alias": "^1.0.1",
+    "node-version-alias": "^2.0.0",
     "ora": "^5.0.0",
     "p-filter": "^2.1.0",
     "p-map": "^4.0.0",
@@ -167,7 +167,7 @@
     "string-similarity": "^4.0.4",
     "strip-ansi-control-characters": "^2.0.0",
     "tabtab": "^3.0.2",
-    "tempy": "^1.0.0",
+    "tempy": "^3.0.0",
     "terminal-link": "^2.1.1",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
@@ -183,13 +183,13 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.27.0",
+    "@vitest/coverage-c8": "^0.28.0",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",
     "form-data": "^4.0.0",
-    "got": "^11.8.1",
+    "got": "^11.8.6",
     "graphviz": "^0.0.9",
     "husky": "^8.0.0",
     "ini": "^2.0.0",
@@ -199,14 +199,14 @@
     "rewiremock": "^3.14.3",
     "serialize-javascript": "^6.0.0",
     "sinon": "^14.0.0",
-    "strip-ansi": "^6.0.0",
+    "strip-ansi": "^7.0.0",
     "temp-dir": "^2.0.0",
     "tomlify-j0.4": "^3.0.0",
     "tree-kill": "^1.2.2",
     "typescript": "^4.4.4",
     "verdaccio": "^5.10.2",
     "vite": "^4.0.0",
-    "vitest": "^0.27.0"
+    "vitest": "^0.28.0"
   },
   "ava": {
     "files": [

package/src/functions-templates/javascript/auth-fetch/package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
-      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
-      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/functions-templates/javascript/google-analytics/package-lock.json

@@ -17,9 +17,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
-      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
-      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/functions-templates/javascript/token-hider/package-lock.json

@@ -19,9 +19,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
+      "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -198,9 +198,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
+      "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -36,9 +36,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -68,9 +68,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
     }
   }
 }

package/src/lib/edge-functions/internal.mjs

@@ -32,7 +32,7 @@ export const getInternalFunctions = async () => {
     }
 
     const data = {
-      functions: manifest.functions,
+      functions: manifest.functions || [],
       path,
     }
 

package/src/lib/functions/netlify-function.mjs

@@ -18,6 +18,7 @@ export default class NetlifyFunction {
   constructor({
     config,
     directory,
+    displayName,
     mainFile,
     name,
     projectRoot,
@@ -31,6 +32,7 @@ export default class NetlifyFunction {
     this.errorExit = errorExit
     this.mainFile = mainFile
     this.name = name
+    this.displayName = displayName
     this.projectRoot = projectRoot
     this.runtime = runtime
     this.timeoutBackground = timeoutBackground

package/src/lib/functions/registry.mjs

@@ -14,7 +14,7 @@ import {
   warn,
   watchDebounced,
 } from '../../utils/command-helpers.mjs'
-import { SERVE_FUNCTIONS_FOLDER } from '../../utils/functions/functions.mjs'
+import { INTERNAL_FUNCTIONS_FOLDER, SERVE_FUNCTIONS_FOLDER } from '../../utils/functions/functions.mjs'
 import { getLogMessage } from '../log.mjs'
 import { getPathInProject } from '../settings.mjs'
 
@@ -164,7 +164,12 @@ export class FunctionsRegistry {
     this.functions.set(name, func)
     this.buildFunctionAndWatchFiles(func)
 
-    log(`${NETLIFYDEVLOG} ${chalk.green('Loaded')} function ${getTerminalLink(chalk.yellow(name), func.url)}.`)
+    log(
+      `${NETLIFYDEVLOG} ${chalk.green('Loaded')} function ${getTerminalLink(
+        chalk.yellow(func.displayName || name),
+        func.url,
+      )}.`,
+    )
   }
 
   // This function is here so we can mock it in tests
@@ -191,6 +196,7 @@ export class FunctionsRegistry {
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true',
         project_deploy_configuration_api_use_per_function_configuration_files: true,
       },
+      configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
       config: this.config.functions,
     })
 
@@ -207,7 +213,7 @@ export class FunctionsRegistry {
     await Promise.all(deletedFunctions.map((func) => this.unregisterFunction(func.name)))
 
     await Promise.all(
-      functions.map(async ({ mainFile, name, runtime: runtimeName }) => {
+      functions.map(async ({ displayName, mainFile, name, runtime: runtimeName }) => {
         const runtime = runtimes[runtimeName]
 
         // If there is no matching runtime, it means this function is not yet
@@ -226,6 +232,7 @@ export class FunctionsRegistry {
           directory: directories.find((directory) => mainFile.startsWith(directory)),
           mainFile,
           name,
+          displayName,
           projectRoot: this.projectRoot,
           runtime,
           timeoutBackground: this.timeouts.backgroundFunctions,

package/src/lib/functions/runtimes/go/index.mjs

@@ -2,7 +2,7 @@
 import { dirname, extname } from 'path'
 import { platform } from 'process'
 
-import tempy from 'tempy'
+import { temporaryFile } from 'tempy'
 
 import execa from '../../../../utils/execa.mjs'
 import { runFunctionsProxy } from '../../local-proxy.mjs'
@@ -41,7 +41,7 @@ const checkGoInstallation = async ({ cwd }) => {
 
 export const getBuildFunction = ({ func }) => {
   const functionDirectory = dirname(func.mainFile)
-  const binaryPath = tempy.file(isWindows ? { extension: 'exe' } : undefined)
+  const binaryPath = temporaryFile(isWindows ? { extension: 'exe' } : undefined)
 
   return () => build({ binaryPath, functionDirectory })
 }

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

@@ -1,7 +1,7 @@
 import { rm } from 'fs/promises'
 
 import cleanDeep from 'clean-deep'
-import tempy from 'tempy'
+import { temporaryDirectory } from 'tempy'
 
 import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.mjs'
 import { warn } from '../command-helpers.mjs'
@@ -45,7 +45,7 @@ export const deploySite = async (
       /* default to noop */
     },
     syncFileLimit = DEFAULT_SYNC_LIMIT,
-    tmpDir = tempy.directory(),
+    tmpDir = temporaryDirectory(),
     rootDir,
   } = {},
 ) => {
@@ -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

@@ -5,6 +5,9 @@ import { promisify } from 'util'
 import fromArray from 'from2-array'
 import pumpModule from 'pump'
 
+import { getPathInProject } from '../../lib/settings.mjs'
+import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.mjs'
+
 import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs'
 
 const pump = promisify(pumpModule)
@@ -65,7 +68,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: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
+    config: functionsConfig,
+  })
 }
 
 const hashFns = async (
@@ -100,7 +108,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 +118,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 +142,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

package/src/utils/deploy/util.mjs

@@ -23,7 +23,7 @@ export const waitForDiff = async (api, deployId, siteId, timeout) => {
     switch (siteDeploy.state) {
       // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
       case 'error': {
-        const deployError = new Error(`Deploy ${deployId} had an error`)
+        const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`)
         deployError.deploy = siteDeploy
         throw deployError
       }
@@ -60,7 +60,7 @@ export const waitForDeploy = async (api, deployId, siteId, timeout) => {
     switch (siteDeploy.state) {
       // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
       case 'error': {
-        const deployError = new Error(`Deploy ${deployId} had an error`)
+        const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`)
         deployError.deploy = siteDeploy
         throw deployError
       }

package/src/functions-templates/rust/hello-world/.gitignore

@@ -1 +0,0 @@
-/target