netlify-cli 11.3.0 → 11.5.1

package/npm-shrinkwrap.json

@@ -1,22 +1,22 @@
 {
   "name": "netlify-cli",
-  "version": "11.3.0",
+  "version": "11.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "11.3.0",
+      "version": "11.5.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.15.5",
-        "@netlify/config": "^18.2.1",
-        "@netlify/edge-bundler": "^1.13.0",
+        "@netlify/build": "^27.16.1",
+        "@netlify/config": "^18.2.3",
+        "@netlify/edge-bundler": "^1.14.1",
         "@netlify/framework-info": "^9.2.0",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugins-list": "^6.39.0",
-        "@netlify/zip-it-and-ship-it": "^5.13.5",
+        "@netlify/plugins-list": "^6.41.0",
+        "@netlify/zip-it-and-ship-it": "^6.0.0",
         "@octokit/rest": "^18.0.0",
         "@sindresorhus/slugify": "^1.1.0",
         "ansi-escapes": "^5.0.0",
@@ -83,7 +83,7 @@
         "netlify-headers-parser": "^6.0.2",
         "netlify-onegraph-internal": "0.10.0",
         "netlify-redirect-parser": "^13.0.5",
-        "netlify-redirector": "^0.2.1",
+        "netlify-redirector": "^0.3.1",
         "node-fetch": "^2.6.0",
         "node-version-alias": "^1.0.1",
         "omit.js": "^2.0.2",
@@ -1189,19 +1189,19 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.15.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.5.tgz",
-      "integrity": "sha512-DfzpiNztkB+7e0eM3B8QrXGP1Fc0ky/9ow5Mwg3+R7VeFKknVFAF8PKddQucR1vS0CW1lL1/jjcrv1M5zudVmQ==",
+      "version": "27.16.1",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.16.1.tgz",
+      "integrity": "sha512-hXOivv/zCd/xPSL7XaqHvnn6GpXUSkztis9QfawLa39W6X01gDj2bXfQBW+cPxTT6S/UaGz70rwthPW9431pOQ==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.2",
-        "@netlify/edge-bundler": "^1.13.0",
-        "@netlify/functions-utils": "^4.2.4",
+        "@netlify/config": "^18.2.3",
+        "@netlify/edge-bundler": "^1.14.1",
+        "@netlify/functions-utils": "^4.2.5",
         "@netlify/git-utils": "^4.0.0",
-        "@netlify/plugins-list": "^6.36.0",
+        "@netlify/plugins-list": "^6.41.0",
         "@netlify/run-utils": "^4.0.0",
-        "@netlify/zip-it-and-ship-it": "^5.13.5",
+        "@netlify/zip-it-and-ship-it": "^6.0.0",
         "@sindresorhus/slugify": "^2.0.0",
         "@types/node": "^16.0.0",
         "ajv": "^8.11.0",
@@ -1806,9 +1806,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "engines": {
         "node": ">=12.20"
       },
@@ -1817,9 +1817,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "engines": {
         "node": ">=12.20"
       },
@@ -2011,9 +2011,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "18.2.2",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
-      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.3.tgz",
+      "integrity": "sha512-z5pFAAVBfIvTsSv3lchfByWYNajPgiCKEbx3JkU/CtIljCtSR3f0B/GVqpHgCOJ9pfS0idVP60EhDHA2QLeUrg==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -2028,7 +2028,7 @@
         "is-plain-obj": "^4.0.0",
         "js-yaml": "^4.0.0",
         "map-obj": "^5.0.0",
-        "netlify": "^12.0.0",
+        "netlify": "^12.0.1",
         "netlify-headers-parser": "^6.0.2",
         "netlify-redirect-parser": "13.0.5",
         "omit.js": "^2.0.2",
@@ -2321,9 +2321,9 @@
       }
     },
     "node_modules/@netlify/config/node_modules/type-fest": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "engines": {
         "node": ">=12.20"
       },
@@ -2343,9 +2343,9 @@
       }
     },
     "node_modules/@netlify/edge-bundler": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.13.0.tgz",
-      "integrity": "sha512-5LDNouZP2tUt3m6NyKkEgor9PycIEq7wxUgrRSpiUcZVV7CNU/CUxxpXJb11/wEFq2bWZp3/xqzxqbR7vpqFNg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.14.1.tgz",
+      "integrity": "sha512-0FJSvK5kZlf093aaWyvcULRzeUImypHn63oVsC+t8xvR08bhA9LebrYHPgQ/0GhFA8yDY+tz25xrNJ6JKKDWEw==",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -3243,11 +3243,11 @@
       }
     },
     "node_modules/@netlify/functions-utils": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-4.2.4.tgz",
