netlify-cli 10.9.1 → 10.10.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "10.9.1",
+  "version": "10.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.9.1",
+      "version": "10.10.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -115,7 +115,7 @@
         "unixify": "^1.0.0",
         "update-notifier": "^5.0.0",
         "uuid": "^8.0.0",
-        "wait-port": "^0.2.14",
+        "wait-port": "^0.3.0",
         "winston": "^3.2.1",
         "write-file-atomic": "^4.0.0"
       },
@@ -22454,75 +22454,19 @@
       }
     },
     "node_modules/wait-port": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.2.14.tgz",
-      "integrity": "sha512-kIzjWcr6ykl7WFbZd0TMae8xovwqcqbx6FM9l+7agOgUByhzdjfzZBPK2CPufldTOMxbUivss//Sh9MFawmPRQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.3.0.tgz",
+      "integrity": "sha512-seNQ7j92tG5uaylFK3RrAajajzpNMOr96pcCsD8cWGtVn4XXsFUMf9vzNcZSXVaMEfuZT/0t/Wc0KN+m74QYkw==",
       "dependencies": {
-        "chalk": "^2.4.2",
-        "commander": "^3.0.2",
-        "debug": "^4.1.1"
+        "chalk": "^4.1.2",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4"
       },
       "bin": {
         "wait-port": "bin/wait-port.js"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wait-port/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wait-port/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wait-port/node_modules/commander": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
-      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="
-    },
-    "node_modules/wait-port/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/wait-port/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wait-port/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
     "node_modules/wcwidth": {
@@ -39552,56 +39496,13 @@
       }
     },
     "wait-port": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.2.14.tgz",
-      "integrity": "sha512-kIzjWcr6ykl7WFbZd0TMae8xovwqcqbx6FM9l+7agOgUByhzdjfzZBPK2CPufldTOMxbUivss//Sh9MFawmPRQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.3.0.tgz",
+      "integrity": "sha512-seNQ7j92tG5uaylFK3RrAajajzpNMOr96pcCsD8cWGtVn4XXsFUMf9vzNcZSXVaMEfuZT/0t/Wc0KN+m74QYkw==",
       "requires": {
-        "chalk": "^2.4.2",
-        "commander": "^3.0.2",
-        "debug": "^4.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "commander": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
-          "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "chalk": "^4.1.2",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4"
       }
     },
     "wcwidth": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.9.1",
+  "version": "10.10.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -321,7 +321,7 @@
     "unixify": "^1.0.0",
     "update-notifier": "^5.0.0",
     "uuid": "^8.0.0",
-    "wait-port": "^0.2.14",
+    "wait-port": "^0.3.0",
     "winston": "^3.2.1",
     "write-file-atomic": "^4.0.0"
   },

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

@@ -93,13 +93,17 @@ const filterRegistry = function (registry, input) {
     })
 }
 
