netlify-cli 12.5.0 → 12.6.0

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

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

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

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

@@ -1,6 +1,6 @@
-const chalk = require('chalk')
+import chalk from 'chalk'
 
-module.exports = {
+export default {
   name: 'stripe-charge',
   description: 'Stripe Charge: Charge a user with Stripe',
   functionType: 'serverless',

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

@@ -1,6 +1,6 @@
-const chalk = require('chalk')
+import chalk from 'chalk'
 
-module.exports = {
+export default {
   name: 'stripe-subscription',
   description: 'Stripe subscription: Create a subscription with Stripe',
   functionType: 'serverless',

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

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

@@ -1,6 +1,6 @@
-const chalk = require('chalk')
+import chalk from 'chalk'
 
-module.exports = {
+export default {
   name: 'token-hider',
   description: 'Token Hider: access APIs without exposing your API keys',
   functionType: 'serverless',

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

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

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

@@ -1,6 +1,6 @@
-const chalk = require('chalk')
+import chalk from 'chalk'
 
-module.exports = {
+export default {
   name: 'url-shortener',
   description: 'URL Shortener: simple URL shortener with Netlify Forms!',
   functionType: 'serverless',

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

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

package/src/functions-templates/rust/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/typescript/abtest/{.netlify-function-template.cjs → .netlify-function-template.mjs}

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

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   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

@@ -17,7 +17,7 @@ export default async (request: Request, context: Context) => {
   //   }
   // }
 
-  return context.json({
+  return Response.json({
     geo: context.geo,
     header: request.headers.get("x-nf-geo"),
   });

package/src/functions-templates/{javascript/hello-world/.netlify-function-template.cjs → typescript/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/typescript/hello-world/package-lock.json

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^1.3.0",
+        "@netlify/functions": "^1.4.0",
         "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.3.0.tgz",
-      "integrity": "sha512-hN/Fgpz8XIOBfsBPLYUMxVKBlCopgeqGB0popayicnmkFLnvKByTTMYgF01wcF9DBtBQdV0H2h1kPFpMl34I8w==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.4.0.tgz",
+      "integrity": "sha512-gy7ULTIRroc2/jyFVGx1djCmmBMVisIwrvkqggq5B6iDcInRSy2Tpkm+V5C63hKJVkNRskKWtLQKm9ecCaQTjA==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.3.0.tgz",
-      "integrity": "sha512-hN/Fgpz8XIOBfsBPLYUMxVKBlCopgeqGB0popayicnmkFLnvKByTTMYgF01wcF9DBtBQdV0H2h1kPFpMl34I8w==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.4.0.tgz",
+      "integrity": "sha512-gy7ULTIRroc2/jyFVGx1djCmmBMVisIwrvkqggq5B6iDcInRSy2Tpkm+V5C63hKJVkNRskKWtLQKm9ecCaQTjA==",
       "requires": {
         "is-promise": "^4.0.0"
       }

package/src/functions-templates/typescript/hello-world/package.json

@@ -14,7 +14,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.3.0",
+    "@netlify/functions": "^1.4.0",
     "@types/node": "^14.0.0",
     "typescript": "^4.0.0"
   }

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

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'json',
   description: 'Function that returns a simple json response',
   functionType: 'edge',

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

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

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

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   name: 'log',
   description: 'Basic function logging context of request',
   functionType: 'edge',

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

@@ -1,9 +1,9 @@
 import type { Context } from "https://edge.netlify.com";
 
 export default async (request: Request, context: Context) => {
-  context.log("Hello from the logging service");
+  console.log(`There was a request from ${context.geo.city} to ${request.url}`);
 
   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.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 TypeScript.',

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

@@ -15,7 +15,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^1.3.0",
+    "@netlify/functions": "^1.4.0",
     "@types/node": "^14.18.9",
     "typescript": "^4.5.5"
   }

package/src/functions-templates/typescript/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/{javascript/set-req-header/.netlify-function-template.cjs → typescript/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',

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

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

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

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

package/src/lib/completion/constants.mjs

@@ -1,4 +1,4 @@
 // @ts-check
-import { getPathInHome } from '../settings.cjs'
+import { getPathInHome } from '../settings.mjs'
 
 export const AUTOCOMPLETION_FILE = getPathInHome(['autocompletion.json'])

package/src/lib/edge-functions/deploy.mjs

@@ -2,7 +2,7 @@
 import { stat } from 'fs/promises'
 import { join } from 'path'
 
-import { getPathInProject } from '../settings.cjs'
+import { getPathInProject } from '../settings.mjs'
 
 import { EDGE_FUNCTIONS_FOLDER, PUBLIC_URL_PATH } from './consts.mjs'
 

package/src/lib/edge-functions/internal.mjs

@@ -3,7 +3,7 @@ import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
 import { cwd } from 'process'
 
-import { getPathInProject } from '../settings.cjs'
+import { getPathInProject } from '../settings.mjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 

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

@@ -8,8 +8,8 @@ import { v4 as generateUUID } from 'uuid'
 
 import { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error as printError, log } from '../../utils/command-helpers.mjs'
 import { getGeoLocation } from '../geo-location.mjs'
-import { getPathInProject } from '../settings.cjs'
-import { startSpinner, stopSpinner } from '../spinner.cjs'
+import { getPathInProject } from '../settings.mjs'
+import { startSpinner, stopSpinner } from '../spinner.mjs'
 
 import { DIST_IMPORT_MAP_PATH } from './consts.mjs'
 import headers from './headers.mjs'

package/src/lib/{fs.cjs → fs.mjs}

@@ -1,10 +1,8 @@
 // @ts-check
-const {
-  constants,
-  promises: { access, stat },
-} = require('fs')
+import { constants } from 'fs'
+import { access, stat } from 'fs/promises'
 
-const fileExistsAsync = async (filePath) => {
+export const fileExistsAsync = async (filePath) => {
   try {
     await access(filePath, constants.F_OK)
     return true
@@ -36,16 +34,10 @@ const isType = async (filePath, type) => {
  * Checks if the provided filePath is a file
  * @param {string} filePath
  */
-const isFileAsync = (filePath) => isType(filePath, 'isFile')
+export const isFileAsync = (filePath) => isType(filePath, 'isFile')
 
 /**
  * Checks if the provided filePath is a directory
  * @param {string} filePath
  */
-const isDirectoryAsync = (filePath) => isType(filePath, 'isDirectory')
-
-module.exports = {
-  fileExistsAsync,
-  isDirectoryAsync,
-  isFileAsync,
-}
+export const isDirectoryAsync = (filePath) => isType(filePath, 'isDirectory')

package/src/lib/functions/runtimes/js/builders/netlify-lambda.mjs

@@ -5,7 +5,7 @@ import { resolve } from 'path'
 import minimist from 'minimist'
 
 import execa from '../../../../../utils/execa.mjs'
-import { fileExistsAsync } from '../../../../fs.cjs'
+import { fileExistsAsync } from '../../../../fs.mjs'
 import { memoizedBuild } from '../../../memoized-build.mjs'
 
 export const detectNetlifyLambda = async function ({ packageJson } = {}) {

package/src/lib/functions/runtimes/js/builders/zisi.mjs

@@ -7,7 +7,7 @@ import readPkgUp from 'read-pkg-up'
 import sourceMapSupport from 'source-map-support'
 
 import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.mjs'
-import { getPathInProject } from '../../../../settings.cjs'
+import { getPathInProject } from '../../../../settings.mjs'
 import { normalizeFunctionsConfig } from '../../../config.mjs'
 import { memoizedBuild } from '../../../memoized-build.mjs'
 

package/src/lib/functions/runtimes/rust/index.mjs

@@ -7,7 +7,7 @@ import findUp from 'find-up'
 import toml from 'toml'
 
 import execa from '../../../../utils/execa.mjs'
-import { getPathInProject } from '../../../settings.cjs'
+import { getPathInProject } from '../../../settings.mjs'
 import { runFunctionsProxy } from '../../local-proxy.mjs'
 
 const isWindows = platform === 'win32'

package/src/lib/{settings.cjs → settings.mjs}

@@ -1,7 +1,7 @@
-const os = require('os')
-const path = require('path')
+import os from 'os'
+import path from 'path'
 
-const envPaths = require('env-paths')
+import envPaths from 'env-paths'
 
 const OSBasedPaths = envPaths('netlify', { suffix: '' })
 const NETLIFY_HOME = '.netlify'
@@ -12,7 +12,7 @@ const NETLIFY_HOME = '.netlify'
  * @param {string[]} paths
  * @returns {string}
  */
-const getLegacyPathInHome = (paths) => {
+export const getLegacyPathInHome = (paths) => {
   const pathInHome = path.join(os.homedir(), NETLIFY_HOME, ...paths)
   return pathInHome
 }
@@ -22,7 +22,7 @@ const getLegacyPathInHome = (paths) => {
  * @param {string[]} paths
  * @returns {string}
  */
-const getPathInHome = (paths) => {
+export const getPathInHome = (paths) => {
   const pathInHome = path.join(OSBasedPaths.config, ...paths)
   return pathInHome
 }
@@ -32,9 +32,7 @@ const getPathInHome = (paths) => {
  * @param {string[]} paths
  * @returns {string}
  */
-const getPathInProject = (paths) => {
+export const getPathInProject = (paths) => {
   const pathInProject = path.join(NETLIFY_HOME, ...paths)
   return pathInProject
 }
-
-module.exports = { getLegacyPathInHome, getPathInHome, getPathInProject }

package/src/lib/{spinner.cjs → spinner.mjs}

@@ -1,6 +1,6 @@
 // @ts-check
-const logSymbols = require('log-symbols')
-const ora = require('ora')
+import logSymbols from 'log-symbols'
+import ora from 'ora'
 
 /**
  * Creates a spinner with the following text
@@ -8,7 +8,7 @@ const ora = require('ora')
  * @param {string} config.text
  * @returns {ora.Ora}
  */
-const startSpinner = ({ text }) =>
+export const startSpinner = ({ text }) =>
   ora({
     text,
   }).start()
@@ -21,7 +21,7 @@ const startSpinner = ({ text }) =>
  * @param {string} [config.text]
  * @returns {void}
  */
-const stopSpinner = ({ error, spinner, text }) => {
+export const stopSpinner = ({ error, spinner, text }) => {
   if (!spinner) {
     return
   }
@@ -39,10 +39,8 @@ const stopSpinner = ({ error, spinner, text }) => {
  * @param {ora.Ora} config.spinner
  * @returns {void}
  */
-const clearSpinner = ({ spinner }) => {
+export const clearSpinner = ({ spinner }) => {
   if (spinner) {
     spinner.stop()
   }
 }
-
-module.exports = { clearSpinner, startSpinner, stopSpinner }

package/src/utils/command-helpers.mjs

@@ -12,7 +12,7 @@ import WSL from 'is-wsl'
 import debounce from 'lodash/debounce.js'
 import terminalLink from 'terminal-link'
 
-import { clearSpinner, startSpinner } from '../lib/spinner.cjs'
+import { clearSpinner, startSpinner } from '../lib/spinner.mjs'
 
 import getGlobalConfig from './get-global-config.mjs'
 import getPackageJson from './get-package-json.mjs'

package/src/utils/dot-env.mjs

@@ -4,7 +4,7 @@ import path from 'path'
 
 import dotenv from 'dotenv'
 
-import { isFileAsync } from '../lib/fs.cjs'
+import { isFileAsync } from '../lib/fs.mjs'
 
 import { warn } from './command-helpers.mjs'
 

package/src/utils/functions/functions.mjs

@@ -1,8 +1,8 @@
 // @ts-check
 import { resolve } from 'path'
 
-import { isDirectoryAsync, isFileAsync } from '../../lib/fs.cjs'
-import { getPathInProject } from '../../lib/settings.cjs'
+import { isDirectoryAsync, isFileAsync } from '../../lib/fs.mjs'
+import { getPathInProject } from '../../lib/settings.mjs'
 
 /**
  * retrieves the function directory out of the flags or config

package/src/utils/functions/get-functions.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { fileExistsAsync } from '../../lib/fs.cjs'
+import { fileExistsAsync } from '../../lib/fs.mjs'
 
 const getUrlPath = (functionName) => `/.netlify/functions/${functionName}`
 

package/src/utils/get-global-config.mjs

@@ -3,7 +3,7 @@ import { readFile } from 'fs/promises'
 import Configstore from 'configstore'
 import { v4 as uuidv4 } from 'uuid'
 
-import { getLegacyPathInHome, getPathInHome } from '../lib/settings.cjs'
+import { getLegacyPathInHome, getPathInHome } from '../lib/settings.mjs'
 
 const globalConfigDefaults = {
   /* disable stats from being sent to Netlify */

package/src/utils/gitignore.mjs

@@ -4,7 +4,7 @@ import path from 'path'
 
 import parseIgnore from 'parse-gitignore'
 
-import { fileExistsAsync } from '../lib/fs.cjs'
+import { fileExistsAsync } from '../lib/fs.mjs'
 
 import { log } from './command-helpers.mjs'
 

package/src/utils/init/utils.mjs

@@ -6,7 +6,7 @@ import process from 'process'
 import cleanDeep from 'clean-deep'
 import inquirer from 'inquirer'
 
-import { fileExistsAsync } from '../../lib/fs.cjs'
+import { fileExistsAsync } from '../../lib/fs.mjs'
 import { normalizeBackslash } from '../../lib/path.mjs'
 import { chalk, error as failAndExit, log, warn } from '../command-helpers.mjs'
 

package/src/utils/live-tunnel.mjs

@@ -5,7 +5,7 @@ import fetch from 'node-fetch'
 import pWaitFor from 'p-wait-for'
 
 import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.mjs'
-import { getPathInHome } from '../lib/settings.cjs'
+import { getPathInHome } from '../lib/settings.mjs'
 
 import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.mjs'
 import execa from './execa.mjs'

package/src/utils/lm/install.mjs

@@ -11,9 +11,9 @@ import Listr from 'listr'
 import pathKey from 'path-key'
 
 import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.mjs'
-import { fileExistsAsync } from '../../lib/fs.cjs'
+import { fileExistsAsync } from '../../lib/fs.mjs'
 import { normalizeBackslash } from '../../lib/path.mjs'
-import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.cjs'
+import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.mjs'
 import { chalk } from '../command-helpers.mjs'
 
 import { checkGitLFSVersionStep, checkGitVersionStep, checkLFSFiltersStep } from './steps.mjs'

package/src/utils/proxy.mjs

@@ -25,7 +25,7 @@ import {
   initializeProxy as initializeEdgeFunctionsProxy,
   isEdgeFunctionsRequest,
 } from '../lib/edge-functions/proxy.mjs'
-import { fileExistsAsync, isFileAsync } from '../lib/fs.cjs'
+import { fileExistsAsync, isFileAsync } from '../lib/fs.mjs'
 import renderErrorTemplate from '../lib/render-error-template.mjs'
 
 import { NETLIFYDEVLOG, NETLIFYDEVWARN } from './command-helpers.mjs'

package/src/utils/rules-proxy.mjs

@@ -6,7 +6,7 @@ import cookie from 'cookie'
 import redirector from 'netlify-redirector'
 import pFilter from 'p-filter'
 
-import { fileExistsAsync } from '../lib/fs.cjs'
+import { fileExistsAsync } from '../lib/fs.mjs'
 
 import { NETLIFYDEVLOG } from './command-helpers.mjs'
 import { parseRedirects } from './redirects.mjs'

package/src/utils/state-config.mjs

@@ -6,7 +6,7 @@ import dotProp from 'dot-prop'
 import findUp from 'find-up'
 import writeFileAtomic from 'write-file-atomic'
 
-import { getPathInProject } from '../lib/settings.cjs'
+import { getPathInProject } from '../lib/settings.mjs'
 
 const STATE_PATH = getPathInProject(['state.json'])
 const permissionError = "You don't have access to this file."