netlify-cli 14.1.0 → 14.2.1

package/npm-shrinkwrap.json

@@ -1,18 +1,19 @@
 {
   "name": "netlify-cli",
-  "version": "14.1.0",
+  "version": "14.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "14.1.0",
+      "version": "14.2.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@bugsnag/js": "^7.20.0",
         "@fastify/static": "^6.6.0",
         "@netlify/build": "^29.9.2",
+        "@netlify/build-info": "^7.0.0-pre-20230418.0",
         "@netlify/config": "^20.3.7",
         "@netlify/edge-bundler": "^8.13.2",
         "@netlify/framework-info": "^9.8.5",
@@ -715,6 +716,85 @@
         "node": "^14.16.0 || >=16.0.0"
       }
     },
+    "node_modules/@netlify/build-info": {
+      "version": "7.0.0-pre-20230418.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.0.0-pre-20230418.0.tgz",
+      "integrity": "sha512-2SH071pIs6eufG5ZBFusZ2FVvpp1UKf6JDChOwNYWcQ86kaELqAkfE4fGE/5cXDEvp8ieid4HdD9i6DgwIIVxw==",
+      "dependencies": {
+        "@bugsnag/js": "^7.20.0",
+        "@netlify/framework-info": "^9.8.5",
+        "find-up": "^6.3.0",
+        "minimatch": "^6.2.0",
+        "read-pkg": "^7.1.0",
+        "semver": "^7.3.8",
+        "yaml": "^2.1.3",
+        "yargs": "^17.6.0"
+      },
+      "bin": {
+        "build-info": "bin.js"
+      },
+      "engines": {
+        "node": "^14.16.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@netlify/build-info/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@netlify/build-info/node_modules/minimatch": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz",
+      "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@netlify/build-info/node_modules/read-pkg": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@netlify/build-info/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@netlify/build-info/node_modules/yaml": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
+      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/@netlify/build/node_modules/@sindresorhus/is": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz",
@@ -16211,6 +16291,60 @@
         }
       }
     },
+    "@netlify/build-info": {
+      "version": "7.0.0-pre-20230418.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.0.0-pre-20230418.0.tgz",
+      "integrity": "sha512-2SH071pIs6eufG5ZBFusZ2FVvpp1UKf6JDChOwNYWcQ86kaELqAkfE4fGE/5cXDEvp8ieid4HdD9i6DgwIIVxw==",
+      "requires": {
+        "@bugsnag/js": "^7.20.0",
+        "@netlify/framework-info": "^9.8.5",
+        "find-up": "^6.3.0",
+        "minimatch": "^6.2.0",
+        "read-pkg": "^7.1.0",
+        "semver": "^7.3.8",
+        "yaml": "^2.1.3",
+        "yargs": "^17.6.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz",
+          "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==",
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "read-pkg": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+          "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+          "requires": {
+            "@types/normalize-package-data": "^2.4.1",
+            "normalize-package-data": "^3.0.2",
+            "parse-json": "^5.2.0",
+            "type-fest": "^2.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
+        },
+        "yaml": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
+          "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw=="
+        }
+      }
+    },
     "@netlify/cache-utils": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-5.1.3.tgz",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "14.1.0",
+  "version": "14.2.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -45,6 +45,7 @@
     "@bugsnag/js": "^7.20.0",
     "@fastify/static": "^6.6.0",
     "@netlify/build": "^29.9.2",
+    "@netlify/build-info": "^7.0.0-pre-20230418.0",
     "@netlify/config": "^20.3.7",
     "@netlify/edge-bundler": "^8.13.2",
     "@netlify/framework-info": "^9.8.5",

package/src/commands/dev/dev.mjs

@@ -111,7 +111,12 @@ const dev = async (options, command) => {
   /** @type {Partial<import('../../utils/types').ServerSettings>} */
   let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, site.root)
