netlify-cli 15.8.1 → 15.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.1",
+  "version": "15.9.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,14 +44,14 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.15.2",
-    "@netlify/build-info": "7.3.4",
-    "@netlify/config": "20.5.2",
-    "@netlify/edge-bundler": "8.16.2",
+    "@netlify/build": "29.16.1",
+    "@netlify/build-info": "7.4.1",
+    "@netlify/config": "20.6.0",
+    "@netlify/edge-bundler": "8.16.4",
     "@netlify/framework-info": "9.8.10",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
-    "@netlify/zip-it-and-ship-it": "9.12.1",
+    "@netlify/zip-it-and-ship-it": "9.13.0",
     "@octokit/rest": "19.0.13",
     "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",
@@ -115,7 +115,7 @@
     "log-update": "5.0.1",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
-    "netlify": "13.1.9",
+    "netlify": "13.1.10",
     "netlify-headers-parser": "7.1.2",
     "netlify-redirect-parser": "14.1.3",
     "netlify-redirector": "0.4.0",
@@ -133,7 +133,7 @@
     "pump": "3.0.0",
     "raw-body": "2.5.2",
     "read-pkg-up": "9.1.0",
-    "semver": "7.5.3",
+    "semver": "7.5.4",
     "source-map-support": "0.5.21",
     "strip-ansi-control-characters": "2.0.0",
     "tabtab": "3.0.2",

package/src/commands/dev/dev.mjs

