netlify-cli 9.9.2 → 9.11.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "9.9.2",
+  "version": "9.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.9.2",
+      "version": "9.11.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -15,7 +15,7 @@
         "@netlify/framework-info": "^9.0.2",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugin-edge-handlers": "^3.0.7",
-        "@netlify/plugins-list": "^6.14.0",
+        "@netlify/plugins-list": "^6.15.0",
         "@netlify/routing-local-proxy": "^0.34.1",
         "@netlify/zip-it-and-ship-it": "^5.9.0",
         "@octokit/rest": "^18.0.0",
@@ -4328,9 +4328,9 @@
       }
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.14.0.tgz",
-      "integrity": "sha512-AOlFh13F5TLLq9uJ+/ahamWYnZAJIo36H55FnWvDlnfFvkp9aIfjHvMv4qL8/Tvc6a5Ulx1NYrL8Fpw6qd5YCw==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.15.0.tgz",
+      "integrity": "sha512-CGvHVRS+IInm+dyn8qEGrADsFiWY/HC8z+taIPQ9d7sZlNr3ShtXHq5fdHVHGH2A9WDVeh8+Xan87196KyE3IQ==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -27317,9 +27317,9 @@
       }
     },
     "@netlify/plugins-list": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.14.0.tgz",
-      "integrity": "sha512-AOlFh13F5TLLq9uJ+/ahamWYnZAJIo36H55FnWvDlnfFvkp9aIfjHvMv4qL8/Tvc6a5Ulx1NYrL8Fpw6qd5YCw=="
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.15.0.tgz",
+      "integrity": "sha512-CGvHVRS+IInm+dyn8qEGrADsFiWY/HC8z+taIPQ9d7sZlNr3ShtXHq5fdHVHGH2A9WDVeh8+Xan87196KyE3IQ=="
     },
     "@netlify/routing-local-proxy": {
       "version": "0.34.1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.9.2",
+  "version": "9.11.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -205,7 +205,7 @@
     "@netlify/framework-info": "^9.0.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.7",
-    "@netlify/plugins-list": "^6.14.0",
+    "@netlify/plugins-list": "^6.15.0",
     "@netlify/routing-local-proxy": "^0.34.1",
     "@netlify/zip-it-and-ship-it": "^5.9.0",
     "@octokit/rest": "^18.0.0",

package/src/commands/deploy/deploy.js

@@ -302,6 +302,7 @@ const runDeploy = async ({
 }) => {
   let results
   let deployId
+
   try {
     if (deployToProduction) {
       await prepareProductionDeploy({ siteData, api })
@@ -462,10 +463,26 @@ const deploy = async (options, command) => {
   await command.authenticate(options.auth)
 
   let siteId = options.site || site.id
+
   let siteData = {}
   if (siteId) {
     try {
-      siteData = await api.getSite({ siteId })
+      const [{ siteError, siteFoundById }, sites] = await Promise.all([
+        api
+          .getSite({ siteId })
+          .then((data) => ({ siteFoundById: data }))
+          .catch((error_) => ({ siteError: error_ })),
+        api.listSites({ name: options.site, filter: 'all' }),
+      ])
+      const siteFoundByName = sites.find((filteredSite) => filteredSite.name === options.site)
+      if (siteFoundById) {
+        siteData = siteFoundById
+      } else if (siteFoundByName) {
+        siteData = siteFoundByName
+        siteId = siteFoundByName.id
+      } else {
+        throw siteError
+      }
     } catch (error_) {
       // TODO specifically handle known cases (e.g. no account access)
       if (error_.status === 404) {
@@ -674,7 +691,7 @@ Support for package.json's main field, and intrinsic index.js entrypoints are co
     .option('-o, --open', 'Open site after deploy', false)
     .option('-m, --message <message>', 'A short message to include in the deploy log')
     .option('-a, --auth <token>', 'Netlify auth token to deploy with', env.NETLIFY_AUTH_TOKEN)
-    .option('-s, --site <id>', 'A site ID to deploy to', env.NETLIFY_SITE_ID)
+    .option('-s, --site <name-or-id>', 'A site name or ID to deploy to', env.NETLIFY_SITE_ID)
     .option('--json', 'Output deployment data as JSON')
     .option('--timeout <number>', 'Timeout to wait for deployment to finish', (value) => Number.parseInt(value))
     .option('--trigger', 'Trigger a new build of your site on Netlify without uploading local files')
@@ -687,6 +704,7 @@ Support for package.json's main field, and intrinsic index.js entrypoints are co
     )
     .addExamples([
       'netlify deploy',
+      'netlify deploy --site my-first-site',
       'netlify deploy --prod',
       'netlify deploy --prod --open',
       'netlify deploy --prodIfUnlocked',

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

@@ -2,12 +2,14 @@
 
 const inquirer = require('inquirer')
 const pick = require('lodash/pick')
+const parseGitHubUrl = require('parse-github-url')
 const prettyjson = require('prettyjson')
+const terminalLink = require('terminal-link')
 
 const { chalk, error, getRepoData, log, logJson, track, warn } = require('../../utils')
 const { configureRepo } = require('../../utils/init/config')
 const { getGitHubToken } = require('../../utils/init/config-github')
-const { createRepo, getTemplatesFromGitHub } = require('../../utils/sites/utils')
+const { createRepo, getTemplatesFromGitHub, validateTemplate } = require('../../utils/sites/utils')
 
 const { getSiteNameInput } = require('./sites-create')
 
@@ -23,12 +25,45 @@ const fetchTemplates = async (token) => {
     }))
 }
 
+const getTemplateName = async ({ ghToken, options, repository }) => {
+  if (repository) {
+    const { repo } = parseGitHubUrl(repository)
+    return repo || `netlify-templates/${repository}`
+  }
+
+  if (options.url) {
+    const urlFromOptions = new URL(options.url)
+    return urlFromOptions.pathname.slice(1)
+  }
+
+  const templates = await fetchTemplates(ghToken)
+
+  log(`Choose one of our starter templates. Netlify will create a new repo for this template in your GitHub account.`)
+
+  const { templateName } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'templateName',
+      message: 'Template:',
+      choices: templates.map((template) => ({
+        value: template.slug,
+        name: template.name,
+      })),
+    },
+  ])
+
+  return templateName
+}
+
+const getGitHubLink = ({ options, templateName }) => options.url || `https://github.com/${templateName}`
+
 /**
  * The sites:create-template command
+ * @param repository {string}
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command').BaseCommand} command
  */
-const sitesCreateTemplate = async (options, command) => {
+const sitesCreateTemplate = async (repository, options, command) => {
   const { api } = command.netlify
 
   await command.authenticate()
@@ -36,27 +71,22 @@ const sitesCreateTemplate = async (options, command) => {
   const { globalConfig } = command.netlify
   const ghToken = await getGitHubToken({ globalConfig })
 
-  let { url: templateUrl } = options
-
-  if (templateUrl) {
-    const urlFromOptions = new URL(templateUrl)
-    templateUrl = { templateName: urlFromOptions.pathname.slice(1) }
-  } else {
-    const templates = await fetchTemplates(ghToken)
-
-    log(`Choose one of our starter templates. Netlify will create a new repo for this template in your GitHub account.`)
-
-    templateUrl = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'templateName',
-        message: 'Template:',
-        choices: templates.map((template) => ({
-          value: template.slug,
-          name: template.name,
-        })),
-      },
-    ])
+  const templateName = await getTemplateName({ ghToken, options, repository })
+  const { exists, isTemplate } = await validateTemplate({ templateName, ghToken })
+  if (!exists) {
+    const githubLink = getGitHubLink({ options, templateName })
+    error(
+      `Could not find template ${chalk.bold(templateName)}. Please verify it exists and you can ${terminalLink(
+        'access to it on GitHub',
+        githubLink,
+      )}`,
+    )
+    return
+  }
+  if (!isTemplate) {
+    const githubLink = getGitHubLink({ options, templateName })
+    error(`${terminalLink(chalk.bold(templateName), githubLink)} is not a valid GitHub template`)
+    return
   }
 
   const accounts = await api.listAccountsForUser()
@@ -90,12 +120,12 @@ const sitesCreateTemplate = async (options, command) => {
       const siteName = inputName ? inputName.trim() : siteSuggestion
 
       // Create new repo from template
-      const repoResp = await createRepo(templateUrl, ghToken, siteName)
+      const repoResp = await createRepo(templateName, ghToken, siteName)
 
       if (repoResp.errors) {
         if (repoResp.errors[0].includes('Name already exists on this account')) {
           warn(
-            `Oh no! We found already a repository with this name. It seems you have already created a template with the name ${templateUrl.templateName}. Please try to run the command again and provide a different name.`,
+            `Oh no! We found already a repository with this name. It seems you have already created a template with the name ${templateName}. Please try to run the command again and provide a different name.`,
           )
           await inputSiteName()
         } else {
@@ -206,7 +236,13 @@ Create a site from a starter template.`,
     .option('-u, --url [url]', 'template url')
     .option('-a, --account-slug [slug]', 'account slug to create the site under')
     .option('-c, --with-ci', 'initialize CI hooks during site creation')
+    .argument('[repository]', 'repository to use as starter template')
     .addHelpText('after', `(Beta) Create a site from starter template.`)
+    .addExamples([
+      'netlify sites:create-template',
+      'netlify sites:create-template nextjs-blog-theme',
+      'netlify sites:create-template my-github-profile/my-template',
+    ])
     .action(sitesCreateTemplate)
 
 module.exports = { createSitesFromTemplateCommand, fetchTemplates }

package/src/lib/build.js

@@ -18,11 +18,12 @@ const netlifyBuildPromise = import('@netlify/build')
  * @param {import('commander').OptionValues} config.options
  * @returns {BuildConfig}
  */
-const getBuildOptions = ({ cachedConfig, options: { debug, dry, json, offline, silent }, token }) => ({
+const getBuildOptions = ({ cachedConfig, options: { context, debug, dry, json, offline, silent }, token }) => ({
   cachedConfig,
   token,
   dry,
   debug,
+  context,
   mode: 'cli',
   telemetry: false,
   // buffer = true will not stream output

package/src/lib/functions/server.js

@@ -120,7 +120,8 @@ const createHandler = function (options) {
     if (func.isBackground) {
       handleBackgroundFunction(functionName, response)
 
-      const { error } = await func.invoke(event, clientContext)
+      // background functions do not receive a clientContext
+      const { error } = await func.invoke(event)
 
       handleBackgroundFunctionResult(functionName, error)
     } else if (await func.isScheduled()) {

package/src/utils/sites/utils.js

@@ -12,8 +12,27 @@ const getTemplatesFromGitHub = async (token) => {
   return allTemplates
 }
 
-const createRepo = async (templateUrl, ghToken, siteName) => {
-  const resp = await fetch(`https://api.github.com/repos/${templateUrl.templateName}/generate`, {
+const validateTemplate = async ({ ghToken, templateName }) => {
+  const response = await fetch(`https://api.github.com/repos/${templateName}`, {
+    headers: {
+      Authorization: `token ${ghToken}`,
+    },
+  })
+
+  if (response.status === 404) {
+    return { exists: false }
+  }
+
+  if (!response.ok) {
+    throw new Error(`Error fetching template ${templateName}: ${await response.text()}`)
+  }
+
+  const data = await response.json()
+  return { exists: true, isTemplate: data.is_template }
+}
+
+const createRepo = async (templateName, ghToken, siteName) => {
+  const resp = await fetch(`https://api.github.com/repos/${templateName}/generate`, {
     method: 'POST',
     headers: {
       Authorization: `token ${ghToken}`,
@@ -27,4 +46,4 @@ const createRepo = async (templateUrl, ghToken, siteName) => {
   return data
 }
 
-module.exports = { getTemplatesFromGitHub, createRepo }
+module.exports = { getTemplatesFromGitHub, createRepo, validateTemplate }