netlify-cli 15.7.0 → 15.8.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.7.0",
+  "version": "15.8.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,14 +44,14 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.12.8",
-    "@netlify/build-info": "7.0.8",
-    "@netlify/config": "20.5.1",
+    "@netlify/build": "29.15.2",
+    "@netlify/build-info": "7.3.4",
+    "@netlify/config": "20.5.2",
     "@netlify/edge-bundler": "8.16.2",
     "@netlify/framework-info": "9.8.10",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
-    "@netlify/zip-it-and-ship-it": "9.10.0",
+    "@netlify/zip-it-and-ship-it": "9.12.1",
     "@octokit/rest": "19.0.13",
     "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",
@@ -60,7 +60,7 @@
     "ascii-table": "0.0.9",
     "backoff": "2.5.0",
     "better-opn": "3.0.2",
-    "boxen": "7.1.0",
+    "boxen": "7.1.1",
     "chalk": "5.2.0",
     "chokidar": "3.5.3",
     "ci-info": "3.8.0",
@@ -92,7 +92,7 @@
     "from2-array": "0.0.4",
     "fuzzy": "0.1.3",
     "get-port": "5.1.1",
-    "gh-release-fetch": "4.0.2",
+    "gh-release-fetch": "4.0.3",
     "git-repo-info": "2.1.1",
     "gitconfiglocal": "2.1.0",
     "hasbin": "1.2.3",
@@ -106,7 +106,7 @@
     "is-stream": "3.0.0",
     "is-wsl": "2.2.0",
     "isexe": "2.0.0",
-    "jsonwebtoken": "9.0.0",
+    "jsonwebtoken": "9.0.1",
     "jwt-decode": "3.1.2",
     "listr": "0.14.3",
     "locate-path": "7.2.0",
@@ -119,7 +119,7 @@
     "netlify-headers-parser": "7.1.2",
     "netlify-redirect-parser": "14.1.3",
     "netlify-redirector": "0.4.0",
-    "node-fetch": "2.6.11",
+    "node-fetch": "2.6.12",
     "node-version-alias": "3.4.1",
     "ora": "6.3.1",
     "p-filter": "3.0.0",

package/src/commands/base-command.mjs

@@ -407,7 +407,8 @@ export default class BaseCommand extends Command {
   }
 
   setAnalyticsPayload(payload) {
-    this.analytics = { ...this.analytics, payload }
+    const newPayload = { ...this.analytics.payload, ...payload }
+    this.analytics = { ...this.analytics, payload: newPayload }
   }
 
   /**

package/src/commands/env/env-set.mjs

@@ -18,7 +18,7 @@ import {
  * @returns {Promise<boolean>}
  */
 const envSet = async (key, value, options, command) => {
-  const { context, scope } = options
+  const { context, scope, secret } = options
 
   const { api, cachedConfig, site } = command.netlify
   const siteId = site.id
@@ -33,7 +33,7 @@ const envSet = async (key, value, options, command) => {
 
   // Get current environment variables set in the UI
   if (siteInfo.use_envelope) {
-    finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope })
+    finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope, secret })
   } else if (context || scope) {
     error(
       `To specify a context or scope, please run ${chalk.yellow(
@@ -56,11 +56,12 @@ const envSet = async (key, value, options, command) => {
   }
 
   const withScope = scope ? ` scoped to ${chalk.white(scope)}` : ''
+  const withSecret = secret ? ` as a ${chalk.blue('secret')}` : ''
   const contextType = AVAILABLE_CONTEXTS.includes(context || 'all') ? 'context' : 'branch'
   log(
-    `Set environment variable ${chalk.yellow(`${key}${value ? '=' : ''}${value}`)}${withScope} in the ${chalk.magenta(
-      context || 'all',
-    )} ${contextType}`,
+    `Set environment variable ${chalk.yellow(
+      `${key}${value && !secret ? `=${value}` : ''}`,
+    )}${withScope}${withSecret} in the ${chalk.magenta(context || 'all')} ${contextType}`,
   )
 }
 
@@ -88,15 +89,35 @@ const setInMongo = async ({ api, key, siteInfo, value }) => {
 
 /**
  * Updates the env for a site configured with Envelope with a new key/value pair
- * @returns {Promise<object>}
+ * @returns {Promise<object | boolean>}
  */
-const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
+const setInEnvelope = async ({ api, context, key, scope, secret, siteInfo, value }) => {
   const accountId = siteInfo.account_slug
   const siteId = siteInfo.id
+
+  // secret values may not be used in the post-processing scope
+  if (secret && scope && scope.some((sco) => /post[-_]processing/.test(sco))) {
+    error(`Secret values cannot be used within the post-processing scope.`)
+    return false
+  }
+
+  // secret values must specify deploy contexts. `all` or `dev` are not allowed
+  if (secret && value && (!context || context.includes('dev'))) {
+    error(
+      `To set a secret environment variable value, please specify a non-development context with the \`--context\` flag.`,
+    )
+    return false
+  }
+
   // fetch envelope env vars
   const envelopeVariables = await api.getEnvVars({ accountId, siteId })
   const contexts = context || ['all']
