netlify-cli 10.7.1 → 10.9.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.7.1",
+  "version": "10.9.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -31,6 +31,7 @@
     "Dan Loewenherz <dan@lionheartsw.com> (https://twitter.com/dwlz)",
     "Daniel Tschinder (https://twitter.com/TschinderDaniel)",
     "Daniel Woelfel <dwwoelfel@gmail.com> (https://twitter.com/danielwoelfel)",
+    "Dario De Vito",
     "Dave Ackerman <dmackerman@gmail.com>",
     "David Calavera <david@netlify.com> (https://twitter.com/calavera)",
     "David Lemler <dlemler@pm.me> (https://twitter.com/davidlemlerm)",
@@ -91,6 +92,7 @@
     "Nicolas Gonzalez",
     "Pankaj Patil <pankaj.patil2099@hotmail.com> (https://twitter.com/pankajpatil16)",
     "Peter",
+    "Prince Wilson (https://twitter.com/maxcell)",
     "Rachael Stavchansky",
     "Raees Iqbal <raees@netlify.com> (https://raeesbhatti.com/)",
     "Ricardo Mendes <rokusu@gmail.com> (https://twitter.com/locks)",
@@ -139,6 +141,7 @@
     "dustincrogers",
     "ehmicky (https://twitter.com/ehmicky)",
     "internal tools netlibot",
+    "just toby",
     "kvn-shn",
     "netlibot (https://www.netlify.com)",
     "nikoladev",
@@ -213,18 +216,18 @@
     "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.3.2",
+    "@netlify/build": "^27.4.0",
     "@netlify/config": "^18.1.1",
-    "@netlify/edge-bundler": "^1.4.3",
+    "@netlify/edge-bundler": "^1.5.0",
     "@netlify/framework-info": "^9.1.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.30.0",
-    "@netlify/zip-it-and-ship-it": "^5.11.1",
+    "@netlify/plugins-list": "^6.33.0",
+    "@netlify/zip-it-and-ship-it": "^5.13.0",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
-    "ansi2html": "^0.0.1",
+    "ansi-to-html": "^0.7.2",
     "ascii-table": "0.0.9",
     "backoff": "^2.5.0",
     "better-opn": "^3.0.0",
@@ -233,7 +236,7 @@
     "chokidar": "^3.0.2",
     "ci-info": "^3.0.0",
     "clean-deep": "^3.0.2",
-    "commander": "^9.0.0",
+    "commander": "^9.2.0",
     "concordance": "^5.0.0",
     "configstore": "^5.0.0",
     "content-type": "^1.0.4",
@@ -258,7 +261,6 @@
     "fuzzy": "^0.1.3",
     "get-port": "^5.1.0",
     "gh-release-fetch": "^3.0.0",
-    "git-clone": "^0.2.0",
     "git-repo-info": "^2.1.0",
     "gitconfiglocal": "^2.1.0",
     "hasbin": "^1.2.3",
@@ -285,7 +287,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^11.0.2",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.3.1",
+    "netlify-onegraph-internal": "0.3.6",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
@@ -319,7 +321,7 @@
     "unixify": "^1.0.0",
     "update-notifier": "^5.0.0",
     "uuid": "^8.0.0",
-    "wait-port": "^0.2.2",
+    "wait-port": "^0.2.14",
     "winston": "^3.2.1",
     "write-file-atomic": "^4.0.0"
   },

package/src/commands/deploy/deploy.js

@@ -37,12 +37,21 @@ const { sitesCreate } = require('../sites')
 
 const DEFAULT_DEPLOY_TIMEOUT = 1.2e6
 
