netlify-cli 8.2.4 → 8.4.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.2.4",
+  "version": "8.4.2",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -78,14 +78,14 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{js,md,yml,json,html}\" \"*.{js,yml,json,html}\" \".*.{js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^26.0.0",
-    "@netlify/config": "^17.0.1",
+    "@netlify/build": "^26.0.2",
+    "@netlify/config": "^17.0.2",
     "@netlify/framework-info": "^7.0.0",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.0",
     "@netlify/plugins-list": "^6.2.0",
     "@netlify/routing-local-proxy": "^0.34.1",
-    "@netlify/zip-it-and-ship-it": "5.3.0",
+    "@netlify/zip-it-and-ship-it": "5.3.1",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-styles": "^5.0.0",
@@ -145,7 +145,7 @@
     "minimist": "^1.2.5",
     "mock-require": "^3.0.3",
     "multiparty": "^4.2.1",
-    "netlify": "^10.0.0",
+    "netlify": "^10.1.0",
     "netlify-headers-parser": "^6.0.0",
     "netlify-redirect-parser": "^13.0.0",
     "netlify-redirector": "^0.2.1",
@@ -176,6 +176,7 @@
     "strip-ansi-control-characters": "^2.0.0",
     "tabtab": "^3.0.2",
     "tempy": "^1.0.0",
+    "terminal-link": "^2.1.1",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-readable-stream": "^2.1.0",
@@ -193,7 +194,6 @@
     "@commitlint/config-conventional": "^15.0.0",
     "@netlify/eslint-config-node": "^4.0.2",
     "ava": "^3.15.0",
-    "eslint-plugin-local-rules": "file:tools/eslint-rules",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",
     "form-data": "^4.0.0",