-const formatRegistryArrayForInquirer = function (lang) {
+const formatRegistryArrayForInquirer = function (lang, funcType) {
   const folderNames = fs.readdirSync(path.join(templatesDir, lang))
   const registry = folderNames
     // filter out markdown files
     .filter((folderName) => !folderName.endsWith('.md'))
-    // eslint-disable-next-line n/global-require, import/no-dynamic-require
-    .map((folderName) => require(path.join(templatesDir, lang, folderName, '.netlify-function-template.js')))
+
+    .map((folderName) =>
+      // eslint-disable-next-line n/global-require, import/no-dynamic-require
+      require(path.join(templatesDir, lang, folderName, '.netlify-function-template.js')),
+    )
+    .filter((folderName) => folderName.functionType === funcType)
     .sort((folderNameA, folderNameB) => {
       const priorityDiff = (folderNameA.priority || DEFAULT_PRIORITY) - (folderNameB.priority || DEFAULT_PRIORITY)
 
@@ -128,8 +132,9 @@ const formatRegistryArrayForInquirer = function (lang) {
 /**
  * pick template from our existing templates
  * @param {import('commander').OptionValues} config
+ *
  */
-const pickTemplate = async function ({ language: languageFromFlag }) {
+const pickTemplate = async function ({ language: languageFromFlag }, funcType) {
   const specialCommands = [
     new inquirer.Separator(),
     {
@@ -148,8 +153,13 @@ const pickTemplate = async function ({ language: languageFromFlag }) {
   let language = languageFromFlag
 
   if (language === undefined) {
+    const langs =
+      funcType === 'edge'
+        ? languages.filter((lang) => lang.value === 'javascript' || lang.value === 'typescript')
+        : languages.filter(Boolean)
+
     const { language: languageFromPrompt } = await inquirer.prompt({
-      choices: languages.filter(Boolean),
+      choices: langs,
       message: 'Select the language of your function',
       name: 'language',
       type: 'list',
@@ -163,7 +173,7 @@ const pickTemplate = async function ({ language: languageFromFlag }) {
   let templatesForLanguage
 
   try {
-    templatesForLanguage = formatRegistryArrayForInquirer(language)
+    templatesForLanguage = formatRegistryArrayForInquirer(language, funcType)
   } catch {
     throw error(`Invalid language: ${language}`)
   }
@@ -173,12 +183,16 @@ const pickTemplate = async function ({ language: languageFromFlag }) {
     message: 'Pick a template',
     type: 'autocomplete',
     source(answersSoFar, input) {
+      // if Edge Functions template, don't show url option
+      const edgeCommands = specialCommands.filter((val) => val.value !== 'url')
+      const parsedSpecialCommands = funcType === 'edge' ? edgeCommands : specialCommands
+
       if (!input || input === '') {
         // show separators
-        return [...templatesForLanguage, ...specialCommands]
+        return [...templatesForLanguage, ...parsedSpecialCommands]
       }
       // only show filtered results sorted by score
-      const answers = [...filterRegistry(templatesForLanguage, input), ...specialCommands].sort(
+      const answers = [...filterRegistry(templatesForLanguage, input), ...parsedSpecialCommands].sort(
         (answerA, answerB) => answerB.score - answerA.score,
       )
       return answers
@@ -189,6 +203,50 @@ const pickTemplate = async function ({ language: languageFromFlag }) {
 
 const DEFAULT_PRIORITY = 999
 
+const selectTypeOfFunc = async () => {
+  const functionTypes = [
+    { name: 'Edge function (Deno)', value: 'edge' },
+    { name: 'Serverless function (Node/Go)', value: 'serverless' },
+  ]
+
+  const { functionType } = await inquirer.prompt([
+    {
+      name: 'functionType',
+      message: "Select the type of function you'd like to create",
+      type: 'list',
+      choices: functionTypes,
+    },
+  ])
+  return functionType
+}
+
+const ensureEdgeFuncDirExists = function (command) {
+  const { config, site } = command.netlify
+  const siteId = site.id
+  let functionsDirHolder = config.build.edge_functions
+
+  if (!siteId) {
+    error(`${NETLIFYDEVERR} No site id found, please run inside a site directory or \`netlify link\``)
+  }
+
+  if (!functionsDirHolder) {
+    functionsDirHolder = 'netlify/edge-functions'
+  }
+
+  if (!fs.existsSync(functionsDirHolder)) {
+    log(
+      `${NETLIFYDEVLOG} Edge Functions directory ${chalk.magenta.inverse(
+        functionsDirHolder,
+      )} does not exist yet, creating it...`,
+    )
+
+    fs.mkdirSync(functionsDirHolder, { recursive: true })
+
+    log(`${NETLIFYDEVLOG} Edge Functions directory ${chalk.magenta.inverse(functionsDirHolder)} created.`)
+  }
+  return functionsDirHolder
+}
+
 /**
  * Get functions directory (and make it if necessary)
  * @param {import('../base-command').BaseCommand} command
@@ -248,7 +306,6 @@ const ensureFunctionDirExists = async function (command) {
 
     log(`${NETLIFYDEVLOG} functions directory ${chalk.magenta.inverse(functionsDirHolder)} created`)
   }
-
   return functionsDirHolder
 }
 
@@ -371,10 +428,12 @@ const installDeps = async ({ functionPackageJson, functionPath, functionsDir })
  * @param {import('commander').OptionValues} options
  * @param {string} argumentName
  * @param {string} functionsDir
+ * @param {string} funcType
  */
-const scaffoldFromTemplate = async function (command, options, argumentName, functionsDir) {
+// eslint-disable-next-line max-params
+const scaffoldFromTemplate = async function (command, options, argumentName, functionsDir, funcType) {
   // pull the rest of the metadata from the template
-  const chosenTemplate = await pickTemplate(options)
+  const chosenTemplate = await pickTemplate(options, funcType)
   if (chosenTemplate === 'url') {
     const { chosenUrl } = await inquirer.prompt([
       {
@@ -398,7 +457,6 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
     log(`${NETLIFYDEVLOG} Open in browser: https://github.com/netlify/cli/issues/new`)
   } else {
     const { onComplete, name: templateName, lang, addons = [] } = chosenTemplate
-
     const pathToTemplate = path.join(templatesDir, lang, templateName)
     if (!fs.existsSync(pathToTemplate)) {
       throw new Error(
@@ -444,6 +502,10 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
       spinner.succeed(`Installed dependencies for ${name}`)
     }
 
+    if (funcType === 'edge') {
+      registerEFInToml(name)
+    }
+
     await installAddons(command, addons, path.resolve(functionPath))
     await handleOnComplete({ command, onComplete })
   }
@@ -565,6 +627,40 @@ const installAddons = async function (command, functionAddons, fnPath) {
   return Promise.all(arr)
 }
 
+const registerEFInToml = async (funcName) => {
+  if (!fs.existsSync('netlify.toml')) {
+    log(`${NETLIFYDEVLOG} \`netlify.toml\` file does not exist yet. Creating it...`)
+  }
+
+  let { funcPath } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'funcPath',
+      message: `What route do you want your edge function to be invoked on?`,
+      default: '/test',
+      validate: (val) => Boolean(val),
+      // Make sure route isn't undefined and is valid
+      // Todo: add more validation?
+    },
+  ])
+
+  // Make sure path begins with a '/'
+  if (funcPath[0] !== '/') {
+    funcPath = `/${funcPath}`
+  }
+
+  const functionRegister = `\n\n[[edge_functions]]\nfunction = "${funcName}"\npath = "${funcPath}"`
+
+  try {
+    fs.promises.appendFile('netlify.toml', functionRegister)
+    log(
+      `${NETLIFYDEVLOG} Function '${funcName}' registered for route \`${funcPath}\`. To change, edit your \`netlify.toml\` file.`,
+    )
+  } catch {
+    error(`${NETLIFYDEVERR} Unable to register function. Please check your \`netlify.toml\` file.`)
+  }
+}
+
 // we used to allow for a --dir command,
 // but have retired that to force every scaffolded function to be a directory
 const ensureFunctionPathIsOk = function (functionsDir, name) {
@@ -582,11 +678,13 @@ const ensureFunctionPathIsOk = function (functionsDir, name) {
  * @param {import('../base-command').BaseCommand} command
  */
 const functionsCreate = async (name, options, command) => {
-  const functionsDir = await ensureFunctionDirExists(command)
+  const functionType = await selectTypeOfFunc()
+  const functionsDir =
+    functionType === 'edge' ? await ensureEdgeFuncDirExists(command) : await ensureFunctionDirExists(command)
 
   /* either download from URL or scaffold from template */
   const mainFunc = options.url ? downloadFromURL : scaffoldFromTemplate
-  await mainFunc(command, options, name, functionsDir)
+  await mainFunc(command, options, name, functionsDir, functionType)
 }
 
 /**

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

@@ -1,5 +1,6 @@
 // @ts-check
 const gitRepoInfo = require('git-repo-info')
+const { OneGraphClient } = require('netlify-onegraph-internal')
 
 const { OneGraphCliClient, ensureCLISession, upsertMergeCLISessionMetadata } = require('../../lib/one-graph/cli-client')
 const {
@@ -73,9 +74,10 @@ const graphEdit = async (options, command) => {
 
   const newMetadata = { docId: persistedDoc.id }
 
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   await upsertMergeCLISessionMetadata({
     netlifyGraphConfig,
-    netlifyToken,
+    jwt,
     siteId,
     siteRoot: site.root,
     oneGraphSessionId,

package/src/functions-templates/go/hello-world/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'hello-world',
   priority: 1,
   description: 'Basic function that shows how to create a handler and return a response',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/apollo-graphql/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'apollo-graphql',
   description: 'GraphQL function using Apollo-Server-Lambda!',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/apollo-graphql-rest/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'apollo-graphql-rest',
   description: 'GraphQL function to wrap REST API using apollo-server-lambda and apollo-datasource-rest!',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/auth-fetch/.netlify-function-template.js

@@ -1,6 +1,7 @@
 module.exports = {
   name: 'auth-fetch',
   description: 'Use `node-fetch` library and Netlify Identity to access APIs',
+  functionType: 'serverless',
   onComplete() {
     console.log(`auth-fetch function created from template!`)
     console.log(

package/src/functions-templates/javascript/create-user/.netlify-function-template.js

@@ -1,6 +1,7 @@
 module.exports = {
   name: 'create-user',
   description: 'Programmatically create a Netlify Identity user by invoking a function',
+  functionType: 'serverless',
   onComplete() {
     console.log(`create-user function created from template!`)
     console.log(

package/src/functions-templates/javascript/fauna-crud/.netlify-function-template.js

@@ -2,6 +2,7 @@ const execa = require('execa')
 module.exports = {
   name: 'fauna-crud',
   description: 'CRUD function using Fauna DB',
+  functionType: 'serverless',
   addons: [
     {
       addonName: 'fauna',

package/src/functions-templates/javascript/fauna-graphql/.netlify-function-template.js

@@ -2,6 +2,7 @@ const execa = require('execa')
 module.exports = {
   name: 'fauna-graphql',
   description: 'GraphQL Backend using Fauna DB',
+  functionType: 'serverless',
   addons: [
     {
       addonName: 'fauna',

package/src/functions-templates/javascript/google-analytics/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'google-analytics',
   description: 'Google Analytics: proxy for GA on your domain to avoid adblock',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/graphql-gateway/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'graphql-gateway',
   description: 'Apollo Server Lambda Gateway stitching schemas from other GraphQL Functions!',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/hasura-event-triggered/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'hasura-event-triggered',
   description: 'Hasura Cleaning: process a Hasura event and fire off a GraphQL mutation with processed text data',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/hello/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'hello',
+  description: 'Basic function that shows async/await usage, and response formatting',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/hello/{{name}}.js

@@ -0,0 +1,5 @@
+export default async (request) => {
+  return new Response('Hello, World!', {
+    headers: { 'content-type': 'text/html' },
+  })
+}

package/src/functions-templates/javascript/hello-world/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'hello-world',
   priority: 1,
   description: 'Basic function that shows async/await usage, and response formatting',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/identity-signup/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'identity-signup',
   description: 'Identity Signup: Triggered when a new Netlify Identity user confirms. Assigns roles and extra metadata',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/image-external/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'image-external',
+  description: 'Fetches and serves an image from an external site',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/image-external/{{name}}.js

@@ -0,0 +1,12 @@
+export default async (request, context) => {
+  // Return an internal image using context.rewrite()
+  // This image is stored in the /public directory of this project
+
+  // return context.rewrite("/apple-touch-icon.png");
+
+  // OR
+
+  // Use fetch() and return the image response
+  const kitten = await fetch('https://placekitten.com/g/300/300')
+  return kitten
+}

package/src/functions-templates/javascript/localized-content/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'localized-content',
+  description: 'Uses geolocation data to serve localized countent according to country code',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/localized-content/{{name}}.js

@@ -0,0 +1,15 @@
+export default async (request, context) => {
+  const translations = {
+    UNKNOWN: 'Hello!',
+    US: "Howdy y'all!",
+    GB: 'How do you do?',
+    AU: "G'day, mate!",
+  }
+
+  const countryCode = context.geo?.country?.code || 'UNKNOWN'
+  const countryName = context.geo?.country?.name || 'somewhere in the world'
+
+  return new Response(`Your personalized greeting for ${countryName} is: ${translations[countryCode]}`, {
+    headers: { 'content-type': 'text/html' },
+  })
+}

package/src/functions-templates/javascript/node-fetch/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'node-fetch',
   description: 'Fetch function: uses node-fetch to hit an external API without CORS issues',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/oauth-passport/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'oauth-passport',
   description: 'oauth-passport: template for Oauth workflow using Passport + Express.js',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/protected-function/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'protected-function',
   description: 'Function protected Netlify Identity authentication',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/sanity-create/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'sanity-create',
   description: 'Create documents in Sanity.io',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/sanity-groq/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'sanity-groq',
   description: 'Query a Sanity.io dataset with GROQ',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/scheduled-function/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'scheduled-function',
   priority: 1,
   description: 'Basic implementation of a scheduled function in JavaScript.',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/send-email/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'send-email',
   description: "Send Email: Send email with no SMTP server via 'sendmail' pkg",
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/serverless-ssr/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'serverless-ssr',
   description: 'Dynamic serverside rendering via functions',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/set-cookie/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'set-cookie',
   description: 'Set a cookie alongside your function',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/set-cookies/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-cookies',
+  description: 'Create and manage HTTP cookies',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/set-cookies/{{name}}.js

@@ -0,0 +1,28 @@
+export default async (request, context) => {
+  const url = new URL(request.url)
+
+  switch (url.searchParams.get('action')) {
+    case 'set':
+      context.cookies.set({
+        name: 'action',
+        value: 'hello',
+      })
+
+      return new Response('Cookie value has been set. Reload this page without the "action" parameter to see it.')
+
+    case 'clear':
+      context.cookies.delete('action')
+
+      return new Response(
+        'Cookie value has been cleared. Reload this page without the "action" parameter to see the new state.',
+      )
+    default:
+  }
+
+  const value = context.cookies.get('action')
+  const message = value
+    ? `Cookie value is "${value}". You can clear it by using "?action=clear".`
+    : 'Cookie has not been set. You can do so by adding "?action=set" to the URL.'
+
+  return new Response(message)
+}

package/src/functions-templates/javascript/set-req-header/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-req-header',
+  description: 'Adds a custom HTTP header to HTTP request.',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/set-req-header/{{name}}.js

@@ -0,0 +1,3 @@
+export default async (request, context) => {
+  request.headers.set('X-Your-Custom-Header', 'Your custom header value')
+}

package/src/functions-templates/javascript/set-res-header/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-res-header',
+  description: 'Adds a custom HTTP header to HTTP response.',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/set-res-header/{{name}}.js

@@ -0,0 +1,5 @@
+export default async (request, context) => {
+  const response = await context.next()
+  response.headers.set('X-Your-Custom-Header', 'A custom value')
+  return response
+}

package/src/functions-templates/javascript/slack-rate-limit/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'slack-rate-limit',
   description: 'Slack Rate-limit: post to Slack, at most once an hour, using Netlify Identity metadata',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/stripe-charge/.netlify-function-template.js

@@ -3,6 +3,7 @@ const chalk = require('chalk')
 module.exports = {
   name: 'stripe-charge',
   description: 'Stripe Charge: Charge a user with Stripe',
+  functionType: 'serverless',
   async onComplete() {
     console.log(`${chalk.yellow('stripe-charge')} function created from template!`)
     if (!process.env.STRIPE_SECRET_KEY) {

package/src/functions-templates/javascript/stripe-subscription/.netlify-function-template.js

@@ -3,6 +3,7 @@ const chalk = require('chalk')
 module.exports = {
   name: 'stripe-subscription',
   description: 'Stripe subscription: Create a subscription with Stripe',
+  functionType: 'serverless',
   async onComplete() {
     console.log(`${chalk.yellow('stripe-subscription')} function created from template!`)
     if (!process.env.STRIPE_SECRET_KEY) {

package/src/functions-templates/javascript/submission-created/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'submission-created',
   description: 'submission-created: template for event triggered function when a new Netlify Form is submitted',
+  functionType: 'serverless',
 }

package/src/functions-templates/javascript/token-hider/.netlify-function-template.js

@@ -3,6 +3,7 @@ const chalk = require('chalk')
 module.exports = {
   name: 'token-hider',
   description: 'Token Hider: access APIs without exposing your API keys',
+  functionType: 'serverless',
   async onComplete() {
     console.log(`${chalk.yellow('token-hider')} function created from template!`)
     if (!process.env.API_URL || !process.env.API_TOKEN) {

package/src/functions-templates/javascript/transform-response/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'transform-response',
+  description: 'Transform the content of an HTTP response',
+  functionType: 'edge',
+}

package/src/functions-templates/javascript/transform-response/{{name}}.js

@@ -0,0 +1,12 @@
+export default async (request, context) => {
+  const url = new URL(request.url)
+
+  // Look for the query parameter, and return if we don't find it
+  if (url.searchParams.get('method') !== 'transform') {
+    return
+  }
+
+  const response = await context.next()
+  const text = await response.text()
+  return new Response(text.toUpperCase(), response)
+}

package/src/functions-templates/javascript/url-shortener/.netlify-function-template.js

@@ -3,6 +3,7 @@ const chalk = require('chalk')
 module.exports = {
   name: 'url-shortener',
   description: 'URL Shortener: simple URL shortener with Netlify Forms!',
+  functionType: 'serverless',
   async onComplete() {
     console.log(`${chalk.yellow('url-shortener')} function created from template!`)
     if (!process.env.ROUTES_FORM_ID || !process.env.API_AUTH) {

package/src/functions-templates/javascript/using-middleware/.netlify-function-template.js

@@ -1,4 +1,5 @@
 module.exports = {
   name: 'using-middleware',
   description: 'Using Middleware with middy',
+  functionType: 'serverless',
 }

package/src/functions-templates/rust/hello-world/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'hello-world',
   priority: 1,
   description: 'Basic function that shows how to create a handler and return a response',
+  functionType: 'serverless',
 }

package/src/functions-templates/typescript/abtest/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'abtest',
+  description: "Function that randomly assigns users to group 'a' or 'b' and sets this value as a cookie.",
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/abtest/{{name}}.ts

@@ -0,0 +1,31 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  // look for existing "test_bucket" cookie
+  const bucketName = "test_bucket";
+  const bucket = context.cookies.get(bucketName);
+
+  // return here if we find a cookie
+  if (bucket) {
+    return new Response(`Welcome back! You were assigned ${bucketName} **${bucket}** when you last visited the site!`);
+  }
+
+  // if no "test_bucket" cookie is found, assign the user to a bucket
+  // in this example we're using two buckets (a, b) with an equal weighting of 50/50
+  const weighting = 0.5;
+
+  // get a random number between (0-1)
+  // this is a basic example and you may want to experiment
+  const random = Math.random();
+  const newBucketValue = random <= weighting ? "a" : "b";
+
+  // set the new "test_bucket" cookie
+  context.cookies.set({
+    name: bucketName,
+    value: newBucketValue,
+  });
+
+  return new Response(
+    `Congratulations! You have been assigned ${bucketName} **${newBucketValue}**. View your browser cookies to check it out!`,
+  );
+};

package/src/functions-templates/typescript/geolocation/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'geolocation',
+  description: "Returns info about user's geolocation, which can be used to serve location-specific content.",
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/geolocation/{{name}}.ts

@@ -0,0 +1,24 @@
+import { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  // Here's what's available on context.geo
+
+  // context: {
+  //   geo: {
+  //     city?: string;
+  //     country?: {
+  //       code?: string;
+  //       name?: string;
+  //     },
+  //     subdivision?: {
+  //       code?: string;
+  //       name?: string;
+  //     },
+  //   }
+  // }
+
+  return context.json({
+    geo: context.geo,
+    header: request.headers.get("x-nf-geo"),
+  });
+};

package/src/functions-templates/typescript/hello-world/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'hello-world',
   priority: 1,
   description: 'Basic function that shows async/await usage, and response formatting',
+  functionType: 'serverless',
 }

package/src/functions-templates/typescript/json/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'json',
+  description: 'Function that returns a simple json response',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/json/{{name}}.ts

@@ -0,0 +1,5 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  return context.json({ hello: "world" });
+};

package/src/functions-templates/typescript/log/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'log',
+  description: 'Basic function logging context of request',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/log/{{name}}.ts

@@ -0,0 +1,9 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  context.log("Hello from the logging service");
+
+  return new Response("The request to this URL was logged", {
+    headers: { "content-type": "text/html" },
+  });
+};

package/src/functions-templates/typescript/scheduled-function/.netlify-function-template.js

@@ -2,4 +2,5 @@ module.exports = {
   name: 'scheduled-function',
   priority: 1,
   description: 'Basic implementation of a scheduled function in TypeScript.',
+  functionType: 'serverless',
 }

package/src/functions-templates/typescript/set-cookies/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-cookies',
+  description: 'Create and manage HTTP cookies',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/set-cookies/{{name}}.ts

@@ -0,0 +1,29 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  const url = new URL(request.url);
+
+  switch (url.searchParams.get("action")) {
+    case "set":
+      context.cookies.set({
+        name: "action",
+        value: "hello",
+      });
+
+      return new Response('Cookie value has been set. Reload this page without the "action" parameter to see it.');
+
+    case "clear":
+      context.cookies.delete("action");
+
+      return new Response(
+        'Cookie value has been cleared. Reload this page without the "action" parameter to see the new state.',
+      );
+  }
+
+  const value = context.cookies.get("action");
+  const message = value
+    ? `Cookie value is "${value}". You can clear it by using "?action=clear".`
+    : 'Cookie has not been set. You can do so by adding "?action=set" to the URL.';
+
+  return new Response(message);
+};

package/src/functions-templates/typescript/set-req-header/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-req-header',
+  description: 'Adds a custom HTTP header to HTTP request.',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/set-req-header/{{name}}.ts

@@ -0,0 +1,5 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  request.headers.set("X-Your-Custom-Header", "Your custom header value");
+};

package/src/functions-templates/typescript/set-res-header/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'set-res-header',
+  description: 'Adds a custom HTTP header to HTTP response.',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/set-res-header/{{name}}.ts

@@ -0,0 +1,7 @@
+import type { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  const response = await context.next();
+  response.headers.set("X-Your-Custom-Header", "A custom value");
+  return response;
+};

package/src/functions-templates/typescript/transform-response/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'transform-response',
+  description: 'Transform the content of an HTTP response',
+  functionType: 'edge',
+}

package/src/functions-templates/typescript/transform-response/{{name}}.ts

@@ -0,0 +1,14 @@
+import { Context } from "netlify:edge";
+
+export default async (request: Request, context: Context) => {
+  const url = new URL(request.url);
+
+  // Look for the query parameter, and return if we don't find it
+  if (url.searchParams.get("method") !== "transform") {
+    return;
+  }
+
+  const response = await context.next();
+  const text = await response.text();
+  return new Response(text.toUpperCase(), response);
+};

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

@@ -75,7 +75,7 @@ const monitorCLISessionEvents = (input) => {
     // @ts-ignore
     const heartbeatIntervalms = fullSession.session.cliHeartbeatIntervalMs || defaultHeartbeatFrequency
     nextMarkActiveHeartbeat = heartbeatIntervalms
-    const markCLISessionActiveResult = await executeMarkCliSessionActiveHeartbeat(netlifyToken, site.id, sessionId)
+    const markCLISessionActiveResult = await executeMarkCliSessionActiveHeartbeat(graphJwt.jwt, site.id, sessionId)
     if (markCLISessionActiveResult.errors && markCLISessionActiveResult.errors.length !== 0) {
       warn(`Failed to mark CLI session active: ${markCLISessionActiveResult.errors.join(', ')}`)
     }
@@ -84,9 +84,8 @@ const monitorCLISessionEvents = (input) => {
 
   setTimeout(markActiveHelper, nextMarkActiveHeartbeat)
 
-  const enabledServiceWatcher = async (innerNetlifyToken, siteId) => {
+  const enabledServiceWatcher = async (jwt, siteId) => {
     const enabledServices = state.get('oneGraphEnabledServices') || ['onegraph']
-    const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
 
     const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(jwt, siteId)
     if (!enabledServicesInfo) {
@@ -103,7 +102,7 @@ const monitorCLISessionEvents = (input) => {
           'Reloading',
         )} Netlify Graph schema..., ${enabledServicesCompareKey} => ${newEnabledServicesCompareKey}`,
       )
-      await refetchAndGenerateFromOneGraph({ netlifyGraphConfig, state, netlifyToken: innerNetlifyToken, siteId })
+      await refetchAndGenerateFromOneGraph({ netlifyGraphConfig, state, jwt, siteId })
       log(`${chalk.green('Reloaded')} Netlify Graph schema and regenerated functions`)
     }
   }
@@ -142,7 +141,7 @@ const monitorCLISessionEvents = (input) => {
       }
     }
 
-    await enabledServiceWatcher(netlifyToken, appId)
+    await enabledServiceWatcher(graphJwt.jwt, appId)
 
     handle = setTimeout(helper, frequency)
   }
@@ -178,15 +177,14 @@ const monitorOperationFile = async ({ netlifyGraphConfig, onAdd, onChange, onUnl
  * Fetch the schema for a site, and regenerate all of the downstream files
  * @param {object} input
  * @param {string} input.siteId The id of the site to query against
- * @param {string} input.netlifyToken The (typically netlify) access token that is used for authentication, if any
+ * @param {string} input.jwt The Graph JWT
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
  * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
  * @returns {Promise<void>}
  */
 const refetchAndGenerateFromOneGraph = async (input) => {
-  const { logger, netlifyGraphConfig, netlifyToken, siteId, state } = input
-  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+  const { jwt, logger, netlifyGraphConfig, siteId, state } = input
 
   await OneGraphClient.ensureAppForSite(jwt, siteId)
 
@@ -577,7 +575,7 @@ const startOneGraphCLISession = async (input) => {
       const newOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
       await persistNewOperationsDocForSession({
         netlifyGraphConfig,
-        jwt,
+        netlifyToken,
         oneGraphSessionId,
         operationsDoc: newOperationsDoc,
         siteId: site.id,
@@ -590,7 +588,7 @@ const startOneGraphCLISession = async (input) => {
       const newOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
       await persistNewOperationsDocForSession({
         netlifyGraphConfig,
-        jwt,
+        netlifyToken,
         oneGraphSessionId,
         operationsDoc: newOperationsDoc,
         siteId: site.id,
@@ -653,7 +651,8 @@ const startOneGraphCLISession = async (input) => {
  * @param {string} input.sessionId The session id to monitor CLI events for
  */
 const markCliSessionInactive = async ({ netlifyToken, sessionId, siteId }) => {
-  const result = await executeMarkCliSessionInactive(netlifyToken, siteId, sessionId)
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+  const result = await executeMarkCliSessionInactive(jwt, siteId, sessionId)
   if (result.errors) {
     warn(`Unable to mark CLI session ${sessionId} inactive: ${JSON.stringify(result.errors, null, 2)}`)
   }