netlify-cli 12.5.0 → 12.6.0

package/package.json

@@ -1,164 +1,9 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "author": "Netlify Inc.",
   "type": "module",
-  "contributors": [
-    "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
-    "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
-    "Alberto De Agostini (https://twitter.com/albertodeago88)",
-    "Alejandro Ñáñez Ortiz <git@alejandro.dev> (https://twitter.com/alejandronanez)",
-    "Alex Reardon (https://twitter.com/alexandereardon)",
-    "Anees Iqbal <hello@aneesiqbal.me> (https://twitter.com/realsteelbrain)",
-    "Antonio Nuno Monteiro (https://twitter.com/_anmonteiro)",
-    "Ardie Wen",
-    "Arthur Puyou <arthur@puyou.fr> (https://twitter.com/apuyou)",
-    "Ashal Farhan",
-    "Battulga Tsogtgerel <theonlytulga@gmail.com>",
-    "Be <be.0@gmx.com> (https://beasintheverb.me/)",
-    "Benaiah Mischenko <benaiah@mischenko.com> (https://benaiah.me)",
-    "Björn Clees <piranhadev@gmail.com> (https://linkedin.com/in/bjoern-clees/en)",
-    "Bob",
-    "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
-    "Brett DeWoody <brettdewoody@gmail.com> (https://twitter.com/brettdewoody)",
-    "C. Lewis (https://twitter.com/ctjlewis)",
-    "Caleb (https://caleblarsen.dev)",
-    "Cassidy Williams (https://twitter.com/cassidoo)",
-    "Charlie Depman <cdepman@gmail.com> (depman.dev)",
-    "Charlie Depman <cdepman@gmail.com> (depman.dev)",
-    "Charlie Depman <cdepman@gmail.com> (depman.dev)",
-    "Chris Templin <ctemplin@gmail.com>",
-    "Cole Bosmann",
-    "Dan Croak (https://twitter.com/croaky)",
-    "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)",
-    "David Thyresson (https://twitter.com/dthyresson)",
-    "David Wells <david.wells@netlify.com> (https://davidwells.io/)",
-    "Devin Fitzsimons (https://twitter.com/fitzsimons_dev)",
-    "Eddie <eddiecooro@gmail.com> (https://www.linkedin.com/in/ali-rezaie-farahani-3b435611a)",
-    "Eduardo Bouças <mail@eduardoboucas.com> (https://twitter.com/eduardoboucas)",
-    "Emily Zhang (https://twitter.com/mlylzhng)",
-    "Erez Rokah (https://www.erezro.com)",
-    "Erica Pisani <pisani.erica@gmail.com>",
-    "Evans Hauser (https://twitter.com/evanshauser)",
-    "Ewan Valentine <ewan.valentine89@gmail.com> (http://ewanvalentine.io)",
-    "Finn Woelm (https://twitter.com/FinnWoelm)",
-    "Flxbot",
-    "Gavin Henderson <gavin.henderson@hotmail.co.uk> (https://twitter.com/gavinhenderson5)",
-    "Gergely Nemeth (https://twitter.com/nthgergo)",
-    "HonkingGoose",
-    "Ian Martorell <ianmartorell@gmail.com>",
-    "Ibrahima G. Coulibaly",
-    "Jackie Macharia (wangoimacharia.dev)",
-    "Jacob Schatz",
-    "Jake Jarvis <jake@jarv.is> (https://twitter.com/jakejarvis)",
-    "Jakob Warkotsch <j.warkotsch@gmail.com>",
-    "James George (https://twitter.com/james_madhacks)",
-    "Jason Barry (https://twitter.com/jasbarry)",
-    "Jason Lengstorf <jason@lengstorf.com> (https://twitter.com/jlengstorf)",
-    "Jenae Janzen",
-    "Jeremy Monson (www.surfline.com)",
-    "Jessica Parsons",
-    "Jhey Tompkins (https://twitter.com/jh3yy)",
-    "Jon Sullivan <hey@jonsully.net> (https://jonsully.net)",
-    "Jonas Brusman (https://jonas.brusman.se)",
-    "Jonathan Cardoso <me@jonathancardoso.com> (https://twitter.com/_jonathancardos)",
-    "Jordan Whistler (www.jordanwhistler.info)",
-    "Joshua T. (http://localhost:8080)",
-    "João Antunes <me@jgantunes.com> (https://twitter.com/jgantunes)",
-    "Karagulamos (https://twitter.com/karagulamos)",
-    "Karin Hendrikse <khendrikse.netlify.app>",
-    "Kaspar Emanuel <kaspar@monostable.co.uk> (https://twitter.com/kaspar_e)",
-    "Keiko Oda (https://keikooda.net/)",
-    "Krasimir Nedelchev (https://github.com/kaykayehnn)",
-    "Kunal Kundu (https://twitter.com/kunal__kundu)",
-    "Kyle Rollins <kyleblankrollins@gmail.com> (kyleblankrollins.com)",
-    "Lana Vorozheykina",
-    "Leon Hennings",
-    "Liran Tal <liran.tal@gmail.com> (https://twitter.com/liran_tal)",
-    "Louis DeScioli (https://twitter.com/descioli)",
-    "Lukas Holzer <lukas.holzer@netlify.com> (https://twitter.com/luka5c0m)",
-    "Lxxyx <Lxxyxzj@gmail.com> (https://twitter.com/Lxxyx_)",
-    "Marc Littlemore (https://twitter.com/marclittlemore)",
-    "Marcus Weiner",
-    "Mark Bello <mark@markbello.dev> (https://markbello.dev)",
-    "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
-    "Matt Messinger <messinger.matt@gmail.com>",
-    "Maximilian Berkmann <maxieberkmann@gmail.com> (https://twitter.com/Berkmann18)",
-    "MentalGear <tomfaber7@gmail.com>",
-    "Moritz Gunz <hello@moritzgunz.de> (https://moritzgunz.de)",
-    "Muhammad Javed <theahmadzai@gmail.com> (https://twitter.com/theahmadzai786)",
-    "Munif Tanjim <github@muniftanjim.dev> (https://twitter.com/MunifTanjim)",
-    "Nestor Vera <nestorvera@me.com> (https://twitter.com/hack_nug)",
-    "Netlify Team Account 1 (https://twitter.com/netlify)",
-    "Nick McCurdy <nick@nickmccurdy.com> (https://twitter.com/nickemccurdy)",
-    "Nick Taylor <nick@iamdeveloper.com> (https://twitter.com/nickytonline)",
-    "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)",
-    "Robert Martin <rmartin@rmart.in>",
-    "Robin Hoodie",
-    "Rodney Coyer <rodney.coyer@gmail.com>",
-    "Rohit J (https://twitter.com/syntaxhacker0)",
-    "Roneo.org (Roneo.org)",
-    "Rui Ramos <ruiramos@gmail.com> (https://ruiramos.com)",
-    "Rune Botten <rbotten@gmail.com> (https://twitter.com/runeb)",
-    "Russell Davis (https://twitter.com/_RussellDavis)",
-    "Ryan Neal",
-    "Sam Holmes <samholmes1337@gmail.com> (https://samholmes.net)",
-    "Sander de Groot (https://degroot.dev)",
-    "Sarah Drasner <sarah.drasner@gmail.com> (https://twitter.com/sarah_edo)",
-    "Sarah Etter <sarah@sarahetter.com> (http://www.sarahetter.com)",
-    "Scott Spence <spences10apps@gmail.com> (https://twitter.com/spences10)",
-    "Sean Grove <sean@bushi.do> (https://twitter.com/sgrove)",
-    "Sebastian Smolorz",
-    "Semyon Tokarev (https://zobzn.com/)",
-    "Sergii Zinkevych",
-    "Shawn Erquhart <shawn@erquh.art>",
-    "Shawn Makinson (http://smakinson.github.io)",
-    "Simon Knott <info@simonknott.de> (https://twitter.com/skn0tt)",
-    "Souma Suzuki <subayai.kobashiri@gmail.com>",
-    "Sven Serlier (dypodex.nl/sven/)",
-    "Sébastien Chopin <seb@nuxtjs.com> (https://twitter.com/Atinux)",
-    "Takumi Hirunuma <m.111_t.1230_nittc@outlook.com> (https://twitter.com/mg111_)",
-    "Tan Zhen Yong (https://www.beyondthesprawl.com)",
-    "Tara Z. Manicsic <tzmanics@gmail.com> (https://tzmanics.dev)",
-    "Thai Pangsakulyanont (https://dt.in.th/)",
-    "Tiffany Le-Nguyen (https://twitter.com/tiffanosaurus)",
-    "Tim Culverhouse <tim@timculverhouse.com> (www.timculverhouse.com)",
-    "Tim Perry (https://twitter.com/pimterry)",
-    "Tim Trautman (timtrautman.com)",
-    "Tom Dyson (https://wagtail.io/)",
-    "Tom Hu (https://twitter.com/thomasrockhu)",
-    "Travis Horn <travis@travishorn.com> (https://twitter.com/horn_travis)",
-    "Try Ajitiono <ballinst@gmail.com> (https://twitter.com/Ajiballinst)",
-    "Victor Dadfar",
-    "Wayne (https://twitter.com/waynehoover_)",
-    "XhmikosR <xhmikosr@gmail.com> (https://twitter.com/xhmikosr)",
-    "Ximena Sandoval <ximena.sandoval.dh@gmail.com> (https://ximenasandoval.github.io)",
-    "Yuvi Panda",
-    "cesare soldini <cesare.soldini@gmail.com>",
-    "chris (fool) mccraw (http://twitter.com/fool)",
-    "dustincrogers",
-    "eddie",
-    "ehmicky (https://twitter.com/ehmicky)",
-    "internal tools netlibot",
-    "kvn-shn",
-    "netlibot (https://www.netlify.com)",
-    "nikoladev",
-    "polemius",
-    "swyx <shawnthe1@gmail.com> (https://twitter.com/swyx)"
-  ],
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
@@ -230,8 +75,9 @@
     "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": "^29.2.2",