package/src/functions-templates/javascript/stripe-charge/package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.1.tgz",
-      "integrity": "sha512-NXKvBVUzIbs6ylBwmOwHFkZS2EXCcjnqr8ZCRNaXBkHAf+3mn/rPcJxwrzuc6movh8fxQAsUUfYklJ/EG+hZqQ=="
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",
+      "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
@@ -119,9 +119,9 @@
   },
   "dependencies": {
     "@types/node": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.1.tgz",
-      "integrity": "sha512-NXKvBVUzIbs6ylBwmOwHFkZS2EXCcjnqr8ZCRNaXBkHAf+3mn/rPcJxwrzuc6movh8fxQAsUUfYklJ/EG+hZqQ=="
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",
+      "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="
     },
     "call-bind": {
       "version": "1.0.2",

package/src/functions-templates/javascript/stripe-subscription/package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.1.tgz",
-      "integrity": "sha512-NXKvBVUzIbs6ylBwmOwHFkZS2EXCcjnqr8ZCRNaXBkHAf+3mn/rPcJxwrzuc6movh8fxQAsUUfYklJ/EG+hZqQ=="
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",
+      "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
@@ -119,9 +119,9 @@
   },
   "dependencies": {
     "@types/node": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.1.tgz",
-      "integrity": "sha512-NXKvBVUzIbs6ylBwmOwHFkZS2EXCcjnqr8ZCRNaXBkHAf+3mn/rPcJxwrzuc6movh8fxQAsUUfYklJ/EG+hZqQ=="
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",
+      "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="
     },
     "call-bind": {
       "version": "1.0.2",

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz",
-      "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g=="
+      "version": "14.18.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.2.tgz",
+      "integrity": "sha512-fqtSN5xn/bBzDxMT77C1rJg6CsH/R49E7qsGuvdPJa20HtV5zSTuLJPNfnlyVH3wauKnkHdLggTVkOW/xP9oQg=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz",
-      "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g=="
+      "version": "14.18.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.2.tgz",
+      "integrity": "sha512-fqtSN5xn/bBzDxMT77C1rJg6CsH/R49E7qsGuvdPJa20HtV5zSTuLJPNfnlyVH3wauKnkHdLggTVkOW/xP9oQg=="
     },
     "is-promise": {
       "version": "4.0.0",

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

@@ -7,7 +7,17 @@ const BACKGROUND_SUFFIX = '-background'
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
 
 class NetlifyFunction {
-  constructor({ config, directory, mainFile, name, projectRoot, runtime, timeoutBackground, timeoutSynchronous }) {
+  constructor({
+    config,
+    directory,
+    mainFile,
+    name,
+    projectRoot,
+    runtime,
+    settings,
+    timeoutBackground,
+    timeoutSynchronous,
+  }) {
     this.config = config
     this.directory = directory
     this.errorExit = errorExit
@@ -17,6 +27,7 @@ class NetlifyFunction {
     this.runtime = runtime
     this.timeoutBackground = timeoutBackground
     this.timeoutSynchronous = timeoutSynchronous
+    this.settings = settings
 
     // Determines whether this is a background function based on the function
     // name.
@@ -93,6 +104,10 @@ class NetlifyFunction {
       return { result: null, error }
     }
   }
+
+  get url() {
+    return `http://localhost:${this.settings.port}/.netlify/functions/${this.name}`
+  }
 }
 
 module.exports = { NetlifyFunction }

package/src/lib/functions/registry.js

@@ -2,6 +2,8 @@
 const { mkdir } = require('fs').promises
 const { env } = require('process')
 
+const terminalLink = require('terminal-link')
+
 const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn } = require('../../utils')
 const { getLogMessage } = require('../log')
 
@@ -10,12 +12,13 @@ const runtimes = require('./runtimes')
 const { watchDebounced } = require('./watcher')
 
 class FunctionsRegistry {
-  constructor({ capabilities, config, isConnected = false, projectRoot, timeouts }) {
+  constructor({ capabilities, config, isConnected = false, projectRoot, settings, timeouts }) {
     this.capabilities = capabilities
     this.config = config
     this.isConnected = isConnected
     this.projectRoot = projectRoot
     this.timeouts = timeouts
+    this.settings = settings
 
     // An object to be shared among all functions in the registry. It can be
     // used to cache the results of the build function — e.g. it's used in
@@ -140,7 +143,7 @@ class FunctionsRegistry {
     this.functions.set(name, func)
     this.buildFunctionAndWatchFiles(func)
 
-    log(`${NETLIFYDEVLOG} ${chalk.green('Loaded')} function ${chalk.yellow(name)}.`)
+    log(`${NETLIFYDEVLOG} ${chalk.green('Loaded')} function ${terminalLink(chalk.yellow(name), func.url)}.`)
   }
 
   async scan(directories) {
@@ -192,6 +195,7 @@ class FunctionsRegistry {
         runtime,
         timeoutBackground: this.timeouts.backgroundFunctions,
         timeoutSynchronous: this.timeouts.syncFunctions,
+        settings: this.settings,
       })
 
       this.registerFunction(name, func)

package/src/lib/functions/server.js

@@ -180,6 +180,7 @@ const startFunctionsServer = async ({
       config,
       isConnected: Boolean(siteUrl),
       projectRoot: site.root,
+      settings,
       timeouts,
     })
 

package/src/utils/command-helpers.js

@@ -3,7 +3,6 @@ const os = require('os')
 const process = require('process')
 const { format, inspect } = require('util')
 
-// eslint-disable-next-line local-rules/no-direct-chalk-import
 const { Instance: ChalkInstance } = require('chalk')
 const WSL = require('is-wsl')
 const { default: omit } = require('omit.js')

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

@@ -52,21 +52,21 @@ const deploySite = async (
     phase: 'start',
   })
 
-  const [{ files, filesShaMap }, { fnShaMap, functions, functionsWithNativeModules }] = await Promise.all([
-    hashFiles(dir, configPath, { concurrentHash, hashAlgorithm, assetType, statusCb, filter }),
-    hashFns(fnDir, {
-      functionsConfig,
-      tmpDir,
-      concurrentHash,
-      hashAlgorithm,
-      statusCb,
-      assetType,
-      rootDir,
-      manifestPath,
-      skipFunctionsCache,
-    }),
-  ])
-
+  const [{ files, filesShaMap }, { fnShaMap, functionSchedules, functions, functionsWithNativeModules }] =
+    await Promise.all([
+      hashFiles(dir, configPath, { concurrentHash, hashAlgorithm, assetType, statusCb, filter }),
+      hashFns(fnDir, {
+        functionsConfig,
+        tmpDir,
+        concurrentHash,
+        hashAlgorithm,
+        statusCb,
+        assetType,
+        rootDir,
+        manifestPath,
+        skipFunctionsCache,
+      }),
+    ])
   const filesCount = Object.keys(files).length
   const functionsCount = Object.keys(functions).length
   const hasFunctionDirectories = fnDir.length !== 0
@@ -106,6 +106,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
     body: {
       files,
       functions,
+      function_schedules: functionSchedules,
       async: Object.keys(files).length > syncFileLimit,
       branch,
       draft,

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

@@ -107,7 +107,9 @@ const hashFns = async (
     normalizedPath: path.basename(functionPath, path.extname(functionPath)),
     runtime,
   }))
-
+  const functionSchedules = functionZips
+    .map(({ name, schedule }) => schedule && { name, cron: schedule })
+    .filter(Boolean)
   const functionsWithNativeModules = functionZips.filter(
     ({ nativeNodeModules }) => nativeNodeModules !== undefined && Object.keys(nativeNodeModules).length !== 0,
   )
@@ -125,7 +127,7 @@ const hashFns = async (
 
   await pump(functionStream, hasher, manifestCollector)
 
-  return { functions, functionsWithNativeModules, fnShaMap }
+  return { functionSchedules, functions, functionsWithNativeModules, fnShaMap }
 }
 
 module.exports = { hashFns }