netlify-cli 10.6.3 → 10.7.0

package/npm-shrinkwrap.json

@@ -1,21 +1,21 @@
 {
   "name": "netlify-cli",
-  "version": "10.6.3",
+  "version": "10.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.6.3",
+      "version": "10.7.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.3.1",
-        "@netlify/config": "^18.1.0",
-        "@netlify/edge-bundler": "^1.4.1",
+        "@netlify/build": "^27.3.2",
+        "@netlify/config": "^18.1.1",
+        "@netlify/edge-bundler": "^1.4.2",
         "@netlify/framework-info": "^9.1.0",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugins-list": "^6.28.0",
+        "@netlify/plugins-list": "^6.30.0",
         "@netlify/zip-it-and-ship-it": "^5.11.1",
         "@octokit/rest": "^18.0.0",
         "@sindresorhus/slugify": "^1.1.0",
@@ -1177,13 +1177,13 @@
       }
     },
     "node_modules/@netlify/build": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.3.1.tgz",
-      "integrity": "sha512-7b1/mgZKRK4mDxA0GsaUHX/8bkzKSm1YufedOyZquq13WxMubrBqY55jsBBblT2SOd+PQgTq+/Nb/tgx12nU0Q==",
+      "version": "27.3.2",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.3.2.tgz",
+      "integrity": "sha512-QoaRwx+qt7582mXSZP0s3YCsK2/xUOsEfhx2Q3PvYKKdVDGjx5MROMuCdc480e8KPWsTTUheB2+A5RuB9dpcLQ==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.1.0",
+        "@netlify/config": "^18.1.1",
         "@netlify/edge-bundler": "^1.4.1",
         "@netlify/functions-utils": "^4.2.0",
         "@netlify/git-utils": "^4.0.0",
@@ -1764,9 +1764,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-      "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+      "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw==",
       "engines": {
         "node": ">=12.20"
       },
@@ -1775,9 +1775,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-      "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+      "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw==",
       "engines": {
         "node": ">=12.20"
       },
@@ -1969,9 +1969,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.0.tgz",
-      "integrity": "sha512-l5CpXb3qM2fmduu3VnrlBNBZ1Xtwm0+ZLZCIUkDa3GFe3X2LLXN2TEttHP/KFSQg7LmRRYX154ReYcpH0QJNpA==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.1.tgz",
+      "integrity": "sha512-w3rIWV72anBCnAb69rCTnuwkLHhZUgZPf9Gsr0Y5AIf/sWJ7cbxwo9cAewgfqVt7ZOFniiQD5ePOaZOawGdn8A==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -2279,9 +2279,9 @@
       }
     },
     "node_modules/@netlify/config/node_modules/type-fest": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-      "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+      "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw==",
       "engines": {
         "node": ">=12.20"
       },
@@ -2301,9 +2301,9 @@
       }
     },
     "node_modules/@netlify/edge-bundler": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.1.tgz",
-      "integrity": "sha512-sgahUAtGiOHGT/mznoxsLrUmKKq8pzEitS4i5CNHFbdPcY2wUnqHTiKGNLEl1VLtenyLRa6RAujjxRVpYE90mg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.2.tgz",
+      "integrity": "sha512-grllAfoFzZu6m63pkcm8GqoG8wng6AIKNjY/Ay6UTMn+E2lBgB6pw2fF7xT8mGYWSB2TLdRlQ4RyPE/DUoyoIQ==",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -3534,9 +3534,9 @@
       "integrity": "sha512-ZJF4nbLPfxsWrVgp2reCb23HMxsWl5+r+K0RtIhxcZ/RxbHVihRA9mwyzIcxPWrT5x9uAAxCr1aKGP7IdsDe+Q=="
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.29.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.29.0.tgz",
-      "integrity": "sha512-H81D32COgftfzJhY+TWNtxd8EXaQS1c/Gkj3WI/v4xhsZvw/6MOzKtDopK7Mq7nYk+aKc2OqxfOuQNR02FpQug==",
+      "version": "6.30.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.30.0.tgz",
+      "integrity": "sha512-NF0G7rMl/FbCkZMDiihoDW70i96aF3fguHvuspucstM4ArAdMai5b3rEKSOO2SXTbmQHaAlQEpiYAPZsGwU7jg==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -22643,9 +22643,9 @@
       }
     },
     "node_modules/winston": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz",
