netlify-cli 15.9.1-rc.0 → 15.10.0-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.9.1-rc.0",
+  "version": "15.10.0-rc.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,15 +44,14 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.17.1",
-    "@netlify/build-info": "7.7.1",
+    "@netlify/build": "29.17.3",
+    "@netlify/build-info": "7.7.3",
     "@netlify/config": "20.6.4",
-    "@netlify/edge-bundler": "8.16.4",
+    "@netlify/edge-bundler": "8.17.1",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.2",
     "@netlify/zip-it-and-ship-it": "9.13.1",
     "@octokit/rest": "19.0.13",
-    "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",
     "ansi-styles": "6.2.1",
     "ansi-to-html": "0.7.2",
@@ -107,6 +106,7 @@
     "isexe": "2.0.0",
     "jsonwebtoken": "9.0.1",
     "jwt-decode": "3.1.2",
+    "lambda-local": "2.1.1",
     "listr": "0.14.3",
     "locate-path": "7.2.0",
     "lodash": "4.17.21",

package/src/commands/base-command.mjs

@@ -1,5 +1,6 @@
 // @ts-check
-import { join, resolve } from 'path'
+import { existsSync } from 'fs'
+import { join, relative, resolve } from 'path'
 import process from 'process'
 import { format } from 'util'
 
@@ -9,7 +10,7 @@ import { NodeFS, NoopLogger } from '@netlify/build-info/node'
 import { resolveConfig } from '@netlify/config'
 import { Command, Option } from 'commander'
 import debug from 'debug'
-import execa from 'execa'
+import { findUp } from 'find-up'
 import inquirer from 'inquirer'
 import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
 import merge from 'lodash/merge.js'
@@ -38,20 +39,27 @@ import { identify, reportError, track } from '../utils/telemetry/index.mjs'
 
 // load the autocomplete plugin
 inquirer.registerPrompt('autocomplete', inquirerAutocompletePrompt)
-// Netlify CLI client id. Lives in bot@netlify.com
+/** Netlify CLI client id. Lives in bot@netlify.com */
 // TODO: setup client for multiple environments
 const CLIENT_ID = 'd6f37de6614df7ae58664cfca524744d73807a377f5ee71f1a254f78412e3750'
 
 const NANO_SECS_TO_MSECS = 1e6
-// The fallback width for the help terminal
+/** The fallback width for the help terminal */
 const FALLBACK_HELP_CMD_WIDTH = 80
 
 const HELP_$ = NETLIFY_CYAN('$')
-// indent on commands or description on the help page
+/** indent on commands or description on the help page */
 const HELP_INDENT_WIDTH = 2
-// separator width between term and description
+/** separator width between term and description */
 const HELP_SEPARATOR_WIDTH = 5
 
