netlify-cli 13.1.7 → 13.2.1

package/npm-shrinkwrap.json

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

package/package.json

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

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/bootstrap.mjs

@@ -1,5 +1,5 @@
 import { env } from 'process'
 
-const latestBootstrapURL = 'https://64109c4552d9020008b9dadc--edge.netlify.com/bootstrap/index-combined.ts'
+const latestBootstrapURL = 'https://6419767d9dc968000848742a--edge.netlify.com/bootstrap/index-combined.ts'
 
 export const getBootstrapURL = () => env.NETLIFY_EDGE_BOOTSTRAP || latestBootstrapURL

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

@@ -1,6 +1,11 @@
-const headers = {
+// @ts-check
+import { Buffer } from 'buffer'
+
+export const headers = {
+  FeatureFlags: 'x-nf-feature-flags',
   ForwardedHost: 'x-forwarded-host',
   Functions: 'x-nf-edge-functions',
+  InvocationMetadata: 'x-nf-edge-functions-metadata',
   Geo: 'x-nf-geo',
   Passthrough: 'x-nf-passthrough',
   IP: 'x-nf-client-connection-ip',
@@ -8,4 +13,24 @@ const headers = {
   DebugLogging: 'x-nf-debug-logging',
 }
 
-export default headers
+/**
+ * Takes an array of feature flags and produces a Base64-encoded JSON object
+ * that the bootstrap layer can understand.
+ *
+ * @param {Array<string>} featureFlags
+ * @returns {string}
+ */
+export const getFeatureFlagsHeader = (featureFlags) => {
+  const featureFlagsObject = featureFlags.reduce((acc, flagName) => ({ ...acc, [flagName]: true }), {})
+
+  return Buffer.from(JSON.stringify(featureFlagsObject)).toString('base64')
+}
+
+/**
+ * Takes the invocation metadata object and produces a Base64-encoded JSON
+ * object that the bootstrap layer can understand.
+ *
+ * @param {object} metadata
+ * @returns {string}
+ */
+export const getInvocationMetadataHeader = (metadata) => Buffer.from(JSON.stringify(metadata)).toString('base64')

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

@@ -12,7 +12,7 @@ import { startSpinner, stopSpinner } from '../spinner.mjs'
 
 import { getBootstrapURL } from './bootstrap.mjs'
 import { DIST_IMPORT_MAP_PATH } from './consts.mjs'
-import headers from './headers.mjs'
+import { headers, getFeatureFlagsHeader, getInvocationMetadataHeader } from './headers.mjs'
 import { getInternalFunctions } from './internal.mjs'
 import { EdgeFunctionsRegistry } from './registry.mjs'
 
@@ -109,7 +109,7 @@ export const initializeProxy = async ({
     await registry.initialize()
 
     const url = new URL(req.url, `http://${LOCAL_HOST}:${mainPort}`)
-    const { functionNames, orphanedDeclarations } = registry.matchURLPath(url.pathname)
+    const { functionNames, invocationMetadata, orphanedDeclarations } = registry.matchURLPath(url.pathname)
 
     // If the request matches a config declaration for an Edge Function without
     // a matching function file, we warn the user.
@@ -129,11 +129,15 @@ export const initializeProxy = async ({
       return
     }
 
+    const featureFlags = ['edge_functions_bootstrap_failure_mode']
+
     req[headersSymbol] = {
-      [headers.Functions]: functionNames.join(','),
+      [headers.FeatureFlags]: getFeatureFlagsHeader(featureFlags),
       [headers.ForwardedHost]: `localhost:${passthroughPort}`,
-      [headers.Passthrough]: 'passthrough',
+      [headers.Functions]: functionNames.join(','),
+      [headers.InvocationMetadata]: getInvocationMetadataHeader(invocationMetadata),
       [headers.IP]: LOCAL_HOST,
+      [headers.Passthrough]: 'passthrough',
     }
 
     if (debug) {

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

@@ -268,6 +268,10 @@ export class EdgeFunctionsRegistry {
       functionConfig: this.declarationsFromSource,
       functions: this.functions,
     })
+    const invocationMetadata = {
+      function_config: manifest.function_config,
+      routes: manifest.routes.map((route) => ({ function: route.function, pattern: route.pattern })),
+    }
     const routes = [...manifest.routes, ...manifest.post_cache_routes].map((route) => ({
       ...route,
       pattern: new RegExp(route.pattern),
@@ -283,7 +287,7 @@ export class EdgeFunctionsRegistry {
       .map((route) => route.function)
     const orphanedDeclarations = this.matchURLPathAgainstOrphanedDeclarations(urlPath)
 
-    return { functionNames, orphanedDeclarations }
+    return { functionNames, invocationMetadata, orphanedDeclarations }
   }
 
   matchURLPathAgainstOrphanedDeclarations(urlPath) {

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)