-    "@netlify/config": "^20.2.0",
+    "@fastify/static": "^6.6.0",
+    "@netlify/build": "^29.4.0",
+    "@netlify/config": "^20.3.0",
     "@netlify/edge-bundler": "^8.0.0",
     "@netlify/framework-info": "^9.5.3",
     "@netlify/local-functions-proxy": "^1.1.1",
@@ -265,6 +111,7 @@
     "execa": "^5.0.0",
     "express": "^4.17.1",
     "express-logging": "^1.1.1",
+    "fastify": "^4.10.2",
     "find-up": "^5.0.0",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
@@ -316,7 +163,6 @@
     "read-pkg-up": "^7.0.1",
     "semver": "^7.3.5",
     "source-map-support": "^0.5.19",
-    "static-server": "^2.2.1",
     "string-similarity": "^4.0.4",
     "strip-ansi-control-characters": "^2.0.0",
     "tabtab": "^3.0.2",

package/src/commands/deploy/deploy.mjs

@@ -15,7 +15,7 @@ import { getBuildOptions, runBuild } from '../../lib/build.mjs'
 import { featureFlags as edgeFunctionsFeatureFlags } from '../../lib/edge-functions/consts.mjs'
 import { normalizeFunctionsConfig } from '../../lib/functions/config.mjs'
 import { getLogMessage } from '../../lib/log.mjs'
