netlify-cli 15.8.1 → 15.9.1-rc.0

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) {
@@ -111,7 +114,8 @@ export const createHandler = function (options) {
       ...request.headers,
       'client-ip': [remoteAddress],
       'x-nf-client-connection-ip': [remoteAddress],
-      [efHeaders.Geo]: JSON.stringify(geoLocation),
+      'x-nf-account-id': [options.accountId],
+      [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'
@@ -184,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])],