-      "integrity": "sha512-+Uw9qO6lIshJrcieriAluGhjFM8JsyNFe5TGxkTssfUeel/+RIrIG5RMslrBoEk8HUKL+4HQDbZRoI6DtWlwsw==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-4.2.5.tgz",
+      "integrity": "sha512-sa8TAD35xO/6q3YSpqlObOSfC25n0JT6DV+j3WaZ5NCSXAdlZJD+pT02pudputwstfMPJtw7GJg3buIiTyGulQ==",
       "dependencies": {
-        "@netlify/zip-it-and-ship-it": "^5.13.5",
+        "@netlify/zip-it-and-ship-it": "^6.0.0",
         "cpy": "^8.1.0",
         "path-exists": "^5.0.0"
       },
@@ -3593,9 +3593,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.39.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.39.0.tgz",
-      "integrity": "sha512-f8sMN7XFlQQ63km5vhg5y5+E3DXoWEoAe94YOMGlmzifZCCzPS/bEUVaQ07n+iDspy3dOIN97FHAAu0B2Jpe2Q==",
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.41.0.tgz",
+      "integrity": "sha512-WUXn1kk1oDumzYKQVAf3Z5xQkVuHyR6k+LGt2qq6rFlxILmFA3gWMSf+AwVfT2bYK8gHWcdz2I9MSo5hbp1ohQ==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -3703,9 +3703,9 @@
       }
     },
     "node_modules/@netlify/zip-it-and-ship-it": {
-      "version": "5.13.5",
-      "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-5.13.5.tgz",
-      "integrity": "sha512-oVXGtGwUQqEDBRApwKgqfauuzD+FhyxKGcwERF2fZLOiH24NoBcskaNDW6TCJmBj3hKiVCgmp69hapvjMVibFQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-6.0.0.tgz",
+      "integrity": "sha512-5nxAeUwQ6ftlnlRShRa7oY+RPiYBRH2qMmTR6RwsBYzUBUzoTgdb+X8tOnO4FFAKndXzzjJrO/ubp+YMeOKSbg==",
       "dependencies": {
         "@babel/parser": "7.16.8",
         "@netlify/binary-info": "^1.0.0",
@@ -3722,6 +3722,7 @@
         "find-up": "^5.0.0",
         "glob": "^8.0.3",
         "is-builtin-module": "^3.1.0",
+        "is-path-inside": "^3.0.3",
         "junk": "^3.1.0",
         "locate-path": "^6.0.0",
         "merge-options": "^3.0.4",
@@ -5486,9 +5487,9 @@
       }
     },
     "node_modules/ava": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ava/-/ava-4.3.1.tgz",
-      "integrity": "sha512-zdSp9QxRTmN5hJeGmg+ZjUKL5yHFLMcP/0KBla8GH25XD8Xm7Uc34CDFlwqGL6JXtjNbVkJ0Zw+DqcTf4ggCCA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/ava/-/ava-4.3.3.tgz",
+      "integrity": "sha512-9Egq/d9R74ExrWohHeqUlexjDbgZJX5jA1Wq4KCTqc3wIfpGEK79zVy4rBtofJ9YKIxs4PzhJ8BgbW5PlAYe6w==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.7.1",
@@ -16018,9 +16019,9 @@
       }
     },
     "node_modules/netlify-redirector": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.1.tgz",
