netlify-cli 15.8.1 → 15.9.1-rc.0

package/src/commands/dev/dev.mjs

@@ -9,7 +9,6 @@ import { printBanner } from '../../utils/banner.mjs'
 import {
   BANG,
   chalk,
-  exit,
   log,
   NETLIFYDEV,
   NETLIFYDEVERR,
@@ -35,7 +34,7 @@ import { createDevExecCommand } from './dev-exec.mjs'
  * @param {object} config
  * @param {*} config.api
  * @param {import('commander').OptionValues} config.options
- * @param {*} config.settings
+ * @param {import('../../utils/types.js').ServerSettings} config.settings
  * @param {*} config.site
  * @param {*} config.state
  * @returns
@@ -68,6 +67,9 @@ const handleLiveTunnel = async ({ api, options, settings, site, state }) => {
   }
 }
 
+/**
+ * @param {string} args
+ */
 const validateShortFlagArgs = (args) => {
   if (args.startsWith('=')) {
     throw new Error(
@@ -94,9 +96,10 @@ const dev = async (options, command) => {
   const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
-  /** @type {import('./types').DevConfig} */
+  /** @type {import('./types.js').DevConfig} */
   const devConfig = {
     framework: '#auto',
+    autoLaunch: Boolean(options.open),
     ...(config.functionsDirectory && { functions: config.functionsDirectory }),
     ...(config.build.publish && { publish: config.build.publish }),
     ...config.dev,
@@ -116,7 +119,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,
@@ -124,20 +127,17 @@ const dev = async (options, command) => {
     siteInfo,
   })
 
-  /** @type {Partial<import('../../utils/types').ServerSettings>} */
-  let settings = {}
+  /** @type {import('../../utils/types.js').ServerSettings} */
+  let settings
   try {
-    settings = await detectServerSettings(devConfig, options, site.root, {
-      site: {
-        id: site.id,
-        url: siteUrl,
-      },
-    })
+    settings = await detectServerSettings(devConfig, options, command)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
-    log(NETLIFYDEVERR, error_.message)
-    exit(1)
+    if (error_ && typeof error_ === 'object' && 'message' in error_) {
+      log(NETLIFYDEVERR, error_.message)
+    }
+    process.exit(1)
   }
 
   command.setAnalyticsPayload({ live: options.live })
@@ -154,6 +154,7 @@ const dev = async (options, command) => {
     cachedConfig,
     options,
     settings,
+    projectDir: command.workingDir,
     site,
     env: {
       URL: url,
@@ -176,6 +177,7 @@ const dev = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -187,8 +189,11 @@ const dev = async (options, command) => {
 
   // TODO: We should consolidate this with the existing config watcher.
   const getUpdatedConfig = async () => {
-    const cwd = options.cwd || process.cwd()
-    const { config: newConfig } = await command.getConfig({ cwd, offline: true, state })
+    const { config: newConfig } = await command.getConfig({
+      cwd: command.workingDir,
+      offline: true,
+      state,
+    })
     const normalizedNewConfig = normalizeConfig(newConfig)
 
     return normalizedNewConfig
@@ -201,6 +206,7 @@ const dev = async (options, command) => {
     config,
     configPath: configPathOverride,
     debug: options.debug,
+    projectDir: command.workingDir,
     env,
     getUpdatedConfig,
     inspectSettings,
@@ -211,6 +217,7 @@ const dev = async (options, command) => {
     state,
     geolocationMode: options.geo,
     geoCountry: options.country,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {
@@ -246,6 +253,7 @@ export const createDevCommand = (program) => {
         .argParser((value) => Number.parseInt(value))
         .hideHelp(true),
     )
+    .addOption(new Option('--no-open', 'disables the automatic opening of a browser window'))
     .option('--target-port <port>', 'port of target app server', (value) => Number.parseInt(value))
     .option('--framework <name>', 'framework to use. Defaults to #auto which automatically detects a framework')
     .option('-d ,--dir <path>', 'dir with static files')

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

@@ -12,7 +12,6 @@ import copyTemplateDirOriginal from 'copy-template-dir'
 import { findUp } from 'find-up'
 import fuzzy from 'fuzzy'
 import inquirer from 'inquirer'
-import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
 import fetch from 'node-fetch'
 import ora from 'ora'
 
@@ -172,8 +171,6 @@ const pickTemplate = async function ({ language: languageFromFlag }, funcType) {
     language = languageFromPrompt
   }
 
-  inquirer.registerPrompt('autocomplete', inquirerAutocompletePrompt)
-
   let templatesForLanguage
 
   try {

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

@@ -2,7 +2,6 @@
 import fs from 'fs'
 import { createRequire } from 'module'
 import path from 'path'
-import process from 'process'
 
 import inquirer from 'inquirer'
 import fetch from 'node-fetch'
@@ -56,14 +55,18 @@ const formatQstring = function (querystring) {
   return ''
 }
 
-/** process payloads from flag */
-const processPayloadFromFlag = function (payloadString) {
+/**
+ * process payloads from flag
+ * @param {string} payloadString
+ * @param {string} workingDir
+ */
+const processPayloadFromFlag = function (payloadString, workingDir) {
   if (payloadString) {
     // case 1: jsonstring
     let payload = tryParseJSON(payloadString)
     if (payload) return payload
     // case 2: jsonpath
-    const payloadpath = path.join(process.cwd(), payloadString)
+    const payloadpath = path.join(workingDir, payloadString)
     const pathexists = fs.existsSync(payloadpath)
     if (pathexists) {
       try {
@@ -210,7 +213,7 @@ const functionsInvoke = async (nameArgument, options, command) => {
       // }
     }
   }
-  const payload = processPayloadFromFlag(options.payload)
+  const payload = processPayloadFromFlag(options.payload, command.workingDir)
   body = { ...body, ...payload }
 
   try {

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

@@ -196,7 +196,7 @@ export const init = async (options, command) => {
   }
 
   // Look for local repo
-  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
   if (repoData.error) {
     await handleNoGitRemoteAndExit({ command, error: repoData.error, state })
   }

package/src/commands/link/link.mjs

@@ -11,11 +11,11 @@ import { track } from '../../utils/telemetry/index.mjs'
 
 /**
  *
- * @param {import('../base-command.mjs').NetlifyOptions} netlify
+ * @param {import('../base-command.mjs').default} command
  * @param {import('commander').OptionValues} options
  */
-const linkPrompt = async (netlify, options) => {
-  const { api, state } = netlify
+const linkPrompt = async (command, options) => {
+  const { api, state } = command.netlify
 
   const SITE_NAME_PROMPT = 'Search by full or partial site name'
   const SITE_LIST_PROMPT = 'Choose from a list of your recently updated sites'
@@ -24,7 +24,7 @@ const linkPrompt = async (netlify, options) => {
   let GIT_REMOTE_PROMPT = 'Use the current git remote origin URL'
   let site
   // Get git remote data if exists
-  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
 
   let linkChoices = [SITE_NAME_PROMPT, SITE_LIST_PROMPT, SITE_ID_PROMPT]
 
@@ -326,7 +326,7 @@ export const link = async (options, command) => {
       kind: 'byName',
     })
   } else {
-    siteData = await linkPrompt(command.netlify, options)
+    siteData = await linkPrompt(command, options)
   }
   return siteData
 }

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,
@@ -69,10 +69,10 @@ const serve = async (options, command) => {
   // Netlify Build are loaded.
   await getInternalFunctionsDir({ base: site.root, ensureExists: true })
 
-  /** @type {Partial<import('../../utils/types').ServerSettings>} */
+  /** @type {Partial<import('../../utils/types.js').ServerSettings>} */
   let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, site.root)
+    settings = await detectServerSettings(devConfig, options, command)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
@@ -87,7 +87,13 @@ const serve = async (options, command) => {
     `${NETLIFYDEVWARN} Changes will not be hot-reloaded, so if you need to rebuild your site you must exit and run 'netlify serve' again`,
   )
 
-  const { configPath: configPathOverride } = await runBuildTimeline({ cachedConfig, options, settings, site })
+  const { configPath: configPathOverride } = await runBuildTimeline({
+    cachedConfig,
+    options,
+    settings,
+    projectDir: command.workingDir,
+    site,
+  })
 
   await startFunctionsServer({
     api,
@@ -105,6 +111,7 @@ const serve = async (options, command) => {
     geoCountry: options.country,
     offline: options.offline,
     state,
+    accountId,
   })
 
   // Try to add `.netlify` to `.gitignore`.
@@ -116,8 +123,7 @@ const serve = async (options, command) => {
 
   // TODO: We should consolidate this with the existing config watcher.
   const getUpdatedConfig = async () => {
-    const cwd = options.cwd || process.cwd()
-    const { config: newConfig } = await command.getConfig({ cwd, offline: true, state })
+    const { config: newConfig } = await command.getConfig({ cwd: command.workingDir, offline: true, state })
     const normalizedNewConfig = normalizeConfig(newConfig)
 
     return normalizedNewConfig
@@ -134,10 +140,12 @@ const serve = async (options, command) => {
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
+    projectDir: command.workingDir,
     settings,
     site,
     siteInfo,
     state,
+    accountId,
   })
 
   if (devConfig.autoLaunch !== false) {

package/src/commands/sites/sites-create-template.mjs

@@ -197,7 +197,7 @@ const sitesCreateTemplate = async (repository, options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData()
+    const repoData = await getRepoData({ workingDir: command.workingDir })
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

package/src/commands/sites/sites-create.mjs

@@ -102,7 +102,7 @@ export const sitesCreate = async (options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData()
+    const repoData = await getRepoData({ workingDir: command.workingDir })
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

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

@@ -1,5 +1,5 @@
 import { env } from 'process'
 
-const latestBootstrapURL = 'https://6494585a67d46e0008867e60--edge.netlify.com/bootstrap/index-combined.ts'
+const latestBootstrapURL = 'https://64ae60d920fd0f000865bcfc--edge.netlify.com/bootstrap/index-combined.ts'
 
 export const getBootstrapURL = () => env.NETLIFY_EDGE_BOOTSTRAP || latestBootstrapURL

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

@@ -1,14 +1,16 @@
 // @ts-check
 import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
-import { cwd } from 'process'
 
 import { getPathInProject } from '../settings.mjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
-export const getInternalFunctions = async () => {
-  const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
+/**
+ * @param {string} workingDir
+ */
+export const getInternalFunctions = async (workingDir) => {
+  const path = join(workingDir, getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
     const stats = await stat(path)

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

@@ -1,8 +1,10 @@
 // @ts-check
 import { Buffer } from 'buffer'
 import { relative } from 'path'
-import { cwd, env } from 'process'
+import { 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,35 @@ 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')
+}
+
+/**
+ *
+ * @param {object} config
+ * @param {*} config.accountId
+ * @param {*} config.config
+ * @param {*} config.configPath
+ * @param {*} config.debug
+ * @param {*} config.env
+ * @param {*} config.geoCountry
+ * @param {*} config.geolocationMode
+ * @param {*} config.getUpdatedConfig
+ * @param {*} config.inspectSettings
+ * @param {*} config.mainPort
+ * @param {boolean=} config.offline
+ * @param {*} config.passthroughPort
+ * @param {*} config.projectDir
+ * @param {*} config.siteInfo
+ * @param {*} config.state
+ * @returns
+ */
 export const initializeProxy = async ({
+  accountId,
   config,
   configPath,
   debug,
@@ -69,7 +99,11 @@ export const initializeProxy = async ({
   siteInfo,
   state,
 }) => {
-  const { functions: internalFunctions, importMap, path: internalFunctionsPath } = await getInternalFunctions()
+  const {
+    functions: internalFunctions,
+    importMap,
+    path: internalFunctionsPath,
+  } = await getInternalFunctions(projectDir)
   const userFunctionsPath = config.build.edge_functions
   const isolatePort = await getAvailablePort()
 
@@ -104,8 +138,9 @@ export const initializeProxy = async ({
     if (!registry) return
 
     // Setting header with geolocation and site info.
-    req.headers[headers.Geo] = JSON.stringify(geoLocation)
+    req.headers[headers.Geo] = Buffer.from(JSON.stringify(geoLocation)).toString('base64')
     req.headers[headers.Site] = createSiteInfoHeader(siteInfo)
+    req.headers[headers.Account] = createAccountInfoHeader({ id: accountId })
 
     await registry.initialize()
 
@@ -121,7 +156,7 @@ export const initializeProxy = async ({
         )} matches declaration for edge function ${chalk.yellow(
           functionName,
         )}, but there's no matching function file in ${chalk.yellow(
-          relative(cwd(), userFunctionsPath),
+          relative(projectDir, userFunctionsPath),
         )}. Please visit ${chalk.blue('https://ntl.fyi/edge-create')} for more information.`,
       )
     })
@@ -176,7 +211,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)
   }