netlify-cli 10.17.7 → 10.18.0-rc.4

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
   "name": "netlify-cli",
-  "version": "10.17.7",
+  "version": "10.18.0-rc.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.17.7",
+      "version": "10.18.0-rc.4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.11.5",
-        "@netlify/config": "^18.1.4",
+        "@netlify/build": "^27.14.0",
+        "@netlify/config": "^18.2.0",
         "@netlify/edge-bundler": "^1.12.1",
         "@netlify/framework-info": "^9.2.0",
         "@netlify/local-functions-proxy": "^1.1.1",
@@ -1189,13 +1189,13 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.11.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.11.5.tgz",
-      "integrity": "sha512-d/EqdcVZzi/EA0rJ21xKvHqugDx2gl3h1mpzk/HQpAmvGtgv+Tkj9W4oVYKyd8L2Pyx/oiFBNyhfNXdCEk3wbA==",
+      "version": "27.14.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
+      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.1.4",
+        "@netlify/config": "^18.2.0",
         "@netlify/edge-bundler": "^1.12.1",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
@@ -2011,9 +2011,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "18.1.4",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.4.tgz",
-      "integrity": "sha512-tM8qDVwBMTYB0n7R6EA6BtuVw9Iq6lNrqE8RjAY4eZ9cjbZkow4M2e0XhmYaNRderLhjYrDlqQr/ttUQA1tZRw==",
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
+      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -23345,13 +23345,13 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.11.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.11.5.tgz",
-      "integrity": "sha512-d/EqdcVZzi/EA0rJ21xKvHqugDx2gl3h1mpzk/HQpAmvGtgv+Tkj9W4oVYKyd8L2Pyx/oiFBNyhfNXdCEk3wbA==",
+      "version": "27.14.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
+      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.1.4",
+        "@netlify/config": "^18.2.0",
         "@netlify/edge-bundler": "^1.12.1",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