-      "integrity": "sha512-17vDR9p1Loanp+vd57y+b6WlKb5X+qb0LZ44oTYsKJbdonz4Md+Ybv1lzH1w1aKm5YWWXHR8LMpWyY9bjlAJKw=="
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.3.1.tgz",
+      "integrity": "sha512-+8x07Ukx8vgKkGqTDq1GrkuCRR0DqheZ9fF5PXk6VbIChp9Qi8+psmwBV3hjocoyUvUGH7CIHLUk05aVwLN3wA=="
     },
     "node_modules/netlify/node_modules/node-fetch": {
       "version": "3.2.10",
@@ -21495,9 +21496,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -22410,15 +22411,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/ws": {
@@ -23374,19 +23375,19 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.15.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.5.tgz",
-      "integrity": "sha512-DfzpiNztkB+7e0eM3B8QrXGP1Fc0ky/9ow5Mwg3+R7VeFKknVFAF8PKddQucR1vS0CW1lL1/jjcrv1M5zudVmQ==",
+      "version": "27.16.1",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.16.1.tgz",
+      "integrity": "sha512-hXOivv/zCd/xPSL7XaqHvnn6GpXUSkztis9QfawLa39W6X01gDj2bXfQBW+cPxTT6S/UaGz70rwthPW9431pOQ==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.2",
-        "@netlify/edge-bundler": "^1.13.0",
-        "@netlify/functions-utils": "^4.2.4",
+        "@netlify/config": "^18.2.3",
+        "@netlify/edge-bundler": "^1.14.1",
+        "@netlify/functions-utils": "^4.2.5",
         "@netlify/git-utils": "^4.0.0",
-        "@netlify/plugins-list": "^6.36.0",
+        "@netlify/plugins-list": "^6.41.0",
         "@netlify/run-utils": "^4.0.0",
-        "@netlify/zip-it-and-ship-it": "^5.13.5",
+        "@netlify/zip-it-and-ship-it": "^6.0.0",
         "@sindresorhus/slugify": "^2.0.0",
         "@types/node": "^16.0.0",
         "ajv": "^8.11.0",
@@ -23752,9 +23753,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
+              "version": "2.19.0",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+              "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
             }
           }
         },
@@ -23769,9 +23770,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
+              "version": "2.19.0",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+              "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
             }
           }
         },
@@ -23885,9 +23886,9 @@
       }
     },
     "@netlify/config": {
-      "version": "18.2.2",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
-      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.3.tgz",
+      "integrity": "sha512-z5pFAAVBfIvTsSv3lchfByWYNajPgiCKEbx3JkU/CtIljCtSR3f0B/GVqpHgCOJ9pfS0idVP60EhDHA2QLeUrg==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -23902,7 +23903,7 @@
         "is-plain-obj": "^4.0.0",
         "js-yaml": "^4.0.0",
         "map-obj": "^5.0.0",
-        "netlify": "^12.0.0",
+        "netlify": "^12.0.1",
         "netlify-headers-parser": "^6.0.2",
         "netlify-redirect-parser": "13.0.5",
         "omit.js": "^2.0.2",
@@ -24063,9 +24064,9 @@
           "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
         },
         "type-fest": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
-          "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
         },
         "yocto-queue": {
           "version": "1.0.0",
@@ -24075,9 +24076,9 @@
       }
     },
     "@netlify/edge-bundler": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.13.0.tgz",
-      "integrity": "sha512-5LDNouZP2tUt3m6NyKkEgor9PycIEq7wxUgrRSpiUcZVV7CNU/CUxxpXJb11/wEFq2bWZp3/xqzxqbR7vpqFNg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.14.1.tgz",
+      "integrity": "sha512-0FJSvK5kZlf093aaWyvcULRzeUImypHn63oVsC+t8xvR08bhA9LebrYHPgQ/0GhFA8yDY+tz25xrNJ6JKKDWEw==",
       "requires": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -24577,11 +24578,11 @@
       }
     },
     "@netlify/functions-utils": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-4.2.4.tgz",
-      "integrity": "sha512-+Uw9qO6lIshJrcieriAluGhjFM8JsyNFe5TGxkTssfUeel/+RIrIG5RMslrBoEk8HUKL+4HQDbZRoI6DtWlwsw==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-4.2.5.tgz",
+      "integrity": "sha512-sa8TAD35xO/6q3YSpqlObOSfC25n0JT6DV+j3WaZ5NCSXAdlZJD+pT02pudputwstfMPJtw7GJg3buIiTyGulQ==",
       "requires": {
-        "@netlify/zip-it-and-ship-it": "^5.13.5",
+        "@netlify/zip-it-and-ship-it": "^6.0.0",
         "cpy": "^8.1.0",
         "path-exists": "^5.0.0"
       },