+/**
+ * A list of commands where we don't have to perform the workspace selection at.
+ * Those commands work with the system or are not writing any config files that need to be
+ * workspace aware.
+ */
+const COMMANDS_WITHOUT_WORKSPACE_OPTIONS = new Set(['recipes', 'completion', 'status', 'switch', 'login', 'lm'])
+
 /**
  * Formats a help list correctly with the correct indent
  * @param {string[]} textArray
@@ -78,10 +86,14 @@ const getDuration = function (startTime) {
  */
 async function selectWorkspace(project, filter) {
   const selected = project.workspace?.packages.find((pkg) => {
-    if (project.relativeBaseDirectory && pkg.path.startsWith(project.relativeBaseDirectory)) {
+    if (
+      project.relativeBaseDirectory &&
+      project.relativeBaseDirectory.length !== 0 &&
+      pkg.path.startsWith(project.relativeBaseDirectory)
+    ) {
       return true
     }
-    return pkg.name === filter
+    return (pkg.name && pkg.name === filter) || pkg.path === filter
   })
 
   if (!selected) {
@@ -96,9 +108,9 @@ async function selectWorkspace(project, filter) {
         (project.workspace?.packages || [])
           .filter((pkg) => pkg.path.includes(input))
           .map((pkg) => ({
-            name: `${pkg.name && `${chalk.bold(pkg.name)}`}  ${pkg.path}  ${
-              pkg.name && chalk.dim(`--filter ${pkg.name}`)
-            }`,
+            name: `${pkg.name ? `${chalk.bold(pkg.name)}  ` : ''}${pkg.path}  ${chalk.dim(
+              `--filter ${pkg.name || pkg.path}`,
+            )}`,
             value: pkg.path,
           })),
     })
@@ -131,6 +143,12 @@ export default class BaseCommand extends Command {
   // eslint-disable-next-line workspace/no-process-cwd
   workingDir = process.cwd()
 
+  /**
+   * The workspace root if inside a mono repository.
+   * Must not be the repository root!
+   * @type {string|undefined}
+   */
+  jsWorkspaceRoot
   /**
    * The current workspace package we should execute the commands in
    * @type {string|undefined}
@@ -144,57 +162,61 @@ export default class BaseCommand extends Command {
    * @returns
    */
   createCommand(name) {
-    return (
-      new BaseCommand(name)
-        // If  --silent or --json flag passed disable logger
-        .addOption(new Option('--json', 'Output return values as JSON').hideHelp(true))
-        .addOption(new Option('--silent', 'Silence CLI output').hideHelp(true))
-        .addOption(new Option('--cwd <cwd>').hideHelp(true))
-        .addOption(new Option('-o, --offline').hideHelp(true))
-        .addOption(new Option('--auth <token>', 'Netlify auth token').hideHelp(true))
-        .addOption(
-          new Option(
-            '--httpProxy [address]',
-            'Old, prefer --http-proxy. Proxy server address to route requests through.',
-          )
-            .default(process.env.HTTP_PROXY || process.env.HTTPS_PROXY)
-            .hideHelp(true),
-        )
-        .addOption(
-          new Option(
-            '--httpProxyCertificateFilename [file]',
-            'Old, prefer --http-proxy-certificate-filename. Certificate file to use when connecting using a proxy server.',
-          )
-            .default(process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME)
-            .hideHelp(true),
+    const base = new BaseCommand(name)
+      // If  --silent or --json flag passed disable logger
+      .addOption(new Option('--json', 'Output return values as JSON').hideHelp(true))
+      .addOption(new Option('--silent', 'Silence CLI output').hideHelp(true))
+      .addOption(new Option('--cwd <cwd>').hideHelp(true))
+      .addOption(new Option('-o, --offline').hideHelp(true))
+      .addOption(new Option('--auth <token>', 'Netlify auth token').hideHelp(true))
+      .addOption(
+        new Option('--httpProxy [address]', 'Old, prefer --http-proxy. Proxy server address to route requests through.')
+          .default(process.env.HTTP_PROXY || process.env.HTTPS_PROXY)
+          .hideHelp(true),
+      )
+      .addOption(
+        new Option(
+          '--httpProxyCertificateFilename [file]',
+          'Old, prefer --http-proxy-certificate-filename. Certificate file to use when connecting using a proxy server.',
         )
-        .option(
+          .default(process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME)
+          .hideHelp(true),
+      )
+      .addOption(
+        new Option(
           '--http-proxy-certificate-filename [file]',
           'Certificate file to use when connecting using a proxy server',
-          process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME,
-        )
-        .option(
-          '--http-proxy [address]',
-          'Proxy server address to route requests through.',
-          process.env.HTTP_PROXY || process.env.HTTPS_PROXY,
         )
-        .option('--debug', 'Print debugging information')
+          .default(process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME)
+          .hideHelp(true),
+      )
+      .addOption(
+        new Option('--httpProxy [address]', 'Proxy server address to route requests through.')
+          .default(process.env.HTTP_PROXY || process.env.HTTPS_PROXY)
+          .hideHelp(true),
+      )
+      .option('--debug', 'Print debugging information')
+
+    // only add the `--config` or `--filter` option to commands that are workspace aware
+    if (!COMMANDS_WITHOUT_WORKSPACE_OPTIONS.has(name)) {
+      base
         .option('--config <configFilePath>', 'Custom path to a netlify configuration file')
         .option(
           '--filter <app>',
           'Optional name of an application to run the command in.\nThis option is needed for working in Monorepos',
         )
-        .hook('preAction', async (_parentCommand, actionCommand) => {
-          if (actionCommand.opts()?.debug) {
-            process.env.DEBUG = '*'
-          }
-          debug(`${name}:preAction`)('start')
-          this.analytics = { startTime: process.hrtime.bigint() }
-          // @ts-ignore cannot type actionCommand as BaseCommand
-          await this.init(actionCommand)
-          debug(`${name}:preAction`)('end')
-        })
-    )
+    }
+
+    return base.hook('preAction', async (_parentCommand, actionCommand) => {
+      if (actionCommand.opts()?.debug) {
+        process.env.DEBUG = '*'
+      }
+      debug(`${name}:preAction`)('start')
+      this.analytics = { startTime: process.hrtime.bigint() }
+      // @ts-ignore cannot type actionCommand as BaseCommand
+      await this.init(actionCommand)
+      debug(`${name}:preAction`)('end')
+    })
   }
 
   /** @private */
@@ -234,18 +256,22 @@ export default class BaseCommand extends Command {
       return padLeft(term, HELP_INDENT_WIDTH)
     }
 
+    /**
+     * @param {BaseCommand} command
+     */
     const getCommands = (command) => {
       const parentCommand = this.name() === 'netlify' ? command : command.parent
-      return parentCommand.commands.filter((cmd) => {
-        // eslint-disable-next-line no-underscore-dangle
-        if (cmd._hidden) return false
-        // the root command
-        if (this.name() === 'netlify') {
-          // don't include subcommands on the main page
-          return !cmd.name().includes(':')
-        }
-        return cmd.name().startsWith(`${command.name()}:`)
-      })
+      return (
+        parentCommand?.commands.filter((cmd) => {
+          if (cmd._hidden) return false
+          // the root command
+          if (this.name() === 'netlify') {
+            // don't include subcommands on the main page
+            return !cmd.name().includes(':')
+          }
+          return cmd.name().startsWith(`${command.name()}:`)
+        }) || []
+      )
     }
 
     /**
@@ -338,9 +364,8 @@ export default class BaseCommand extends Command {
       }
 
       // Aliases
-      // eslint-disable-next-line no-underscore-dangle
+
       if (command._aliases.length !== 0) {
-        // eslint-disable-next-line no-underscore-dangle
         const aliases = command._aliases.map((alias) => formatItem(`${parentCommand.name()} ${alias}`, null, true))
         output = [...output, chalk.bold('ALIASES'), formatHelpList(aliases), '']
       }
@@ -511,13 +536,26 @@ export default class BaseCommand extends Command {
         })
       })
     const frameworks = await this.project.detectFrameworks()
+    /** @type { string|undefined} */
+    let packageConfig = flags.config ? resolve(flags.config) : undefined
     // check if we have detected multiple projects inside which one we have to perform our operations.
     // only ask to select one if on the workspace root
-    if (this.project.workspace?.packages.length && this.project.workspace.isRoot) {
+    if (
+      !COMMANDS_WITHOUT_WORKSPACE_OPTIONS.has(actionCommand.name()) &&
+      this.project.workspace?.packages.length &&
+      this.project.workspace.isRoot
+    ) {
       this.workspacePackage = await selectWorkspace(this.project, actionCommand.opts().filter)
       this.workingDir = join(this.project.jsWorkspaceRoot, this.workspacePackage)
     }
 
+    this.jsWorkspaceRoot = this.project.jsWorkspaceRoot
+    // detect if a toml exists in this package.
+    const tomlFile = join(this.workingDir, 'netlify.toml')
+    if (!packageConfig && existsSync(tomlFile)) {
+      packageConfig = tomlFile
+    }
+
     // ==================================================
     // Retrieve Site id and build state from the state.json
     // ==================================================
@@ -541,9 +579,10 @@ export default class BaseCommand extends Command {
     // configuration file and the API
     // ==================================================
     const cachedConfig = await actionCommand.getConfig({
-      cwd: this.workingDir,
+      cwd: this.jsWorkspaceRoot || this.workingDir,
+      repositoryRoot: rootDir,
       // The config flag needs to be resolved from the actual process working directory
-      configFilePath: flags.config ? resolve(flags.config) : undefined,
+      configFilePath: packageConfig,
       state,
       token,
       ...apiUrlOpts,
@@ -588,11 +627,20 @@ export default class BaseCommand extends Command {
     actionCommand.project = this.project
     actionCommand.workingDir = this.workingDir
     actionCommand.workspacePackage = this.workspacePackage
+    actionCommand.jsWorkspaceRoot = this.jsWorkspaceRoot
+
+    // Either an existing configuration file from `@netlify/config` or a file path
+    // that should be used for creating it.
+    const configFilePath = configPath || join(this.workingDir, 'netlify.toml')
+
     actionCommand.netlify = {
       // api methods
       api,
       apiOpts,
+      // The Absolute Repository root (detected through @netlify/config)
       repositoryRoot,
+      configFilePath,
+      relConfigFilePath: relative(repositoryRoot, configFilePath),
       // current site context
       site: {
         root: buildDir,
@@ -683,24 +731,19 @@ export default class BaseCommand extends Command {
    * @returns {'production' | 'dev'}
    */
   getDefaultContext() {
-    if (this.name() === 'serve') {
-      return 'production'
-    }
-
-    return 'dev'
+    return this.name() === 'serve' ? 'production' : 'dev'
   }
 }
 
 /**
  * Retrieves the repository root through a git command.
  * Returns undefined if not a git project.
+ * @param {string} [cwd] The optional current working directory
  * @returns {Promise<string|undefined>}
  */
-async function getRepositoryRoot() {
-  try {
-    const res = await execa('git', ['rev-parse', '--show-toplevel'], { preferLocal: true })
-    return res.stdout
-  } catch {
-    // noop
+async function getRepositoryRoot(cwd) {
+  const res = await findUp('.git', { cwd, type: 'directory' })
+  if (res) {
+    return join(res, '..')
   }
 }

package/src/commands/build/build.mjs

@@ -2,6 +2,7 @@
 import process from 'process'
 
 import { getBuildOptions, runBuild } from '../../lib/build.mjs'
+import { detectFrameworkSettings } from '../../utils/build-info.mjs'
 import { error, exit, getToken } from '../../utils/command-helpers.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
@@ -33,11 +34,18 @@ const injectEnv = async function (command, { api, buildOptions, context, siteInf
  * @param {import('../base-command.mjs').default} command
  */
 const build = async (options, command) => {
+  const { cachedConfig, siteInfo } = command.netlify
   command.setAnalyticsPayload({ dry: options.dry })
   // Retrieve Netlify Build options
   const [token] = await getToken()
+  const settings = await detectFrameworkSettings(command, 'build')
+
+  // override the build command with the detection result if no command is specified through the config
+  if (!cachedConfig.config.build.command) {
+    cachedConfig.config.build.command = settings?.buildCommand
+    cachedConfig.config.build.commandOrigin = 'heuristics'
+  }
 
-  const { cachedConfig, siteInfo } = command.netlify
   const buildOptions = await getBuildOptions({
     cachedConfig,
     token,

package/src/commands/deploy/deploy.mjs

@@ -72,6 +72,7 @@ const triggerDeploy = async ({ api, options, siteData, siteId }) => {
  * @returns {Promise<string>}
  */
 const getDeployFolder = async ({ config, options, site, siteData, workingDir }) => {
+  console.log()
   let deployFolder
   if (options.dir) {
     deployFolder = resolve(workingDir, options.dir)

package/src/commands/dev/dev.mjs

@@ -102,6 +102,7 @@ const dev = async (options, command) => {
     autoLaunch: Boolean(options.open),
     ...(config.functionsDirectory && { functions: config.functionsDirectory }),
     ...(config.build.publish && { publish: config.build.publish }),
+    ...(config.build.base && { base: config.build.base }),
     ...config.dev,
     ...options,
   }
@@ -151,11 +152,9 @@ const dev = async (options, command) => {
   log(`${NETLIFYDEVWARN} Setting up local development server`)
 
   const { configPath: configPathOverride } = await runDevTimeline({
-    cachedConfig,
+    command,
     options,
     settings,
-    projectDir: command.workingDir,
-    site,
     env: {
       URL: url,
       DEPLOY_URL: url,