netlify-cli 15.8.0 → 15.8.1-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.0",
+  "version": "15.8.1-rc.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,14 +44,13 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.14.0",
-    "@netlify/build-info": "7.0.8",
-    "@netlify/config": "20.5.1",
-    "@netlify/edge-bundler": "8.16.2",
-    "@netlify/framework-info": "9.8.10",
+    "@netlify/build": "29.15.6",
+    "@netlify/build-info": "7.4.1",
+    "@netlify/config": "20.5.2",
+    "@netlify/edge-bundler": "8.16.3",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
-    "@netlify/zip-it-and-ship-it": "9.11.0",
+    "@netlify/zip-it-and-ship-it": "9.13.0",
     "@octokit/rest": "19.0.13",
     "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",
@@ -60,7 +59,7 @@
     "ascii-table": "0.0.9",
     "backoff": "2.5.0",
     "better-opn": "3.0.2",
-    "boxen": "7.1.0",
+    "boxen": "7.1.1",
     "chalk": "5.2.0",
     "chokidar": "3.5.3",
     "ci-info": "3.8.0",
@@ -92,7 +91,7 @@
     "from2-array": "0.0.4",
     "fuzzy": "0.1.3",
     "get-port": "5.1.1",
-    "gh-release-fetch": "4.0.2",
+    "gh-release-fetch": "4.0.3",
     "git-repo-info": "2.1.1",
     "gitconfiglocal": "2.1.0",
     "hasbin": "1.2.3",
@@ -106,7 +105,7 @@
     "is-stream": "3.0.0",
     "is-wsl": "2.2.0",
     "isexe": "2.0.0",
-    "jsonwebtoken": "9.0.0",
+    "jsonwebtoken": "9.0.1",
     "jwt-decode": "3.1.2",
     "listr": "0.14.3",
     "locate-path": "7.2.0",
@@ -119,7 +118,7 @@
     "netlify-headers-parser": "7.1.2",
     "netlify-redirect-parser": "14.1.3",
     "netlify-redirector": "0.4.0",
-    "node-fetch": "2.6.11",
+    "node-fetch": "2.6.12",
     "node-version-alias": "3.4.1",
     "ora": "6.3.1",
     "p-filter": "3.0.0",

package/src/commands/base-command.mjs

@@ -8,6 +8,7 @@ import { NodeFS } from '@netlify/build-info/node'
 import { resolveConfig } from '@netlify/config'
 import { Command, Option } from 'commander'
 import debug from 'debug'
+import execa from 'execa'
 import merge from 'lodash/merge.js'
 import { NetlifyAPI } from 'netlify'
 
