netlify-cli 11.5.1 → 11.7.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "11.5.1",
+  "version": "11.7.1",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -223,13 +223,13 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^27.16.1",
+    "@netlify/build": "^27.17.2",
     "@netlify/config": "^18.2.3",
     "@netlify/edge-bundler": "^1.14.1",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.41.0",
-    "@netlify/zip-it-and-ship-it": "^6.0.0",
+    "@netlify/plugins-list": "^6.42.0",
+    "@netlify/zip-it-and-ship-it": "^7.1.1",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^5.0.0",

package/src/commands/build/build.js

@@ -7,11 +7,7 @@ const { error, exit, generateNetlifyGraphJWT, getEnvelopeEnv, getToken, normaliz
 /**
  * @param {import('../../lib/build').BuildConfig} options
  */
-const checkOptions = ({ cachedConfig: { siteInfo = {} }, token }) => {
-  if (!siteInfo.id) {
-    error('Could not find the site ID. Please run netlify link.')
-  }
-
+const checkOptions = ({ token }) => {
   if (!token) {
     error('Could not find the access token. Please run netlify login.')
   }
@@ -72,7 +68,7 @@ const build = async (options, command) => {
     await injectEnv(command, { api, buildOptions, context, site, siteInfo })
   }
 
-  const { exitCode } = await runBuild(buildOptions)
+  const { exitCode } = await runBuild(buildOptions, command, options)
   exit(exitCode)
 }
 

package/src/commands/deploy/deploy.js

@@ -375,10 +375,11 @@ const runDeploy = async ({
  *
  * @param {object} config
  * @param {*} config.cachedConfig
+ * @param {*} config.command
  * @param {import('commander').OptionValues} config.options The options of the command
  * @returns
  */
-const handleBuild = async ({ cachedConfig, options }) => {
+const handleBuild = async ({ cachedConfig, command, options }) => {
   if (!options.build) {
     return {}
   }
@@ -388,7 +389,7 @@ const handleBuild = async ({ cachedConfig, options }) => {
     token,
     options,
   })
-  const { configMutations, exitCode, newConfig } = await runBuild(resolvedOptions)
+  const { configMutations, exitCode, newConfig } = await runBuild(resolvedOptions, command, options)
   if (exitCode !== 0) {
     exit(exitCode)
   }
@@ -573,6 +574,7 @@ const deploy = async (options, command) => {
 
   const { newConfig, configMutations = [] } = await handleBuild({
     cachedConfig: command.netlify.cachedConfig,
+    command,
     options,
   })
   const config = newConfig || command.netlify.config

package/src/functions-templates/javascript/stripe-charge/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "stripe": "^9.0.0"
+        "stripe": "^10.0.0"
       }
     },
     "node_modules/@types/node": {
@@ -105,9 +105,9 @@
       }
     },
     "node_modules/stripe": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-9.16.0.tgz",
-      "integrity": "sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.8.0.tgz",
+      "integrity": "sha512-/cQiJ7puqVMDrGDRGqtHn6zPB+nRNA97qyQU59msLQ1OWaQOmwW1IQR7PpRqeqkSv9SgPU7BVBlMKNwWtn1qNA==",
       "dependencies": {
         "@types/node": ">=8.1.0",
         "qs": "^6.10.3"
@@ -184,9 +184,9 @@
       }
     },
     "stripe": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-9.16.0.tgz",
-      "integrity": "sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.8.0.tgz",
+      "integrity": "sha512-/cQiJ7puqVMDrGDRGqtHn6zPB+nRNA97qyQU59msLQ1OWaQOmwW1IQR7PpRqeqkSv9SgPU7BVBlMKNwWtn1qNA==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.10.3"

package/src/functions-templates/javascript/stripe-charge/package.json

@@ -16,6 +16,6 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "stripe": "^9.0.0"
+    "stripe": "^10.0.0"
   }
 }

package/src/functions-templates/javascript/stripe-subscription/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "stripe": "^9.0.0"
+        "stripe": "^10.0.0"
       }
     },
     "node_modules/@types/node": {
@@ -105,9 +105,9 @@
       }
     },
     "node_modules/stripe": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-9.16.0.tgz",
