netlify-cli 9.10.0 → 9.12.1

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
   "name": "netlify-cli",
-  "version": "9.10.0",
+  "version": "9.12.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.10.0",
+      "version": "9.12.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^26.3.12",
-        "@netlify/config": "^17.0.16",
+        "@netlify/build": "^26.3.13",
+        "@netlify/config": "^17.0.17",
         "@netlify/framework-info": "^9.0.2",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugin-edge-handlers": "^3.0.7",
@@ -2358,9 +2358,9 @@
       }
     },
     "node_modules/@netlify/build": {
-      "version": "26.3.12",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.12.tgz",
-      "integrity": "sha512-xZfCck6jmJi/r36t/4Vwlbtc9Q4SekQorkMfRkp7auUvixVVTzS50P8i5Uov1BYtO9dEgcVBU0HvwSHsjtpSfQ==",
+      "version": "26.3.13",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.13.tgz",
+      "integrity": "sha512-FoG4snU2BwCy85Uk6DA3/ewkKE6YrG9jEAs6t6hKe0kfJyTxxyOqThoFzYVK3/9Zm2uZKV4wWQ0Jq7TlXiHajA==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -2368,7 +2368,7 @@
         "@netlify/functions-utils": "^4.0.0",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugin-edge-handlers": "^3.0.7",
-        "@netlify/plugins-list": "^6.14.0",
+        "@netlify/plugins-list": "^6.15.0",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "5.9.0",
         "@sindresorhus/slugify": "^2.0.0",
@@ -3110,9 +3110,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "17.0.16",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.16.tgz",
-      "integrity": "sha512-MajIdbsdOVpI59zayMY/9S4XrO0gVWXvl7r5iEFoSnzuloJlN/Ws0GFOSL9FqJEH8Fh1lafOIMPCugRxWhdJ6g==",
+      "version": "17.0.17",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.17.tgz",
+      "integrity": "sha512-D1qBygGjsEoskqNxhWiXD2ukvd/KKpjC2UYF6V8n5Z8FCu11nbfS96I+yK2rWrfPV34Qj3cwKKrntDzQiDcphQ==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -26118,9 +26118,9 @@
       }
     },
     "@netlify/build": {
-      "version": "26.3.12",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.12.tgz",
-      "integrity": "sha512-xZfCck6jmJi/r36t/4Vwlbtc9Q4SekQorkMfRkp7auUvixVVTzS50P8i5Uov1BYtO9dEgcVBU0HvwSHsjtpSfQ==",
+      "version": "26.3.13",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.13.tgz",
+      "integrity": "sha512-FoG4snU2BwCy85Uk6DA3/ewkKE6YrG9jEAs6t6hKe0kfJyTxxyOqThoFzYVK3/9Zm2uZKV4wWQ0Jq7TlXiHajA==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -26128,7 +26128,7 @@
         "@netlify/functions-utils": "^4.0.0",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugin-edge-handlers": "^3.0.7",
-        "@netlify/plugins-list": "^6.14.0",
+        "@netlify/plugins-list": "^6.15.0",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "5.9.0",
         "@sindresorhus/slugify": "^2.0.0",
@@ -26583,9 +26583,9 @@
       }
     },
     "@netlify/config": {
-      "version": "17.0.16",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.16.tgz",
-      "integrity": "sha512-MajIdbsdOVpI59zayMY/9S4XrO0gVWXvl7r5iEFoSnzuloJlN/Ws0GFOSL9FqJEH8Fh1lafOIMPCugRxWhdJ6g==",
+      "version": "17.0.17",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.17.tgz",
+      "integrity": "sha512-D1qBygGjsEoskqNxhWiXD2ukvd/KKpjC2UYF6V8n5Z8FCu11nbfS96I+yK2rWrfPV34Qj3cwKKrntDzQiDcphQ==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.10.0",
+  "version": "9.12.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -200,8 +200,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\" \"!site/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^26.3.12",
-    "@netlify/config": "^17.0.16",
+    "@netlify/build": "^26.3.13",
+    "@netlify/config": "^17.0.17",
     "@netlify/framework-info": "^9.0.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.7",

package/src/commands/dev/dev.js

@@ -348,7 +348,7 @@ const dev = async (options, command) => {
     exit(1)
   }
 
-  command.setAnalyticsPayload({ projectType: settings.framework || 'custom', live: options.live })
+  command.setAnalyticsPayload({ projectType: settings.framework || 'custom', live: options.live, graph: options.graph })
 
   const startNetlifyGraphWatcher = Boolean(options.graph)
   if (startNetlifyGraphWatcher) {

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/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 }