netlify-cli 15.8.1-rc.1 → 15.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.1-rc.1",
+  "version": "15.9.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,10 +44,11 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.15.6",
+    "@netlify/build": "29.16.1",
     "@netlify/build-info": "7.4.1",
-    "@netlify/config": "20.5.2",
-    "@netlify/edge-bundler": "8.16.3",
+    "@netlify/config": "20.6.0",
+    "@netlify/edge-bundler": "8.16.4",
+    "@netlify/framework-info": "9.8.10",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
     "@netlify/zip-it-and-ship-it": "9.13.0",
@@ -114,7 +115,7 @@
     "log-update": "5.0.1",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
-    "netlify": "13.1.9",
+    "netlify": "13.1.10",
     "netlify-headers-parser": "7.1.2",
     "netlify-redirect-parser": "14.1.3",
     "netlify-redirector": "0.4.0",
@@ -132,7 +133,7 @@
     "pump": "3.0.0",
     "raw-body": "2.5.2",
     "read-pkg-up": "9.1.0",
-    "semver": "7.5.3",
+    "semver": "7.5.4",
     "source-map-support": "0.5.21",
     "strip-ansi-control-characters": "2.0.0",
     "tabtab": "3.0.2",

package/src/commands/base-command.mjs

@@ -8,7 +8,6 @@ import { NodeFS } from '@netlify/build-info/node'
 import { resolveConfig } from '@netlify/config'
 import { Command, Option } from 'commander'
 import debug from 'debug'
-import execa from 'execa'
 import merge from 'lodash/merge.js'
 import { NetlifyAPI } from 'netlify'
 
