netlify-cli 15.10.0-rc.1 → 15.11.0

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

@@ -16,7 +16,7 @@ const normalizeFunction = function (deployedFunctions, { name, urlPath: url }) {
  * @param {import('../base-command.mjs').default} command
  */
 const functionsList = async (options, command) => {
-  const { config, relConfigFilePath, siteInfo } = command.netlify
+  const { config, siteInfo } = command.netlify
 
   const deploy = siteInfo.published_deploy || {}
   const deployedFunctions = deploy.available_functions || []
@@ -25,7 +25,7 @@ const functionsList = async (options, command) => {
 
   if (typeof functionsDir === 'undefined') {
     log('Functions directory is undefined')
-    log(`Please verify functions.directory is set in your Netlify configuration file ${relConfigFilePath}`)
+    log('Please verify functions.directory is set in your Netlify configuration file (netlify.toml/yml/json)')
     log('See https://docs.netlify.com/configure-builds/file-based-configuration/ for more information')
     exit(1)
   }

package/src/commands/init/init.mjs

@@ -196,7 +196,7 @@ export const init = async (options, command) => {
   }
 
   // Look for local repo
-  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
   if (repoData.error) {
     await handleNoGitRemoteAndExit({ command, error: repoData.error, state })
   }

package/src/commands/link/link.mjs

@@ -11,11 +11,11 @@ import { track } from '../../utils/telemetry/index.mjs'
 
 /**
  *
- * @param {import('../base-command.mjs').default} command
+ * @param {import('../base-command.mjs').NetlifyOptions} netlify
  * @param {import('commander').OptionValues} options
  */
-const linkPrompt = async (command, options) => {
-  const { api, state } = command.netlify
+const linkPrompt = async (netlify, options) => {
+  const { api, state } = netlify
 
   const SITE_NAME_PROMPT = 'Search by full or partial site name'
   const SITE_LIST_PROMPT = 'Choose from a list of your recently updated sites'
@@ -24,7 +24,7 @@ const linkPrompt = async (command, options) => {
   let GIT_REMOTE_PROMPT = 'Use the current git remote origin URL'
   let site
   // Get git remote data if exists
-  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
 
   let linkChoices = [SITE_NAME_PROMPT, SITE_LIST_PROMPT, SITE_ID_PROMPT]
 
@@ -326,7 +326,7 @@ export const link = async (options, command) => {
       kind: 'byName',
     })
   } else {
-    siteData = await linkPrompt(command, options)
+    siteData = await linkPrompt(command.netlify, options)
   }
   return siteData
 }

package/src/commands/serve/serve.mjs

@@ -38,7 +38,6 @@ const serve = async (options, command) => {
   const devConfig = {
     ...(config.functionsDirectory && { functions: config.functionsDirectory }),
     ...(config.build.publish && { publish: config.build.publish }),
-
     ...config.dev,
     ...options,
     // Override the `framework` value so that we start a static server and not
@@ -70,9 +69,10 @@ const serve = async (options, command) => {
   // Netlify Build are loaded.
   await getInternalFunctionsDir({ base: site.root, ensureExists: true })
 
-  let settings = /** @type {import('../../utils/types.js').ServerSettings} */ ({})
+  /** @type {Partial<import('../../utils/types').ServerSettings>} */
+  let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, command)
+    settings = await detectServerSettings(devConfig, options, site.root)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
@@ -87,11 +87,7 @@ const serve = async (options, command) => {
     `${NETLIFYDEVWARN} Changes will not be hot-reloaded, so if you need to rebuild your site you must exit and run 'netlify serve' again`,
   )
 
-  const { configPath: configPathOverride } = await runBuildTimeline({
-    command,
-    settings,
-    options,
-  })
+  const { configPath: configPathOverride } = await runBuildTimeline({ cachedConfig, options, settings, site })
 
   await startFunctionsServer({
     api,
@@ -121,7 +117,8 @@ const serve = async (options, command) => {
 
   // TODO: We should consolidate this with the existing config watcher.
   const getUpdatedConfig = async () => {
-    const { config: newConfig } = await command.getConfig({ cwd: command.workingDir, offline: true, state })
+    const cwd = options.cwd || process.cwd()
+    const { config: newConfig } = await command.getConfig({ cwd, offline: true, state })
     const normalizedNewConfig = normalizeConfig(newConfig)
 
     return normalizedNewConfig
@@ -138,7 +135,6 @@ const serve = async (options, command) => {
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
-    projectDir: command.workingDir,
     settings,
     site,
     siteInfo,

package/src/commands/sites/sites-create-template.mjs

@@ -197,7 +197,7 @@ const sitesCreateTemplate = async (repository, options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData({ workingDir: command.workingDir })
+    const repoData = await getRepoData()
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

package/src/commands/sites/sites-create.mjs

@@ -102,7 +102,7 @@ export const sitesCreate = async (options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData({ workingDir: command.workingDir })
+    const repoData = await getRepoData()
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

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

@@ -1,16 +1,14 @@
 // @ts-check
 import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
+import { cwd } from 'process'
 
 import { getPathInProject } from '../settings.mjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
-/**
- * @param {string} workingDir
- */
-export const getInternalFunctions = async (workingDir) => {
-  const path = join(workingDir, getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
+export const getInternalFunctions = async () => {
+  const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
     const stats = await stat(path)

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

@@ -1,7 +1,7 @@
 // @ts-check
 import { Buffer } from 'buffer'
 import { relative } from 'path'
-import { env } from 'process'
+import { cwd, env } from 'process'
 
 // eslint-disable-next-line import/no-namespace
 import * as bundler from '@netlify/edge-bundler'
@@ -62,26 +62,6 @@ export const createAccountInfoHeader = (accountInfo = {}) => {
   return Buffer.from(accountString).toString('base64')
 }
 
-/**
- *
- * @param {object} config
- * @param {*} config.accountId
- * @param {*} config.config
- * @param {*} config.configPath
- * @param {*} config.debug
- * @param {*} config.env
- * @param {*} config.geoCountry
- * @param {*} config.geolocationMode
- * @param {*} config.getUpdatedConfig
- * @param {*} config.inspectSettings
- * @param {*} config.mainPort
- * @param {boolean=} config.offline
- * @param {*} config.passthroughPort
- * @param {*} config.projectDir
- * @param {*} config.siteInfo
- * @param {*} config.state
- * @returns
- */
 export const initializeProxy = async ({
   accountId,
   config,
@@ -99,11 +79,7 @@ export const initializeProxy = async ({
   siteInfo,
   state,
 }) => {
-  const {
-    functions: internalFunctions,
-    importMap,
-    path: internalFunctionsPath,
-  } = await getInternalFunctions(projectDir)
+  const { functions: internalFunctions, importMap, path: internalFunctionsPath } = await getInternalFunctions()
   const userFunctionsPath = config.build.edge_functions
   const isolatePort = await getAvailablePort()
 
@@ -157,7 +133,7 @@ export const initializeProxy = async ({
         )} matches declaration for edge function ${chalk.yellow(
           functionName,
         )}, but there's no matching function file in ${chalk.yellow(
-          relative(projectDir, userFunctionsPath),
+          relative(cwd(), userFunctionsPath),
         )}. Please visit ${chalk.blue('https://ntl.fyi/edge-create')} for more information.`,
       )
     })

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

@@ -1,9 +1,14 @@
 // @ts-check
+import { version as nodeVersion } from 'process'
+
 import CronParser from 'cron-parser'
+import semver from 'semver'
 
 import { error as errorExit } from '../../utils/command-helpers.mjs'
 import { BACKGROUND } from '../../utils/functions/get-functions.mjs'
 
+const V2_MIN_NODE_VERSION = '18.0.0'
+
 // Returns a new set with all elements of `setA` that don't exist in `setB`.
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
 
@@ -27,12 +32,13 @@ export default class NetlifyFunction {
     timeoutBackground,
     timeoutSynchronous,
   }) {
+    this.buildError = null
     this.config = config
     this.directory = directory
     this.errorExit = errorExit
     this.mainFile = mainFile
     this.name = name
-    this.displayName = displayName
+    this.displayName = displayName ?? name
     this.projectRoot = projectRoot
     this.runtime = runtime
     this.timeoutBackground = timeoutBackground
@@ -63,6 +69,10 @@ export default class NetlifyFunction {
     return Boolean(this.schedule)
   }
 
+  isSupported() {
+    return !(this.buildData?.runtimeAPIVersion === 2 && semver.lt(nodeVersion, V2_MIN_NODE_VERSION))
+  }
+
   async getNextRun() {
     if (!(await this.isScheduled())) {
       return null
@@ -93,11 +103,22 @@ export default class NetlifyFunction {
       const srcFilesDiff = this.getSrcFilesDiff(srcFilesSet)
 
       this.buildData = buildData
+      this.buildError = null
       this.srcFiles = srcFilesSet
       this.schedule = schedule || this.schedule
 
+      if (!this.isSupported()) {
+        throw new Error(
+          `Function requires Node.js version ${V2_MIN_NODE_VERSION} or above, but ${nodeVersion.slice(
+            1,
+          )} is installed. Refer to https://ntl.fyi/functions-node18 for information on how to update.`,
+        )
+      }
+
       return { includedFiles, srcFilesDiff }
     } catch (error) {
+      this.buildError = error
+
       return { error }
     }
   }
@@ -118,6 +139,10 @@ export default class NetlifyFunction {
   async invoke(event, context) {
     await this.buildQueue
 
+    if (this.buildError) {
+      return { result: null, error: { errorMessage: this.buildError.message } }
+    }
+
     const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous
 
     try {

package/src/lib/functions/registry.mjs

@@ -6,15 +6,7 @@ import { env } from 'process'
 import { listFunctions } from '@netlify/zip-it-and-ship-it'
 import extractZip from 'extract-zip'
 
-import {
-  chalk,
-  getTerminalLink,
-  log,
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  warn,
-  watchDebounced,
-} from '../../utils/command-helpers.mjs'
+import { chalk, log, NETLIFYDEVERR, NETLIFYDEVLOG, warn, watchDebounced } from '../../utils/command-helpers.mjs'
 import { INTERNAL_FUNCTIONS_FOLDER, SERVE_FUNCTIONS_FOLDER } from '../../utils/functions/functions.mjs'
 import { BACKGROUND_FUNCTIONS_WARNING } from '../log.mjs'
 import { getPathInProject } from '../settings.mjs'
@@ -70,21 +62,23 @@ export class FunctionsRegistry {
     )
   }
 
-  async buildFunctionAndWatchFiles(func, { verbose = false } = {}) {
-    if (verbose) {
-      log(`${NETLIFYDEVLOG} ${chalk.magenta('Reloading')} function ${chalk.yellow(func.name)}...`)
+  async buildFunctionAndWatchFiles(func, firstLoad = false) {
+    if (!firstLoad) {
+      log(`${NETLIFYDEVLOG} ${chalk.magenta('Reloading')} function ${chalk.yellow(func.displayName)}...`)
     }
 
-    const { error_, includedFiles, srcFilesDiff } = await func.build({ cache: this.buildCache })
+    const { error: buildError, includedFiles, srcFilesDiff } = await func.build({ cache: this.buildCache })
 
-    if (error_) {
+    if (buildError) {
       log(
-        `${NETLIFYDEVERR} ${chalk.red('Failed')} reloading function ${chalk.yellow(func.name)} with error:\n${
-          error_.message
+        `${NETLIFYDEVERR} ${chalk.red('Failed to load')} function ${chalk.yellow(func.displayName)}: ${
+          buildError.message
         }`,
       )
-    } else if (verbose) {
-      log(`${NETLIFYDEVLOG} ${chalk.green('Reloaded')} function ${chalk.yellow(func.name)}`)
+    } else {
+      const verb = firstLoad ? 'Loaded' : 'Reloaded'
+
+      log(`${NETLIFYDEVLOG} ${chalk.green(verb)} function ${chalk.yellow(func.displayName)}`)
     }
 
     // If the build hasn't resulted in any files being added or removed, there
@@ -116,7 +110,7 @@ export class FunctionsRegistry {
 
       const newWatcher = await watchDebounced(filesToWatch, {
         onChange: () => {
-          this.buildFunctionAndWatchFiles(func, { verbose: true })
+          this.buildFunctionAndWatchFiles(func, false)
         },
       })
 
@@ -163,14 +157,8 @@ export class FunctionsRegistry {
     }
 
     this.functions.set(name, func)
-    this.buildFunctionAndWatchFiles(func)
 
-    log(
-      `${NETLIFYDEVLOG} ${chalk.green('Loaded')} function ${getTerminalLink(
-        chalk.yellow(func.displayName || name),
-        func.url,
-      )}.`,
-    )
+    this.buildFunctionAndWatchFiles(func, true)
   }
 
   // This function is here so we can mock it in tests

package/src/lib/functions/runtimes/js/worker.mjs

@@ -11,7 +11,7 @@ if (isMainThread) {
 
 sourceMapSupport.install()
 
-lambdaLocal.getLogger().level = 'warn'
+lambdaLocal.getLogger().level = 'alert'
 
 const { clientContext, entryFilePath, event, timeoutMs } = workerData
 

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 {boolean} [config.error]
+ * @param {object} [config.error]
  * @param {string} [config.text]
  * @returns {void}
  */

package/src/recipes/vscode/index.mjs

@@ -1,4 +1,3 @@
-// @ts-check
 import { join } from 'path'
 
 import { DenoBridge } from '@netlify/edge-bundler'
@@ -28,24 +27,15 @@ const getPrompt = ({ fileExists, path }) => {
 const getEdgeFunctionsPath = ({ config, repositoryRoot }) =>
   config.build.edge_functions || join(repositoryRoot, 'netlify', 'edge-functions')
 
-/**
- * @param {string} repositoryRoot
- */
 const getSettingsPath = (repositoryRoot) => join(repositoryRoot, '.vscode', 'settings.json')
 
-/**
- * @param {string} repositoryRoot
- */
-const hasDenoVSCodeExt = async (repositoryRoot) => {
-  const { stdout: extensions } = await execa('code', ['--list-extensions'], { stderr: 'inherit', cwd: repositoryRoot })
+const hasDenoVSCodeExt = async () => {
+  const { stdout: extensions } = await execa('code', ['--list-extensions'], { stderr: 'inherit' })
   return extensions.split('\n').includes('denoland.vscode-deno')
 }
 
-/**
- * @param {string} repositoryRoot
- */
-const getDenoVSCodeExt = async (repositoryRoot) => {
-  await execa('code', ['--install-extension', 'denoland.vscode-deno'], { stdio: 'inherit', cwd: repositoryRoot })
+const getDenoVSCodeExt = async () => {
+  await execa('code', ['--install-extension', 'denoland.vscode-deno'], { stdio: 'inherit' })
 }
 
 const getDenoExtPrompt = () => {
@@ -59,12 +49,6 @@ const getDenoExtPrompt = () => {
   })
 }
 
-/**
- * @param {object} params
- * @param {*} params.config
- * @param {string} params.repositoryRoot
- * @returns
- */
 export const run = async ({ config, repositoryRoot }) => {
   const deno = new DenoBridge({
     onBeforeDownload: () =>
@@ -82,11 +66,9 @@ export const run = async ({ config, repositoryRoot }) => {
   }
 
   try {
-    if (!(await hasDenoVSCodeExt(repositoryRoot))) {
+    if (!(await hasDenoVSCodeExt())) {
       const { confirm: denoExtConfirm } = await getDenoExtPrompt()
-      if (denoExtConfirm) {
-        getDenoVSCodeExt(repositoryRoot)
-      }
+      if (denoExtConfirm) getDenoVSCodeExt()
     }
   } catch {
     log(

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 {import('chalk').ChalkInstance} - default or custom chalk instance
+ * @return {object} - default or custom chalk instance
  */
 const safeChalk = function (noColors) {
   if (noColors) {
@@ -174,18 +174,12 @@ export const warn = (message = '') => {
 
 /**
  * throws an error or log it
- * @param {unknown} message
+ * @param {string|Error} message
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
 export const error = (message = '', options = {}) => {
-  const err =
-    message instanceof Error
-      ? message
-      : // eslint-disable-next-line unicorn/no-nested-ternary
-      typeof message === 'string'
-      ? new Error(message)
-      : /** @type {Error} */ ({ message, stack: undefined, name: 'Error' })
+  const err = message instanceof Error ? message : new Error(message)
 
   if (options.exit === false) {
     const bang = chalk.red(BANG)
@@ -204,13 +198,10 @@ export const exit = (code = 0) => {
   process.exit(code)
 }
 
-/**
- * When `build.publish` is not set by the user, the CLI behavior differs in
- * several ways. It detects it by checking if `build.publish` is `undefined`.
- * However, `@netlify/config` adds a default value to `build.publish`.
- * This removes 'publish' and 'publishOrigin' in this case.
- * @param {*} config
- */
+// When `build.publish` is not set by the user, the CLI behavior differs in
+// several ways. It detects it by checking if `build.publish` is `undefined`.
+// However, `@netlify/config` adds a default value to `build.publish`.
+// This removes 'publish' and 'publishOrigin' in this case.
 export const normalizeConfig = (config) => {
   // Unused var here is in order to omit 'publish' from build config
   // eslint-disable-next-line no-unused-vars