-      "integrity": "sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.0.tgz",
+      "integrity": "sha512-Iix1w8rIq2kBDkGvclO0db2CVOHYVamCIkVWcUbs567G9i2pdB+gvqLgDgxx4B4HXHYD6U4Zybh6ojepUOqcFQ==",
       "dependencies": {
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
@@ -23705,13 +23705,13 @@
       }
     },
     "@netlify/build": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.3.1.tgz",
-      "integrity": "sha512-7b1/mgZKRK4mDxA0GsaUHX/8bkzKSm1YufedOyZquq13WxMubrBqY55jsBBblT2SOd+PQgTq+/Nb/tgx12nU0Q==",
+      "version": "27.3.2",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.3.2.tgz",
+      "integrity": "sha512-QoaRwx+qt7582mXSZP0s3YCsK2/xUOsEfhx2Q3PvYKKdVDGjx5MROMuCdc480e8KPWsTTUheB2+A5RuB9dpcLQ==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.1.0",
+        "@netlify/config": "^18.1.1",
         "@netlify/edge-bundler": "^1.4.1",
         "@netlify/functions-utils": "^4.2.0",
         "@netlify/git-utils": "^4.0.0",
@@ -24059,9 +24059,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.14.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-              "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w=="
+              "version": "2.15.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+              "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw=="
             }
           }
         },
@@ -24076,9 +24076,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.14.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-              "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w=="
+              "version": "2.15.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+              "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw=="
             }
           }
         },
@@ -24192,9 +24192,9 @@
       }
     },
     "@netlify/config": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.0.tgz",
-      "integrity": "sha512-l5CpXb3qM2fmduu3VnrlBNBZ1Xtwm0+ZLZCIUkDa3GFe3X2LLXN2TEttHP/KFSQg7LmRRYX154ReYcpH0QJNpA==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.1.1.tgz",
+      "integrity": "sha512-w3rIWV72anBCnAb69rCTnuwkLHhZUgZPf9Gsr0Y5AIf/sWJ7cbxwo9cAewgfqVt7ZOFniiQD5ePOaZOawGdn8A==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -24370,9 +24370,9 @@
           "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
         },
         "type-fest": {
-          "version": "2.14.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.14.0.tgz",
-          "integrity": "sha512-hQnTQkFjL5ik6HF2fTAM8ycbr94UbQXK364wF930VHb0dfBJ5JBP8qwrR8TaK9zwUEk7meruo2JAUDMwvuxd/w=="
+          "version": "2.15.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.15.1.tgz",
+          "integrity": "sha512-LYSjcIz3NmoQksXq/3/B7Nfad+T8mkaI628agAAnHCpXPTBRMK2ygt3eABpzII8CbZZM8dLdVQ4Gr8ousjFjMw=="
         },
         "yocto-queue": {
           "version": "1.0.0",
@@ -24382,9 +24382,9 @@
       }
     },
     "@netlify/edge-bundler": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.1.tgz",
-      "integrity": "sha512-sgahUAtGiOHGT/mznoxsLrUmKKq8pzEitS4i5CNHFbdPcY2wUnqHTiKGNLEl1VLtenyLRa6RAujjxRVpYE90mg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.2.tgz",
+      "integrity": "sha512-grllAfoFzZu6m63pkcm8GqoG8wng6AIKNjY/Ay6UTMn+E2lBgB6pw2fF7xT8mGYWSB2TLdRlQ4RyPE/DUoyoIQ==",
       "requires": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -25065,9 +25065,9 @@
       "integrity": "sha512-ZJF4nbLPfxsWrVgp2reCb23HMxsWl5+r+K0RtIhxcZ/RxbHVihRA9mwyzIcxPWrT5x9uAAxCr1aKGP7IdsDe+Q=="
     },
     "@netlify/plugins-list": {
-      "version": "6.29.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.29.0.tgz",
-      "integrity": "sha512-H81D32COgftfzJhY+TWNtxd8EXaQS1c/Gkj3WI/v4xhsZvw/6MOzKtDopK7Mq7nYk+aKc2OqxfOuQNR02FpQug=="
+      "version": "6.30.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.30.0.tgz",
+      "integrity": "sha512-NF0G7rMl/FbCkZMDiihoDW70i96aF3fguHvuspucstM4ArAdMai5b3rEKSOO2SXTbmQHaAlQEpiYAPZsGwU7jg=="
     },
     "@netlify/run-utils": {
       "version": "4.0.1",
@@ -39695,9 +39695,9 @@
       }
     },
     "winston": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz",