-import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import { startSpinner, stopSpinner } from '../../lib/spinner.mjs'
 import {
   chalk,
   error,

package/src/commands/dev/dev.mjs

@@ -2,12 +2,12 @@
 import events from 'events'
 import path from 'path'
 import process from 'process'
-import { promisify } from 'util'
 
+import fastifyStatic from '@fastify/static'
 import boxen from 'boxen'
 import { Option } from 'commander'
 import execa from 'execa'
-import StaticServer from 'static-server'
+import Fastify from 'fastify'
 import stripAnsiCc from 'strip-ansi-control-characters'
 import waitPort from 'wait-port'
 
@@ -26,7 +26,7 @@ import {
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import { startSpinner, stopSpinner } from '../../lib/spinner.mjs'
 import {
   BANG,
   chalk,
@@ -55,16 +55,29 @@ import { createDevExecCommand } from './dev-exec.mjs'
 const netlifyBuildPromise = import('@netlify/build')
 
 const startStaticServer = async ({ settings }) => {
-  const server = new StaticServer({
-    rootPath: settings.dist,
-    name: 'netlify-dev',
-    port: settings.frameworkPort,
-    templates: {
-      notFound: path.join(settings.dist, '404.html'),
-    },
+  const server = Fastify()
+  const rootPath = path.resolve(settings.dist)
+  server.register(fastifyStatic, {
+    root: rootPath,
+    etag: false,
+    acceptRanges: false,
+    lastModified: false,
   })
 
-  await promisify(server.start.bind(server))()
+  server.setNotFoundHandler((_req, res) => {
+    res.code(404).sendFile('404.html', rootPath)
+  })
+
+  server.addHook('onRequest', (req, reply, done) => {
+    reply.header('X-Powered-by', 'netlify-dev')
+    const validMethods = ['GET', 'HEAD']
+    if (!validMethods.includes(req.method)) {
+      reply.code(405).send('Method Not Allowed')
+    }
+    done()
+  })
+
+  await server.listen({ port: settings.frameworkPort })
   log(`\n${NETLIFYDEVLOG} Static server listening to`, settings.frameworkPort)
 }
 

package/src/commands/env/env-list.mjs

@@ -134,6 +134,7 @@ export const createEnvListCommand = (program) =>
       normalizeContext,
       'dev',
     )
+    .option('--json', 'Output environment variables as JSON')
     .addOption(new Option('--plain', 'Output environment variables as plaintext').conflicts('json'))
     .addOption(
       new Option('-s, --scope <scope>', 'Specify a scope')

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

@@ -1,11 +1,11 @@
 // @ts-check
 import cp from 'child_process'
 import fs from 'fs'
-import { mkdir } from 'fs/promises'
+import { mkdir, readdir, unlink } from 'fs/promises'
 import { createRequire } from 'module'
 import path, { dirname } from 'path'
 import process from 'process'
-import { fileURLToPath } from 'url'
+import { fileURLToPath, pathToFileURL } from 'url'
 import { promisify } from 'util'
 
 import copyTemplateDirOriginal from 'copy-template-dir'
@@ -16,6 +16,7 @@ import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
 import fetch from 'node-fetch'
 import ora from 'ora'
 
+import { fileExistsAsync } from '../../lib/fs.mjs'
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.mjs'
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs'
 import { injectEnvVariables } from '../../utils/dev.mjs'
@@ -90,19 +91,26 @@ const filterRegistry = function (registry, input) {
     })
 }
 
-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'))
+const formatRegistryArrayForInquirer = async function (lang, funcType) {
+  const folderNames = await readdir(path.join(templatesDir, lang))
 
-    .map((folderName) =>
-      // eslint-disable-next-line import/no-dynamic-require
-      require(path.join(templatesDir, lang, folderName, '.netlify-function-template.cjs')),
-    )
-    .filter((folderName) => folderName.functionType === funcType)
-    .sort((folderNameA, folderNameB) => {
-      const priorityDiff = (folderNameA.priority || DEFAULT_PRIORITY) - (folderNameB.priority || DEFAULT_PRIORITY)
+  const imports = await Promise.all(
+    folderNames
+      // filter out markdown files
+      .filter((folderName) => !folderName.endsWith('.md'))
+      .map(async (folderName) => {
+        const templatePath = path.join(templatesDir, lang, folderName, '.netlify-function-template.mjs')
+        // eslint-disable-next-line import/no-dynamic-require
+        const template = await import(pathToFileURL(templatePath))
+
+        return template.default
+      }),
+  )
+
+  const registry = imports
+    .filter((template) => template.functionType === funcType)
+    .sort((templateA, templateB) => {
+      const priorityDiff = (templateA.priority || DEFAULT_PRIORITY) - (templateB.priority || DEFAULT_PRIORITY)
 
       if (priorityDiff !== 0) {
         return priorityDiff
@@ -112,7 +120,7 @@ const formatRegistryArrayForInquirer = function (lang, funcType) {
       // until Node 11, so the original sorting order from `fs.readdirSync`
       // was not respected. We can simplify this once we drop support for
       // Node 10.
-      return folderNameA - folderNameB
+      return templateA - templateB
     })
     .map((t) => {
       t.lang = lang
@@ -170,7 +178,7 @@ const pickTemplate = async function ({ language: languageFromFlag }, funcType) {
   let templatesForLanguage
 
   try {
-    templatesForLanguage = formatRegistryArrayForInquirer(language, funcType)
+    templatesForLanguage = await formatRegistryArrayForInquirer(language, funcType)
   } catch {
     throw error(`Invalid language: ${language}`)
   }
@@ -292,14 +300,14 @@ const ensureFunctionDirExists = async function (command) {
     }
   }
 
-  if (!fs.existsSync(functionsDirHolder)) {
+  if (!(await fileExistsAsync(functionsDirHolder))) {
     log(
       `${NETLIFYDEVLOG} functions directory ${chalk.magenta.inverse(
         functionsDirHolder,
       )} does not exist yet, creating it...`,
     )
 
-    fs.mkdirSync(functionsDirHolder, { recursive: true })
+    await mkdir(functionsDirHolder, { recursive: true })
 
     log(`${NETLIFYDEVLOG} functions directory ${chalk.magenta.inverse(functionsDirHolder)} created`)
   }
@@ -350,15 +358,17 @@ const downloadFromURL = async function (command, options, argumentName, function
   })
 
   // read, execute, and delete function template file if exists
-  const fnTemplateFile = path.join(fnFolder, '.netlify-function-template.cjs')
-  if (fs.existsSync(fnTemplateFile)) {
-    // eslint-disable-next-line import/no-dynamic-require
-    const { onComplete, addons = [] } = require(fnTemplateFile)
+  const fnTemplateFile = path.join(fnFolder, '.netlify-function-template.mjs')
+  if (await fileExistsAsync(fnTemplateFile)) {
+    const {
+      default: { onComplete, addons = [] },
+      // eslint-disable-next-line import/no-dynamic-require
+    } = await import(pathToFileURL(fnTemplateFile).href)
 
     await installAddons(command, addons, path.resolve(fnFolder))
     await handleOnComplete({ command, onComplete })
     // delete
-    fs.unlinkSync(fnTemplateFile)
+    await unlink(fnTemplateFile)
   }
 }
 
@@ -471,7 +481,7 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
 
     // These files will not be part of the log message because they'll likely
     // be removed before the command finishes.
-    const omittedFromOutput = new Set(['.netlify-function-template.cjs', 'package.json', 'package-lock.json'])
+    const omittedFromOutput = new Set(['.netlify-function-template.mjs', 'package.json', 'package-lock.json'])
     const createdFiles = await copyTemplateDir(pathToTemplate, functionPath, vars)
     createdFiles.forEach((filePath) => {
       const filename = path.basename(filePath)
@@ -487,7 +497,7 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
     })
 
     // delete function template file that was copied over by copydir
-    fs.unlinkSync(path.join(functionPath, '.netlify-function-template.cjs'))
+    await unlink(path.join(functionPath, '.netlify-function-template.mjs'))
 
     // npm install
     if (functionPackageJson !== undefined) {

package/src/commands/sites/sites-list.mjs

@@ -1,6 +1,6 @@
 // @ts-check
 import { listSites } from '../../lib/api.mjs'
-import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import { startSpinner, stopSpinner } from '../../lib/spinner.mjs'
 import { chalk, log, logJson } from '../../utils/command-helpers.mjs'
 
 /**

package/src/commands/watch/watch.mjs

@@ -2,7 +2,7 @@
 import pWaitFor from 'p-wait-for'
 import prettyjson from 'prettyjson'
 
-import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import { startSpinner, stopSpinner } from '../../lib/spinner.mjs'
 import { chalk, error, log } from '../../utils/command-helpers.mjs'
 import { init } from '../init/index.mjs'
 

package/src/functions-templates/go/hello-world/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/apollo-graphql/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/apollo-graphql-rest/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'auth-fetch',
   description: 'Use `node-fetch` library and Netlify Identity to access APIs',
   functionType: 'serverless',

package/src/functions-templates/javascript/create-user/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'create-user',
   description: 'Programmatically create a Netlify Identity user by invoking a function',
   functionType: 'serverless',

package/src/functions-templates/javascript/fauna-crud/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,5 +1,6 @@
-const execa = require('execa')
-module.exports = {
+import execa from 'execa'
+
+export default {
   name: 'fauna-crud',
   description: 'CRUD function using Fauna DB',
   functionType: 'serverless',

package/src/functions-templates/javascript/fauna-graphql/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,5 +1,6 @@
-const execa = require('execa')
-module.exports = {
+import execa from 'execa'
+
+export default {
   name: 'fauna-graphql',
   description: 'GraphQL Backend using Fauna DB',
   functionType: 'serverless',

package/src/functions-templates/javascript/google-analytics/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/{typescript/hello-world/.netlify-function-template.cjs → javascript/hello-world/.netlify-function-template.mjs}

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

package/src/functions-templates/javascript/identity-signup/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/localized-content/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/node-fetch/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/sanity-create/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/sanity-groq/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/scheduled-function/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'scheduled-function',
   priority: 1,
   description: 'Basic implementation of a scheduled function in JavaScript.',

package/src/functions-templates/javascript/scheduled-function/package.json

@@ -15,6 +15,6 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.3.0"
+    "@netlify/functions": "^1.4.0"
   }
 }

package/src/functions-templates/javascript/send-email/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/set-cookie/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

package/src/functions-templates/javascript/set-cookies/{.netlify-function-template.cjs → .netlify-function-template.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'set-cookies',
   description: 'Create and manage HTTP cookies',
   functionType: 'edge',

package/src/functions-templates/{typescript/set-req-header/.netlify-function-template.cjs → javascript/set-req-header/.netlify-function-template.mjs}

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