netlify-cli 11.8.1 → 11.8.3

package/npm-shrinkwrap.json

@@ -1,21 +1,21 @@
 {
   "name": "netlify-cli",
-  "version": "11.8.1",
+  "version": "11.8.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "11.8.1",
+      "version": "11.8.3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.18.3",
+        "@netlify/build": "^27.18.5",
         "@netlify/config": "^18.2.3",
-        "@netlify/edge-bundler": "^2.1.0",
+        "@netlify/edge-bundler": "^2.2.0",
         "@netlify/framework-info": "^9.2.0",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugins-list": "^6.45.0",
+        "@netlify/plugins-list": "^6.46.0",
         "@netlify/zip-it-and-ship-it": "^7.1.2",
         "@octokit/rest": "^18.0.0",
         "@sindresorhus/slugify": "^1.1.0",
@@ -1194,17 +1194,17 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.18.3",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.18.3.tgz",
-      "integrity": "sha512-Q4IKNpLhJFezhyMb+jg7OIhS2ANOB9akLt58JX4A/XStY+42jQvuzsNG/2EcDcmshjJP5fob50GyqrzpsLG3Aw==",
+      "version": "27.18.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.18.5.tgz",
+      "integrity": "sha512-SmLOcgp/VJiCe9ft/8oUmCdPBOvQ/k7G4Y0fUb1BXusRePdultUDzC0pHFybNa/YyIsA4HDTAtGsTAk8GJpu7g==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
         "@netlify/config": "^18.2.3",
-        "@netlify/edge-bundler": "^2.1.0",
+        "@netlify/edge-bundler": "^2.2.0",
         "@netlify/functions-utils": "^4.2.9",
         "@netlify/git-utils": "^4.0.0",
-        "@netlify/plugins-list": "^6.44.0",
+        "@netlify/plugins-list": "^6.46.0",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "^7.1.2",
         "@sindresorhus/slugify": "^2.0.0",
@@ -2348,9 +2348,9 @@
       }
     },
     "node_modules/@netlify/edge-bundler": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-2.1.0.tgz",
-      "integrity": "sha512-yHb4xIZi1qiDtrL7Th7zJkJDBMmrbtRNVGllqq1hLLqDhugEtAz9AVGp3huHgl2F9D5m0l0HbpyWKG+SnZ+54A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-2.2.0.tgz",
+      "integrity": "sha512-8dvI9y77TULQCcLXya4xJIt1GMTmCAJ0XIPfxjv6lbbB2XU87/tEAQ/8VOzaC2lNf+U5qG0fcrzVjjuKt3K2Sw==",
       "dependencies": {
         "@import-maps/resolve": "^1.0.1",
         "common-path-prefix": "^3.0.0",
@@ -2358,6 +2358,7 @@
         "env-paths": "^3.0.0",
         "execa": "^6.0.0",
         "find-up": "^6.3.0",
+        "get-port": "^6.1.2",
         "glob-to-regexp": "^0.4.1",
         "node-fetch": "^3.1.1",
         "node-stream-zip": "^1.15.0",
@@ -2420,6 +2421,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@netlify/edge-bundler/node_modules/get-port": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
+      "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@netlify/edge-bundler/node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
@@ -3684,9 +3696,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.45.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.45.0.tgz",
-      "integrity": "sha512-eFvBjP1o+ckujlV81GFDfnMOM9Vz4jeI/ZsRELLH7j1+GnGRrYcdG20THDJCS++l1bWEvX59PC2Je9eyD7fZFA==",
+      "version": "6.46.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.46.0.tgz",
+      "integrity": "sha512-kUX90Eacqko9ni3cepVZKXFTLmhdwES/HDRlMYxyUh+SmvXWRC+h43b11nA0/6M5PEPolUChQOZN9wZql6oJJw==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -23481,17 +23493,17 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.18.3",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.18.3.tgz",
-      "integrity": "sha512-Q4IKNpLhJFezhyMb+jg7OIhS2ANOB9akLt58JX4A/XStY+42jQvuzsNG/2EcDcmshjJP5fob50GyqrzpsLG3Aw==",
+      "version": "27.18.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.18.5.tgz",
+      "integrity": "sha512-SmLOcgp/VJiCe9ft/8oUmCdPBOvQ/k7G4Y0fUb1BXusRePdultUDzC0pHFybNa/YyIsA4HDTAtGsTAk8GJpu7g==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
         "@netlify/config": "^18.2.3",
-        "@netlify/edge-bundler": "^2.1.0",
+        "@netlify/edge-bundler": "^2.2.0",
         "@netlify/functions-utils": "^4.2.9",
         "@netlify/git-utils": "^4.0.0",
-        "@netlify/plugins-list": "^6.44.0",
+        "@netlify/plugins-list": "^6.46.0",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "^7.1.2",
         "@sindresorhus/slugify": "^2.0.0",
@@ -24182,9 +24194,9 @@
       }
     },
     "@netlify/edge-bundler": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-2.1.0.tgz",
