netlify-cli 16.0.0 → 16.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "16.0.0",
+  "version": "16.0.2",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,13 +44,13 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.19.0",
+    "@netlify/build": "29.20.2",
     "@netlify/build-info": "7.7.3",
     "@netlify/config": "20.8.0",
     "@netlify/edge-bundler": "8.17.1",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.2",
-    "@netlify/zip-it-and-ship-it": "9.13.1",
+    "@netlify/zip-it-and-ship-it": "9.15.1",
     "@octokit/rest": "19.0.13",
     "ansi-escapes": "6.2.0",
     "ansi-styles": "6.2.1",

package/src/commands/build/build.mjs

@@ -48,6 +48,7 @@ const build = async (options, command) => {
 
   const buildOptions = await getBuildOptions({
     cachedConfig,
+    packagePath: command.workspacePackage,
     token,
     options,
   })

package/src/commands/deploy/deploy.mjs

@@ -13,6 +13,7 @@ import prettyjson from 'prettyjson'
 
 import { cancelDeploy } from '../../lib/api.mjs'
 import { getBuildOptions, runBuild } from '../../lib/build.mjs'
+import { getBootstrapURL } from '../../lib/edge-functions/bootstrap.mjs'
 import { featureFlags as edgeFunctionsFeatureFlags } from '../../lib/edge-functions/consts.mjs'
 import { normalizeFunctionsConfig } from '../../lib/functions/config.mjs'
 import { BACKGROUND_FUNCTIONS_WARNING } from '../../lib/log.mjs'
@@ -399,16 +400,18 @@ const runDeploy = async ({
  *
  * @param {object} config
  * @param {*} config.cachedConfig
+ * @param {string} [config.packagePath]
  * @param {import('commander').OptionValues} config.options The options of the command
  * @returns
  */
-const handleBuild = async ({ cachedConfig, options }) => {
+const handleBuild = async ({ cachedConfig, options, packagePath }) => {
   if (!options.build) {
     return {}
   }
   const [token] = await getToken()
   const resolvedOptions = await getBuildOptions({
     cachedConfig,
+    packagePath,
     token,
     options,
   })
@@ -442,6 +445,7 @@ const bundleEdgeFunctions = async (options, command) => {
     packagePath: command.workspacePackage,
     buffer: true,
     featureFlags: edgeFunctionsFeatureFlags,
+    edgeFunctionsBootstrapURL: getBootstrapURL(),
   })
 
   if (!success) {
@@ -587,6 +591,7 @@ const deploy = async (options, command) => {
   }
 
   const { configMutations = [], newConfig } = await handleBuild({
+    packagePath: command.workspacePackage,
     cachedConfig: command.netlify.cachedConfig,
     options,
   })

package/src/lib/build.mjs

@@ -3,6 +3,7 @@ import process from 'process'
 
 import build from '@netlify/build'
 
+import { getBootstrapURL } from './edge-functions/bootstrap.mjs'
 import { featureFlags as edgeFunctionsFeatureFlags } from './edge-functions/consts.mjs'
 
 /**
@@ -18,6 +19,7 @@ import { featureFlags as edgeFunctionsFeatureFlags } from './edge-functions/cons
  *
  * @param {object} config
  * @param {*} config.cachedConfig
+ * @param {string} [config.packagePath]
  * @param {string} config.token
  * @param {import('commander').OptionValues} config.options
  * @returns {BuildConfig}
@@ -25,10 +27,12 @@ import { featureFlags as edgeFunctionsFeatureFlags } from './edge-functions/cons
 export const getBuildOptions = ({
   cachedConfig,
   options: { context, cwd, debug, dry, json, offline, silent },
+  packagePath,
   token,
 }) => ({
   cachedConfig,
   siteId: cachedConfig.siteInfo.id,
+  packagePath,
   token,
   dry,
   debug,
@@ -43,6 +47,7 @@ export const getBuildOptions = ({
     ...edgeFunctionsFeatureFlags,
     functionsBundlingManifest: true,
   },
+  edgeFunctionsBootstrapURL: getBootstrapURL(),
 })
 
 /**

package/src/lib/functions/server.mjs

@@ -219,6 +219,20 @@ const getFunctionsServer = (options) => {
   return app
 }
 
+/**
+ *
+ * @param {object} options
+ * @param {import('../../commands/base-command.mjs').default} options.command
+ * @param {*} options.capabilities
+ * @param {*} options.config
+ * @param {boolean} options.debug
+ * @param {*} options.loadDistFunctions
+ * @param {*} options.settings
+ * @param {*} options.site
+ * @param {string} options.siteUrl
+ * @param {*} options.timeouts
+ * @returns
+ */
 export const startFunctionsServer = async (options) => {
   const { capabilities, command, config, debug, loadDistFunctions, settings, site, siteUrl, timeouts } = options
   const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root })
@@ -260,15 +274,22 @@ export const startFunctionsServer = async (options) => {
 
   const server = await getFunctionsServer(Object.assign(options, { functionsRegistry }))
 
-  await startWebServer({ server, settings })
+  await startWebServer({ server, settings, debug })
 }
 
-const startWebServer = async ({ server, settings }) => {
-  await new Promise((resolve) => {
-    server.listen(settings.functionsPort, (err) => {
+/**
+ *
+ * @param {object} config
+ * @param {boolean} config.debug
+ * @param {ReturnType<Awaited<typeof getFunctionsServer>>} config.server
+ * @param {*} config.settings
+ */
+const startWebServer = async ({ debug, server, settings }) => {
+  await new Promise((/** @type {(resolve: void) => void} */ resolve) => {
+    server.listen(settings.functionsPort, (/** @type {unknown} */ err) => {
       if (err) {
         errorExit(`${NETLIFYDEVERR} Unable to start functions server: ${err}`)
-      } else {
+      } else if (debug) {
         log(`${NETLIFYDEVLOG} Functions server is listening on ${settings.functionsPort}`)
       }
       resolve()

package/src/utils/run-build.mjs

@@ -2,6 +2,7 @@
 import { promises as fs } from 'fs'
 import path, { join } from 'path'
 
+import { getBootstrapURL } from '../lib/edge-functions/bootstrap.mjs'
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from '../lib/edge-functions/consts.mjs'
 import { getPathInProject } from '../lib/settings.mjs'
 
@@ -73,6 +74,7 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
     cwd: cachedConfig.buildDir,
     quiet: options.quiet,
     saveConfig: options.saveConfig,
+    edgeFunctionsBootstrapURL: getBootstrapURL(),
   }
 
   const devCommand = async (settingsOverrides = {}) => {