@@ -116,7 +116,7 @@ const dev = async (options, command) => {
   injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
-  const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline
     offline: options.offline,
     api,
@@ -176,6 +176,7 @@ const dev = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -211,6 +212,7 @@ const dev = async (options, command) => {
     state,
     geolocationMode: options.geo,
     geoCountry: options.country,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {

package/src/commands/functions/functions-serve.mjs

@@ -23,7 +23,7 @@ const functionsServe = async (options, command) => {
   env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
   injectEnvVariables(env)
 
-  const { capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, capabilities, siteUrl, timeouts } = await getSiteInformation({
     offline: options.offline,
     api,
     site,
@@ -52,6 +52,7 @@ const functionsServe = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 }
 

package/src/commands/serve/serve.mjs

@@ -56,7 +56,7 @@ const serve = async (options, command) => {
   injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
-  const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
+  const { accountId, addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline
     offline: options.offline,
     api,
@@ -105,6 +105,7 @@ const serve = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -138,6 +139,7 @@ const serve = async (options, command) => {
     site,
     siteInfo,
     state,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {

package/src/functions-templates/javascript/auth-fetch/package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/functions-templates/javascript/google-analytics/package-lock.json

@@ -17,9 +17,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.48",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.48.tgz",
-      "integrity": "sha512-iL0PIMwejpmuVHgfibHpfDwOdsbmB50wr21X71VnF5d7SsBF7WK+ZvP/SCcFm7Iwb9iiYSap9rlrdhToNAWdxg=="
+      "version": "14.18.53",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.48",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.48.tgz",
-      "integrity": "sha512-iL0PIMwejpmuVHgfibHpfDwOdsbmB50wr21X71VnF5d7SsBF7WK+ZvP/SCcFm7Iwb9iiYSap9rlrdhToNAWdxg=="
+      "version": "14.18.53",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/functions-templates/typescript/transform-response/{{name}}.ts

@@ -7,7 +7,6 @@ export default async (request: Request, context: Context) => {
   if (url.searchParams.get("method") !== "transform") {
     return;
   }
-
   const response = await context.next();
   const text = await response.text();
   return new Response(text.toUpperCase(), response);

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

@@ -11,6 +11,7 @@ export const headers = {
   IP: 'x-nf-client-connection-ip',
   Site: 'X-NF-Site-Info',
   DebugLogging: 'x-nf-debug-logging',
+  Account: 'x-nf-account-info',
 }
 
 /**

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

@@ -53,7 +53,15 @@ export const createSiteInfoHeader = (siteInfo = {}) => {
   return Buffer.from(siteString).toString('base64')
 }
 
+export const createAccountInfoHeader = (accountInfo = {}) => {
+  const { id } = accountInfo
+  const account = { id }
+  const accountString = JSON.stringify(account)
+  return Buffer.from(accountString).toString('base64')
+}
+
 export const initializeProxy = async ({
+  accountId,
   config,
   configPath,
   debug,
@@ -106,6 +114,7 @@ export const initializeProxy = async ({
     // Setting header with geolocation and site info.
     req.headers[headers.Geo] = JSON.stringify(geoLocation)
     req.headers[headers.Site] = createSiteInfoHeader(siteInfo)
+    req.headers[headers.Account] = createAccountInfoHeader({ id: accountId })
 
     await registry.initialize()
 

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

@@ -467,17 +467,19 @@ export class EdgeFunctionsRegistry {
    * @param {string} projectDir
    */
   async #setupWatchers(projectDir) {
-    // Creating a watcher for the config file. When it changes, we update the
-    // declarations and see if we need to register or unregister any functions.
-    this.#configWatcher = await watchDebounced(this.#configPath, {
-      onChange: async () => {
-        const newConfig = await this.#getUpdatedConfig()
+    if (this.#configPath) {
+      // Creating a watcher for the config file. When it changes, we update the
+      // declarations and see if we need to register or unregister any functions.
+      this.#configWatcher = await watchDebounced(this.#configPath, {
+        onChange: async () => {
+          const newConfig = await this.#getUpdatedConfig()
 
-        this.#declarationsFromTOML = EdgeFunctionsRegistry.#getDeclarationsFromTOML(newConfig)
+          this.#declarationsFromTOML = EdgeFunctionsRegistry.#getDeclarationsFromTOML(newConfig)
 
-        await this.#checkForAddedOrDeletedFunctions()
-      },
-    })
+          await this.#checkForAddedOrDeletedFunctions()
+        },
+      })
+    }
 
     // While functions are guaranteed to be inside one of the configured
     // directories, they might be importing files that are located in

package/src/lib/functions/server.mjs

@@ -111,6 +111,7 @@ export const createHandler = function (options) {
       ...request.headers,
       'client-ip': [remoteAddress],
       'x-nf-client-connection-ip': [remoteAddress],
+      'x-nf-account-id': [options.accountId],
       [efHeaders.Geo]: JSON.stringify(geoLocation),
     }).reduce((prev, [key, value]) => ({ ...prev, [key]: Array.isArray(value) ? value : [value] }), {})
     const rawQuery = new URLSearchParams(requestQuery).toString()

package/src/utils/dev.mjs

@@ -107,6 +107,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
     return {
       addonsUrls,
       siteUrl: siteInfo.ssl_url,
+      accountId: account.id,
       capabilities: {
         backgroundFunctions: supportsBackgroundFunctions(account),
       },

package/src/utils/proxy-server.mjs

@@ -53,6 +53,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
  * @returns
  */
 export const startProxyServer = async ({
+  accountId,
   addonsUrls,
   config,
   configPath,
@@ -83,6 +84,7 @@ export const startProxyServer = async ({
     settings,
     state,
     siteInfo,
+    accountId,
   })
   if (!url) {
     log(NETLIFYDEVERR, `Unable to start proxy server on port '${settings.port}'`)

package/src/utils/proxy.mjs

@@ -605,6 +605,7 @@ export const getProxyUrl = function (settings) {
 }
 
 export const startProxy = async function ({
+  accountId,
   addonsUrls,
   config,
   configPath,
@@ -636,6 +637,7 @@ export const startProxy = async function ({
     passthroughPort: secondaryServerPort || settings.port,
     projectDir,
     siteInfo,
+    accountId,
     state,
   })
   const proxy = await initializeProxy({