-      "integrity": "sha512-yHb4xIZi1qiDtrL7Th7zJkJDBMmrbtRNVGllqq1hLLqDhugEtAz9AVGp3huHgl2F9D5m0l0HbpyWKG+SnZ+54A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-2.2.0.tgz",
+      "integrity": "sha512-8dvI9y77TULQCcLXya4xJIt1GMTmCAJ0XIPfxjv6lbbB2XU87/tEAQ/8VOzaC2lNf+U5qG0fcrzVjjuKt3K2Sw==",
       "requires": {
         "@import-maps/resolve": "^1.0.1",
         "common-path-prefix": "^3.0.0",
@@ -24192,6 +24204,7 @@
         "env-paths": "^3.0.0",
         "execa": "^6.0.0",
         "find-up": "^6.3.0",
+        "get-port": "^6.1.2",
         "glob-to-regexp": "^0.4.1",
         "node-fetch": "^3.1.1",
         "node-stream-zip": "^1.15.0",
@@ -24233,6 +24246,11 @@
             "path-exists": "^5.0.0"
           }
         },
+        "get-port": {
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
+          "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw=="
+        },
         "glob-to-regexp": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
@@ -24923,9 +24941,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "@netlify/plugins-list": {
-      "version": "6.45.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.45.0.tgz",
-      "integrity": "sha512-eFvBjP1o+ckujlV81GFDfnMOM9Vz4jeI/ZsRELLH7j1+GnGRrYcdG20THDJCS++l1bWEvX59PC2Je9eyD7fZFA=="
+      "version": "6.46.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.46.0.tgz",
+      "integrity": "sha512-kUX90Eacqko9ni3cepVZKXFTLmhdwES/HDRlMYxyUh+SmvXWRC+h43b11nA0/6M5PEPolUChQOZN9wZql6oJJw=="
     },
     "@netlify/run-utils": {
       "version": "4.0.1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "11.8.1",
+  "version": "11.8.3",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -223,12 +223,12 @@
     "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.18.3",
+    "@netlify/build": "^27.18.5",
     "@netlify/config": "^18.2.3",
-    "@netlify/edge-bundler": "^2.1.0",
+    "@netlify/edge-bundler": "^2.2.0",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.45.0",
+    "@netlify/plugins-list": "^6.46.0",
     "@netlify/zip-it-and-ship-it": "^7.1.2",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",

package/src/commands/build/build.js

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

package/src/commands/deploy/deploy.js

@@ -375,11 +375,10 @@ 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, command, options }) => {
+const handleBuild = async ({ cachedConfig, options }) => {
   if (!options.build) {
     return {}
   }
@@ -389,7 +388,7 @@ const handleBuild = async ({ cachedConfig, command, options }) => {
     token,
     options,
   })
-  const { configMutations, exitCode, newConfig } = await runBuild(resolvedOptions, command, options)
+  const { configMutations, exitCode, newConfig } = await runBuild(resolvedOptions)
   if (exitCode !== 0) {
     exit(exitCode)
   }
@@ -574,7 +573,6 @@ const deploy = async (options, command) => {
 
   const { newConfig, configMutations = [] } = await handleBuild({
     cachedConfig: command.netlify.cachedConfig,
-    command,
     options,
   })
   const config = newConfig || command.netlify.config

package/src/lib/build.js

@@ -3,8 +3,6 @@ const process = require('process')
 
 const netlifyBuildPromise = import('@netlify/build')
 
-const { NETLIFYDEVERR, detectServerSettings, error, log } = require('../utils')
-
 /**
  * The buildConfig + a missing cachedConfig
  * @typedef BuildConfig
@@ -44,20 +42,11 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, js
 
 /**
  * run the build command
- * @param {BuildConfig} buildOptions
- * @param {import('../commands/base-command').BaseCommand} command
- * @param {import('commander').OptionValues} commandOptions
+ * @param {BuildConfig} options
  * @returns
  */
-const runBuild = async (buildOptions, command, commandOptions) => {
+const runBuild = async (options) => {
   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.
@@ -67,52 +56,10 @@ const runBuild = async (buildOptions, command, commandOptions) => {
       scheme: apiUrl.protocol.slice(0, -1),
       host: apiUrl.host,
     }
-    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)
+    options = { ...options, testOpts }
   }
 
-  const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(buildOptions)
+  const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(options)
   return { exitCode, newConfig, configMutations }
 }
 

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

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