@@ -88,6 +89,9 @@ export default class BaseCommand extends Command {
   /** @type {{ startTime: bigint, payload?: any}} */
   analytics = { startTime: process.hrtime.bigint() }
 
+  /** @type {Project} */
+  project
+
   /**
    * IMPORTANT this function will be called for each command!
    * Don't do anything expensive in there.
@@ -337,6 +341,11 @@ export default class BaseCommand extends Command {
     }
   }
 
+  /**
+   *
+   * @param {string|undefined} tokenFromFlag
+   * @returns
+   */
   async authenticate(tokenFromFlag) {
     const [token] = await getToken(tokenFromFlag)
     if (token) {
@@ -407,7 +416,8 @@ export default class BaseCommand extends Command {
   }
 
   setAnalyticsPayload(payload) {
-    this.analytics = { ...this.analytics, payload }
+    const newPayload = { ...this.analytics.payload, ...payload }
+    this.analytics = { ...this.analytics, payload: newPayload }
   }
 
   /**
@@ -459,10 +469,12 @@ export default class BaseCommand extends Command {
 
     const globalConfig = await getGlobalConfig()
 
+    // retrieve the repository root
+    const rootDir = await getRepositoryRoot()
     // Get framework, add to analytics payload for every command, if a framework is set
     const fs = new NodeFS()
-    const project = new Project(fs, buildDir)
-    const frameworks = await project.detectFrameworks()
+    this.project = new Project(fs, buildDir, rootDir).setEnvironment(process.env).setNodeVersion(process.version)
+    const frameworks = await this.project.detectFrameworks()
 
     const frameworkIDs = frameworks?.map((framework) => framework.id)
 
@@ -471,10 +483,12 @@ export default class BaseCommand extends Command {
     }
 
     this.setAnalyticsPayload({
-      packageManager: project.packageManager?.name,
-      buildSystem: project.buildSystems.map(({ id }) => id),
+      packageManager: this.project.packageManager?.name,
+      buildSystem: this.project.buildSystems.map(({ id }) => id),
     })
 
+    actionCommand.project = this.project
+
     actionCommand.netlify = {
       // api methods
       api,
@@ -567,3 +581,17 @@ export default class BaseCommand extends Command {
     return 'dev'
   }
 }
+
+/**
+ * Retrieves the repository root through a git command.
+ * Returns undefined if not a git project.
+ * @returns {Promise<string|undefined>}
+ */
+async function getRepositoryRoot() {
+  try {
+    const res = await execa('git', ['rev-parse', '--show-toplevel'], { preferLocal: true })
+    return res.stdout
+  } catch {
+    // noop
+  }
+}

package/src/commands/dev/dev.mjs

@@ -9,7 +9,6 @@ import { printBanner } from '../../utils/banner.mjs'
 import {
   BANG,
   chalk,
-  exit,
   log,
   NETLIFYDEV,
   NETLIFYDEVERR,
@@ -35,7 +34,7 @@ import { createDevExecCommand } from './dev-exec.mjs'
  * @param {object} config
  * @param {*} config.api
  * @param {import('commander').OptionValues} config.options
- * @param {*} config.settings
+ * @param {import('../../utils/types.js').ServerSettings} config.settings
  * @param {*} config.site
  * @param {*} config.state
  * @returns
@@ -68,6 +67,9 @@ const handleLiveTunnel = async ({ api, options, settings, site, state }) => {
   }
 }
 
+/**
+ * @param {string} args
+ */
 const validateShortFlagArgs = (args) => {
   if (args.startsWith('=')) {
     throw new Error(
@@ -94,7 +96,7 @@ const dev = async (options, command) => {
   const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
-  /** @type {import('./types').DevConfig} */
+  /** @type {import('./types.js').DevConfig} */
   const devConfig = {
     framework: '#auto',
     ...(config.functionsDirectory && { functions: config.functionsDirectory }),
@@ -116,7 +118,7 @@ const dev = async (options, command) => {
   injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
-  const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline
     offline: options.offline,
     api,
@@ -124,20 +126,17 @@ const dev = async (options, command) => {
     siteInfo,
   })
 
-  /** @type {Partial<import('../../utils/types').ServerSettings>} */
-  let settings = {}
+  /** @type {import('../../utils/types.js').ServerSettings} */
+  let settings
   try {
-    settings = await detectServerSettings(devConfig, options, site.root, {
-      site: {
-        id: site.id,
-        url: siteUrl,
-      },
-    })
+    settings = await detectServerSettings(devConfig, options, command.project, site.root)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
-    log(NETLIFYDEVERR, error_.message)
-    exit(1)
+    if (error_ && typeof error_ === 'object' && 'message' in error_) {
+      log(NETLIFYDEVERR, error_.message)
+    }
+    process.exit(1)
   }
 
   command.setAnalyticsPayload({ live: options.live })
@@ -176,6 +175,7 @@ const dev = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -211,6 +211,7 @@ const dev = async (options, command) => {
     state,
     geolocationMode: options.geo,
     geoCountry: options.country,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {

package/src/commands/functions/functions-serve.mjs

@@ -23,7 +23,7 @@ const functionsServe = async (options, command) => {
   env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
   injectEnvVariables(env)
 
-  const { capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, capabilities, siteUrl, timeouts } = await getSiteInformation({
     offline: options.offline,
     api,
     site,
@@ -52,6 +52,7 @@ const functionsServe = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 }
 

package/src/commands/serve/serve.mjs

@@ -56,7 +56,7 @@ const serve = async (options, command) => {
   injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
-  const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline
     offline: options.offline,
     api,
@@ -72,7 +72,7 @@ const serve = async (options, command) => {
   /** @type {Partial<import('../../utils/types').ServerSettings>} */
   let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, site.root)
+    settings = await detectServerSettings(devConfig, options, command.project, site.root)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
@@ -105,6 +105,7 @@ const serve = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -138,6 +139,7 @@ const serve = async (options, command) => {
     site,
     siteInfo,
     state,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.48",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.48.tgz",
-      "integrity": "sha512-iL0PIMwejpmuVHgfibHpfDwOdsbmB50wr21X71VnF5d7SsBF7WK+ZvP/SCcFm7Iwb9iiYSap9rlrdhToNAWdxg=="
+      "version": "14.18.53",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.48",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.48.tgz",
-      "integrity": "sha512-iL0PIMwejpmuVHgfibHpfDwOdsbmB50wr21X71VnF5d7SsBF7WK+ZvP/SCcFm7Iwb9iiYSap9rlrdhToNAWdxg=="
+      "version": "14.18.53",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/functions-templates/typescript/transform-response/{{name}}.ts

@@ -7,7 +7,6 @@ export default async (request: Request, context: Context) => {
   if (url.searchParams.get("method") !== "transform") {
     return;
   }
-
   const response = await context.next();
   const text = await response.text();
   return new Response(text.toUpperCase(), response);

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

@@ -11,6 +11,7 @@ export const headers = {
   IP: 'x-nf-client-connection-ip',
   Site: 'X-NF-Site-Info',
   DebugLogging: 'x-nf-debug-logging',
+  Account: 'x-nf-account-info',
 }
 
 /**

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

@@ -53,7 +53,15 @@ export const createSiteInfoHeader = (siteInfo = {}) => {
   return Buffer.from(siteString).toString('base64')
 }
 
+export const createAccountInfoHeader = (accountInfo = {}) => {
+  const { id } = accountInfo
+  const account = { id }
+  const accountString = JSON.stringify(account)
+  return Buffer.from(accountString).toString('base64')
+}
+
 export const initializeProxy = async ({
+  accountId,
   config,
   configPath,
   debug,
@@ -106,6 +114,7 @@ export const initializeProxy = async ({
     // Setting header with geolocation and site info.
     req.headers[headers.Geo] = JSON.stringify(geoLocation)
     req.headers[headers.Site] = createSiteInfoHeader(siteInfo)
+    req.headers[headers.Account] = createAccountInfoHeader({ id: accountId })
 
     await registry.initialize()
 

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

@@ -467,17 +467,19 @@ export class EdgeFunctionsRegistry {
    * @param {string} projectDir
    */
   async #setupWatchers(projectDir) {
-    // Creating a watcher for the config file. When it changes, we update the
-    // declarations and see if we need to register or unregister any functions.
-    this.#configWatcher = await watchDebounced(this.#configPath, {
-      onChange: async () => {
-        const newConfig = await this.#getUpdatedConfig()
+    if (this.#configPath) {
+      // Creating a watcher for the config file. When it changes, we update the
+      // declarations and see if we need to register or unregister any functions.
+      this.#configWatcher = await watchDebounced(this.#configPath, {
+        onChange: async () => {
+          const newConfig = await this.#getUpdatedConfig()
 
-        this.#declarationsFromTOML = EdgeFunctionsRegistry.#getDeclarationsFromTOML(newConfig)
+          this.#declarationsFromTOML = EdgeFunctionsRegistry.#getDeclarationsFromTOML(newConfig)
 
-        await this.#checkForAddedOrDeletedFunctions()
-      },
-    })
+          await this.#checkForAddedOrDeletedFunctions()
+        },
+      })
+    }
 
     // While functions are guaranteed to be inside one of the configured
     // directories, they might be importing files that are located in

package/src/lib/functions/server.mjs

@@ -111,6 +111,7 @@ export const createHandler = function (options) {
       ...request.headers,
       'client-ip': [remoteAddress],
       'x-nf-client-connection-ip': [remoteAddress],
+      'x-nf-account-id': [options.accountId],
       [efHeaders.Geo]: JSON.stringify(geoLocation),
     }).reduce((prev, [key, value]) => ({ ...prev, [key]: Array.isArray(value) ? value : [value] }), {})
     const rawQuery = new URLSearchParams(requestQuery).toString()

package/src/lib/functions/synchronous.mjs

@@ -75,20 +75,20 @@ const formatLambdaLocalError = (err, acceptsHtml) =>
       })
     : `${err.errorType}: ${err.errorMessage}\n ${err.stackTrace?.join('\n ')}`
 
-const processRenderedResponse = async (err, request) => {
-  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
-  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
-
-  return acceptsHtml
-    ? await renderErrorTemplate(errorString, './templates/function-error.html', 'function')
-    : errorString
-}
-
 const handleErr = async (err, request, response) => {
   detectAwsSdkError({ err })
 
+  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
+  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
+
   response.statusCode = 500
-  response.end(await processRenderedResponse(err, request))
+
+  if (acceptsHtml) {
+    response.setHeader('Content-Type', 'text/html')
+    response.end(await renderErrorTemplate(errorString, './templates/function-error.html', 'function'))
+  } else {
+    response.end(errorString)
+  }
 }
 
 const validateLambdaResponse = (lambdaResponse) => {

package/src/lib/spinner.mjs

@@ -17,7 +17,7 @@ export const startSpinner = ({ text }) =>
  * Stops the spinner with the following text
  * @param {object} config
  * @param {ora.Ora} config.spinner
- * @param {object} [config.error]
+ * @param {boolean} [config.error]
  * @param {string} [config.text]
  * @returns {void}
  */

package/src/utils/command-helpers.mjs

@@ -24,7 +24,7 @@ const argv = process.argv.slice(2)
  * Chalk instance for CLI that can be initialized with no colors mode
  * needed for json outputs where we don't want to have colors
  * @param  {boolean} noColors - disable chalk colors
- * @return {object} - default or custom chalk instance
+ * @return {import('chalk').ChalkInstance} - default or custom chalk instance
  */
 const safeChalk = function (noColors) {
   if (noColors) {
@@ -174,12 +174,19 @@ export const warn = (message = '') => {
 
 /**
  * throws an error or log it
- * @param {string|Error} message
+ * @param {unknown} message
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
 export const error = (message = '', options = {}) => {
-  const err = message instanceof Error ? message : new Error(message)
+  const err =
+    message instanceof Error
+      ? message
+      : // eslint-disable-next-line unicorn/no-nested-ternary
+      typeof message === 'string'
+      ? new Error(message)
+      : // eslint-disable-next-line no-inline-comments
+        /** @type {Error} */ ({ message, stack: undefined, name: 'Error' })
 
   if (options.exit === false) {
     const bang = chalk.red(BANG)