netlify-cli 15.9.0 → 15.9.1-rc.0

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/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

@@ -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,
@@ -117,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
@@ -135,6 +140,7 @@ const serve = async (options, command) => {
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
+    projectDir: command.workingDir,
     settings,
     site,
     siteInfo,

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/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/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'
@@ -60,6 +62,26 @@ export const createAccountInfoHeader = (accountInfo = {}) => {
   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,
@@ -77,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()
 
@@ -112,7 +138,7 @@ 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 })
 
@@ -130,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.`,
       )
     })
@@ -185,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/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,8 @@
 // @ts-check
+import { Buffer } from 'buffer'
+
+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'
@@ -45,7 +49,6 @@ const hasBody = (req) =>
   // eslint-disable-next-line unicorn/prefer-number-properties
   (req.header('transfer-encoding') !== undefined || !isNaN(req.header('content-length'))) &&
   // we expect a string or a buffer, because we use the two bodyParsers(text, raw) from express
-  // eslint-disable-next-line n/prefer-global/buffer
   (typeof req.body === 'string' || Buffer.isBuffer(req.body))
 
 export const createHandler = function (options) {
@@ -112,7 +115,7 @@ export const createHandler = function (options) {
       'client-ip': [remoteAddress],
       'x-nf-client-connection-ip': [remoteAddress],
       'x-nf-account-id': [options.accountId],
-      [efHeaders.Geo]: JSON.stringify(geoLocation),
+      [efHeaders.Geo]: Buffer.from(JSON.stringify(geoLocation)).toString('base64'),
     }).reduce((prev, [key, value]) => ({ ...prev, [key]: Array.isArray(value) ? value : [value] }), {})
     const rawQuery = new URLSearchParams(requestQuery).toString()
     const protocol = options.config?.dev?.https ? 'https' : 'http'
@@ -185,11 +188,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/lib/spinner.mjs

@@ -17,7 +17,7 @@ export const startSpinner = ({ text }) =>
  * Stops the spinner with the following text
  * @param {object} config
  * @param {ora.Ora} config.spinner
- * @param {object} [config.error]
+ * @param {boolean} [config.error]
  * @param {string} [config.text]
  * @returns {void}
  */

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

@@ -0,0 +1,19 @@
+// @ts-check
+
+/**
+ * Detects and filters the build setting for a project and a command
+ * @param {import('../commands/base-command.mjs').default} command
+ */
+export const detectBuildSettings = async (command) => {
+  const { project, workspacePackage } = command
+  const buildSettings = await project.getBuildSettings(project.workspace ? workspacePackage : '')
+  return buildSettings
+    .filter((setting) => {
+      if (project.workspace && project.relativeBaseDirectory && setting.packagePath) {
+        return project.relativeBaseDirectory.startsWith(setting.packagePath)
+      }
+
+      return true
+    })
+    .filter((setting) => setting.devCommand)
+}

package/src/utils/command-helpers.mjs

@@ -24,7 +24,7 @@ const argv = process.argv.slice(2)
  * Chalk instance for CLI that can be initialized with no colors mode
  * needed for json outputs where we don't want to have colors
  * @param  {boolean} noColors - disable chalk colors
- * @return {object} - default or custom chalk instance
+ * @return {import('chalk').ChalkInstance} - default or custom chalk instance
  */
 const safeChalk = function (noColors) {
   if (noColors) {
@@ -174,12 +174,18 @@ export const warn = (message = '') => {
 
 /**
  * throws an error or log it
- * @param {string|Error} message
+ * @param {unknown} message
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
 export const error = (message = '', options = {}) => {
-  const err = message instanceof Error ? message : new Error(message)
+  const err =
+    message instanceof Error
+      ? message
+      : // eslint-disable-next-line unicorn/no-nested-ternary
+      typeof message === 'string'
+      ? new Error(message)
+      : /** @type {Error} */ ({ message, stack: undefined, name: 'Error' })
 
   if (options.exit === false) {
     const bang = chalk.red(BANG)
@@ -198,10 +204,13 @@ export const exit = (code = 0) => {
   process.exit(code)
 }
 
-// When `build.publish` is not set by the user, the CLI behavior differs in
-// several ways. It detects it by checking if `build.publish` is `undefined`.
-// However, `@netlify/config` adds a default value to `build.publish`.
-// This removes 'publish' and 'publishOrigin' in this case.
+/**
+ * When `build.publish` is not set by the user, the CLI behavior differs in
+ * several ways. It detects it by checking if `build.publish` is `undefined`.
+ * However, `@netlify/config` adds a default value to `build.publish`.
+ * This removes 'publish' and 'publishOrigin' in this case.
+ * @param {*} config
+ */
 export const normalizeConfig = (config) => {
   // Unused var here is in order to omit 'publish' from build config
   // eslint-disable-next-line no-unused-vars

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])],