netlify-cli 8.13.1 → 8.14.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.13.1",
+  "version": "8.14.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -78,7 +78,7 @@
   },
   "dependencies": {
     "@netlify/build": "^26.2.0",
-    "@netlify/config": "^17.0.3",
+    "@netlify/config": "^17.0.6",
     "@netlify/framework-info": "^9.0.0",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.4",
@@ -146,7 +146,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^10.1.2",
     "netlify-headers-parser": "^6.0.1",
-    "netlify-onegraph-internal": "0.0.15",
+    "netlify-onegraph-internal": "0.0.16",
     "netlify-redirect-parser": "^13.0.1",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
@@ -185,8 +185,8 @@
   },
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
-    "@netlify/eslint-config-node": "^4.1.6",
-    "ava": "^3.15.0",
+    "@netlify/eslint-config-node": "^4.1.7",
+    "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",

package/src/commands/dev/dev.js

@@ -308,7 +308,7 @@ const dev = async (options, command) => {
   } else if (startNetlifyGraphWatcher) {
     const netlifyToken = await command.authenticate()
     await OneGraphCliClient.ensureAppForSite(netlifyToken, site.id)
-    const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options })
+    const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options, settings })
 
     log(`Starting Netlify Graph session, to edit your library run \`netlify graph:edit\` in another tab`)
 

package/src/commands/link/link.js

@@ -276,16 +276,13 @@ const link = async (options, command) => {
     return exit()
   }
 
-  // If already linked to site. exit and prompt for unlink
   if (siteData) {
+    // If already linked to site. exit and prompt for unlink
     log(`Site already linked to "${siteData.name}"`)
     log(`Admin url: ${siteData.admin_url}`)
     log()
     log(`To unlink this site, run: ${chalk.cyanBright('netlify unlink')}`)
-    return exit()
-  }
-
-  if (options.id) {
+  } else if (options.id) {
     try {
       // @ts-ignore types from API are wrong they cannot recognize `getSite` of API
       siteData = await api.getSite({ site_id: options.id })
@@ -306,11 +303,7 @@ const link = async (options, command) => {
       linkType: 'manual',
       kind: 'byId',
     })
-
-    return exit()
-  }
-
-  if (options.name) {
+  } else if (options.name) {
     let results
     try {
       results = await listSites({
@@ -341,11 +334,9 @@ const link = async (options, command) => {
       linkType: 'manual',
       kind: 'byName',
     })
-
-    return exit()
+  } else {
+    siteData = await linkPrompt(command.netlify, options)
   }
-
-  siteData = await linkPrompt(command.netlify, options)
   return siteData
 }
 

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

@@ -9,6 +9,7 @@ const { v4: uuidv4 } = require('uuid')
 
 const { chalk, error, getRepoData, log, logJson, track, warn } = require('../../utils')
 const { configureRepo } = require('../../utils/init/config')
+const { link } = require('../link')
 
 const SITE_NAME_SUGGESTION_SUFFIX_LENGTH = 5
 
@@ -159,6 +160,11 @@ const sitesCreate = async (options, command) => {
     )
   }
 
+  if (!options.disableLinking) {
+    log()
+    await link({ id: site.id }, command)
+  }
+
   return site
 }
 
@@ -172,15 +178,16 @@ const createSitesCreateCommand = (program) =>
     .command('sites:create')
     .description(
       `Create an empty site (advanced)
-Create a blank site that isn't associated with any git remote. Does not link to the current working directory.`,
+Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
     )
     .option('-n, --name [name]', 'name of site')
     .option('-a, --account-slug [slug]', 'account slug to create the site under')
     .option('-c, --with-ci', 'initialize CI hooks during site creation')
     .option('-m, --manual', 'force manual CI setup.  Used --with-ci flag')
+    .option('--disable-linking', 'create the site without linking it to current directory')
     .addHelpText(
       'after',
-      `Create a blank site that isn't associated with any git remote. Does not link to the current working directory.`,
+      `Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
     )
     .action(sitesCreate)
 

package/src/lib/one-graph/cli-netlify-graph.js

@@ -29,7 +29,7 @@ const filterRelativePathItems = (items) => items.filter((part) => part !== '')
  * @param {import('../base-command').BaseCommand} command
  * @return {NetlifyGraphConfig} NetlifyGraphConfig
  */
-const getNetlifyGraphConfig = async ({ command, options }) => {
+const getNetlifyGraphConfig = async ({ command, options, settings }) => {
   const { config, site } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
@@ -44,11 +44,12 @@ const getNetlifyGraphConfig = async ({ command, options }) => {
   }
 
   /** @type {Partial<import('../../utils/types').ServerSettings>} */
-  let settings = {}
-  try {
-    settings = await detectServerSettings(devConfig, options, site.root)
-  } catch (detectServerSettingsError) {
-    error(detectServerSettingsError)
+  if (!settings) {
+    try {
+      settings = await detectServerSettings(devConfig, options, site.root)
+    } catch (detectServerSettingsError) {
+      error(detectServerSettingsError)
+    }
   }
 
   const siteRoot = [path.sep, ...filterRelativePathItems(site.root.split(path.sep))]