+    settings = await detectServerSettings(devConfig, options, site.root, {
+      site: {
+        id: site.id,
+        url: siteUrl,
+      },
+    })
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {

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

@@ -4,6 +4,9 @@ import { EOL } from 'os'
 import path from 'path'
 import process from 'process'
 
+import { Project } from '@netlify/build-info'
+// eslint-disable-next-line import/extensions, n/no-missing-import
+import { NodeFS } from '@netlify/build-info/node'
 import { getFramework, listFrameworks } from '@netlify/framework-info'
 import fuzzy from 'fuzzy'
 import getPort from 'get-port'
@@ -12,6 +15,7 @@ import isPlainObject from 'is-plain-obj'
 import { NETLIFYDEVWARN, chalk, log } from './command-helpers.mjs'
 import { acquirePort } from './dev.mjs'
 import { getInternalFunctionsDir } from './functions/functions.mjs'
+import { reportError } from './telemetry/report-error.mjs'
 
 const formatProperty = (str) => chalk.magenta(`'${str}'`)
 const formatValue = (str) => chalk.green(`'${str}'`)
@@ -112,10 +116,10 @@ const getStaticServerPort = async ({ devConfig }) => {
 /**
  *
  * @param {object} param0
- * @param {import('../commands/dev/types').DevConfig} param0.devConfig
+ * @param {import('../commands/dev/types.js').DevConfig} param0.devConfig
  * @param {import('commander').OptionValues} param0.options
  * @param {string} param0.projectDir
- * @returns {Promise<import('./types').BaseServerSettings>}
+ * @returns {Promise<import('./types.js').BaseServerSettings>}
  */
 const handleStaticServer = async ({ devConfig, options, projectDir }) => {
   validateNumberProperty({ devConfig, property: 'staticServerPort' })
@@ -152,8 +156,8 @@ const handleStaticServer = async ({ devConfig, options, projectDir }) => {
 
 /**
  * Retrieves the settings from a framework
- * @param {import('./types').FrameworkInfo} framework
- * @returns {import('./types').BaseServerSettings}
+ * @param {import('./types.js').FrameworkInfo} framework
+ * @returns {import('./types.js').BaseServerSettings}
  */
 const getSettingsFromFramework = (framework) => {
   const {
@@ -182,6 +186,71 @@ const getSettingsFromFramework = (framework) => {
 
 const hasDevCommand = (framework) => Array.isArray(framework.dev.commands) && framework.dev.commands.length !== 0
 
+/**
+ * The new build setting detection with build systems and frameworks combined
+ * @param {string} projectDir
+ */
+const detectSettings = async (projectDir) => {
+  const fs = new NodeFS()
+  const project = new Project(fs, projectDir)
+
+  return await project.getBuildSettings()
+}
+
+/**
+ *
+ * @param {import('./types.js').BaseServerSettings | undefined} frameworkSettings
+ * @param {import('@netlify/build-info').Settings[]} newSettings
+ * @param {Record<string, Record<string, any>>} [metadata]
+ */
+const detectChangesInNewSettings = (frameworkSettings, newSettings, metadata) => {
+  /** @type {string[]} */
+  const message = ['']
+  const [setting] = newSettings
+
+  if (frameworkSettings?.framework !== setting?.framework) {
+    message.push(
+      `- Framework does not match:`,
+      `   [old]: ${frameworkSettings?.framework}`,
+      `   [new]: ${setting?.framework}`,
+      '',
+    )
+  }
+
+  if (frameworkSettings?.command !== setting?.devCommand) {
+    message.push(
+      `- command does not match:`,
+      `   [old]: ${frameworkSettings?.command}`,
+      `   [new]: ${setting?.devCommand}`,
+      '',
+    )
+  }
+
+  if (frameworkSettings?.dist !== setting?.dist) {
+    message.push(`- dist does not match:`, `   [old]: ${frameworkSettings?.dist}`, `   [new]: ${setting?.dist}`, '')
+  }
+
+  if (frameworkSettings?.frameworkPort !== setting?.frameworkPort) {
+    message.push(
+      `- frameworkPort does not match:`,
+      `   [old]: ${frameworkSettings?.frameworkPort}`,
+      `   [new]: ${setting?.frameworkPort}`,
+      '',
+    )
+  }
+
+  if (message.length !== 0) {
+    reportError(
+      {
+        name: 'NewSettingsDetectionMismatch',
+        errorMessage: 'New Settings detection does not match old one',
+        message: message.join('\n'),
+      },
+      { severity: 'info', metadata },
+    )
+  }
+}
+
 const detectFrameworkSettings = async ({ projectDir }) => {
   const projectFrameworks = await listFrameworks({ projectDir })
   const frameworks = projectFrameworks.filter((framework) => hasDevCommand(framework))
@@ -224,7 +293,7 @@ const hasCommandAndTargetPort = ({ devConfig }) => devConfig.command && devConfi
 /**
  * Creates settings for the custom framework
  * @param {*} param0
- * @returns {import('./types').BaseServerSettings}
+ * @returns {import('./types.js').BaseServerSettings}
  */
 const handleCustomFramework = ({ devConfig }) => {
   if (!hasCommandAndTargetPort({ devConfig })) {
@@ -271,7 +340,7 @@ const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
 /**
  * Handles a forced framework and retrieves the settings for it
  * @param {*} param0
- * @returns {Promise<import('./types').BaseServerSettings>}
+ * @returns {Promise<import('./types.js').BaseServerSettings>}
  */
 const handleForcedFramework = async ({ devConfig, projectDir }) => {
   // this throws if `devConfig.framework` is not a supported framework
@@ -281,15 +350,16 @@ const handleForcedFramework = async ({ devConfig, projectDir }) => {
 
 /**
  * Get the server settings based on the flags and the devConfig
- * @param {import('../commands/dev/types').DevConfig} devConfig
+ * @param {import('../commands/dev/types.js').DevConfig} devConfig
  * @param {import('commander').OptionValues} options
  * @param {string} projectDir
- * @returns {Promise<import('./types').ServerSettings>}
+ * @param {Record<string, Record<string, any>>} [metadata]
+ * @returns {Promise<import('./types.js').ServerSettings>}
  */
-const detectServerSettings = async (devConfig, options, projectDir) => {
+const detectServerSettings = async (devConfig, options, projectDir, metadata) => {
   validateStringProperty({ devConfig, property: 'framework' })
 
-  /** @type {Partial<import('./types').BaseServerSettings>} */
+  /** @type {Partial<import('./types.js').BaseServerSettings>} */
   let settings = {}
 
   if (options.dir || devConfig.framework === '#static') {
@@ -300,6 +370,19 @@ const detectServerSettings = async (devConfig, options, projectDir) => {
 
     const runDetection = !hasCommandAndTargetPort({ devConfig })
     const frameworkSettings = runDetection ? await detectFrameworkSettings({ projectDir }) : undefined
+    const newSettings = runDetection ? await detectSettings(projectDir) : undefined
+
+    // just report differences in the settings
+    detectChangesInNewSettings(frameworkSettings, newSettings || [], {
+      ...metadata,
+      settings: {
+        projectDir,
+        devConfig,
+        options,
+        old: frameworkSettings,
+        settings: newSettings,
+      },
+    })
 
     if (frameworkSettings === undefined && runDetection) {
       log(`${NETLIFYDEVWARN} No app server detected. Using simple static server`)
@@ -368,7 +451,7 @@ const formatSettingsArrForInquirer = function (frameworks) {
  * Returns a copy of the provided config with any plugins provided by the
  * server settings
  * @param {*} config
- * @param {Partial<import('./types').ServerSettings>} settings
+ * @param {Partial<import('./types.js').ServerSettings>} settings
  * @returns {*} Modified config
  */
 export const getConfigWithPlugins = (config, settings) => {

package/src/utils/telemetry/report-error.mjs

@@ -1,7 +1,10 @@
+import os from 'os'
 import { dirname, join } from 'path'
 import process, { version as nodejsVersion } from 'process'
 import { fileURLToPath } from 'url'
 
+import { isCI } from 'ci-info'
+
 import execa from '../execa.mjs'
 import getGlobalConfig from '../get-global-config.mjs'
 
@@ -14,9 +17,14 @@ const dirPath = dirname(fileURLToPath(import.meta.url))
  * @param {import('@bugsnag/js').NotifiableError} error
  * @param {object} config
  * @param {import('@bugsnag/js').Event['severity']} config.severity
+ * @param {Record<string, Record<string, any>>} [config.metadata]
  * @returns {Promise<void>}
  */
 export const reportError = async function (error, config = {}) {
+  if (isCI) {
+    return
+  }
+
   const globalConfig = await getGlobalConfig()
 
   const options = JSON.stringify({
@@ -30,15 +38,17 @@ export const reportError = async function (error, config = {}) {
       user: {
         id: globalConfig.get('userId'),
       },
-      osName: process.platform,
+      metadata: config.metadata,
+      osName: `${os.platform()}-${os.arch()}`,
       cliVersion,
       nodejsVersion,
     },
   })
 
-  // spawn detached child process to handle send
-  execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
+  // spawn detached child process to handle send and wait for the http request to finish
+  // otherwise it can get canceled
+  await execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
     detached: true,
     stdio: 'ignore',
-  }).unref()
+  })
 }