netlify-cli 8.7.0 → 8.8.0

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "netlify-cli",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.7.0",
+      "version": "8.8.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@netlify/build": "^26.1.1",
         "@netlify/config": "^17.0.3",
-        "@netlify/framework-info": "^8.0.0",
+        "@netlify/framework-info": "^8.0.1",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugin-edge-handlers": "^3.0.2",
         "@netlify/plugins-list": "^6.2.1",
@@ -3037,9 +3037,9 @@
       }
     },
     "node_modules/@netlify/framework-info": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.0.tgz",
-      "integrity": "sha512-8kU0+1civXPehsOcHY9DzAAFWmovkPQFt4W+Z2J86MojER5BXk6PTXhEHNcmgPSYoTejcA7vQ0nAPFErzt5gkA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.1.tgz",
+      "integrity": "sha512-fEvnNMPTFrjHui43UVsljopAmkB4TdY3ewtL1oKhBeiIW+QjN9EexrmkosFJznjLPb/SzS9i3hkd24ae1lVPEg==",
       "dependencies": {
         "ajv": "^8.0.0",
         "filter-obj": "^2.0.1",
@@ -22101,9 +22101,9 @@
       }
     },
     "@netlify/framework-info": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.0.tgz",
-      "integrity": "sha512-8kU0+1civXPehsOcHY9DzAAFWmovkPQFt4W+Z2J86MojER5BXk6PTXhEHNcmgPSYoTejcA7vQ0nAPFErzt5gkA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.1.tgz",
+      "integrity": "sha512-fEvnNMPTFrjHui43UVsljopAmkB4TdY3ewtL1oKhBeiIW+QjN9EexrmkosFJznjLPb/SzS9i3hkd24ae1lVPEg==",
       "requires": {
         "ajv": "^8.0.0",
         "filter-obj": "^2.0.1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -80,7 +80,7 @@
   "dependencies": {
     "@netlify/build": "^26.1.1",
     "@netlify/config": "^17.0.3",
-    "@netlify/framework-info": "^8.0.0",
+    "@netlify/framework-info": "^8.0.1",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.2",
     "@netlify/plugins-list": "^6.2.1",

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

@@ -100,6 +100,16 @@ const getDefaultDist = () => {
   return process.cwd()
 }
 
+const getStaticServerPort = async ({ devConfig }) => {
+  const port = await acquirePort({
+    configuredPort: devConfig.staticServerPort,
+    defaultPort: DEFAULT_STATIC_PORT,
+    errorMessage: 'Could not acquire configured static server port',
+  })
+
+  return port
+}
+
 /**
  *
  * @param {object} param0
@@ -132,11 +142,7 @@ const handleStaticServer = async ({ devConfig, options, projectDir }) => {
   const dist = options.dir || devConfig.publish || getDefaultDist()
   log(`${NETLIFYDEVWARN} Running static server from "${path.relative(path.dirname(projectDir), dist)}"`)
 
-  const frameworkPort = await acquirePort({
-    configuredPort: devConfig.staticServerPort,
-    defaultPort: DEFAULT_STATIC_PORT,
-    errorMessage: 'Could not acquire configured static server port',
-  })
+  const frameworkPort = await getStaticServerPort({ devConfig })
   return {
     ...(devConfig.command && { command: devConfig.command }),
     useStaticServer: true,
@@ -156,7 +162,7 @@ const getSettingsFromFramework = (framework) => {
     dev: {
       commands: [command],
       port: frameworkPort,
-      pollingStrategies,
+      pollingStrategies = [],
     },
     name: frameworkName,
     staticAssetsDirectory: staticDir,
@@ -238,6 +244,31 @@ const handleCustomFramework = ({ devConfig }) => {
   }
 }
 
+const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
+  const {
+    command: frameworkCommand,
+    frameworkPort: frameworkDetectedPort,
+    dist,
+    framework,
+    env,
+    pollingStrategies = [],
+  } = frameworkSettings
+
+  const command = devConfig.command || frameworkCommand
+  const frameworkPort = devConfig.targetPort || frameworkDetectedPort
+  // if the framework doesn't start a server, we use a static one
+  const useStaticServer = !(command && frameworkPort)
+  return {
+    command,
+    frameworkPort: useStaticServer ? await getStaticServerPort({ devConfig }) : frameworkPort,
+    dist: devConfig.publish || dist || getDefaultDist(),
+    framework,
+    env,
+    pollingStrategies,
+    useStaticServer,
+  }
+}
+
 /**
  * Handles a forced framework and retrieves the settings for it
  * @param {*} param0
@@ -245,17 +276,8 @@ const handleCustomFramework = ({ devConfig }) => {
  */
 const handleForcedFramework = async ({ devConfig, projectDir }) => {
   // this throws if `devConfig.framework` is not a supported framework
-  const { command, dist, env, framework, frameworkPort, pollingStrategies } = getSettingsFromFramework(
-    await getFramework(devConfig.framework, { projectDir }),
-  )
-  return {
-    command: devConfig.command || command,
-    frameworkPort: devConfig.targetPort || frameworkPort,
-    dist: devConfig.publish || dist,
-    framework,
-    env,
-    pollingStrategies,
-  }
+  const frameworkSettings = getSettingsFromFramework(await getFramework(devConfig.framework, { projectDir }))
+  return mergeSettings({ devConfig, frameworkSettings })
 }
 
 /**
@@ -285,15 +307,7 @@ const detectServerSettings = async (devConfig, options, projectDir) => {
       settings = await handleStaticServer({ options, devConfig, projectDir })
     } else {
       validateFrameworkConfig({ devConfig })
-      const { command, frameworkPort, dist, framework, env, pollingStrategies = [] } = frameworkSettings || {}
-      settings = {
-        command: devConfig.command || command,
-        frameworkPort: devConfig.targetPort || frameworkPort,
-        dist: devConfig.publish || dist || getDefaultDist(),
-        framework,
-        env,
-        pollingStrategies,
-      }
+      settings = await mergeSettings({ devConfig, frameworkSettings })
     }
   } else if (devConfig.framework === '#custom') {
     validateFrameworkConfig({ devConfig })