netlify-cli 11.1.0 → 11.2.0

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
   "name": "netlify-cli",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "11.1.0",
+      "version": "11.2.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.14.0",
-        "@netlify/config": "^18.2.0",
+        "@netlify/build": "^27.15.4",
+        "@netlify/config": "^18.2.1",
         "@netlify/edge-bundler": "^1.13.0",
         "@netlify/framework-info": "^9.2.0",
         "@netlify/local-functions-proxy": "^1.1.1",
@@ -1189,14 +1189,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
-      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
+      "version": "27.15.4",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.4.tgz",
+      "integrity": "sha512-4fNEB3V4DF1HQEQrRfFFRWWRNNlkZEdcyWXz1ekzAwQ6rJYmhUxHV5tJg98AhHTrovXBmlWK1gLF3qLaGGoMFA==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.0",
-        "@netlify/edge-bundler": "^1.12.1",
+        "@netlify/config": "^18.2.2",
+        "@netlify/edge-bundler": "^1.13.0",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.36.0",
@@ -1806,9 +1806,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -1817,9 +1817,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -2011,9 +2011,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
-      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
+      "version": "18.2.2",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
+      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -2321,9 +2321,9 @@
       }
     },
     "node_modules/@netlify/config/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -23374,14 +23374,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
-      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
+      "version": "27.15.4",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.4.tgz",
+      "integrity": "sha512-4fNEB3V4DF1HQEQrRfFFRWWRNNlkZEdcyWXz1ekzAwQ6rJYmhUxHV5tJg98AhHTrovXBmlWK1gLF3qLaGGoMFA==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.0",
-        "@netlify/edge-bundler": "^1.12.1",
+        "@netlify/config": "^18.2.2",
+        "@netlify/edge-bundler": "^1.13.0",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.36.0",
@@ -23752,9 +23752,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-              "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+              "version": "2.18.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
             }
           }
         },
@@ -23769,9 +23769,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-              "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+              "version": "2.18.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
             }
           }
         },
@@ -23885,9 +23885,9 @@
       }
     },
     "@netlify/config": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