@@ -89,9 +88,6 @@ export default class BaseCommand extends Command {
   /** @type {{ startTime: bigint, payload?: any}} */
   analytics = { startTime: process.hrtime.bigint() }
 
-  /** @type {Project} */
-  project
-
   /**
    * IMPORTANT this function will be called for each command!
    * Don't do anything expensive in there.
@@ -341,11 +337,6 @@ export default class BaseCommand extends Command {
     }
   }
 
-  /**
-   *
-   * @param {string|undefined} tokenFromFlag
-   * @returns
-   */
   async authenticate(tokenFromFlag) {
     const [token] = await getToken(tokenFromFlag)
     if (token) {
@@ -469,12 +460,10 @@ export default class BaseCommand extends Command {
 
     const globalConfig = await getGlobalConfig()
 
-    // retrieve the repository root
-    const rootDir = await getRepositoryRoot()
     // Get framework, add to analytics payload for every command, if a framework is set
     const fs = new NodeFS()
-    this.project = new Project(fs, buildDir, rootDir).setEnvironment(process.env).setNodeVersion(process.version)
-    const frameworks = await this.project.detectFrameworks()
+    const project = new Project(fs, buildDir)
+    const frameworks = await project.detectFrameworks()
 
     const frameworkIDs = frameworks?.map((framework) => framework.id)
 
@@ -483,12 +472,10 @@ export default class BaseCommand extends Command {
     }
 
     this.setAnalyticsPayload({
-      packageManager: this.project.packageManager?.name,
-      buildSystem: this.project.buildSystems.map(({ id }) => id),
+      packageManager: project.packageManager?.name,
+      buildSystem: project.buildSystems.map(({ id }) => id),
     })
 
-    actionCommand.project = this.project
-
     actionCommand.netlify = {
       // api methods
       api,
@@ -581,17 +568,3 @@ export default class BaseCommand extends Command {
     return 'dev'
   }
 }
-
-/**
- * Retrieves the repository root through a git command.
- * Returns undefined if not a git project.
- * @returns {Promise<string|undefined>}
- */
-async function getRepositoryRoot() {
-  try {
-    const res = await execa('git', ['rev-parse', '--show-toplevel'], { preferLocal: true })
-    return res.stdout
-  } catch {
-    // noop
-  }
-}

package/src/commands/dev/dev.mjs

@@ -9,6 +9,7 @@ import { printBanner } from '../../utils/banner.mjs'
 import {
   BANG,
   chalk,
+  exit,
   log,
   NETLIFYDEV,
   NETLIFYDEVERR,
@@ -34,7 +35,7 @@ import { createDevExecCommand } from './dev-exec.mjs'
  * @param {object} config
  * @param {*} config.api
  * @param {import('commander').OptionValues} config.options
- * @param {import('../../utils/types.js').ServerSettings} config.settings
+ * @param {*} config.settings
  * @param {*} config.site
  * @param {*} config.state
  * @returns
@@ -67,9 +68,6 @@ const handleLiveTunnel = async ({ api, options, settings, site, state }) => {
   }
 }
 
-/**
- * @param {string} args
- */
 const validateShortFlagArgs = (args) => {
   if (args.startsWith('=')) {
     throw new Error(
@@ -96,7 +94,7 @@ const dev = async (options, command) => {
   const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
-  /** @type {import('./types.js').DevConfig} */
+  /** @type {import('./types').DevConfig} */
   const devConfig = {
     framework: '#auto',
     ...(config.functionsDirectory && { functions: config.functionsDirectory }),
@@ -126,17 +124,20 @@ const dev = async (options, command) => {
     siteInfo,
   })
 
-  /** @type {import('../../utils/types.js').ServerSettings} */
-  let settings
+  /** @type {Partial<import('../../utils/types').ServerSettings>} */
+  let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, command.project, site.root)
+    settings = await detectServerSettings(devConfig, options, site.root, {
+      site: {
+        id: site.id,
+        url: siteUrl,
+      },
+    })
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
-    if (error_ && typeof error_ === 'object' && 'message' in error_) {
-      log(NETLIFYDEVERR, error_.message)
-    }
-    process.exit(1)
+    log(NETLIFYDEVERR, error_.message)
+    exit(1)
   }
 
   command.setAnalyticsPayload({ live: options.live })

package/src/commands/serve/serve.mjs

@@ -72,7 +72,7 @@ const serve = async (options, command) => {
   /** @type {Partial<import('../../utils/types').ServerSettings>} */
   let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, command.project, site.root)
+    settings = await detectServerSettings(devConfig, options, site.root)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {

package/src/functions-templates/javascript/auth-fetch/package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/functions-templates/javascript/google-analytics/package-lock.json

@@ -17,9 +17,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/lib/spinner.mjs

@@ -17,7 +17,7 @@ export const startSpinner = ({ text }) =>
  * Stops the spinner with the following text
  * @param {object} config
  * @param {ora.Ora} config.spinner
- * @param {boolean} [config.error]
+ * @param {object} [config.error]
  * @param {string} [config.text]
  * @returns {void}
  */

package/src/utils/command-helpers.mjs

@@ -24,7 +24,7 @@ const argv = process.argv.slice(2)
  * Chalk instance for CLI that can be initialized with no colors mode
  * needed for json outputs where we don't want to have colors
  * @param  {boolean} noColors - disable chalk colors
- * @return {import('chalk').ChalkInstance} - default or custom chalk instance
+ * @return {object} - default or custom chalk instance
  */
 const safeChalk = function (noColors) {
   if (noColors) {
@@ -174,19 +174,12 @@ export const warn = (message = '') => {
 
 /**
  * throws an error or log it
- * @param {unknown} message
+ * @param {string|Error} message
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
 export const error = (message = '', options = {}) => {
-  const err =
-    message instanceof Error
-      ? message
-      : // eslint-disable-next-line unicorn/no-nested-ternary
-      typeof message === 'string'
-      ? new Error(message)
-      : // eslint-disable-next-line no-inline-comments
-        /** @type {Error} */ ({ message, stack: undefined, name: 'Error' })
+  const err = message instanceof Error ? message : new Error(message)
 
   if (options.exit === false) {
     const bang = chalk.red(BANG)