netlify-cli 12.2.9 → 12.2.10

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "12.2.9",
+  "version": "12.2.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "12.2.9",
+      "version": "12.2.10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -5956,13 +5956,13 @@
       "dev": true
     },
     "node_modules/@vitest/coverage-c8": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.25.3.tgz",
-      "integrity": "sha512-+tmrB3E7pZTSM+aWKzLk0FpyyaQOoRQf0594hHp+E3Kk0tiFONiEFYf7+9a1Z+C2ffU/0w6KvyBjpNPdashMrg==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.25.6.tgz",
+      "integrity": "sha512-+Bcs1XZ8CuEe52QSOgzqmqiV82CXZRRj3yclPQqtLkUV4S6+kdOdfRTtMHOilwhZH70giDjBQx3jgiZoYgFVMA==",
       "dev": true,
       "dependencies": {
         "c8": "^7.12.0",
-        "vitest": "0.25.3"
+        "vitest": "0.25.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
@@ -5986,9 +5986,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -22053,12 +22053,12 @@
       }
     },
     "node_modules/strip-literal": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-0.4.2.tgz",
-      "integrity": "sha512-pv48ybn4iE1O9RLgCAN0iU4Xv7RlBTiit6DKmMiErbs9x1wH6vXBs45tWc0H5wUIF6TLTrKweqkmYF/iraQKNw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.0.tgz",
+      "integrity": "sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0"
+        "acorn": "^8.8.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
@@ -24126,9 +24126,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.4.tgz",
-      "integrity": "sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
+      "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.15.9",
@@ -24192,9 +24192,9 @@
       }
     },
     "node_modules/vitest": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.25.3.tgz",
-      "integrity": "sha512-/UzHfXIKsELZhL7OaM2xFlRF8HRZgAHtPctacvNK8H4vOcbJJAMEgbWNGSAK7Y9b1NBe5SeM7VTuz2RsTHFJJA==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.25.6.tgz",
+      "integrity": "sha512-jdPgmZ7BcDnm1+hmMPIl9BZjSy+b8Y8V0tQMsv7ECO90Qic7EZ5/+traILXLpsXgqK5KgVrUJmchevAUuKL/1w==",
       "dev": true,
       "dependencies": {
         "@types/chai": "^4.3.3",
@@ -24206,7 +24206,7 @@
         "debug": "^4.3.4",
         "local-pkg": "^0.4.2",
         "source-map": "^0.6.1",
-        "strip-literal": "^0.4.2",
+        "strip-literal": "^1.0.0",
         "tinybench": "^2.3.1",
         "tinypool": "^0.3.0",
         "tinyspy": "^1.0.2",
@@ -28531,13 +28531,13 @@
       "dev": true
     },
     "@vitest/coverage-c8": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.25.3.tgz",
-      "integrity": "sha512-+tmrB3E7pZTSM+aWKzLk0FpyyaQOoRQf0594hHp+E3Kk0tiFONiEFYf7+9a1Z+C2ffU/0w6KvyBjpNPdashMrg==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.25.6.tgz",
+      "integrity": "sha512-+Bcs1XZ8CuEe52QSOgzqmqiV82CXZRRj3yclPQqtLkUV4S6+kdOdfRTtMHOilwhZH70giDjBQx3jgiZoYgFVMA==",
       "dev": true,
       "requires": {
         "c8": "^7.12.0",
-        "vitest": "0.25.3"
+        "vitest": "0.25.6"
       }
     },
     "abbrev": {
@@ -28555,9 +28555,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
     },
     "acorn-jsx": {
       "version": "5.3.2",
@@ -40633,12 +40633,12 @@
       "dev": true
     },
     "strip-literal": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-0.4.2.tgz",
-      "integrity": "sha512-pv48ybn4iE1O9RLgCAN0iU4Xv7RlBTiit6DKmMiErbs9x1wH6vXBs45tWc0H5wUIF6TLTrKweqkmYF/iraQKNw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.0.tgz",
+      "integrity": "sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0"
+        "acorn": "^8.8.1"
       }
     },
     "strip-outer": {
@@ -42160,9 +42160,9 @@
       }
     },
     "vite": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.4.tgz",
-      "integrity": "sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
+      "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
       "dev": true,
       "requires": {
         "esbuild": "^0.15.9",
@@ -42186,9 +42186,9 @@
       }
     },
     "vitest": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.25.3.tgz",
-      "integrity": "sha512-/UzHfXIKsELZhL7OaM2xFlRF8HRZgAHtPctacvNK8H4vOcbJJAMEgbWNGSAK7Y9b1NBe5SeM7VTuz2RsTHFJJA==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.25.6.tgz",
+      "integrity": "sha512-jdPgmZ7BcDnm1+hmMPIl9BZjSy+b8Y8V0tQMsv7ECO90Qic7EZ5/+traILXLpsXgqK5KgVrUJmchevAUuKL/1w==",
       "dev": true,
       "requires": {
         "@types/chai": "^4.3.3",
@@ -42200,7 +42200,7 @@
         "debug": "^4.3.4",
         "local-pkg": "^0.4.2",
         "source-map": "^0.6.1",
-        "strip-literal": "^0.4.2",
+        "strip-literal": "^1.0.0",
         "tinybench": "^2.3.1",
         "tinypool": "^0.3.0",
         "tinyspy": "^1.0.2",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.2.9",
+  "version": "12.2.10",
   "author": "Netlify Inc.",
   "type": "module",
   "contributors": [

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) {