-      "integrity": "sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.0.tgz",
+      "integrity": "sha512-Iix1w8rIq2kBDkGvclO0db2CVOHYVamCIkVWcUbs567G9i2pdB+gvqLgDgxx4B4HXHYD6U4Zybh6ojepUOqcFQ==",
       "requires": {
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.6.3",
+  "version": "10.7.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -55,6 +55,7 @@
     "Jake Jarvis <jake@jarv.is> (https://twitter.com/jakejarvis)",
     "Jakob Warkotsch <j.warkotsch@gmail.com>",
     "James George (https://twitter.com/james_madhacks)",
+    "Jason Barry (https://twitter.com/jasbarry)",
     "Jason Lengstorf <jason@lengstorf.com> (https://twitter.com/jlengstorf)",
     "Jeremy Monson (www.surfline.com)",
     "Jessica Parsons",
@@ -212,12 +213,12 @@
     "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.3.1",
-    "@netlify/config": "^18.1.0",
-    "@netlify/edge-bundler": "^1.4.1",
+    "@netlify/build": "^27.3.2",
+    "@netlify/config": "^18.1.1",
+    "@netlify/edge-bundler": "^1.4.2",
     "@netlify/framework-info": "^9.1.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.28.0",
+    "@netlify/plugins-list": "^6.30.0",
     "@netlify/zip-it-and-ship-it": "^5.11.1",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",

package/src/commands/dev/dev.js

@@ -26,6 +26,7 @@ const {
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
 } = require('../../lib/one-graph/cli-netlify-graph')
+const { startSpinner, stopSpinner } = require('../../lib/spinner')
 const {
   BANG,
   NETLIFYDEV,
@@ -115,7 +116,7 @@ const cleanupBeforeExit = async ({ exitCode }) => {
  * @param {NodeJS.ProcessEnv} env
  * @returns {execa.ExecaChildProcess<string>}
  */
-const runCommand = (command, env = {}) => {
+const runCommand = (command, env = {}, spinner = null) => {
   const commandProcess = execa.command(command, {
     preferLocal: true,
     // we use reject=false to avoid rejecting synchronously when the command doesn't exist
@@ -125,8 +126,23 @@ const runCommand = (command, env = {}) => {
     windowsHide: false,
   })
 
-  commandProcess.stdout.pipe(stripAnsiCc.stream()).pipe(process.stdout)
-  commandProcess.stderr.pipe(stripAnsiCc.stream()).pipe(process.stderr)
+  // This ensures that an active spinner stays at the bottom of the commandline
+  // even though the actual framework command might be outputting stuff
+  const pipeDataWithSpinner = (writeStream, chunk) => {
+    if (spinner && spinner.isSpinning) {
+      spinner.clear()
+      spinner.isSilent = true
+    }
+    writeStream.write(chunk, () => {
+      if (spinner && spinner.isSpinning) {
+        spinner.isSilent = false
+        spinner.render()
+      }
+    })
+  }
+
+  commandProcess.stdout.pipe(stripAnsiCc.stream()).on('data', pipeDataWithSpinner.bind(null, process.stdout))
+  commandProcess.stderr.pipe(stripAnsiCc.stream()).on('data', pipeDataWithSpinner.bind(null, process.stderr))
   process.stdin.pipe(commandProcess.stdin)
 
   // we can't try->await->catch since we don't want to block on the framework server which
@@ -173,15 +189,16 @@ const startFrameworkServer = async function ({ settings }) {
 
   log(`${NETLIFYDEVLOG} Starting Netlify Dev with ${settings.framework || 'custom config'}`)
 
-  runCommand(settings.command, settings.env)
+  const spinner = startSpinner({
+    text: `Waiting for framework port ${settings.frameworkPort}. This can be configured using the 'targetPort' property in the netlify.toml`,
+  })
+
+  runCommand(settings.command, settings.env, spinner)
 
   try {
-    log(
-      `${NETLIFYDEVLOG} Waiting for framework port ${settings.frameworkPort}. This can be configured using the 'targetPort' property in the netlify.toml`,
-    )
     const open = await waitPort({
       port: settings.frameworkPort,
-      output: 'dots',
+      output: 'silent',
       timeout: FRAMEWORK_PORT_TIMEOUT,
       ...(settings.pollingStrategies.includes('HTTP') && { protocol: 'http' }),
     })
@@ -189,7 +206,10 @@ const startFrameworkServer = async function ({ settings }) {
     if (!open) {
       throw new Error(`Timed out waiting for port '${settings.frameworkPort}' to be open`)
     }
+
+    stopSpinner({ error: false, spinner })
   } catch {
+    stopSpinner({ error: true, spinner })
     log(NETLIFYDEVERR, `Netlify Dev could not connect to localhost:${settings.frameworkPort}.`)
     log(NETLIFYDEVERR, `Please make sure your framework server is running on port ${settings.frameworkPort}`)
     exit(1)

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

@@ -5,7 +5,7 @@ const AsciiTable = require('ascii-table')
 const dotenv = require('dotenv')
 const isEmpty = require('lodash/isEmpty')
 
-const { exit, log, logJson } = require('../../utils')
+const { exit, log, logJson, translateFromEnvelopeToMongo, translateFromMongoToEnvelope } = require('../../utils')
 
 /**
  * The env:import command
@@ -23,13 +23,6 @@ const envImport = async (fileName, options, command) => {
     return false
   }
 
-  const siteData = await api.getSite({ siteId })
-
-  // Get current environment variables set in the UI
-  const {
-    build_settings: { env = {} },
-  } = siteData
-
   let importedEnv = {}
   try {
     const envFileContents = await readFile(fileName, 'utf-8')
@@ -44,21 +37,14 @@ const envImport = async (fileName, options, command) => {
     return false
   }
 
-  // Apply environment variable updates
-  const siteResult = await api.updateSite({
-    siteId,
-    body: {
-      build_settings: {
-        // Only set imported variables if --replaceExisting or otherwise merge
-        // imported ones with the current environment variables.
-        env: options.replaceExisting ? importedEnv : { ...env, ...importedEnv },
-      },
-    },
-  })
+  const siteData = await api.getSite({ siteId })
+
+  const importIntoService = siteData.use_envelope ? importIntoEnvelope : importIntoMongo
+  const finalEnv = await importIntoService({ api, importedEnv, options, siteData })
 
   // Return new environment variables of site if using json flag
   if (options.json) {
-    logJson(siteResult.build_settings.env)
+    logJson(finalEnv)
     return false
   }
 
@@ -71,6 +57,66 @@ const envImport = async (fileName, options, command) => {
   log(table.toString())
 }
 
+/**
+ * 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 finalEnv = options.replaceExisting ? importedEnv : { ...env, ...importedEnv }
+
+  // Apply environment variable updates
+  await api.updateSite({
+    siteId,
+    body: {
+      build_settings: {
+        // Only set imported variables if --replaceExisting or otherwise merge
+        // imported ones with the current environment variables.
+        env: finalEnv,
+      },
+    },
+  })
+
+  return finalEnv
+}
+
+/**
+ * Saves the imported env in the Envelope service
+ * @returns {Promise<object>}
+ */
+const importIntoEnvelope = async ({ api, importedEnv, options, siteData }) => {
+  // fetch env vars
+  const accountId = siteData.account_slug
+  const siteId = siteData.id
+  const dotEnvKeys = Object.keys(importedEnv)
+  const envelopeVariables = await api.getEnvVars({ accountId, siteId })
+  const envelopeKeys = envelopeVariables.map(({ key }) => key)
+
+  // if user intends to replace all existing env vars
+  // either replace; delete all existing env vars on the site
+  // or, merge; delete only the existing env vars that would collide with new .env entries
+  const keysToDelete = options.replaceExisting ? envelopeKeys : envelopeKeys.filter((key) => dotEnvKeys.includes(key))
+
+  // delete marked env vars in parallel
+  await Promise.all(keysToDelete.map((key) => api.deleteEnvVar({ accountId, siteId, key })))
+
+  // hit create endpoint
+  const body = translateFromMongoToEnvelope(importedEnv)
+  try {
+    await api.createEnvVars({ accountId, siteId, body })
+  } catch (error) {
+    throw error.json ? error.json.msg : error
+  }
+
+  // return final env to aid in --json output (for testing)
+  return {
+    ...translateFromEnvelopeToMongo(envelopeVariables.filter(({ key }) => !keysToDelete.includes(key))),
+    ...importedEnv,
+  }
+}
+
 /**
  * Creates the `netlify env:import` command
  * @param {import('../base-command').BaseCommand} program

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

@@ -2,7 +2,13 @@
 
 const { isEmpty } = require('lodash')
 
-const { chalk, error: logError, log } = require('../../utils')
+const {
+  chalk,
+  error: logError,
+  log,
+  translateFromEnvelopeToMongo,
+  translateFromMongoToEnvelope,
+} = require('../../utils')
 
 const safeGetSite = async (api, siteId) => {
   try {
@@ -51,6 +57,37 @@ const envMigrate = async (options, command) => {
     return false
   }
 
+  // determine if siteFrom and/or siteTo is on Envelope
+  let method
+  if (!siteFrom.use_envelope && !siteTo.use_envelope) {
+    method = mongoToMongo
+  } else if (!siteFrom.use_envelope && siteTo.use_envelope) {
+    method = mongoToEnvelope
+  } else if (siteFrom.use_envelope && !siteTo.use_envelope) {
+    method = envelopeToMongo
+  } else {
+    method = envelopeToEnvelope
+  }
+  const success = await method({ api, siteFrom, siteTo })
+
+  if (!success) {
+    return false
+  }
+
+  log(
+    `Successfully migrated environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
+      siteTo.name,
+    )}`,
+  )
+
+  return true
+}
+
+/**
+ * Copies the env from a site not configured with Envelope to a different site not configured with Envelope
+ * @returns {Promise<boolean>}
+ */
+const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
   const [
     {
       build_settings: { env: envFrom = {} },
@@ -73,7 +110,7 @@ const envMigrate = async (options, command) => {
 
   // Apply environment variable updates
   await api.updateSite({
-    siteId: siteId.to,
+    siteId: siteTo.id,
     body: {
       build_settings: {
         env: mergedEnv,
@@ -81,11 +118,107 @@ const envMigrate = async (options, command) => {
     },
   })
 
-  log(
-    `Successfully migrated environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
-      siteTo.name,
-    )}`,
-  )
+  return true
+}
+
+/**
+ * Copies the env from a site not configured with Envelope to a site configured with Envelope
+ * @returns {Promise<boolean>}
+ */
+const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
+  const envFrom = siteFrom.build_settings.env || {}
+  const keysFrom = Object.keys(envFrom)
+
+  if (isEmpty(envFrom)) {
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    return false
+  }
+
+  const accountId = siteTo.account_slug
+  const siteId = siteTo.id
+
+  const envelopeTo = await api.getEnvVars({ accountId, siteId })
+
+  const envVarsToDelete = envelopeTo.filter(({ key }) => keysFrom.includes(key))
+  // delete marked env vars in parallel
+  await Promise.all(envVarsToDelete.map(({ key }) => api.deleteEnvVar({ accountId, siteId, key })))
+
+  // hit create endpoint
+  const body = translateFromMongoToEnvelope(envFrom)
+  try {
+    await api.createEnvVars({ accountId, siteId, body })
+  } catch (error) {
+    throw error.json ? error.json.msg : error
+  }
+
+  return true
+}
+
+/**
+ * Copies the env from a site configured with Envelope to a site not configured with Envelope
+ * @returns {Promise<boolean>}
+ */
+const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
+  const envelopeVariables = await api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id })
+  const envFrom = translateFromEnvelopeToMongo(envelopeVariables)
+
+  if (isEmpty(envFrom)) {
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    return false
+  }
+
+  const envTo = siteTo.build_settings.env || {}
+
+  // Merge from site A to site B
+  const mergedEnv = {
+    ...envTo,
+    ...envFrom,
+  }
+
+  // Apply environment variable updates
+  await api.updateSite({
+    siteId: siteTo.id,
+    body: {
+      build_settings: {
+        env: mergedEnv,
+      },
+    },
+  })
+
+  return true
+}
+
+/**
+ * Copies the env from a site configured with Envelope to a different site configured with Envelope
+ * @returns {Promise<boolean>}
+ */
+const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
+  const [envelopeFrom, envelopeTo] = await Promise.all([
+    api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id }),
+    api.getEnvVars({ accountId: siteTo.account_slug, siteId: siteTo.id }),
+  ])
+
+  const keysFrom = envelopeFrom.map(({ key }) => key)
+
+  if (isEmpty(keysFrom)) {
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    return false
+  }
+
+  const accountId = siteTo.account_slug
+  const siteId = siteTo.id
+  const envVarsToDelete = envelopeTo.filter(({ key }) => keysFrom.includes(key))
+  // delete marked env vars in parallel
+  await Promise.all(envVarsToDelete.map(({ key }) => api.deleteEnvVar({ accountId, siteId, key })))
+
+  // hit create endpoint
+  try {
+    await api.createEnvVars({ accountId, siteId, body: envelopeFrom })
+  } catch (error) {
+    throw error.json ? error.json.msg : error
+  }
+
+  return true
 }
 
 /**

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

@@ -1,15 +1,15 @@
 // @ts-check
-const { log, logJson } = require('../../utils')
+const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
 
 /**
  * The env:set command
- * @param {string} name Environment variable name
+ * @param {string} key Environment variable key
  * @param {string} value Value to set to
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command').BaseCommand} command
  * @returns {Promise<boolean>}
  */
-const envSet = async (name, value, options, command) => {
+const envSet = async (key, value, options, command) => {
   const { api, site } = command.netlify
   const siteId = site.id
 
@@ -21,32 +21,67 @@ const envSet = async (name, value, options, command) => {
   const siteData = await api.getSite({ siteId })
 
   // Get current environment variables set in the UI
-  const {
-    build_settings: { env = {} },
-  } = siteData
+  const setInService = siteData.use_envelope ? setInEnvelope : setInMongo
+  const finalEnv = await setInService({ api, siteData, key, value })
 
+  // Return new environment variables of site if using json flag
+  if (options.json) {
+    logJson(finalEnv)
+    return false
+  }
+
+  log(`Set environment variable ${key}=${value} for site ${siteData.name}`)
+}
+
+/**
+ * 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 newEnv = {
     ...env,
-    [name]: value,
+    [key]: value,
   }
-
   // Apply environment variable updates
-  const siteResult = await api.updateSite({
-    siteId,
+  await api.updateSite({
+    siteId: siteData.id,
     body: {
       build_settings: {
         env: newEnv,
       },
     },
   })
+  return newEnv
+}
 
-  // Return new environment variables of site if using json flag
-  if (options.json) {
-    logJson(siteResult.build_settings.env)
-    return false
+/**
+ * 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
+  // 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 }]
+
+  try {
+    await method({ accountId, siteId, key, body })
+  } catch (error) {
+    throw error.json ? error.json.msg : error
   }
 
-  log(`Set environment variable ${name}=${value} for site ${siteData.name}`)
+  const env = translateFromEnvelopeToMongo(envelopeVariables)
+  return {
+    ...env,
+    [key]: value,
+  }
 }
 
 /**
@@ -57,11 +92,11 @@ const envSet = async (name, value, options, command) => {
 const createEnvSetCommand = (program) =>
   program
     .command('env:set')
-    .argument('<name>', 'Environment variable name')
+    .argument('<key>', 'Environment variable key')
     .argument('[value]', 'Value to set to', '')
     .description('Set value of environment variable')
-    .action(async (name, value, options, command) => {
-      await envSet(name, value, options, command)
+    .action(async (key, value, options, command) => {
+      await envSet(key, value, options, command)
     })
 
 module.exports = { createEnvSetCommand }

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

@@ -1,14 +1,14 @@
 // @ts-check
-const { log, logJson } = require('../../utils')
+const { log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
 
 /**
  * The env:unset command
- * @param {string} name Environment variable name
+ * @param {string} key Environment variable key
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command').BaseCommand} command
  * @returns {Promise<boolean>}
  */
-const envUnset = async (name, options, command) => {
+const envUnset = async (key, options, command) => {
   const { api, site } = command.netlify
   const siteId = site.id
 
@@ -19,6 +19,23 @@ const envUnset = async (name, options, command) => {
 
   const siteData = await api.getSite({ siteId })
 
+  const unsetInService = siteData.use_envelope ? unsetInEnvelope : unsetInMongo
+  const finalEnv = await unsetInService({ api, siteData, key })
+
+  // Return new environment variables of site if using json flag
+  if (options.json) {
+    logJson(finalEnv)
+    return false
+  }
+
+  log(`Unset environment variable ${key} for site ${siteData.name}`)
+}
+
+/**
+ * Deletes a given key from the env of a site record
+ * @returns {Promise<object>}
+ */
+const unsetInMongo = async ({ api, key, siteData }) => {
   // Get current environment variables set in the UI
   const {
     build_settings: { env = {} },
@@ -27,11 +44,11 @@ const envUnset = async (name, options, command) => {
   const newEnv = env
 
   // Delete environment variable from current variables
-  delete newEnv[name]
+  delete newEnv[key]
 
   // Apply environment variable updates
-  const siteResult = await api.updateSite({
-    siteId,
+  await api.updateSite({
+    siteId: siteData.id,
     body: {
       build_settings: {
         env: newEnv,
@@ -39,13 +56,36 @@ const envUnset = async (name, options, command) => {
     },
   })
 
-  // Return new environment variables of site if using json flag
-  if (options.json) {
-    logJson(siteResult.build_settings.env)
-    return false
+  return newEnv
+}
+
+/**
+ * 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
+  // fetch envelope env vars
+  const envelopeVariables = await api.getEnvVars({ accountId, siteId })
+
+  // check if the given key exists
+  const env = translateFromEnvelopeToMongo(envelopeVariables)
+  if (!env[key]) {
+    // if not, no need to call delete; return early
+    return env
   }
 
-  log(`Unset environment variable ${name} for site ${siteData.name}`)
+  // delete the given key
+  try {
+    await api.deleteEnvVar({ accountId, siteId, key })
+  } catch (error) {
+    throw error.json ? error.json.msg : error
+  }
+
+  delete env[key]
+
+  return env
 }
 
 /**
@@ -57,10 +97,10 @@ const createEnvUnsetCommand = (program) =>
   program
     .command('env:unset')
     .aliases(['env:delete', 'env:remove'])
-    .argument('<name>', 'Environment variable name')
+    .argument('<key>', 'Environment variable key')
     .description('Unset an environment variable which removes it from the UI')
-    .action(async (name, options, command) => {
-      await envUnset(name, options, command)
+    .action(async (key, options, command) => {
+      await envUnset(key, options, command)
     })
 
 module.exports = { createEnvUnsetCommand }

package/src/commands/graph/graph-edit.js

@@ -11,7 +11,7 @@ const {
 const { NETLIFYDEVERR, chalk, error, log } = require('../../utils')
 const { openBrowser } = require('../../utils/open-browser')
 
-const { createPersistedQuery, ensureAppForSite } = OneGraphCliClient
+const { ensureAppForSite, executeCreatePersistedQueryMutation } = OneGraphCliClient
 
 /**
  * Creates the `netlify graph:edit` command
@@ -50,12 +50,26 @@ const graphEdit = async (options, command) => {
   })
 
   const { branch } = gitRepoInfo()
-  const persistedDoc = await createPersistedQuery(netlifyToken, {
-    appId: siteId,
-    description: 'Temporary snapshot of local queries',
-    document: graphqlDocument,
-    tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`],
-  })
+  const persistedResult = await executeCreatePersistedQueryMutation(
+    {
+      nfToken: netlifyToken,
+      appId: siteId,
+      description: 'Temporary snapshot of local queries',
+      query: graphqlDocument,
+      tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`],
+    },
+    {
+      accessToken: netlifyToken,
+
+      siteId,
+    },
+  )
+
+  const persistedDoc =
+    persistedResult.data &&
+    persistedResult.data.oneGraph &&
+    persistedResult.data.oneGraph.createPersistedQuery &&
+    persistedResult.data.oneGraph.createPersistedQuery.persistedQuery
 
   const newMetadata = { docId: persistedDoc.id }
 

package/src/commands/graph/graph-operations.js

@@ -102,7 +102,7 @@ const graphOperations = async (options, command) => {
  * @param {import('../base-command').BaseCommand} program
  * @returns
  */
-const createGraphOperationCommand = (program) =>
+const createGraphOperationsCommand = (program) =>
   program
     .command('graph:operations')
     .description('List all of the locally available operations')
@@ -110,4 +110,4 @@ const createGraphOperationCommand = (program) =>
       await graphOperations(options, command)
     })
 
-module.exports = { createGraphOperationCommand }
+module.exports = { createGraphOperationsCommand }

package/src/commands/graph/graph.js

@@ -3,7 +3,7 @@ const { createGraphConfigWriteCommand } = require('./graph-config-write')
 const { createGraphEditCommand } = require('./graph-edit')
 const { createGraphHandlerCommand } = require('./graph-handler')
 const { createGraphLibraryCommand } = require('./graph-library')
-const { createGraphOperationCommand } = require('./graph-operations')
+const { createGraphOperationsCommand } = require('./graph-operations')
 const { createGraphPullCommand } = require('./graph-pull')
 
 /**
@@ -25,7 +25,7 @@ const createGraphCommand = (program) => {
   createGraphEditCommand(program)
   createGraphHandlerCommand(program)
   createGraphLibraryCommand(program)
-  createGraphOperationCommand(program)
+  createGraphOperationsCommand(program)
   createGraphPullCommand(program)
 
   return program

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

@@ -128,8 +128,14 @@ const monitorCLISessionEvents = (input) => {
     const { events } = next
 
     if (events.length !== 0) {
-      const ackIds = await onEvents(events)
-      await OneGraphClient.ackCLISessionEvents({ appId, authToken: netlifyToken, sessionId, eventIds: ackIds })
+      let ackIds = []
+      try {
+        ackIds = await onEvents(events)
+      } catch (eventHandlerError) {
+        warn(`Error handling event: ${eventHandlerError}`)
+      } finally {
+        await OneGraphClient.ackCLISessionEvents({ appId, authToken: netlifyToken, sessionId, eventIds: ackIds })
+      }
     }
 
     await enabledServiceWatcher(netlifyToken, appId)
@@ -474,14 +480,31 @@ const persistNewOperationsDocForSession = async ({
   siteRoot,
 }) => {
   const { branch } = gitRepoInfo()
-  const payload = {
-    appId: siteId,
-    description: 'Temporary snapshot of local queries',
-    document: operationsDoc,
-    tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`, `local-change`],
+  const persistedResult = await executeCreatePersistedQueryMutation(
+    {
+      nfToken: netlifyToken,
+      appId: siteId,
+      description: 'Temporary snapshot of local queries',
+      query: operationsDoc,
+      tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`, `local-change`],
+    },
+    {
+      accessToken: netlifyToken,
+      siteId,
+    },
+  )
+
+  const persistedDoc =
+    persistedResult.data &&
+    persistedResult.data.oneGraph &&
+    persistedResult.data.oneGraph.createPersistedQuery &&
+    persistedResult.data.oneGraph.createPersistedQuery.persistedQuery
+
+  if (!persistedDoc) {
+    warn(`Failed to create persisted query for editing, ${JSON.stringify(persistedResult, null, 2)}`)
   }
-  const persistedDoc = await executeCreatePersistedQueryMutation(netlifyToken, payload)
-  const newMetadata = await { docId: persistedDoc.id }
+
+  const newMetadata = { docId: persistedDoc.id }
   const result = await upsertMergeCLISessionMetadata({
     netlifyGraphConfig,
     netlifyToken,
@@ -697,7 +720,8 @@ const ensureCLISession = async ({ metadata, netlifyToken, site, state }) => {
 
 const OneGraphCliClient = {
   ackCLISessionEvents: OneGraphClient.ackCLISessionEvents,
-  createPersistedQuery: executeCreatePersistedQueryMutation,
+  executeCreatePersistedQueryMutation: OneGraphClient.executeCreatePersistedQueryMutation,
+  executeCreateApiTokenMutation: OneGraphClient.executeCreateApiTokenMutation,
   fetchCliSessionEvents: OneGraphClient.fetchCliSessionEvents,
   ensureAppForSite,
   updateCLISessionMetadata,

package/src/utils/env/index.js

@@ -0,0 +1,43 @@
+/**
+ * Translates a Mongo env into an Envelope env
+ * @param {object} env - The site's env as it exists in Mongo
+ * @returns {Array<object>} The array of Envelope env vars
+ */
+const translateFromMongoToEnvelope = (env = {}) => {
+  const envVars = Object.entries(env).map(([key, value]) => ({
+    key,
+    scopes: ['builds', 'functions', 'runtime', 'post_processing'],
+    values: [
+      {
+        context: 'all',
+        value,
+      },
+    ],
+  }))
+
+  return envVars
+}
+
+/**
+ * Translates an Envelope env into a Mongo env
+ * @param {Array<object>} envVars - The array of Envelope env vars
+ * @returns {object} The env object as compatible with Mongo
+ */
+const translateFromEnvelopeToMongo = (envVars = []) =>
+  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))
+      if (envVar && envVar.value) {
+        return {
+          ...acc,
+          [cur.key]: envVar.value,
+        }
+      }
+      return acc
+    }, {})
+
+module.exports = {
+  translateFromMongoToEnvelope,
+  translateFromEnvelopeToMongo,
+}

package/src/utils/index.js

@@ -4,6 +4,7 @@ const createStreamPromise = require('./create-stream-promise')
 const deploy = require('./deploy')
 const detectServerSettings = require('./detect-server-settings')
 const dev = require('./dev')
+const env = require('./env')
 const execa = require('./execa')
 const functions = require('./functions')
 const getGlobalConfig = require('./get-global-config')
@@ -24,6 +25,7 @@ module.exports = {
   ...deploy,
   ...detectServerSettings,
   ...dev,
+  ...env,
   ...functions,
   ...getRepoData,
   ...ghAuth,