@@ -24766,9 +24767,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "@netlify/plugins-list": {
-      "version": "6.39.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.39.0.tgz",
-      "integrity": "sha512-f8sMN7XFlQQ63km5vhg5y5+E3DXoWEoAe94YOMGlmzifZCCzPS/bEUVaQ07n+iDspy3dOIN97FHAAu0B2Jpe2Q=="
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.41.0.tgz",
+      "integrity": "sha512-WUXn1kk1oDumzYKQVAf3Z5xQkVuHyR6k+LGt2qq6rFlxILmFA3gWMSf+AwVfT2bYK8gHWcdz2I9MSo5hbp1ohQ=="
     },
     "@netlify/run-utils": {
       "version": "4.0.1",
@@ -24833,9 +24834,9 @@
       }
     },
     "@netlify/zip-it-and-ship-it": {
-      "version": "5.13.5",
-      "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-5.13.5.tgz",
-      "integrity": "sha512-oVXGtGwUQqEDBRApwKgqfauuzD+FhyxKGcwERF2fZLOiH24NoBcskaNDW6TCJmBj3hKiVCgmp69hapvjMVibFQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-6.0.0.tgz",
+      "integrity": "sha512-5nxAeUwQ6ftlnlRShRa7oY+RPiYBRH2qMmTR6RwsBYzUBUzoTgdb+X8tOnO4FFAKndXzzjJrO/ubp+YMeOKSbg==",
       "requires": {
         "@babel/parser": "7.16.8",
         "@netlify/binary-info": "^1.0.0",
@@ -24852,6 +24853,7 @@
         "find-up": "^5.0.0",
         "glob": "^8.0.3",
         "is-builtin-module": "^3.1.0",
+        "is-path-inside": "^3.0.3",
         "junk": "^3.1.0",
         "locate-path": "^6.0.0",
         "merge-options": "^3.0.4",
@@ -26232,9 +26234,9 @@
       "dev": true
     },
     "ava": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ava/-/ava-4.3.1.tgz",
-      "integrity": "sha512-zdSp9QxRTmN5hJeGmg+ZjUKL5yHFLMcP/0KBla8GH25XD8Xm7Uc34CDFlwqGL6JXtjNbVkJ0Zw+DqcTf4ggCCA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/ava/-/ava-4.3.3.tgz",
+      "integrity": "sha512-9Egq/d9R74ExrWohHeqUlexjDbgZJX5jA1Wq4KCTqc3wIfpGEK79zVy4rBtofJ9YKIxs4PzhJ8BgbW5PlAYe6w==",
       "dev": true,
       "requires": {
         "acorn": "^8.7.1",
@@ -34232,9 +34234,9 @@
       }
     },
     "netlify-redirector": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.1.tgz",
