netlify-cli 12.2.8 → 12.2.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.2.8",
+  "version": "12.2.10",
   "author": "Netlify Inc.",
   "type": "module",
   "contributors": [
@@ -211,8 +211,11 @@
     "test:init:eleventy-deps": "npm ci --prefix tests/integration/eleventy-site --no-audit",
     "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
     "test:dev:ava": "ava --verbose",
+    "test:dev:vitest": "vitest run",
     "test:ci:ava:unit": "c8 -r json ava --no-worker-threads tests/unit/ tools/",
     "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/",
+    "test:ci:vitest:unit": "vitest run --coverage tests/unit/",
+    "test:ci:vitest:integration": "vitest run --coverage --no-threads tests/integration/",
     "test:affected": "node ./tools/affected-test.mjs",
     "e2e": "node ./tools/e2e/run.mjs",
     "docs": "node ./site/scripts/docs.mjs",
@@ -230,7 +233,7 @@
   "dependencies": {
     "@netlify/build": "^28.4.5",
     "@netlify/config": "^20.0.2",
-    "@netlify/edge-bundler": "^5.0.0",
+    "@netlify/edge-bundler": "^5.3.1",
     "@netlify/framework-info": "^9.5.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/zip-it-and-ship-it": "^8.1.0",
@@ -337,6 +340,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
+    "@vitest/coverage-c8": "^0.25.3",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -352,19 +356,20 @@
     "rewiremock": "^3.14.3",
     "serialize-javascript": "^6.0.0",
     "sinon": "^14.0.0",
-    "sort-on": "^4.1.0",
     "strip-ansi": "^6.0.0",
     "supertest": "^6.1.6",
     "temp-dir": "^2.0.0",
     "tomlify-j0.4": "^3.0.0",
     "tree-kill": "^1.2.2",
     "typescript": "^4.4.4",
-    "verdaccio": "^5.10.2"
+    "verdaccio": "^5.10.2",
+    "vite": "^3.2.4",
+    "vitest": "^0.25.3"
   },
   "ava": {
     "files": [
       "tools/**/*.test.mjs",
-      "tests/**/*.test.+(c|m)js"
+      "tests/**/*.test.cjs"
     ],
     "cache": true,
     "concurrency": 5,

package/src/commands/dev/dev.mjs

@@ -516,7 +516,7 @@ const dev = async (options, command) => {
 
   const devCommand = async () => {
     const { ipVersion } = await startFrameworkServer({ settings })
-    // eslint-disable-next-line no-magic-numbers
+
     settings.frameworkHost = ipVersion === 6 ? '::1' : '127.0.0.1'
   }
   const startDevOptions = getBuildOptions({

package/src/functions-templates/javascript/graphql-gateway/example-sibling-function-graphql-1.js

@@ -17,13 +17,11 @@ const typeDefs = gql`
   }
 `
 
-/* eslint-disable no-magic-numbers */
 const authors = [
   { id: 1, name: 'Terry Pratchett', age: 67 },
   { id: 2, name: 'Stephen King', age: 71 },
   { id: 3, name: 'JK Rowling', age: 53 },
 ]
-/* eslint-enable no-magic-numbers */
 
 const resolvers = {
   Query: {

package/src/functions-templates/javascript/graphql-gateway/example-sibling-function-graphql-2.js

@@ -17,7 +17,6 @@ const typeDefs = gql`
   }
 `
 
-/* eslint-disable no-magic-numbers */
 const books = [
   {
     id: 1,
@@ -62,7 +61,6 @@ const books = [
     authorName: 'JK Rowling',
   },
 ]
-/* eslint-enable no-magic-numbers */
 
 const resolvers = {
   Query: {

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
-      "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="
+      "version": "14.18.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.34.tgz",
+      "integrity": "sha512-hcU9AIQVHmPnmjRK+XUUYlILlr9pQrsqSrwov/JK1pnf3GTQowVBhx54FbvM0AU/VXGH4i3+vgXS5EguR7fysA=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
-      "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="
+      "version": "14.18.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.34.tgz",
+      "integrity": "sha512-hcU9AIQVHmPnmjRK+XUUYlILlr9pQrsqSrwov/JK1pnf3GTQowVBhx54FbvM0AU/VXGH4i3+vgXS5EguR7fysA=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/lib/edge-functions/consts.cjs

@@ -1,21 +1,11 @@
-const DEFAULT_SRC_DIR = 'netlify/edge-functions'
 const DIST_IMPORT_MAP_PATH = 'edge-functions-import-map.json'
 const INTERNAL_EDGE_FUNCTIONS_FOLDER = 'edge-functions'
 const EDGE_FUNCTIONS_FOLDER = 'edge-functions-dist'
 const PUBLIC_URL_PATH = '.netlify/internal/edge-functions'
 
-// 1 second
-const SERVER_POLL_INTERNAL = 1e3
-
-// 10 seconds
-const SERVER_POLL_TIMEOUT = 1e4
-
 module.exports = {
-  DEFAULT_SRC_DIR,
   DIST_IMPORT_MAP_PATH,
   INTERNAL_EDGE_FUNCTIONS_FOLDER,
   EDGE_FUNCTIONS_FOLDER,
   PUBLIC_URL_PATH,
-  SERVER_POLL_INTERNAL,
-  SERVER_POLL_TIMEOUT,
 }

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

@@ -1,6 +1,6 @@
 // @ts-check
 const { promises: fs } = require('fs')
-const path = require('path')
+const { dirname, join, resolve } = require('path')
 const { cwd } = require('process')
 const { pathToFileURL } = require('url')
 
@@ -30,16 +30,16 @@ const getImportMap = async (importMapPath) => {
 }
 
 const getInternalFunctions = async () => {
-  const internalPath = path.join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
+  const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
-    const stats = await fs.stat(internalPath)
+    const stats = await fs.stat(path)
 
     if (!stats.isDirectory()) {
       throw new Error('Path is not a directory')
     }
 
-    const manifestPath = path.join(internalPath, 'manifest.json')
+    const manifestPath = join(path, 'manifest.json')
     // eslint-disable-next-line import/no-dynamic-require, n/global-require
     const manifest = require(manifestPath)
 
@@ -49,11 +49,11 @@ const getInternalFunctions = async () => {
 
     const data = {
       functions: manifest.functions,
-      path: internalPath,
+      path,
     }
 
     if (manifest.import_map) {
-      const importMapPath = path.resolve(path.dirname(manifestPath), manifest.import_map)
+      const importMapPath = resolve(dirname(manifestPath), manifest.import_map)
       const importMap = await getImportMap(importMapPath)
 
       if (importMap !== null) {
@@ -71,7 +71,7 @@ const getInternalFunctions = async () => {
   } catch {
     return {
       functions: [],
-      path: null,
+      path,
     }
   }
 }

package/src/lib/edge-functions/registry.cjs

@@ -11,12 +11,21 @@ const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } = requi
  */
 
 /**
- * @typedef EdgeFunctionDeclaration
+ * @typedef EdgeFunctionDeclarationWithPath
  * @type {object}
  * @property {string} function
  * @property {string} path
  */
 
+/**
+ * @typedef EdgeFunctionDeclarationWithPattern
+ * @type {object}
+ * @property {string} function
+ * @property {RegExp} pattern
+ */
+
+/** @typedef {(EdgeFunctionDeclarationWithPath | EdgeFunctionDeclarationWithPattern) } EdgeFunctionDeclaration */
+
 class EdgeFunctionsRegistry {
   /**
    * @param {Object} opts
@@ -341,7 +350,9 @@ class EdgeFunctionsRegistry {
       }
     })
 
-    return declarations
+    const filteredDeclarations = declarations.filter((declaration) => 'path' in declaration || 'pattern' in declaration)
+
+    return filteredDeclarations
   }
 
   processGraph(graph) {

package/src/lib/functions/server.mjs

@@ -41,6 +41,14 @@ const buildClientContext = function (headers) {
   }
 }
 
+const hasBody = (req) =>
+  // copied from is-type package
+  // eslint-disable-next-line unicorn/prefer-number-properties
+  (req.header('transfer-encoding') !== undefined || !isNaN(req.header('content-length'))) &&
+  // we expect a string or a buffer, because we use the two bodyParsers(text, raw) from express
+  // eslint-disable-next-line n/prefer-global/buffer
+  (typeof req.body === 'string' || Buffer.isBuffer(req.body))
+
 export const createHandler = function (options) {
   const { config, functionsRegistry } = options
 
@@ -62,18 +70,21 @@ export const createHandler = function (options) {
       return
     }
 
-    const isBase64Encoded = shouldBase64Encode(request.headers['content-type'])
-    const body = request.get('content-length') ? request.body.toString(isBase64Encoded ? 'base64' : 'utf8') : undefined
+    const isBase64Encoded = shouldBase64Encode(request.header('content-type'))
+    let body
+    if (hasBody(request)) {
+      body = request.body.toString(isBase64Encoded ? 'base64' : 'utf8')
+    }
 
-    let remoteAddress = request.get('x-forwarded-for') || request.connection.remoteAddress || ''
+    let remoteAddress = request.header('x-forwarded-for') || request.connection.remoteAddress || ''
     remoteAddress = remoteAddress
       .split(remoteAddress.includes('.') ? ':' : ',')
       .pop()
       .trim()
 
     let requestPath = request.path
-    if (request.get('x-netlify-original-pathname')) {
-      requestPath = request.get('x-netlify-original-pathname')
+    if (request.header('x-netlify-original-pathname')) {
+      requestPath = request.header('x-netlify-original-pathname')
       delete request.headers['x-netlify-original-pathname']
     }
     const queryParams = Object.entries(request.query).reduce(

package/src/utils/command-helpers.cjs

@@ -53,7 +53,6 @@ const USER_AGENT = `${name}/${version} ${platform}-${arch} node-${process.versio
 /** A list of base command flags that needs to be sorted down on documentation and on help pages */
 const BASE_FLAGS = new Set(['--debug', '--httpProxy', '--httpProxyCertificateFilename'])
 
-// eslint-disable-next-line no-magic-numbers
 const NETLIFY_CYAN = chalk.rgb(40, 180, 170)
 
 const NETLIFYDEV = `${chalk.greenBright('◈')} ${NETLIFY_CYAN('Netlify Dev')} ${chalk.greenBright('◈')}`