-  const scopes = scope || AVAILABLE_SCOPES
+  let scopes = scope || AVAILABLE_SCOPES
+
+  if (secret) {
+    // post_processing (aka post-processing) scope is not allowed with secrets
+    scopes = scopes.filter((sco) => !/post[-_]processing/.test(sco))
+  }
 
   // if the passed context is unknown, it is actually a branch name
   let values = contexts.map((ctx) =>
@@ -111,6 +132,10 @@ const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
       if (!value) {
         // eslint-disable-next-line prefer-destructuring
         values = existing.values
+        if (!scope) {
+          // eslint-disable-next-line prefer-destructuring
+          scopes = existing.scopes
+        }
       }
       if (context && scope) {
         error(
@@ -123,12 +148,24 @@ const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
         await Promise.all(values.map((val) => api.setEnvVarValue({ ...params, body: val })))
       } else {
         // otherwise update whole env var
-        const body = { key, scopes, values }
+        if (secret) {
+          scopes = scopes.filter((sco) => !/post[-_]processing/.test(sco))
+          if (values.some((val) => val.context === 'all')) {
+            log(`This secret's value will be empty in the dev context.`)
+            log(`Run \`netlify env:set ${key} <value> --context dev\` to set a new value for the dev context.`)
+            values = AVAILABLE_CONTEXTS.filter((ctx) => ctx !== 'all').map((ctx) => ({
+              context: ctx,
+              // empty out dev value so that secret is indeed secret
+              value: ctx === 'dev' ? '' : values.find((val) => val.context === 'all').value,
+            }))
+          }
+        }
+        const body = { key, is_secret: secret, scopes, values }
         await api.updateEnvVar({ ...params, body })
       }
     } else {
       // create whole env var
-      const body = [{ key, scopes, values }]
+      const body = [{ key, is_secret: secret, scopes, values }]
       await api.createEnvVars({ ...params, body })
     }
   } catch (error_) {
@@ -166,13 +203,16 @@ export const createEnvSetCommand = (program) =>
         'runtime',
       ]),
     )
