netlify-cli 15.10.0 → 15.11.0

package/npm-shrinkwrap.json

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

package/package.json

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

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