-      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
+      "version": "18.2.2",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
+      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -24063,9 +24063,9 @@
           "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
         },
         "type-fest": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-          "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+          "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
         },
         "yocto-queue": {
           "version": "1.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -222,8 +222,8 @@
     "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.14.0",
-    "@netlify/config": "^18.2.0",
+    "@netlify/build": "^27.15.4",
+    "@netlify/config": "^18.2.1",
     "@netlify/edge-bundler": "^1.13.0",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",

package/src/commands/init/init.js

@@ -198,6 +198,8 @@ const init = async (options, command) => {
     siteInfo = await createOrLinkSiteToRepo(command)
   }
 
+  log()
+
   // Check for existing CI setup
   const remoteBuildRepo = getRepoUrl({ siteInfo })
   if (remoteBuildRepo && !options.force) {

package/src/commands/link/link.js

@@ -1,8 +1,4 @@
 // @ts-check
-const { join, relative } = require('path')
-const path = require('path')
-const { cwd } = require('process')
-
 const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
@@ -234,10 +230,6 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
   log(`Admin url: ${chalk.magentaBright(site.admin_url)}`)
   log(`Site url:  ${chalk.cyanBright(site.ssl_url || site.url)}`)
   log()
-
-  log(`Site id saved to ${path.join(netlify.site.root, '/.netlify/state.json')}`)
-  // log(`Local Config: .netlify/config.json`)
-  log()
   log(`You can now run other \`netlify\` cli commands in this directory`)
 
   return site
@@ -296,7 +288,7 @@ const link = async (options, command) => {
 
     // Save site ID
     state.set('siteId', siteData.id)
-    log(`Linked to ${siteData.name} in ${state.path}`)
+    log(`Linked to ${siteData.name}`)
 
     await track('sites_linked', {
       siteId: siteData.id,
@@ -327,7 +319,7 @@ const link = async (options, command) => {
     const [firstSiteData] = results
     state.set('siteId', firstSiteData.id)
 
-    log(`Linked to ${firstSiteData.name} in ${relative(join(cwd(), '..'), state.path)}`)
+    log(`Linked to ${firstSiteData.name}`)
 
     await track('sites_linked', {
       siteId: (firstSiteData && firstSiteData.id) || siteId,

package/src/commands/sites/sites-create.js

@@ -39,16 +39,14 @@ const getSiteNameInput = async (name, user, api) => {
     ]
     siteSuggestion = sample(suggestions)
 
-    console.log(
-      `Choose a unique site name (e.g. ${siteSuggestion}.netlify.app) or leave it blank for a random name. You can update the site name later.`,
-    )
     const { name: nameInput } = await inquirer.prompt([
       {
         type: 'input',
         name: 'name',
-        message: 'Site name (optional):',
-        filter: (val) => (val === '' ? undefined : val),
-        validate: (input) => /^[a-zA-Z\d-]+$/.test(input) || 'Only alphanumeric characters and hyphens are allowed',
+        message: 'Site name (you can change it later):',
+        default: siteSuggestion,
+        validate: (input) =>
+          /^[a-zA-Z\d-]+$/.test(input || undefined) || 'Only alphanumeric characters and hyphens are allowed',
       },
     ])
     name = nameInput || siteSuggestion

package/src/utils/init/config-github.js

@@ -224,6 +224,8 @@ const configGithub = async ({ command, repoName, repoOwner, siteId }) => {
   })
   await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
 
+  log()
+
   const octokit = getGitHubClient(token)
   const [deployKey, githubRepo] = await Promise.all([
     addDeployKey({ api, octokit, repoOwner, repoName }),

package/src/utils/init/plugins.js

@@ -1,38 +1,10 @@
-const fetch = require('node-fetch')
-
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyPluginsList = import('@netlify/plugins-list')
-
-// 1 minute
-const PLUGINS_LIST_TIMEOUT = 6e4
-
-const getPluginsList = async () => {
-  const { pluginsList, pluginsUrl } = await netlifyPluginsList
-  try {
-    const response = await fetch(pluginsUrl, { timeout: PLUGINS_LIST_TIMEOUT })
-    return await response.json()
-  } catch {
-    return pluginsList
-  }
-}
-
-const getPluginInfo = (list, packageName) => list.find(({ package }) => package === packageName)
-
 const isPluginInstalled = (configPlugins, plugin) =>
   configPlugins.some(({ package: configPlugin }) => configPlugin === plugin)
 
 const getRecommendPlugins = (frameworkPlugins, config) =>
   frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin))
 
-const getPluginsToInstall = ({ installSinglePlugin, plugins, recommendedPlugins }) => {
-  if (Array.isArray(plugins)) {
-    return plugins.map((plugin) => ({ package: plugin }))
-  }
-
-  return installSinglePlugin === true ? [{ package: recommendedPlugins[0] }] : []
-}
-
 const getUIPlugins = (configPlugins) =>
   configPlugins.filter(({ origin }) => origin === 'ui').map(({ package }) => ({ package }))
 
-module.exports = { getPluginsList, getPluginInfo, getRecommendPlugins, getPluginsToInstall, getUIPlugins }
+module.exports = { getRecommendPlugins, getUIPlugins }

package/src/utils/init/utils.js

@@ -1,7 +1,6 @@
 // @ts-check
 const { existsSync } = require('fs')
 const { writeFile } = require('fs').promises
-const { EOL } = require('os')
 const path = require('path')
 const process = require('process')
 
@@ -10,11 +9,12 @@ const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
 const { normalizeBackslash } = require('../../lib/path')
+const { log } = require('../command-helpers')
 const { chalk, error: failAndExit, warn } = require('../command-helpers')
 
 const { getFrameworkInfo } = require('./frameworks')
 const { detectNodeVersion } = require('./node-version')
-const { getPluginInfo, getPluginsList, getPluginsToInstall, getRecommendPlugins, getUIPlugins } = require('./plugins')
+const { getRecommendPlugins, getUIPlugins } = require('./plugins')
 
 const normalizeDir = ({ baseDirectory, defaultValue, dir }) => {
   if (dir === undefined) {
@@ -55,14 +55,7 @@ const getDefaultSettings = ({
   }
 }
 
-const getPromptInputs = async ({
-  defaultBaseDir,
-  defaultBuildCmd,
-  defaultBuildDir,
-  defaultFunctionsDir,
-  frameworkName,
-  recommendedPlugins,
-}) => {
+const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) => {
   const inputs = [
     defaultBaseDir !== undefined && {
       type: 'input',
@@ -83,50 +76,9 @@ const getPromptInputs = async ({
       message: 'Directory to deploy (blank for current dir):',
       default: defaultBuildDir,
     },
-    {
-      type: 'input',
-      name: 'functionsDir',
-      message: 'Netlify functions folder:',
-      default: defaultFunctionsDir,
-    },
   ].filter(Boolean)
 
-  if (recommendedPlugins.length === 0) {
-    return inputs
-  }
-
-  const pluginsList = await getPluginsList()
-
-  const prefix = `Seems like this is a ${formatTitle(frameworkName)} site.${EOL}❇️  `
-  if (recommendedPlugins.length === 1) {
-    const { name } = getPluginInfo(pluginsList, recommendedPlugins[0])
-    return [
-      ...inputs,
-      {
-        type: 'confirm',
-        name: 'installSinglePlugin',
-        message: `${prefix}We're going to install this Build Plugin: ${formatTitle(
-          `${name} plugin`,
-        )}${EOL}➡️  OK to install?`,
-        default: true,
-      },
-    ]
-  }
-
-  const infos = recommendedPlugins.map((packageName) => getPluginInfo(pluginsList, packageName))
-  return [
-    ...inputs,
-    {
-      type: 'checkbox',
-      name: 'plugins',
-      message: `${prefix}We're going to install these plugins: ${infos
-        .map(({ name }) => `${name} plugin`)
-        .map(formatTitle)
-        .join(', ')}${EOL}➡️  OK to install??`,
-      choices: infos.map((info) => ({ name: `${info.name} plugin`, value: info.package })),
-      default: infos.map((info) => info.package),
-    },
-  ]
+  return inputs.filter(Boolean)
 }
 
 // `repositoryRoot === siteRoot` means the base directory wasn't detected by @netlify/config, so we use cwd()
@@ -154,25 +106,24 @@ const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }) => {
       frameworkBuildDir,
       frameworkPlugins,
     })
-  const { baseDir, buildCmd, buildDir, functionsDir, installSinglePlugin, plugins } = await inquirer.prompt(
-    await getPromptInputs({
+
+  if (recommendedPlugins.length !== 0) {
+    log(`Configuring ${formatTitle(frameworkName)} runtime...`)
+    log()
+  }
+
+  const { baseDir, buildCmd, buildDir } = await inquirer.prompt(
+    getPromptInputs({
+      defaultBaseDir,
       defaultBuildCmd,
       defaultBuildDir,
-      defaultFunctionsDir,
-      defaultBaseDir,
-      recommendedPlugins,
-      frameworkName,
     }),
   )
-  const pluginsToInstall = getPluginsToInstall({
-    plugins,
-    installSinglePlugin,
-    recommendedPlugins,
-  })
 
+  const pluginsToInstall = recommendedPlugins.map((plugin) => ({ package: plugin }))
   const normalizedBaseDir = baseDir ? normalizeBackslash(baseDir) : undefined
 
-  return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir, pluginsToInstall }
+  return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir: defaultFunctionsDir, pluginsToInstall }
 }
 
 const getNetlifyToml = ({