+    .option('--secret', 'Indicate whether the environment variable value can be read again.')
     .description('Set value of environment variable')
     .addExamples([
       'netlify env:set VAR_NAME value # set in all contexts and scopes',
       'netlify env:set VAR_NAME value --context production',
       'netlify env:set VAR_NAME value --context production deploy-preview',
+      'netlify env:set VAR_NAME value --context production --secret',
       'netlify env:set VAR_NAME value --scope builds',
       'netlify env:set VAR_NAME value --scope builds functions',
+      'netlify env:set VAR_NAME --secret # convert existing variable to secret',
     ])
     .action(async (key, value, options, command) => {
       await envSet(key, value, options, command)

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

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

package/src/lib/functions/runtimes/js/builders/zisi.mjs

@@ -135,18 +135,8 @@ export default async function handler({ config, directory, errorExit, func, meta
   const featureFlags = {}
 
   if (metadata.runtimeAPIVersion === 2) {
-    // For TypeScript we use NFT, otherwise we leave the file untouched with the `none` bundler
-    const isTypescript = ['.ts', '.mts', '.cts'].includes(path.extname(func.mainFile))
-
-    if (isTypescript) {
-      functionsConfig['*'].nodeBundler = 'nft'
-    } else {
-      // using esbuild is less performant than `none`, but it emits sourcemaps and thus
-      // enables debugging functions
-      functionsConfig['*'].nodeBundler = 'esbuild'
-      featureFlags.zisi_pure_esm = true
-      featureFlags.zisi_pure_esm_mjs = true
-    }
+    featureFlags.zisi_pure_esm = true
+    featureFlags.zisi_pure_esm_mjs = true
   } else {
     // We must use esbuild for certain file extensions.
     const mustTranspile = ['.mjs', '.ts', '.mts', '.cts'].includes(path.extname(func.mainFile))

package/src/lib/functions/synchronous.mjs

@@ -75,20 +75,20 @@ const formatLambdaLocalError = (err, acceptsHtml) =>
       })
     : `${err.errorType}: ${err.errorMessage}\n ${err.stackTrace?.join('\n ')}`
 
-const processRenderedResponse = async (err, request) => {
-  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
-  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
-
-  return acceptsHtml
-    ? await renderErrorTemplate(errorString, './templates/function-error.html', 'function')
-    : errorString
-}
-
 const handleErr = async (err, request, response) => {
   detectAwsSdkError({ err })
 
+  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
+  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
+
   response.statusCode = 500
-  response.end(await processRenderedResponse(err, request))
+
+  if (acceptsHtml) {
+    response.setHeader('Content-Type', 'text/html')
+    response.end(await renderErrorTemplate(errorString, './templates/function-error.html', 'function'))
+  } else {
+    response.end(errorString)
+  }
 }
 
 const validateLambdaResponse = (lambdaResponse) => {

package/src/utils/proxy.mjs

@@ -36,9 +36,29 @@ import { generateRequestID } from './request-id.mjs'
 import { createRewriter, onChanges } from './rules-proxy.mjs'
 import { signRedirect } from './sign-redirect.mjs'
 
-const decompress = util.promisify(zlib.gunzip)
+const gunzip = util.promisify(zlib.gunzip)
+const brotliDecompress = util.promisify(zlib.brotliDecompress)
+const deflate = util.promisify(zlib.deflate)
 const shouldGenerateETag = Symbol('Internal: response should generate ETag')
 
+/**
+ * @param {Buffer} body
+ * @param {string | undefined} contentEncoding
+ * @returns {Promise<Buffer>}
+ */
+const decompressResponseBody = async function (body, contentEncoding = '') {
+  switch (contentEncoding) {
+    case 'gzip':
+      return await gunzip(body)
+    case 'br':
+      return await brotliDecompress(body)
+    case 'deflate':
+      return await deflate(body)
+    default:
+      return body
+  }
+}
+
 const formatEdgeFunctionError = (errorBuffer, acceptsHtml) => {
   const {
     error: { message, name, stack },
@@ -479,7 +499,7 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
 
       if (isEdgeFunctionsRequest(req) && isUncaughtError) {
         const acceptsHtml = req.headers && req.headers.accept && req.headers.accept.includes('text/html')
-        const decompressedBody = await decompress(responseBody)
+        const decompressedBody = await decompressResponseBody(responseBody, req.headers['content-encoding'])
         const formattedBody = formatEdgeFunctionError(decompressedBody, acceptsHtml)
         const errorResponse = acceptsHtml
           ? await renderErrorTemplate(formattedBody, './templates/function-error.html', 'edge function')
@@ -487,6 +507,7 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
         const contentLength = Buffer.from(errorResponse, 'utf8').byteLength
 
         res.setHeader('content-length', contentLength)
+        res.statusCode = 500
         res.write(errorResponse)
         return res.end()
       }