-const triggerDeploy = async ({ api, siteData, siteId }) => {
+const triggerDeploy = async ({ api, options, siteData, siteId }) => {
   try {
     const siteBuild = await api.createSiteBuild({ siteId })
-    log(
-      `${NETLIFYDEV} A new deployment was triggered successfully. Visit https://app.netlify.com/sites/${siteData.name}/deploys/${siteBuild.deploy_id} to see the logs.`,
-    )
+    if (options.json) {
+      logJson({
+        site_id: siteId,
+        site_name: siteData.name,
+        deploy_id: `${siteBuild.deploy_id}`,
+        logs: `https://app.netlify.com/sites/${siteData.name}/deploys/${siteBuild.deploy_id}`,
+      })
+    } else {
+      log(
+        `${NETLIFYDEV} A new deployment was triggered successfully. Visit https://app.netlify.com/sites/${siteData.name}/deploys/${siteBuild.deploy_id} to see the logs.`,
+      )
+    }
   } catch (error_) {
     if (error_.status === 404) {
       error('Site not found. Please rerun "netlify link" and make sure that your site has CI configured.')
@@ -553,7 +562,7 @@ const deploy = async (options, command) => {
   const deployToProduction = options.prod || (options.prodIfUnlocked && !siteData.published_deploy.locked)
 
   if (options.trigger) {
-    return triggerDeploy({ api, siteId, siteData })
+    return triggerDeploy({ api, options, siteData, siteId })
   }
 
   const { newConfig, configMutations = [] } = await handleBuild({

package/src/commands/dev/dev.js

@@ -234,6 +234,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
  * @param {InspectSettings} params.inspectSettings
  * @param {() => Promise<object>} params.getUpdatedConfig
  * @param {string} params.geolocationMode
+ * @param {string} params.geoCountry
  * @param {*} params.settings
  * @param {boolean} params.offline
  * @param {*} params.site
@@ -243,6 +244,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
 const startProxyServer = async ({
   addonsUrls,
   config,
+  geoCountry,
   geolocationMode,
   getUpdatedConfig,
   inspectSettings,
@@ -256,6 +258,7 @@ const startProxyServer = async ({
     config,
     configPath: site.configPath,
     geolocationMode,
+    geoCountry,
     getUpdatedConfig,
     inspectSettings,
     offline,
@@ -386,6 +389,19 @@ const validateShortFlagArgs = (args) => {
   return args
 }
 
+const validateGeoCountryCode = (arg) => {
+  // Validate that the arg passed is two letters only for country
+  // See https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+  if (!/^[a-z]{2}$/i.test(arg)) {
+    throw new Error(
+      `The geo country code must use a two letter abbreviation.
+      ${chalk.red(BANG)}  Example:
+      netlify dev --geo=mock --country=FR`,
+    )
+  }
+  return arg.toUpperCase()
+}
+
 /**
  * The dev command
  * @param {import('commander').OptionValues} options
@@ -460,6 +476,7 @@ const dev = async (options, command) => {
     addonsUrls,
     config,
     geolocationMode: options.geo,
+    geoCountry: options.country,
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
@@ -501,7 +518,13 @@ const dev = async (options, command) => {
         graphqlDocument = defaultExampleOperationsDoc
       }
 
-      stopWatchingCLISessions = await startOneGraphCLISession({ netlifyGraphConfig, netlifyToken, site, state })
+      stopWatchingCLISessions = await startOneGraphCLISession({
+        netlifyGraphConfig,
+        netlifyToken,
+        site,
+        state,
+        oneGraphSessionId: options.sessionId,
+      })
 
       // Should be created by startOneGraphCLISession
       const oneGraphSessionId = loadCLISession(state)
@@ -593,12 +616,19 @@ const createDevCommand = (program) => {
         .choices(['cache', 'mock', 'update'])
         .default('cache'),
     )
+    .addOption(
+      new Option(
+        '--country <geoCountry>',
+        'Two-letter country code (ISO 3166-1 alpha-2, https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) to use as mock geolocation (enables --geo=mock autmatically)',
+      ).argParser(validateGeoCountryCode),
+    )
     .addOption(
       new Option('--staticServerPort <port>', 'port of the static app server used when no framework is detected')
         .argParser((value) => Number.parseInt(value))
         .hideHelp(),
     )
     .addOption(new Option('--graph', 'enable Netlify Graph support').hideHelp())
+    .addOption(new Option('--sessionId [sessionId]', '(Graph) connect to cloud session with ID [sessionId]'))
     .addOption(
       new Option(
         '-e, --edgeInspect [address]',

package/src/commands/env/{env-migrate.js → env-clone.js}

@@ -20,14 +20,14 @@ const safeGetSite = async (api, siteId) => {
 }
 
 /**
- * The env:migrate command
+ * The env:clone command
  * @param {string} siteIdA Site (From)
  * @param {string} siteIdB Site (To)
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command').BaseCommand} command
  * @returns {Promise<boolean>}
  */
-const envMigrate = async (options, command) => {
+const envClone = async (options, command) => {
   const { api, site } = command.netlify
 
   if (!site.id && !options.from) {
@@ -75,7 +75,7 @@ const envMigrate = async (options, command) => {
   }
 
   log(
-    `Successfully migrated environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
+    `Successfully cloned environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
       siteTo.name,
     )}`,
   )
@@ -98,7 +98,7 @@ const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
   ] = [siteFrom, siteTo]
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -130,7 +130,7 @@ const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = Object.keys(envFrom)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -163,7 +163,7 @@ const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
   const envFrom = translateFromEnvelopeToMongo(envelopeVariables)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -201,7 +201,7 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = envelopeFrom.map(({ key }) => key)
 
   if (isEmpty(keysFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -222,20 +222,18 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
 }
 
 /**
- * Creates the `netlify env:migrate` command
+ * Creates the `netlify env:clone` command
  * @param {import('../base-command').BaseCommand} program
  * @returns
  */
-const createEnvMigrateCommand = (program) =>
+const createEnvCloneCommand = (program) =>
   program
-    .command('env:migrate')
+    .command('env:clone')
+    .alias('env:migrate')
     .option('-f, --from <from>', 'Site ID (From)')
     .requiredOption('-t, --to <to>', 'Site ID (To)')
-    .description(`Migrate environment variables from one site to another`)
-    .addExamples([
-      'netlify env:migrate --to <to-site-id>',
-      'netlify env:migrate --to <to-site-id> --from <from-site-id>',
-    ])
-    .action(envMigrate)
-
-module.exports = { createEnvMigrateCommand }
+    .description(`Clone environment variables from one site to another`)
+    .addExamples(['netlify env:clone --to <to-site-id>', 'netlify env:clone --to <to-site-id> --from <from-site-id>'])
+    .action(envClone)
+
+module.exports = { createEnvCloneCommand }

package/src/commands/env/env.js

@@ -1,8 +1,8 @@
 // @ts-check
+const { createEnvCloneCommand } = require('./env-clone')
 const { createEnvGetCommand } = require('./env-get')
 const { createEnvImportCommand } = require('./env-import')
 const { createEnvListCommand } = require('./env-list')
-const { createEnvMigrateCommand } = require('./env-migrate')
 const { createEnvSetCommand } = require('./env-set')
 const { createEnvUnsetCommand } = require('./env-unset')
 
@@ -26,7 +26,7 @@ const createEnvCommand = (program) => {
   createEnvListCommand(program)
   createEnvSetCommand(program)
   createEnvUnsetCommand(program)
-  createEnvMigrateCommand(program)
+  createEnvCloneCommand(program)
 
   return program
     .command('env')
@@ -37,7 +37,7 @@ const createEnvCommand = (program) => {
       'netlify env:set VAR_NAME value',
       'netlify env:unset VAR_NAME',
       'netlify env:import fileName',
-      'netlify env:migrate --to <to-site-id>',
+      'netlify env:clone --to <to-site-id>',
     ])
     .action(env)
 }

package/src/commands/graph/graph-pull.js

@@ -56,9 +56,10 @@ const graphPull = async (options, command) => {
     error(`Failed to fetch and update Netlify GraphQL schema`)
   }
 
+  const { jwt } = await OneGraphCliClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   const next = await OneGraphCliClient.fetchCliSessionEvents({
     appId: siteId,
-    authToken: netlifyToken,
+    jwt,
     sessionId: oneGraphSessionId,
   })
 
@@ -83,7 +84,7 @@ const graphPull = async (options, command) => {
 
     await OneGraphCliClient.ackCLISessionEvents({
       appId: siteId,
-      authToken: netlifyToken,
+      jwt,
       sessionId: oneGraphSessionId,
       eventIds: ackIds,
     })

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

@@ -1,12 +1,11 @@
 // @ts-check
 
-const clone = require('git-clone/promise')
 const inquirer = require('inquirer')
 const pick = require('lodash/pick')
 const parseGitHubUrl = require('parse-github-url')
 const prettyjson = require('prettyjson')
 
-const { chalk, error, getRepoData, getTerminalLink, log, logJson, track, warn } = require('../../utils')
+const { chalk, error, execa, getRepoData, getTerminalLink, log, logJson, track, warn } = require('../../utils')
 const { configureRepo } = require('../../utils/init/config')
 const { getGitHubToken } = require('../../utils/init/config-github')
 const { createRepo, getTemplatesFromGitHub, validateTemplate } = require('../../utils/sites/utils')
@@ -17,7 +16,7 @@ const fetchTemplates = async (token) => {
   const templatesFromGithubOrg = await getTemplatesFromGitHub(token)
 
   return templatesFromGithubOrg
-    .filter((repo) => !repo.archived && !repo.private && !repo.disabled)
+    .filter((repo) => !repo.archived && !repo.disabled)
     .map((template) => ({
       name: template.name,
       sourceCodeUrl: template.html_url,
@@ -190,7 +189,7 @@ const sitesCreateTemplate = async (repository, options, command) => {
   })
   if (cloneConfirm) {
     log()
-    await clone(repoResp.git_url, `${repoResp.name}`)
+    await execa('git', ['clone', repoResp.clone_url, `${repoResp.name}`])
     log(`🚀 Repository cloned successfully. You can find it under the ${chalk.magenta(repoResp.name)} folder`)
   }
 

package/src/functions-templates/go/hello-world/go.mod

@@ -2,4 +2,4 @@ module github.com/someone/{{name}}
 
 go 1.15
 
-require github.com/aws/aws-lambda-go v1.32.0
+require github.com/aws/aws-lambda-go v1.32.1

package/src/lib/edge-functions/proxy.js

@@ -48,6 +48,7 @@ const handleProxyRequest = (req, proxyReq) => {
 const initializeProxy = async ({
   config,
   configPath,
+  geoCountry,
   geolocationMode,
   getUpdatedConfig,
   inspectSettings,
@@ -84,7 +85,7 @@ const initializeProxy = async ({
     }
 
     const [geoLocation, registry] = await Promise.all([
-      getGeoLocation({ mode: geolocationMode, offline, state }),
+      getGeoLocation({ mode: geolocationMode, geoCountry, offline, state }),
       server,
     ])
 

package/src/lib/functions/registry.js

@@ -173,12 +173,11 @@ class FunctionsRegistry {
     }
 
     await Promise.all(directories.map((path) => FunctionsRegistry.prepareDirectoryScan(path)))
-
     const functions = await this.listFunctions(directories, {
       featureFlags: {
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true',
       },
-      config: this.config,
+      config: this.config.functions,
     })
 
     // Before registering any functions, we look for any functions that were on

package/src/lib/functions/scheduled.js

@@ -1,4 +1,6 @@
-const ansi2html = require('ansi2html')
+const AnsiToHtml = require('ansi-to-html')
+
+const ansiToHtml = new AnsiToHtml()
 
 const { CLOCKWORK_USERAGENT } = require('../../utils')
 
@@ -11,7 +13,7 @@ const buildHelpResponse = ({ error, headers, path, result }) => {
     text = text.trim()
 
     if (acceptsHtml) {
-      return ansi2html(`<p>${text}</p>`)
+      return ansiToHtml.toHtml(`<p>${text}</p>`)
     }
 
     text = text

package/src/lib/geo-location.js

@@ -3,7 +3,6 @@ const fetch = require('node-fetch')
 
 const API_URL = 'https://netlifind.netlify.app'
 const STATE_GEO_PROPERTY = 'geolocation'
-
 // 24 hours
 const CACHE_TTL = 8.64e7
 
@@ -17,12 +16,11 @@ const REQUEST_TIMEOUT = 1e4
  * @property {object} country
  * @property {string} country.code
  * @property {string} country.name
- * @property {object} country
- * @property {string} country.code
- * @property {string} country.name
+ * @property {object} subdivision
+ * @property {string} subdivision.code
+ * @property {string} subdivision.name
  */
 
-// The default location to be used if we're unable to talk to the API.
 const mockLocation = {
   city: 'San Francisco',
   country: { code: 'US', name: 'United States' },
@@ -34,13 +32,13 @@ const mockLocation = {
  * location, depending on the mode selected.
  *
  * @param {object} params
- * @param {string} params.geolocationMode
  * @param {"cache"|"update"|"mock"} params.mode
+ * @param {string} params.geoCountry
  * @param {boolean} params.offline
  * @param {import('../utils/state-config').StateConfig} params.state
  * @returns {Promise<GeoLocation>}
  */
-const getGeoLocation = async ({ mode, offline, state }) => {
+const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
   const cacheObject = state.get(STATE_GEO_PROPERTY)
 
   // If we have cached geolocation data and the `--geo` option is set to
@@ -56,10 +54,18 @@ const getGeoLocation = async ({ mode, offline, state }) => {
     }
   }
 
-  // If the `--geo` option is set to `mock`, we use the mock location. Also,
-  // if the `--offline` option was used, we can't talk to the API, so let's
-  // also use the mock location.
-  if (mode === 'mock' || offline) {
+  // If the `--geo` option is set to `mock`, we use the default mock location.
+  // If the `--offline` option was used, we can't talk to the API, so let's
+  // also use the mock location.  Otherwise, use the country code passed in by
+  // the user.
+  if (mode === 'mock' || offline || geoCountry) {
+    if (geoCountry) {
+      return {
+        city: 'Mock City',
+        country: { code: geoCountry, name: 'Mock Country' },
+        subdivision: { code: 'SD', name: 'Mock Subdivision' },
+      }
+    }
     return mockLocation
   }