-      "integrity": "sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.8.0.tgz",
+      "integrity": "sha512-/cQiJ7puqVMDrGDRGqtHn6zPB+nRNA97qyQU59msLQ1OWaQOmwW1IQR7PpRqeqkSv9SgPU7BVBlMKNwWtn1qNA==",
       "dependencies": {
         "@types/node": ">=8.1.0",
         "qs": "^6.10.3"
@@ -184,9 +184,9 @@
       }
     },
     "stripe": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-9.16.0.tgz",
-      "integrity": "sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.8.0.tgz",
+      "integrity": "sha512-/cQiJ7puqVMDrGDRGqtHn6zPB+nRNA97qyQU59msLQ1OWaQOmwW1IQR7PpRqeqkSv9SgPU7BVBlMKNwWtn1qNA==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.10.3"

package/src/functions-templates/javascript/stripe-subscription/package.json

@@ -16,6 +16,6 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "stripe": "^9.0.0"
+    "stripe": "^10.0.0"
   }
 }

package/src/functions-templates/rust/hello-world/Cargo.toml

@@ -11,4 +11,4 @@ http = "0.2.8"
 lambda_runtime = "0.6.0"
 log = "0.4.17"
 simple_logger = "1.16.0"
-tokio = "1.20.1"
+tokio = "1.21.0"

package/src/lib/build.js

@@ -3,6 +3,8 @@ const process = require('process')
 
 const netlifyBuildPromise = import('@netlify/build')
 
+const { NETLIFYDEVERR, detectServerSettings, error, log } = require('../utils')
+
 /**
  * The buildConfig + a missing cachedConfig
  * @typedef BuildConfig
@@ -36,16 +38,26 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, js
   featureFlags: {
     functionsBundlingManifest: true,
     edge_functions_produce_eszip: true,
+    project_deploy_configuration_api_use_per_function_configuration_files: true,
   },
 })
 
 /**
  * run the build command
- * @param {BuildConfig} options
+ * @param {BuildConfig} buildOptions
+ * @param {import('../commands/base-command').BaseCommand} command
+ * @param {import('commander').OptionValues} commandOptions
  * @returns
  */
-const runBuild = async (options) => {
+const runBuild = async (buildOptions, command, commandOptions) => {
   const { default: build } = await netlifyBuildPromise
+  const { cachedConfig, config, site } = command.netlify
+  const devConfig = {
+    framework: '#auto',
+    ...(config.functionsDirectory && { functions: config.functionsDirectory }),
+    ...config.dev,
+    ...commandOptions,
+  }
 
   // If netlify NETLIFY_API_URL is set we need to pass this information to @netlify/build
   // TODO don't use testOpts, but add real properties to do this.
@@ -55,10 +67,52 @@ const runBuild = async (options) => {
       scheme: apiUrl.protocol.slice(0, -1),
       host: apiUrl.host,
     }
-    options = { ...options, testOpts }
+    buildOptions = { ...buildOptions, testOpts }
+  }
+
+  /** @type {Partial<import('../../utils/types').ServerSettings>} */
+  let settings = {}
+  try {
+    settings = await detectServerSettings(devConfig, commandOptions, site.root)
+
+    const defaultConfig = { build: {} }
+
+    if (settings.buildCommand && settings.dist) {
+      buildOptions.cachedConfig.config.build.command = settings.buildCommand
+      defaultConfig.build.command = settings.buildCommand
+      buildOptions.cachedConfig.config.build.publish = settings.buildCommand
+      defaultConfig.build.publish = settings.dist
+    }
+
+    if (defaultConfig.build.command && defaultConfig.build.publish) {
+      buildOptions.defaultConfig = defaultConfig
+    }
+
+    // If there are plugins that we should be running for this site, add them
+    // to the config as if they were declared in netlify.toml. We must check
+    // whether the plugin has already been added by another source (like the
+    // TOML file or the UI), as we don't want to run the same plugin twice.
+    if (settings.plugins) {
+      const { plugins: existingPlugins = [] } = cachedConfig.config
+      const existingPluginNames = new Set(existingPlugins.map((plugin) => plugin.package))
+      const newPlugins = settings.plugins
+        .map((pluginName) => {
+          if (existingPluginNames.has(pluginName)) {
+            return
+          }
+
+          return { package: pluginName, origin: 'config', inputs: {} }
+        })
+        .filter(Boolean)
+
+      buildOptions.cachedConfig.config.plugins = [...newPlugins, ...cachedConfig.config.plugins]
+    }
+  } catch (detectServerSettingsError) {
+    log(NETLIFYDEVERR, detectServerSettingsError.message)
+    error(detectServerSettingsError)
   }
 
-  const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(options)
+  const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(buildOptions)
   return { exitCode, newConfig, configMutations }
 }
 