-      "integrity": "sha512-17vDR9p1Loanp+vd57y+b6WlKb5X+qb0LZ44oTYsKJbdonz4Md+Ybv1lzH1w1aKm5YWWXHR8LMpWyY9bjlAJKw=="
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.3.1.tgz",
+      "integrity": "sha512-+8x07Ukx8vgKkGqTDq1GrkuCRR0DqheZ9fF5PXk6VbIChp9Qi8+psmwBV3hjocoyUvUGH7CIHLUk05aVwLN3wA=="
     },
     "next-tick": {
       "version": "1.1.0",
@@ -38404,9 +38406,9 @@
       }
     },
     "typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw=="
     },
     "uglify-js": {
       "version": "3.15.0",
@@ -39129,9 +39131,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "requires": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "11.3.0",
+  "version": "11.5.1",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -46,6 +46,7 @@
     "Erez Rokah (https://www.erezro.com)",
     "Erica Pisani <pisani.erica@gmail.com>",
     "Evans Hauser (https://twitter.com/evanshauser)",
+    "Ewan Valentine <ewan.valentine89@gmail.com> (http://ewanvalentine.io)",
     "Finn Woelm (https://twitter.com/FinnWoelm)",
     "Flxbot",
     "Gavin Henderson <gavin.henderson@hotmail.co.uk> (https://twitter.com/gavinhenderson5)",
@@ -222,13 +223,13 @@
     "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.15.5",
-    "@netlify/config": "^18.2.1",
-    "@netlify/edge-bundler": "^1.13.0",
+    "@netlify/build": "^27.16.1",
+    "@netlify/config": "^18.2.3",
+    "@netlify/edge-bundler": "^1.14.1",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.39.0",
-    "@netlify/zip-it-and-ship-it": "^5.13.5",
+    "@netlify/plugins-list": "^6.41.0",
+    "@netlify/zip-it-and-ship-it": "^6.0.0",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^5.0.0",
@@ -295,7 +296,7 @@
     "netlify-headers-parser": "^6.0.2",
     "netlify-onegraph-internal": "0.10.0",
     "netlify-redirect-parser": "^13.0.5",
-    "netlify-redirector": "^0.2.1",
+    "netlify-redirector": "^0.3.1",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
     "omit.js": "^2.0.2",

package/src/commands/build/build.js

@@ -2,7 +2,7 @@ const process = require('process')
 
 // @ts-check
 const { getBuildOptions, runBuild } = require('../../lib/build')
-const { error, exit, generateNetlifyGraphJWT, getEnvelopeEnv, getToken } = require('../../utils')
+const { error, exit, generateNetlifyGraphJWT, getEnvelopeEnv, getToken, normalizeContext } = require('../../utils')
 
 /**
  * @param {import('../../lib/build').BuildConfig} options
@@ -85,7 +85,12 @@ 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(
+      '--context <context>',
+      'Specify a build context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev")',
+      normalizeContext,
+      process.env.CONTEXT || 'production',
+    )
     .option('--dry', 'Dry run: show instructions without running them', false)
     .option('-o, --offline', 'disables any features that require network access', false)
     .addExamples(['netlify build'])

package/src/commands/deploy/deploy.js

@@ -410,7 +410,13 @@ const bundleEdgeFunctions = async (options) => {
     phase: 'start',
   })
 
-  const { severityCode, success } = await runCoreSteps(['edge_functions_bundling'], { ...options, buffer: true })
+  const { severityCode, success } = await runCoreSteps(['edge_functions_bundling'], {
+    ...options,
+    buffer: true,
+    featureFlags: {
+      edge_functions_produce_eszip: true,
+    },
+  })
 
   if (!success) {
     statusCb({

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

@@ -1,7 +1,6 @@
-const { Option } = require('commander')
 const execa = require('execa')
 
-const { getEnvelopeEnv, injectEnvVariables } = require('../../utils')
+const { getEnvelopeEnv, injectEnvVariables, normalizeContext } = require('../../utils')
 
 /**
  * The dev:exec command
@@ -32,10 +31,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'),
+    .option(
+      '--context <context>',
+      'Specify a deploy context or branch for environment variables (contexts: "production", "deploy-preview", "branch-deploy", "dev")',
+      normalizeContext,
+      '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

@@ -45,6 +45,7 @@ const {
   injectEnvVariables,
   log,
   normalizeConfig,
+  normalizeContext,
   openBrowser,
   processOnExit,
   startLiveTunnel,
@@ -684,10 +685,11 @@ const createDevCommand = (program) => {
       `Local dev server\nThe dev command will run a local dev server with Netlify's proxy and redirect rules`,
     )
     .option('-c ,--command <command>', 'command to run')
-    .addOption(
-      new Option('--context <context>', 'Specify a deploy context for environment variables')
-        .choices(['production', 'deploy-preview', 'branch-deploy', 'dev'])
-        .default('dev'),
+    .option(
+      '--context <context>',
+      'Specify a deploy context or branch for environment variables (contexts: "production", "deploy-preview", "branch-deploy", "dev")',
+      normalizeContext,
+      'dev',
     )
     .option('-p ,--port <port>', 'port of netlify dev', (value) => Number.parseInt(value))
     .option('--targetPort <port>', 'port of target app server', (value) => Number.parseInt(value))

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

@@ -1,7 +1,7 @@
 // @ts-check
 const { Option } = require('commander')
 
-const { chalk, error, getEnvelopeEnv, log, logJson } = require('../../utils')
+const { AVAILABLE_CONTEXTS, chalk, error, getEnvelopeEnv, log, logJson, normalizeContext } = require('../../utils')
 
 /**
  * The env:get command
@@ -42,7 +42,8 @@ const envGet = async (name, options, command) => {
   }
 
   if (!value) {
-    const withContext = `in the ${chalk.magenta(context)} context`
+    const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch'
+    const withContext = `in the ${chalk.magenta(context)} ${contextType}`
     const withScope = scope === 'any' ? '' : ` and the ${chalk.magenta(scope)} scope`
     log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellow(name)}`)
     return false
@@ -60,16 +61,23 @@ const createEnvGetCommand = (program) =>
   program
     .command('env:get')
     .argument('<name>', 'Environment variable name')
-    .addOption(
-      new Option('-c, --context <context>', 'Specify a deploy context')
-        .choices(['production', 'deploy-preview', 'branch-deploy', 'dev'])
-        .default('dev'),
+    .option(
+      '-c, --context <context>',
+      'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev")',
+      normalizeContext,
+      'dev',
     )
     .addOption(
       new Option('-s, --scope <scope>', 'Specify a scope')
         .choices(['builds', 'functions', 'post_processing', 'runtime', 'any'])
         .default('any'),
     )
+    .addExamples([
+      'netlify env:get MY_VAR # get value for MY_VAR in dev context',
+      'netlify env:get MY_VAR --context production',
+      'netlify env:get MY_VAR --context branch:staging',
+      'netlify env:get MY_VAR --scope functions',
+    ])
     .description('Get resolved value of specified environment variable (includes netlify.toml)')
     .action(async (name, options, command) => {
       await envGet(name, options, command)

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

@@ -5,7 +5,16 @@ const { Option } = require('commander')
 const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
-const { chalk, error, getEnvelopeEnv, getHumanReadableScopes, log, logJson } = require('../../utils')
+const {
+  AVAILABLE_CONTEXTS,
+  chalk,
+  error,
+  getEnvelopeEnv,
+  getHumanReadableScopes,
+  log,
+  logJson,
+  normalizeContext,
+} = require('../../utils')
 
 const [logUpdatePromise, ansiEscapesPromise] = [import('log-update'), import('ansi-escapes')]
 
@@ -77,7 +86,8 @@ const envList = async (options, command) => {
   }
 
   const forSite = `for site ${chalk.green(siteInfo.name)}`
-  const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} context` : ''
+  const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch'
+  const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} ${contextType}` : ''
   const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellow(options.scope)} scope` : ''
   if (isEmpty(environment)) {
     log(`No environment variables set ${forSite} ${withContext} ${withScope}`)
@@ -122,16 +132,23 @@ const envList = async (options, command) => {
 const createEnvListCommand = (program) =>
   program
     .command('env:list')
-    .addOption(
-      new Option('-c, --context <context>', 'Specify a deploy context')
-        .choices(['production', 'deploy-preview', 'branch-deploy', 'dev'])
-        .default('dev'),
+    .option(
+      '-c, --context <context>',
+      'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev")',
+      normalizeContext,
+      'dev',
     )
     .addOption(
       new Option('-s, --scope <scope>', 'Specify a scope')
         .choices(['builds', 'functions', 'post_processing', 'runtime', 'any'])
         .default('any'),
     )
+    .addExamples([
+      'netlify env:list # list variables with values in the dev context and with any scope',
+      'netlify env:list --context production',
+      'netlify env:list --context branch:staging',
+      'netlify env:list --scope functions',
+    ])
     .description('Lists resolved environment variables for site (includes netlify.toml)')
     .action(async (options, command) => {
       await envList(options, command)

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

@@ -1,9 +1,16 @@
 // @ts-check
 const { Option } = require('commander')
 
-const { chalk, error, log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
-
-const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing']
+const {
+  AVAILABLE_CONTEXTS,
+  AVAILABLE_SCOPES,
+  chalk,
+  error,
+  log,
+  logJson,
+  normalizeContext,
+  translateFromEnvelopeToMongo,
+} = require('../../utils')
 
 /**
  * The env:set command
@@ -52,10 +59,11 @@ const envSet = async (key, value, options, command) => {
   }
 
   const withScope = scope ? ` scoped to ${chalk.white(scope)}` : ''
+  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',
-    )} context`,
+    )} ${contextType}`,
   )
 }
 
@@ -93,7 +101,10 @@ const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
   const contexts = context || ['all']
   const scopes = scope || AVAILABLE_SCOPES
 
-  let values = contexts.map((ctx) => ({ context: ctx, value }))
+  // if the passed context is unknown, it is actually a branch name
+  let values = contexts.map((ctx) =>
+    AVAILABLE_CONTEXTS.includes(ctx) ? { context: ctx, value } : { context: 'branch', context_parameter: ctx, value },
+  )
 
   const existing = envelopeVariables.find((envVar) => envVar.key === key)
 
@@ -144,13 +155,11 @@ 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',
-      ]),
+    .option(
+      '-c, --context <context...>',
+      'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev") (default: all contexts)',
+      // spread over an array for variadic options
+      (context, previous = []) => [...previous, normalizeContext(context)],
     )
     .addOption(
       new Option('-s, --scope <scope...>', 'Specify a scope (default: all scopes)').choices([

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

@@ -1,9 +1,13 @@
-const { Option } = require('commander')
-
 // @ts-check
-const { chalk, error, log, logJson, translateFromEnvelopeToMongo } = require('../../utils')
-
-const AVAILABLE_CONTEXTS = ['production', 'deploy-preview', 'branch-deploy', 'dev']
+const {
+  AVAILABLE_CONTEXTS,
+  chalk,
+  error,
+  log,
+  logJson,
+  normalizeContext,
+  translateFromEnvelopeToMongo,
+} = require('../../utils')
 
 /**
  * The env:unset command
@@ -44,7 +48,8 @@ const envUnset = async (key, options, command) => {
     return false
   }
 
-  log(`Unset environment variable ${chalk.yellow(key)} in the ${chalk.magenta(context || 'all')} context`)
+  const contextType = AVAILABLE_CONTEXTS.includes(context || 'all') ? 'context' : 'branch'
+  log(`Unset environment variable ${chalk.yellow(key)} in the ${chalk.magenta(context || 'all')} ${contextType}`)
 }
 
 /**
@@ -98,8 +103,10 @@ const unsetInEnvelope = async ({ api, context, key, siteInfo }) => {
   const params = { accountId, siteId, key }
   try {
     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 context(s) are passed, delete the matching contexts / branches, and the `all` context
+      const values = variable.values.filter((val) =>
+        [...contexts, 'all'].includes(val.context_parameter || 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
@@ -107,7 +114,9 @@ const unsetInEnvelope = async ({ api, context, key, siteInfo }) => {
           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 } })),
+            newContexts
+              .filter((ctx) => ctx !== 'all')
+              .map((ctx) => api.setEnvVarValue({ ...params, body: { context: ctx, value: allValue } })),
           )
         }
       }
@@ -134,13 +143,11 @@ 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',
-      ]),
+    .option(
+      '-c, --context <context...>',
+      'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev") (default: all contexts)',
+      // spread over an array for variadic options
+      (context, previous = []) => [...previous, normalizeContext(context)],
     )
     .addExamples([
       'netlify env:unset VAR_NAME # unset in all contexts',

package/src/functions-templates/javascript/apollo-graphql-rest/package.json

@@ -16,7 +16,7 @@
   "license": "MIT",
   "dependencies": {
     "apollo-server-lambda": "^2.18.2",
-    "apollo-datasource-rest": "^0.14.0",
+    "apollo-datasource-rest": "^0.15.0",
     "graphql": "^14.1.1"
   }
 }

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.23.tgz",
-      "integrity": "sha512-MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA=="
+      "version": "14.18.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz",
+      "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -36,9 +36,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "node_modules/typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.23.tgz",
-      "integrity": "sha512-MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA=="
+      "version": "14.18.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz",
+      "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA=="
     },
     "is-promise": {
       "version": "4.0.0",
@@ -68,9 +68,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw=="
     }
   }
 }

package/src/lib/build.js

@@ -35,6 +35,7 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, js
   cwd,
   featureFlags: {
     functionsBundlingManifest: true,
+    edge_functions_produce_eszip: true,
   },
 })
 

package/src/utils/env/index.js

@@ -1,10 +1,46 @@
+const { error } = require('../command-helpers')
+
+const AVAILABLE_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev']
+const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing']
+
+/**
+ * @param {string|undefined} context - The deploy context or branch of the environment variable value
+ * @returns {Array<string|undefined>} The normalized context or branch name
+ */
+const normalizeContext = (context) => {
+  if (!context) {
+    return context
+  }
+  const CONTEXT_SYNONYMS = {
+    dp: 'deploy-preview',
+    prod: 'production',
+  }
+  context = context.toLowerCase()
+  if (context in CONTEXT_SYNONYMS) {
+    context = CONTEXT_SYNONYMS[context]
+  }
+  const forbiddenContexts = AVAILABLE_CONTEXTS.map((ctx) => `branch:${ctx}`)
+  if (forbiddenContexts.includes(context)) {
+    error(`The context ${context} includes a reserved keyword and is not allowed`)
+  }
+  context = context.replace(/^branch:/, '')
+  return context
+}
+
 /**
  * Finds a matching environment variable value from a given context
  * @param {Array<object>} values - An array of environment variable values from Envelope
- * @param {enum<dev,branch-deploy,deploy-preview,production>} context - The deploy context of the environment variable value
- * @returns {object<context: enum<dev,branch-deploy,deploy-preview,production>, value: string>} The matching environment variable value object
+ * @param {string} context - The deploy context or branch of the environment variable value
+ * @returns {object<context: enum<dev,branch-deploy,deploy-preview,production,branch>, context_parameter: <string>, value: string>} The matching environment variable value object
  */
-const findValueFromContext = (values, context) => values.find((val) => [context, 'all'].includes(val.context))
+const findValueInValues = (values, context) =>
+  values.find((val) => {
+    if (!AVAILABLE_CONTEXTS.includes(context)) {
+      // the "context" option passed in is actually the name of a branch
+      return val.context === 'all' || val.context_parameter === context
+    }
+    return [context, 'all'].includes(val.context)
+  })
 
 /**
  * Finds environment variables that match a given source
@@ -45,7 +81,7 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId }) {
 
 /**
  * Filters and sorts data from Envelope by a given context and/or scope
- * @param {enum<dev,branch-deploy,deploy-preview,production>} context - The deploy context of the environment variable value
+ * @param {string} context - The deploy context or branch of the environment variable value
  * @param {Array<object>} envelopeItems - An array of environment variables from the Envelope service
  * @param {enum<any,builds,functions,runtime,post_processing>} scope - The scope of the environment variables
  * @param {enum<general,account,addons,ui,configFile>} source - The source of the environment variable
@@ -58,7 +94,8 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId }) {
  *     value: 'bar',
  *   },
  *   BAZ: {
- *     context: 'dev',
+ *     context: 'branch',
+ *     branch: 'staging',
  *     scopes: ['runtime'],
  *     sources: ['account'],
  *     value: 'bang',
@@ -68,18 +105,19 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId }) {
 const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any', source }) =>
   envelopeItems
     // filter by context
-    .filter(({ values }) => Boolean(findValueFromContext(values, context)))
+    .filter(({ values }) => Boolean(findValueInValues(values, context)))
     // filter by scope
     .filter(({ scopes }) => (scope === 'any' ? true : scopes.includes(scope)))
     // sort alphabetically, case insensitive
     .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
     // format the data
     .reduce((acc, cur) => {
-      const { context: ctx, value } = findValueFromContext(cur.values, context)
+      const { context: ctx, context_parameter: branch, value } = findValueInValues(cur.values, context)
       return {
         ...acc,
         [cur.key]: {
           context: ctx,
+          branch,
           scopes: cur.scopes,
           sources: [source],
           value,
@@ -90,7 +128,7 @@ const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any'
 /**
  * Collects env vars from multiple sources and arranges them in the correct order of precedence
  * @param {object} api - The api singleton object
- * @param {enum<dev,branch-deploy,deploy-preview,production>} context - The deploy context of the environment variable
+ * @param {string} context - The deploy context or branch of the environment variable
  * @param {object} env - The dictionary of environment variables
  * @param {string} key - If present, fetch a single key (case-sensitive)
  * @param {enum<any,builds,functions,runtime,post_processing>} scope - The scope of the environment variables
@@ -130,7 +168,7 @@ const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scope = 'an
  * @returns {string} A human-readable, comma-separated list of scopes
  */
 const getHumanReadableScopes = (scopes) => {
-  const AVAILABLE_SCOPES = {
+  const HUMAN_SCOPES = {
     builds: 'Builds',
     functions: 'Functions',
     post_processing: 'Post processing',
@@ -141,11 +179,11 @@ const getHumanReadableScopes = (scopes) => {
     // env vars specified in netlify.toml are present in the `builds` and `post_processing` scope
     return 'Builds, Post processing'
   }
-  if (scopes.length === Object.keys(AVAILABLE_SCOPES).length) {
+  if (scopes.length === Object.keys(HUMAN_SCOPES).length) {
     // shorthand instead of listing every available scope
     return 'All'
   }
-  return scopes.map((scope) => AVAILABLE_SCOPES[scope]).join(', ')
+  return scopes.map((scope) => HUMAN_SCOPES[scope]).join(', ')
 }
 
 /**
@@ -156,7 +194,7 @@ const getHumanReadableScopes = (scopes) => {
 const translateFromMongoToEnvelope = (env = {}) => {
   const envVars = Object.entries(env).map(([key, value]) => ({
     key,
-    scopes: ['builds', 'functions', 'runtime', 'post_processing'],
+    scopes: AVAILABLE_SCOPES,
     values: [
       {
         context: 'all',
@@ -171,14 +209,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
+ * @param {string} context - The deploy context or branch of the environment variable
  * @returns {object} The env object as compatible with Mongo
  */
 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) => [context, 'all'].includes(val.context))
+      const envVar = cur.values.find((val) => [context, 'all'].includes(val.context_parameter || val.context))
       if (envVar && envVar.value) {
         return {
           ...acc,
@@ -189,11 +227,14 @@ const translateFromEnvelopeToMongo = (envVars = [], context = 'dev') =>
     }, {})
 
 module.exports = {
-  findValueFromContext,
+  AVAILABLE_CONTEXTS,
+  AVAILABLE_SCOPES,
+  findValueInValues,
   filterEnvBySource,
   formatEnvelopeData,
   getEnvelopeEnv,
   getHumanReadableScopes,
+  normalizeContext,
   translateFromEnvelopeToMongo,
   translateFromMongoToEnvelope,
 }