@netlify/functions-utils 2.0.1 → 4.0.0

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@netlify/functions-utils",
-  "version": "2.0.1",
+  "version": "4.0.0",
   "description": "Utility for adding Functions files in Netlify Build",
-  "main": "src/main.js",
+  "type": "module",
+  "exports": "./src/main.js",
+  "main": "./src/main.js",
   "files": [
     "src/**/*.js"
   ],
   "author": "Netlify Inc.",
   "scripts": {
-    "prepublishOnly": "cd ../../ && npm run prepublishOnly"
   },
   "keywords": [
     "nodejs",
@@ -43,18 +44,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@netlify/zip-it-and-ship-it": "^4.15.0",
+    "@netlify/zip-it-and-ship-it": "^5.2.0",
     "cpy": "^8.1.0",
     "path-exists": "^4.0.0"
   },
   "devDependencies": {
-    "ava": "^2.4.0",
+    "ava": "^3.15.0",
     "del": "^5.1.0",
-    "sinon": "^11.0.0",
+    "sinon": "^12.0.0",
     "sort-on": "^4.1.0",
     "tmp-promise": "^3.0.0"
   },
   "engines": {
-    "node": ">=10.18.0"
+    "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
   }
 }

package/src/main.js

@@ -1,17 +1,16 @@
-'use strict'
+import { stat } from 'fs'
+import { basename, dirname } from 'path'
+import { promisify } from 'util'
 
-const { stat } = require('fs')
-const { basename, dirname } = require('path')
-const { promisify } = require('util')
-
-const cpy = require('cpy')
-const pathExists = require('path-exists')
+import { listFunctions, listFunctionsFiles } from '@netlify/zip-it-and-ship-it'
+import cpy from 'cpy'
+import pathExists from 'path-exists'
 
 const pStat = promisify(stat)
 
 // Add a Netlify Function file to the `functions` directory so it is processed
 // by `@netlify/plugin-functions-core`
-const add = async function (src, dist, { fail = defaultFail } = {}) {
+export const add = async function (src, dist, { fail = defaultFail } = {}) {
   if (src === undefined) {
     return fail('No function source directory was specified')
   }
@@ -25,13 +24,8 @@ const add = async function (src, dist, { fail = defaultFail } = {}) {
   }
 
   const srcBasename = basename(src)
-  const functionsDist = `${dist}/${srcBasename}`
-  if (await pathExists(functionsDist)) {
-    return fail(`Function file or directory already exists at "${functionsDist}"`)
-  }
-
   const srcGlob = await getSrcGlob(src, srcBasename)
-  await cpy(srcGlob, dist, { cwd: dirname(src), parents: true, overwrite: false })
+  await cpy(srcGlob, dist, { cwd: dirname(src), parents: true, overwrite: true })
 }
 
 const getSrcGlob = async function (src, srcBasename) {
@@ -44,16 +38,11 @@ const getSrcGlob = async function (src, srcBasename) {
   return srcBasename
 }
 
-const list = async function (functionsSrc, { fail = defaultFail } = {}) {
-  if (functionsSrc === undefined) {
+export const list = async function (functionsSrc, { fail = defaultFail } = {}) {
+  if (functionsSrc === undefined || functionsSrc.length === 0) {
     return fail('No function directory was specified')
   }
 
-  // This package currently supports Node 8 but not zip-it-and-ship-it
-  // @todo put the `require()` to the top-level scope again once Node 8 support
-  // is removed
-  // eslint-disable-next-line node/global-require
-  const { listFunctions } = require('@netlify/zip-it-and-ship-it')
   try {
     return await listFunctions(functionsSrc)
   } catch (error) {
@@ -61,16 +50,11 @@ const list = async function (functionsSrc, { fail = defaultFail } = {}) {
   }
 }
 
-const listAll = async function (functionsSrc, { fail = defaultFail } = {}) {
-  if (functionsSrc === undefined) {
+export const listAll = async function (functionsSrc, { fail = defaultFail } = {}) {
+  if (functionsSrc === undefined || functionsSrc.length === 0) {
     return fail('No function directory was specified')
   }
 
-  // This package currently supports Node 8 but not zip-it-and-ship-it
-  // @todo put the `require()` to the top-level scope again once Node 8 support
-  // is removed
-  // eslint-disable-next-line node/global-require
-  const { listFunctionsFiles } = require('@netlify/zip-it-and-ship-it')
   try {
     return await listFunctionsFiles(functionsSrc)
   } catch (error) {
@@ -81,5 +65,3 @@ const listAll = async function (functionsSrc, { fail = defaultFail } = {}) {
 const defaultFail = function (message) {
   throw new Error(message)
 }
-
-module.exports = { add, list, listAll }