package/src/lib/functions/registry.js

@@ -176,6 +176,7 @@ class FunctionsRegistry {
     const functions = await this.listFunctions(directories, {
       featureFlags: {
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true',
+        project_deploy_configuration_api_use_per_function_configuration_files: true,
       },
       config: this.config.functions,
     })

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

@@ -158,7 +158,10 @@ const handleStaticServer = async ({ devConfig, options, projectDir }) => {
  */
 const getSettingsFromFramework = (framework) => {
   const {
-    build: { directory: dist },
+    build: {
+      directory: dist,
+      commands: [buildCommand],
+    },
     dev: {
       commands: [command],
       port: frameworkPort,
@@ -172,6 +175,7 @@ const getSettingsFromFramework = (framework) => {
 
   return {
     command,
+    buildCommand,
     frameworkPort,
     dist: staticDir || dist,
     framework: frameworkName,
@@ -250,6 +254,7 @@ const handleCustomFramework = ({ devConfig }) => {
 const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
   const {
     command: frameworkCommand,
+    buildCommand,
     frameworkPort: frameworkDetectedPort,
     dist,
     framework,
@@ -263,6 +268,7 @@ const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
   const useStaticServer = !(command && frameworkPort)
   return {
     command,
+    buildCommand,
     frameworkPort: useStaticServer ? await getStaticServerPort({ devConfig }) : frameworkPort,
     dist: devConfig.publish || dist || getDefaultDist(),
     framework,

package/src/utils/proxy.js

@@ -70,7 +70,7 @@ const proxyToExternalUrl = function ({ dest, destURL, req, res }) {
     pathRewrite: () => destURL,
     ...(Buffer.isBuffer(req.originalBody) && { buffer: toReadableStream(req.originalBody) }),
   })
-  return handler(req, res, {})
+  return handler(req, res, () => {})
 }
 
 const handleAddonUrl = function ({ addonUrl, req, res }) {
@@ -185,7 +185,7 @@ const serveRedirect = async function ({ match, options, proxy, req, res }) {
 
   const staticFile = await getStatic(decodeURIComponent(reqUrl.pathname), options.publicFolder)
   if (staticFile) {
-    req.url = encodeURIComponent(staticFile) + reqUrl.search
+    req.url = encodeURI(staticFile) + reqUrl.search
     // if there is an existing static file and it is not a forced redirect, return the file
     if (!match.force) {
       return proxy.web(req, res, { ...options, staticFile })
@@ -214,18 +214,25 @@ const serveRedirect = async function ({ match, options, proxy, req, res }) {
       })
     }
 
-    const destURL = stripOrigin(dest)
+    let destURL = stripOrigin(dest)
 
     if (isExternal(match)) {
-      return proxyToExternalUrl({ req, res, dest, destURL })
+      if (isRedirect(match)) {
+        // This is a redirect, so we set the complete external URL as destination
+        destURL = `${dest}`
+      } else {
+        return proxyToExternalUrl({ req, res, dest, destURL })
+      }
     }
 
     if (isRedirect(match)) {
+      console.log(`${NETLIFYDEVLOG} Redirecting ${req.url} to ${destURL}`)
       res.writeHead(match.status, {
         Location: destURL,
         'Cache-Control': 'no-cache',
       })
       res.end(`Redirecting to ${destURL}`)
+
       return
     }