netlify-cli 13.2.0 → 13.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "13.2.0",
+  "version": "13.2.2",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -76,9 +76,9 @@
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.7.1",
-    "@netlify/config": "^20.3.6",
-    "@netlify/edge-bundler": "^8.12.3",
+    "@netlify/build": "^29.8.0",
+    "@netlify/config": "^20.3.7",
+    "@netlify/edge-bundler": "^8.13.0",
     "@netlify/framework-info": "^9.8.5",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/zip-it-and-ship-it": "^8.9.0",
@@ -144,7 +144,7 @@
     "log-update": "^5.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
-    "netlify": "^13.1.3",
+    "netlify": "^13.1.4",
     "netlify-headers-parser": "^7.1.2",
     "netlify-onegraph-internal": "0.10.1",
     "netlify-redirect-parser": "^14.1.2",
@@ -185,7 +185,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.29.0",
+    "@vitest/coverage-c8": "^0.29.7",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "cpy": "^9.0.1",
@@ -208,8 +208,7 @@
     "tree-kill": "^1.2.2",
     "typescript": "^4.4.4",
     "verdaccio": "^5.22.1",
-    "vite": "^4.0.0",
-    "vitest": "^0.29.0"
+    "vitest": "^0.29.7"
   },
   "ava": {
     "files": [

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.38",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.38.tgz",
-      "integrity": "sha512-zMRIidN2Huikv/+/U7gRPFYsXDR/7IGqFZzTLnCEj5+gkrQjsowfamaxEnyvArct5hxGA3bTxMXlYhH78V6Cew=="
+      "version": "14.18.40",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
+      "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.38",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.38.tgz",
-      "integrity": "sha512-zMRIidN2Huikv/+/U7gRPFYsXDR/7IGqFZzTLnCEj5+gkrQjsowfamaxEnyvArct5hxGA3bTxMXlYhH78V6Cew=="
+      "version": "14.18.40",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
+      "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g=="
     },
     "is-promise": {
       "version": "4.0.0",

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

@@ -261,11 +261,13 @@ export class EdgeFunctionsRegistry {
     const declarations = this.bundler.mergeDeclarations(
       this.declarationsFromTOML,
       this.declarationsFromSource,
+      {},
       this.declarationsFromDeployConfig,
     )
     const manifest = this.bundler.generateManifest({
       declarations,
-      functionConfig: this.declarationsFromSource,
+      userFunctionConfig: this.declarationsFromSource,
+      internalFunctionConfig: {},
       functions: this.functions,
     })
     const invocationMetadata = {
@@ -279,7 +281,7 @@ export class EdgeFunctionsRegistry {
     const functionNames = routes
       .filter(({ pattern }) => pattern.test(urlPath))
       .filter(({ function: name }) => {
-        const isExcluded = manifest.function_config[name]?.excluded_patterns.some((pattern) =>
+        const isExcluded = manifest.function_config[name]?.excluded_patterns?.some((pattern) =>
           new RegExp(pattern).test(urlPath),
         )
         return !isExcluded

package/src/utils/get-global-config.mjs

@@ -15,6 +15,9 @@ const globalConfigDefaults = {
 // Memoise config result so that we only load it once
 let configStore
 
+/**
+ * @returns {Promise<Configstore>}
+ */
 const getGlobalConfig = async function () {
   if (!configStore) {
     const configPath = getPathInHome(['config.json'])

package/src/utils/telemetry/telemetry.mjs

@@ -1,15 +1,18 @@
 // @ts-check
 import { dirname, join } from 'path'
-import process from 'process'
+import process, { version as nodejsVersion } from 'process'
 import { fileURLToPath } from 'url'
 
 import { isCI } from 'ci-info'
 
 import execa from '../execa.mjs'
 import getGlobalConfig from '../get-global-config.mjs'
+import getPackageJson from '../get-package-json.mjs'
 
 import isValidEventName from './validation.mjs'
 
+const { version: cliVersion } = await getPackageJson()
+
 const isTelemetryDisabled = function (config) {
   return config.get('telemetryDisabled')
 }
@@ -80,7 +83,7 @@ export const track = async function (eventName, payload = {}) {
     anonymousId: cliId,
     duration,
     status,
-    properties,
+    properties: { ...properties, nodejsVersion, cliVersion },
   }
 
   return send('track', defaultData)