@@ -23856,9 +23856,9 @@
       }
     },
     "@netlify/config": {
-      "version": "18.1.4",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.4.tgz",
-      "integrity": "sha512-tM8qDVwBMTYB0n7R6EA6BtuVw9Iq6lNrqE8RjAY4eZ9cjbZkow4M2e0XhmYaNRderLhjYrDlqQr/ttUQA1tZRw==",
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
+      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.17.7",
+  "version": "10.18.0-rc.4",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -205,8 +205,8 @@
     "test:init:eleventy-deps": "npm ci --prefix tests/integration/eleventy-site --no-audit",
     "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
     "test:dev:ava": "ava --verbose",
-    "test:ci:ava:unit": "c8 -r json ava --no-worker-threads tests/unit/**/*.test.js tools/**/*.test.js",
-    "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/**/*.test.js",
+    "test:ci:ava:unit": "c8 -r json ava --no-worker-threads tests/unit/ tools/",
+    "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/",
     "test:affected": "node ./tools/affected-test.mjs",
     "e2e": "node ./tools/e2e/run.mjs",
     "docs": "node ./site/scripts/docs.mjs",
@@ -222,8 +222,8 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^27.11.5",
-    "@netlify/config": "^18.1.4",
+    "@netlify/build": "^27.14.0",
+    "@netlify/config": "^18.2.0",
     "@netlify/edge-bundler": "^1.12.1",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",

package/src/commands/build/build.js

@@ -1,6 +1,8 @@
+const process = require('process')
+
 // @ts-check
 const { getBuildOptions, runBuild } = require('../../lib/build')
-const { error, exit, generateNetlifyGraphJWT, getToken } = require('../../utils')
+const { error, exit, generateNetlifyGraphJWT, getEnvelopeEnv, getToken } = require('../../utils')
 
 /**
  * @param {import('../../lib/build').BuildConfig} options
@@ -15,9 +17,14 @@ const checkOptions = ({ cachedConfig: { siteInfo = {} }, token }) => {
   }
 }
 
-const injectNetlifyGraphEnv = async function (command, { api, buildOptions, site }) {
-  const siteData = await api.getSite({ siteId: site.id })
-  const authlifyTokenId = siteData && siteData.authlify_token_id
+const injectEnv = async function (command, { api, buildOptions, context, site, siteInfo }) {
+  const isUsingEnvelope = siteInfo && siteInfo.use_envelope
+  const authlifyTokenId = siteInfo && siteInfo.authlify_token_id
+
+  const { env } = buildOptions.cachedConfig
+  if (isUsingEnvelope) {
+    buildOptions.cachedConfig.env = await getEnvelopeEnv({ api, context, env, siteInfo })
+  }
 
   if (authlifyTokenId) {
     const netlifyToken = await command.authenticate()
@@ -48,12 +55,12 @@ const injectNetlifyGraphEnv = async function (command, { api, buildOptions, site
  */
 const build = async (options, command) => {
   command.setAnalyticsPayload({ dry: options.dry })
-
   // Retrieve Netlify Build options
   const [token] = await getToken()
 
+  const { cachedConfig, siteInfo } = command.netlify
   const buildOptions = await getBuildOptions({
-    cachedConfig: command.netlify.cachedConfig,
+    cachedConfig,
     token,
     options,
   })
@@ -61,7 +68,8 @@ const build = async (options, command) => {
   if (!options.offline) {
     checkOptions(buildOptions)
     const { api, site } = command.netlify
-    await injectNetlifyGraphEnv(command, { api, site, buildOptions })
+    const { context } = options
+    await injectEnv(command, { api, buildOptions, context, site, siteInfo })
   }
 
   const { exitCode } = await runBuild(buildOptions)
@@ -77,8 +85,8 @@ const createBuildCommand = (program) =>
   program
     .command('build')
     .description('(Beta) Build on your local machine')
+    .option('--context <context>', 'Specify a build context', process.env.CONTEXT || 'production')
     .option('--dry', 'Dry run: show instructions without running them', false)
-    .option('--context [context]', 'Build context')
     .option('-o, --offline', 'disables any features that require network access', false)
     .addExamples(['netlify build'])
     .action(build)

package/src/commands/dev/dev-exec.js

@@ -1,6 +1,7 @@
+const { Option } = require('commander')
 const execa = require('execa')
 
-const { injectEnvVariables } = require('../../utils')
+const { getEnvelopeEnv, injectEnvVariables } = require('../../utils')
 
 /**
  * The dev:exec command
@@ -8,8 +9,14 @@ const { injectEnvVariables } = require('../../utils')
  * @param {import('../base-command').BaseCommand} command
  */
 const devExec = async (cmd, options, command) => {
-  const { cachedConfig, config, site } = command.netlify
-  await injectEnvVariables({ devConfig: { ...config.dev }, env: cachedConfig.env, site })
+  const { api, cachedConfig, config, site, siteInfo } = command.netlify
+
+  let { env } = cachedConfig
+  if (siteInfo.use_envelope) {
+    env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
+  }
+
+  await injectEnvVariables({ devConfig: { ...config.dev }, env, site })
 
   await execa(cmd, command.args.slice(1), {
     stdio: 'inherit',
@@ -25,6 +32,11 @@ const createDevExecCommand = (program) =>
   program
     .command('dev:exec')
     .argument('<...cmd>', `the command that should be executed`)
+    .addOption(
+      new Option('--context <context>', 'Specify a deploy context for environment variables')
+        .choices(['production', 'deploy-preview', 'branch-deploy', 'dev'])
+        .default('dev'),
+    )
     .description(
       'Exec command\nRuns a command within the netlify dev environment, e.g. with env variables from any installed addons',
     )

package/src/commands/dev/dev.js

@@ -430,7 +430,7 @@ const dev = async (options, command) => {
   }
 
   let { env } = command.netlify.cachedConfig
-  if (siteInfo.use_envelope) {
+  if (!options.offline && siteInfo.use_envelope) {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }
 

package/src/commands/env/env-clone.js

@@ -74,11 +74,7 @@ const envClone = async (options, command) => {
     return false
   }
 
-  log(
-    `Successfully cloned environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
-      siteTo.name,
-    )}`,
-  )
+  log(`Successfully cloned environment variables from ${chalk.green(siteFrom.name)} to ${chalk.green(siteTo.name)}`)
 
   return true
 }
@@ -98,7 +94,7 @@ const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
   ] = [siteFrom, siteTo]
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -130,7 +126,7 @@ const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = Object.keys(envFrom)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -163,7 +159,7 @@ const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
   const envFrom = translateFromEnvelopeToMongo(envelopeVariables)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -201,7 +197,7 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = envelopeFrom.map(({ key }) => key)
 
   if (isEmpty(keysFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 

package/src/commands/env/env-get.js

@@ -26,7 +26,7 @@ const envGet = async (name, options, command) => {
     env = await getEnvelopeEnv({ api, context, env, key: name, scope, siteInfo })
   } else if (context !== 'dev' || scope !== 'any') {
     error(
-      `To specify a context or scope, please run ${chalk.yellowBright(
+      `To specify a context or scope, please run ${chalk.yellow(
         'netlify open:admin',
       )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
     )
@@ -42,9 +42,9 @@ const envGet = async (name, options, command) => {
   }
 
   if (!value) {
-    const withContext = `in the ${chalk.magentaBright(context)} context`
-    const withScope = scope === 'any' ? '' : ` in the ${chalk.magentaBright(context)} scope`
-    log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellowBright(name)}`)
+    const withContext = `in the ${chalk.magenta(context)} context`
+    const withScope = scope === 'any' ? '' : ` and the ${chalk.magenta(scope)} scope`
+    log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellow(name)}`)
     return false
   }
 

package/src/commands/env/env-import.js

@@ -15,7 +15,7 @@ const { exit, log, logJson, translateFromEnvelopeToMongo, translateFromMongoToEn
  * @returns {Promise<boolean>}
  */
 const envImport = async (fileName, options, command) => {
-  const { api, site } = command.netlify
+  const { api, cachedConfig, site } = command.netlify
   const siteId = site.id
 
   if (!siteId) {
@@ -37,10 +37,10 @@ const envImport = async (fileName, options, command) => {
     return false
   }
 
-  const siteData = await api.getSite({ siteId })
+  const { siteInfo } = cachedConfig
 
-  const importIntoService = siteData.use_envelope ? importIntoEnvelope : importIntoMongo
-  const finalEnv = await importIntoService({ api, importedEnv, options, siteData })
+  const importIntoService = siteInfo.use_envelope ? importIntoEnvelope : importIntoMongo
+  const finalEnv = await importIntoService({ api, importedEnv, options, siteInfo })
 
   // Return new environment variables of site if using json flag
   if (options.json) {
@@ -49,7 +49,7 @@ const envImport = async (fileName, options, command) => {
   }
 
   // List newly imported environment variables in a table
-  log(`site: ${siteData.name}`)
+  log(`site: ${siteInfo.name}`)
   const table = new AsciiTable(`Imported environment variables`)
 
   table.setHeading('Key', 'Value')
@@ -61,9 +61,9 @@ const envImport = async (fileName, options, command) => {
  * Updates the imported env in the site record
  * @returns {Promise<object>}
  */
-const importIntoMongo = async ({ api, importedEnv, options, siteData }) => {
-  const { env = {} } = siteData.build_settings
-  const siteId = siteData.id
+const importIntoMongo = async ({ api, importedEnv, options, siteInfo }) => {
+  const { env = {} } = siteInfo.build_settings
+  const siteId = siteInfo.id
 
   const finalEnv = options.replaceExisting ? importedEnv : { ...env, ...importedEnv }
 
@@ -86,10 +86,10 @@ const importIntoMongo = async ({ api, importedEnv, options, siteData }) => {
  * Saves the imported env in the Envelope service
  * @returns {Promise<object>}
  */
-const importIntoEnvelope = async ({ api, importedEnv, options, siteData }) => {
+const importIntoEnvelope = async ({ api, importedEnv, options, siteInfo }) => {
   // fetch env vars
-  const accountId = siteData.account_slug
-  const siteId = siteData.id
+  const accountId = siteInfo.account_slug
+  const siteId = siteInfo.id
   const dotEnvKeys = Object.keys(importedEnv)
   const envelopeVariables = await api.getEnvVars({ accountId, siteId })
   const envelopeKeys = envelopeVariables.map(({ key }) => key)

package/src/commands/env/env-list.js

@@ -22,7 +22,7 @@ const getTable = ({ environment, hideValues, scopesColumn }) => {
         // Key
         key,
         // Value
-        hideValues ? MASK : variable.value,
+        hideValues ? MASK : variable.value || ' ',
         // Scope
         scopesColumn && getHumanReadableScopes(variable.scopes),
       ].filter(Boolean),
@@ -55,7 +55,7 @@ const envList = async (options, command) => {
     environment = await getEnvelopeEnv({ api, context, env, scope, siteInfo })
   } else if (context !== 'dev' || scope !== 'any') {
     error(
-      `To specify a context or scope, please run ${chalk.yellowBright(
+      `To specify a context or scope, please run ${chalk.yellow(
         'netlify open:admin',
       )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
     )
@@ -76,9 +76,9 @@ const envList = async (options, command) => {
     return false
   }
 
-  const forSite = `for site ${chalk.greenBright(siteInfo.name)}`
-  const withContext = isUsingEnvelope ? `in the ${chalk.magentaBright(options.context)} context` : ''
-  const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellowBright(options.scope)} scope` : ''
+  const forSite = `for site ${chalk.green(siteInfo.name)}`
+  const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} context` : ''
+  const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellow(options.scope)} scope` : ''
   if (isEmpty(environment)) {
     log(`No environment variables set ${forSite} ${withContext} ${withScope}`)
     return false

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

@@ -1,5 +1,9 @@
 // @ts-check
-const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
+const { Option } = require('commander')
+
+const { chalk, error, log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
+
+const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing']
 
 /**
  * The env:set command
@@ -10,7 +14,9 @@ const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
  * @returns {Promise<boolean>}
  */
 const envSet = async (key, value, options, command) => {
-  const { api, site } = command.netlify
+  const { context, scope } = options
+
+  const { api, cachedConfig, site } = command.netlify
   const siteId = site.id
 
   if (!siteId) {
@@ -18,11 +24,26 @@ const envSet = async (key, value, options, command) => {
     return false
   }
 
-  const siteData = await api.getSite({ siteId })
+  const { siteInfo } = cachedConfig
+  let finalEnv
 
   // Get current environment variables set in the UI
-  const setInService = siteData.use_envelope ? setInEnvelope : setInMongo
-  const finalEnv = await setInService({ api, siteData, key, value })
+  if (siteInfo.use_envelope) {
+    finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope })
+  } else if (context || scope) {
+    error(
+      `To specify a context or scope, please run ${chalk.yellow(
+        'netlify open:admin',
+      )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
+    )
+    return false
+  } else {
+    finalEnv = await setInMongo({ api, siteInfo, key, value })
+  }
+
+  if (!finalEnv) {
+    return false
+  }
 
   // Return new environment variables of site if using json flag
   if (options.json) {
@@ -30,22 +51,27 @@ const envSet = async (key, value, options, command) => {
     return false
   }
 
-  log(`Set environment variable ${key}=${value} for site ${siteData.name}`)
+  const withScope = scope ? ` scoped to ${chalk.white(scope)}` : ''
+  log(
+    `Set environment variable ${chalk.yellow(`${key}${value ? '=' : ''}${value}`)}${withScope} in the ${chalk.magenta(
+      context || 'all',
+    )} context`,
+  )
 }
 
 /**
  * Updates the env for a site record with a new key/value pair
  * @returns {Promise<object>}
  */
-const setInMongo = async ({ api, key, siteData, value }) => {
-  const { env = {} } = siteData.build_settings
+const setInMongo = async ({ api, key, siteInfo, value }) => {
+  const { env = {} } = siteInfo.build_settings
   const newEnv = {
     ...env,
     [key]: value,
   }
   // Apply environment variable updates
   await api.updateSite({
-    siteId: siteData.id,
+    siteId: siteInfo.id,
     body: {
       build_settings: {
         env: newEnv,
@@ -59,28 +85,52 @@ const setInMongo = async ({ api, key, siteData, value }) => {
  * Updates the env for a site configured with Envelope with a new key/value pair
  * @returns {Promise<object>}
  */
-const setInEnvelope = async ({ api, key, siteData, value }) => {
-  const accountId = siteData.account_slug
-  const siteId = siteData.id
+const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
+  const accountId = siteInfo.account_slug
+  const siteId = siteInfo.id
   // fetch envelope env vars
   const envelopeVariables = await api.getEnvVars({ accountId, siteId })
-  const scopes = ['builds', 'functions', 'runtime', 'post_processing']
-  const values = [{ context: 'all', value }]
-  // check if we need to create or update
-  const exists = envelopeVariables.some((envVar) => envVar.key === key)
-  const method = exists ? api.updateEnvVar : api.createEnvVars
-  const body = exists ? { key, scopes, values } : [{ key, scopes, values }]
+  const contexts = context || ['all']
+  const scopes = scope || AVAILABLE_SCOPES
+
+  let values = contexts.map((ctx) => ({ context: ctx, value }))
 
+  const existing = envelopeVariables.find((envVar) => envVar.key === key)
+
+  const params = { accountId, siteId, key }
   try {
-    await method({ accountId, siteId, key, body })
-  } catch (error) {
-    throw error.json ? error.json.msg : error
+    if (existing) {
+      if (!value) {
+        // eslint-disable-next-line prefer-destructuring
+        values = existing.values
+      }
+      if (context && scope) {
+        error(
+          'Setting the context and scope at the same time on an existing env var is not allowed. Run the set command separately for each update.',
+        )
+        return false
+      }
+      if (context) {
+        // update individual value(s)
+        await Promise.all(values.map((val) => api.setEnvVarValue({ ...params, body: val })))
+      } else {
+        // otherwise update whole env var
+        const body = { key, scopes, values }
+        await api.updateEnvVar({ ...params, body })
+      }
+    } else {
+      // create whole env var
+      const body = [{ key, scopes, values }]
+      await api.createEnvVars({ ...params, body })
+    }
+  } catch (error_) {
+    throw error_.json ? error_.json.msg : error_
   }
 
-  const env = translateFromEnvelopeToMongo(envelopeVariables)
+  const env = translateFromEnvelopeToMongo(envelopeVariables, context ? context[0] : 'dev')
   return {
     ...env,
-    [key]: value,
+    [key]: value || env[key],
   }
 }
 
@@ -94,7 +144,30 @@ const createEnvSetCommand = (program) =>
     .command('env:set')
     .argument('<key>', 'Environment variable key')
     .argument('[value]', 'Value to set to', '')
+    .addOption(
+      new Option('-c, --context <context...>', 'Specify a deploy context (default: all contexts)').choices([
+        'production',
+        'deploy-preview',
+        'branch-deploy',
+        'dev',
+      ]),
+    )
+    .addOption(
+      new Option('-s, --scope <scope...>', 'Specify a scope (default: all scopes)').choices([
+        'builds',
+        'functions',
+        'post_processing',
+        'runtime',
+      ]),
+    )
     .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 --scope builds',
+      'netlify env:set VAR_NAME value --scope builds functions',
+    ])
     .action(async (key, value, options, command) => {
       await envSet(key, value, options, command)
     })

package/src/commands/env/env-unset.js

@@ -1,5 +1,9 @@
+const { Option } = require('commander')
+
 // @ts-check
-const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
+const { chalk, error, log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
+
+const AVAILABLE_CONTEXTS = ['production', 'deploy-preview', 'branch-deploy', 'dev']
 
 /**
  * The env:unset command
@@ -9,7 +13,8 @@ const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
  * @returns {Promise<boolean>}
  */
 const envUnset = async (key, options, command) => {
-  const { api, site } = command.netlify
+  const { context } = options
+  const { api, cachedConfig, site } = command.netlify
   const siteId = site.id
 
   if (!siteId) {
@@ -17,10 +22,21 @@ const envUnset = async (key, options, command) => {
     return false
   }
 
-  const siteData = await api.getSite({ siteId })
-
-  const unsetInService = siteData.use_envelope ? unsetInEnvelope : unsetInMongo
-  const finalEnv = await unsetInService({ api, siteData, key })
+  const { siteInfo } = cachedConfig
+
+  let finalEnv
+  if (siteInfo.use_envelope) {
+    finalEnv = await unsetInEnvelope({ api, context, siteInfo, key })
+  } else if (context) {
+    error(
+      `To specify a context, please run ${chalk.yellow(
+        'netlify open:admin',
+      )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
+    )
+    return false
+  } else {
+    finalEnv = await unsetInMongo({ api, siteInfo, key })
+  }
 
   // Return new environment variables of site if using json flag
   if (options.json) {
@@ -28,18 +44,18 @@ const envUnset = async (key, options, command) => {
     return false
   }
 
-  log(`Unset environment variable ${key} for site ${siteData.name}`)
+  log(`Unset environment variable ${chalk.yellow(key)} in the ${chalk.magenta(context || 'all')} context`)
 }
 
 /**
  * Deletes a given key from the env of a site record
  * @returns {Promise<object>}
  */
-const unsetInMongo = async ({ api, key, siteData }) => {
+const unsetInMongo = async ({ api, key, siteInfo }) => {
   // Get current environment variables set in the UI
   const {
     build_settings: { env = {} },
-  } = siteData
+  } = siteInfo
 
   const newEnv = env
 
@@ -48,7 +64,7 @@ const unsetInMongo = async ({ api, key, siteData }) => {
 
   // Apply environment variable updates
   await api.updateSite({
-    siteId: siteData.id,
+    siteId: siteInfo.id,
     body: {
       build_settings: {
         env: newEnv,
@@ -63,24 +79,44 @@ const unsetInMongo = async ({ api, key, siteData }) => {
  * Deletes a given key from the env of a site configured with Envelope
  * @returns {Promise<object>}
  */
-const unsetInEnvelope = async ({ api, key, siteData }) => {
-  const accountId = siteData.account_slug
-  const siteId = siteData.id
+const unsetInEnvelope = async ({ api, context, key, siteInfo }) => {
+  const accountId = siteInfo.account_slug
+  const siteId = siteInfo.id
   // fetch envelope env vars
   const envelopeVariables = await api.getEnvVars({ accountId, siteId })
+  const contexts = context || ['all']
+
+  const env = translateFromEnvelopeToMongo(envelopeVariables, context ? context[0] : 'dev')
 
   // check if the given key exists
-  const env = translateFromEnvelopeToMongo(envelopeVariables)
-  if (!env[key]) {
+  const variable = envelopeVariables.find((envVar) => envVar.key === key)
+  if (!variable) {
     // if not, no need to call delete; return early
     return env
   }
 
-  // delete the given key
+  const params = { accountId, siteId, key }
   try {
-    await api.deleteEnvVar({ accountId, siteId, key })
-  } catch (error) {
-    throw error.json ? error.json.msg : error
+    if (context) {
+      // if context(s) are passed, delete the matching contexts, and the `all` context
+      const values = variable.values.filter((val) => [...contexts, 'all'].includes(val.context))
+      if (values) {
+        await Promise.all(values.map((value) => api.deleteEnvVarValue({ ...params, id: value.id })))
+        // if this was the `all` context, we need to create 3 values in the other contexts
+        if (values.length === 1 && values[0].context === 'all') {
+          const newContexts = AVAILABLE_CONTEXTS.filter((ctx) => !context.includes(ctx))
+          const allValue = values[0].value
+          await Promise.all(
+            newContexts.map((ctx) => api.setEnvVarValue({ ...params, body: { context: ctx, value: allValue } })),
+          )
+        }
+      }
+    } else {
+      // otherwise, if no context passed, delete the whole key
+      await api.deleteEnvVar({ accountId, siteId, key })
+    }
+  } catch (error_) {
+    throw error_.json ? error_.json.msg : error_
   }
 
   delete env[key]
@@ -98,6 +134,19 @@ const createEnvUnsetCommand = (program) =>
     .command('env:unset')
     .aliases(['env:delete', 'env:remove'])
     .argument('<key>', 'Environment variable key')
+    .addOption(
+      new Option('-c, --context <context...>', 'Specify a deploy context (default: all contexts)').choices([
+        'production',
+        'deploy-preview',
+        'branch-deploy',
+        'dev',
+      ]),
+    )
+    .addExamples([
+      'netlify env:unset VAR_NAME # unset in all contexts',
+      'netlify env:unset VAR_NAME --context production',
+      'netlify env:unset VAR_NAME --context production deploy-preview',
+    ])
     .description('Unset an environment variable which removes it from the UI')
     .action(async (key, options, command) => {
       await envUnset(key, options, command)

package/src/functions-templates/javascript/scheduled-function/package.json

@@ -15,6 +15,6 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.1.0"
+    "@netlify/functions": "^1.2.0"
   }
 }

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

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^1.1.0",
+        "@netlify/functions": "^1.2.0",
         "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz",
-      "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.2.0.tgz",
+      "integrity": "sha512-zCOJPoZQLv4ISHjyBS7asqzR6Y9NU+Vb0VKYDD0xUwYmReMhLTDchjGMkt5x0Jk1EVnJwUvA29rGyQEj3tIgAA==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz",
-      "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.2.0.tgz",
+      "integrity": "sha512-zCOJPoZQLv4ISHjyBS7asqzR6Y9NU+Vb0VKYDD0xUwYmReMhLTDchjGMkt5x0Jk1EVnJwUvA29rGyQEj3tIgAA==",
       "requires": {
         "is-promise": "^4.0.0"
       }

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

@@ -14,7 +14,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.1.0",
+    "@netlify/functions": "^1.2.0",
     "@types/node": "^14.0.0",
     "typescript": "^4.0.0"
   }

package/src/functions-templates/typescript/scheduled-function/package.json

@@ -15,7 +15,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.1.0",
+    "@netlify/functions": "^1.2.0",
     "@types/node": "^14.18.9",
     "typescript": "^4.5.5"
   }

package/src/lib/build.js

@@ -1,4 +1,6 @@
 // @ts-check
+const process = require('process')
+
 const netlifyBuildPromise = import('@netlify/build')
 
 /**
@@ -20,6 +22,7 @@ const netlifyBuildPromise = import('@netlify/build')
  */
 const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, json, offline, silent }, token }) => ({
   cachedConfig,
+  siteId: cachedConfig.siteInfo.id,
   token,
   dry,
   debug,
@@ -42,6 +45,18 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, js
  */
 const runBuild = async (options) => {
   const { default: build } = await netlifyBuildPromise
+
+  // If netlify NETLIFY_API_URL is set we need to pass this information to @netlify/build
+  // TODO don't use testOpts, but add real properties to do this.
+  if (process.env.NETLIFY_API_URL) {
+    const apiUrl = new URL(process.env.NETLIFY_API_URL)
+    const testOpts = {
+      scheme: apiUrl.protocol.slice(0, -1),
+      host: apiUrl.host,
+    }
+    options = { ...options, testOpts }
+  }
+
   const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(options)
   return { exitCode, newConfig, configMutations }
 }

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

@@ -24,6 +24,7 @@ class EdgeFunctionsRegistry {
    * @param {object} opts.config
    * @param {string} opts.configPath
    * @param {string[]} opts.directories
+   * @param {Record<string, string>} opts.env
    * @param {() => Promise<object>} opts.getUpdatedConfig
    * @param {EdgeFunction[]} opts.internalFunctions
    * @param {string} opts.projectDir
@@ -197,6 +198,7 @@ class EdgeFunctionsRegistry {
     })
 
     env.DENO_REGION = 'local'
+    env.NETLIFY_DEV = 'true'
     // We use it in the bootstrap layer to detect whether we're running in production or not
     // (see https://github.com/netlify/edge-functions-bootstrap/blob/main/src/bootstrap/environment.ts#L2)
     // env.DENO_DEPLOYMENT_ID = 'xxx='

package/src/lib/one-graph/cli-client.js

@@ -828,12 +828,32 @@ const detectLocalCLISessionMetadata = async ({ siteRoot }) => {
  * @param {string} input.jwt The GraphJWT string
  * @param {string} input.sessionId The id of the cli session to fetch the current metadata for
  * @param {string} input.siteRoot Path to the root of the project
+ * @param {object} input.config The parsed netlify.toml config file
  * @param {string} input.docId The GraphQL operations document id to fetch
  * @param {string} input.schemaId The GraphQL schemaId to use when generating code
  */
-const publishCliSessionMetadataPublishEvent = async ({ docId, jwt, schemaId, sessionId, siteRoot }) => {
+const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schemaId, sessionId, siteRoot }) => {
   const detectedMetadata = await detectLocalCLISessionMetadata({ siteRoot })
 
+  /** @type {CodegenHelpers.CodegenModuleMeta | null} */
+  let codegen = null
+
+  const codegenModule = await getCodegenModule({ config })
+
+  if (codegenModule) {
+    codegen = {
+      id: codegenModule.id,
+      version: codegenModule.id,
+      generators: codegenModule.generators.map((generator) => ({
+        id: generator.id,
+        name: generator.name,
+        options: generator.generateHandlerOptions || null,
+        supportedDefinitionTypes: generator.supportedDefinitionTypes,
+        version: generator.version,
+      })),
+    }
+  }
+
   /** @type {CliEventHelper.OneGraphNetlifyCliSessionMetadataPublishEvent} */
   const event = {
     __typename: 'OneGraphNetlifyCliSessionMetadataPublishEvent',
@@ -848,7 +868,7 @@ const publishCliSessionMetadataPublishEvent = async ({ docId, jwt, schemaId, ses
       siteRootFriendly: detectedMetadata.siteRoot,
       persistedDocId: docId,
       schemaId,
-      codegenModule: detectedMetadata.codegen,
+      codegenModule: codegen,
       arch: detectedMetadata.arch,
       nodeVersion: detectedMetadata.nodeVersion,
       platform: detectedMetadata.platform,

package/src/utils/env/index.js

@@ -171,13 +171,14 @@ const translateFromMongoToEnvelope = (env = {}) => {
 /**
  * Translates an Envelope env into a Mongo env
  * @param {Array<object>} envVars - The array of Envelope env vars
+ * @param {enum<dev,branch-deploy,deploy-preview,production>} context - The deploy context of the environment variable
  * @returns {object} The env object as compatible with Mongo
  */
-const translateFromEnvelopeToMongo = (envVars = []) =>
+const translateFromEnvelopeToMongo = (envVars = [], context = 'dev') =>
   envVars
     .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
     .reduce((acc, cur) => {
-      const envVar = cur.values.find((val) => ['dev', 'all'].includes(val.context))
+      const envVar = cur.values.find((val) => [context, 'all'].includes(val.context))
       if (envVar && envVar.value) {
         return {
           ...acc,