netlify-cli 15.8.1 → 15.9.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.1",
+  "version": "15.9.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,14 +44,14 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.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/scripts/postinstall.mjs

@@ -1,5 +1,11 @@
 import process from 'process'
 
+import chalk from 'chalk'
+
+import { createMainCommand } from '../src/commands/index.mjs'
+// TODO: use destructuring again once the imported file is esm
+import { generateAutocompletion } from '../src/lib/completion/index.mjs'
+
 const id = (message) => message
 
 /**
@@ -8,12 +14,10 @@ const id = (message) => message
  * @param {Array<chalk['Color'] | chalk['Modifiers']>} styles
  * @returns
  */
-const format = async (message, styles) => {
+const format = (message, styles) => {
   let func = id
   try {
-    // this fails sometimes on outdated npm versions
-    const chalk = await import('chalk')
-    func = chalk.default
+    func = chalk
     styles.forEach((style) => {
       func = func[style]
     })
@@ -26,10 +30,6 @@ const postInstall = async () => {
   // as yarn pnp analyzes everything inside the postinstall
   // yarn pnp executes it out of a .yarn folder .yarn/unplugged/netlify-cli-file-fb026a3a6d/node_modules/netlify-cli/scripts/postinstall.mjs
   if (!process.argv[1].includes('.yarn')) {
-    const { createMainCommand } = await import('../src/commands/index.mjs')
-    // TODO: use destructuring again once the imported file is esm
-    const { generateAutocompletion } = await import('../src/lib/completion/index.mjs')
-
     // create or update the autocompletion definition
     const program = createMainCommand()
     generateAutocompletion(program)

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-build.mjs

@@ -1,6 +1,8 @@
 // @ts-check
 import { mkdir } from 'fs/promises'
 
+import { zipFunctions } from '@netlify/zip-it-and-ship-it'
+
 import { NETLIFYDEVERR, NETLIFYDEVLOG, exit, log } from '../../utils/command-helpers.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
 
@@ -36,8 +38,6 @@ const functionsBuild = async (options, command) => {
 
   log(`${NETLIFYDEVLOG} Building functions`)
 
-  const { zipFunctions } = await import('@netlify/zip-it-and-ship-it')
-
   zipFunctions(src, dst, { skipGo: true })
   log(`${NETLIFYDEVLOG} Functions built to `, dst)
 }

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/main.mjs

@@ -2,6 +2,7 @@
 import process from 'process'
 
 import { Option } from 'commander'
+import envinfo from 'envinfo'
 import { closest } from 'fastest-levenshtein'
 import inquirer from 'inquirer'
 
@@ -39,7 +40,6 @@ const SUGGESTION_TIMEOUT = 1e4
 const getVersionPage = async () => {
   // performance optimization - load envinfo on demand
 
-  const envinfo = await import('envinfo')
   const data = await envinfo.run({
     System: ['OS', 'CPU'],
     Binaries: ['Node', 'Yarn', 'npm'],

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/completion/generate-autocompletion.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import fs from 'fs'
 import { dirname } from 'path'
 
 import { sortOptions, warn } from '../../utils/command-helpers.mjs'
@@ -28,10 +28,10 @@ const generateAutocompletion = (program) => {
       {},
     )
 
-    if (!existsSync(dirname(AUTOCOMPLETION_FILE))) {
-      mkdirSync(dirname(AUTOCOMPLETION_FILE), { recursive: true })
+    if (!fs.existsSync(dirname(AUTOCOMPLETION_FILE))) {
+      fs.mkdirSync(dirname(AUTOCOMPLETION_FILE), { recursive: true })
     }
-    writeFileSync(AUTOCOMPLETION_FILE, JSON.stringify(autocomplete), 'utf-8')
+    fs.writeFileSync(AUTOCOMPLETION_FILE, JSON.stringify(autocomplete), 'utf-8')
   } catch (error_) {
     // Sometimes it can happen that the autocomplete generation in the postinstall script lacks permissions
     // to write files to the home directory of the user. Therefore just warn with the error and don't break install.

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

@@ -3,6 +3,8 @@ import { Buffer } from 'buffer'
 import { relative } from 'path'
 import { cwd, env } from 'process'
 
+// eslint-disable-next-line import/no-namespace
+import * as bundler from '@netlify/edge-bundler'
 import getAvailablePort from 'get-port'
 
 import { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error as printError, log } from '../../utils/command-helpers.mjs'
@@ -53,7 +55,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 +116,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()
 
@@ -176,7 +187,6 @@ const prepareServer = async ({
   const importMapPaths = [...importMaps, config.functions['*'].deno_import_map]
 
   try {
-    const bundler = await import('@netlify/edge-bundler')
     const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH])
     const runIsolate = await bundler.serve({
       ...getDownloadUpdateFunctions(),

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/registry.mjs

@@ -3,6 +3,7 @@ import { mkdir } from 'fs/promises'
 import { extname, isAbsolute, join, resolve } from 'path'
 import { env } from 'process'
 
+import { listFunctions } from '@netlify/zip-it-and-ship-it'
 import extractZip from 'extract-zip'
 
 import {
@@ -175,9 +176,6 @@ export class FunctionsRegistry {
   // This function is here so we can mock it in tests
   // eslint-disable-next-line class-methods-use-this
   async listFunctions(...args) {
-    // Performance optimization: load '@netlify/zip-it-and-ship-it' on demand.
-    const { listFunctions } = await import('@netlify/zip-it-and-ship-it')
-
     return await listFunctions(...args)
   }
 

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

@@ -2,6 +2,7 @@ import { mkdir, writeFile } from 'fs/promises'
 import { createRequire } from 'module'
 import path from 'path'
 
+import { zipFunction, listFunction } from '@netlify/zip-it-and-ship-it'
 import decache from 'decache'
 import { readPackageUp } from 'read-pkg-up'
 import sourceMapSupport from 'source-map-support'
@@ -44,9 +45,6 @@ const buildFunction = async ({
   }
   const functionDirectory = path.dirname(func.mainFile)
 
-  // performance
-  const { zipFunction } = await import('@netlify/zip-it-and-ship-it')
-
   // If we have a function at `functions/my-func/index.js` and we pass
   // that path to `zipFunction`, it will lack the context of the whole
   // functions directory and will infer the name of the function to be
@@ -92,15 +90,12 @@ const buildFunction = async ({
  * @param {string} params.mainFile
  * @param {string} params.projectRoot
  */
-export const parseFunctionForMetadata = async ({ config, mainFile, projectRoot }) => {
-  const { listFunction } = await import('@netlify/zip-it-and-ship-it')
-
-  return await listFunction(mainFile, {
+export const parseFunctionForMetadata = async ({ config, mainFile, projectRoot }) =>
+  await listFunction(mainFile, {
     config: netlifyConfigToZisiConfig({ config, projectRoot }),
     featureFlags: { zisi_functions_api_v2: true },
     parseISC: true,
   })
-}
 
 // Clears the cache for any files inside the directory from which functions are
 // served.

package/src/lib/functions/server.mjs

@@ -1,4 +1,6 @@
 // @ts-check
+import express from 'express'
+import expressLogging from 'express-logging'
 import jwtDecode from 'jwt-decode'
 
 import { NETLIFYDEVERR, NETLIFYDEVLOG, error as errorExit, log } from '../../utils/command-helpers.mjs'
@@ -111,6 +113,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()
@@ -184,11 +187,8 @@ export const createHandler = function (options) {
   }
 }
 
-const getFunctionsServer = async function (options) {
+const getFunctionsServer = (options) => {
   const { buildersPrefix = '', functionsPrefix = '', functionsRegistry, siteUrl } = options
-  // performance optimization, load express on demand
-  const { default: express } = await import('express')
-  const { default: expressLogging } = await import('express-logging')
   const app = express()
   const functionHandler = createHandler(options)
 

package/src/recipes/vscode/index.mjs

@@ -1,5 +1,6 @@
 import { join } from 'path'
 
+import { DenoBridge } from '@netlify/edge-bundler'
 import execa from 'execa'
 import inquirer from 'inquirer'
 
@@ -49,7 +50,6 @@ const getDenoExtPrompt = () => {
 }
 
 export const run = async ({ config, repositoryRoot }) => {
-  const { DenoBridge } = await import('@netlify/edge-bundler')
   const deno = new DenoBridge({
     onBeforeDownload: () =>
       log(`${NETLIFYDEVWARN} Setting up the Edge Functions environment. This may take a couple of minutes.`),

package/src/utils/deploy/hash-fns.mjs

@@ -2,6 +2,7 @@ import { readFile } from 'fs/promises'
 import path from 'path'
 import { promisify } from 'util'
 
+import { zipFunctions } from '@netlify/zip-it-and-ship-it'
 import fromArray from 'from2-array'
 import pumpModule from 'pump'
 
@@ -66,8 +67,6 @@ const getFunctionZips = async ({
     })
   }
 
-  const { zipFunctions } = await import('@netlify/zip-it-and-ship-it')
-
   return await zipFunctions(directories, tmpDir, {
     basePath: rootDir,
     configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],

package/src/utils/detect-server-settings.mjs

@@ -10,6 +10,8 @@ import { NodeFS } from '@netlify/build-info/node'
 import { getFramework, listFrameworks } from '@netlify/framework-info'
 import fuzzy from 'fuzzy'
 import getPort from 'get-port'
+import inquirer from 'inquirer'
+import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
 
 import { NETLIFYDEVWARN, chalk, log } from './command-helpers.mjs'
 import { acquirePort } from './dev.mjs'
@@ -207,11 +209,11 @@ const detectChangesInNewSettings = (frameworkSettings, newSettings, metadata) =>
   const message = ['']
   const [setting] = newSettings
 
-  if (frameworkSettings?.framework !== setting?.framework) {
+  if (frameworkSettings?.framework !== setting?.framework.name) {
     message.push(
       `- Framework does not match:`,
       `   [old]: ${frameworkSettings?.framework}`,
-      `   [new]: ${setting?.framework}`,
+      `   [new]: ${setting?.framework.name}`,
       '',
     )
   }
@@ -259,9 +261,6 @@ const detectFrameworkSettings = async ({ projectDir }) => {
   }
 
   if (frameworks.length > 1) {
-    // performance optimization, load inquirer on demand
-    const { default: inquirer } = await import('inquirer')
-    const { default: inquirerAutocompletePrompt } = await import('inquirer-autocomplete-prompt')
     /** multiple matching detectors, make the user choose */
     inquirer.registerPrompt('autocomplete', inquirerAutocompletePrompt)
     const scriptInquirerOptions = formatSettingsArrForInquirer(frameworks)

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/execa.mjs

@@ -1,4 +1,7 @@
 import { env } from 'process'
+
+import execaLib from 'execa'
+
 // This is a thin layer on top of `execa` that allows consumers to provide an
 // alternative path to the module location, making it easier to mock its logic
 // in tests (see `tests/utils/mock-execa.js`).
@@ -13,8 +16,7 @@ if (env.NETLIFY_CLI_EXECA_PATH) {
   const execaMock = await import(env.NETLIFY_CLI_EXECA_PATH)
   execa = execaMock.default
 } else {
-  const execaLib = await import('execa')
-  execa = execaLib.default
+  execa = execaLib
 }
 
 export default execa

package/src/utils/functions/get-functions.mjs

@@ -1,4 +1,6 @@
 // @ts-check
+import { listFunctions } from '@netlify/zip-it-and-ship-it'
+
 import { fileExistsAsync } from '../../lib/fs.mjs'
 
 const getUrlPath = (functionName) => `/.netlify/functions/${functionName}`
@@ -24,8 +26,6 @@ export const getFunctions = async (functionsSrcDir, config = {}) => {
     return []
   }
 
-  // performance optimization, load '@netlify/zip-it-and-ship-it' on demand
-  const { listFunctions } = await import('@netlify/zip-it-and-ship-it')
   const functions = await listFunctions(functionsSrcDir, {
     config: config.functions ? extractSchedule(config.functions) : undefined,
     parseISC: true,

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({