netlify-cli 12.11.0 → 12.12.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.11.0",
+  "version": "12.12.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -71,17 +71,17 @@
     "certs": "openssl req -x509 -out localhost.crt -keyout localhost.key -newkey rsa:2048 -nodes -sha256 -subj \"/CN=localhost\" -extensions EXT -config certconf"
   },
   "config": {
-    "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,html}\" \"*.{mjs,cjs,js,md,html}\" \".*.{mjs,cjs,js,md,html}\"",
-    "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\""
+    "eslint": "--cache --format=codeframe --max-warnings=0 \"{src,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,html}\" \"*.{mjs,cjs,js,md,html}\" \".*.{mjs,cjs,js,md,html}\"",
+    "prettier": "--ignore-path .eslintignore --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": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.5.5",
+    "@netlify/build": "^29.5.7",
     "@netlify/config": "^20.3.3",
-    "@netlify/edge-bundler": "^8.4.0",
+    "@netlify/edge-bundler": "^8.6.0",
     "@netlify/framework-info": "^9.8.1",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.5.0",
+    "@netlify/zip-it-and-ship-it": "^8.6.0",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
@@ -94,7 +94,8 @@
     "chokidar": "^3.0.2",
     "ci-info": "^3.0.0",
     "clean-deep": "^3.0.2",
-    "commander": "^9.2.0",
+    "commander": "^10.0.0",
+    "comment-json": "^4.2.3",
     "concordance": "^5.0.0",
     "configstore": "^5.0.0",
     "content-type": "^1.0.4",
@@ -186,6 +187,7 @@
     "@vitest/coverage-c8": "^0.28.0",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
+    "cpy": "^9.0.1",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",
     "form-data": "^4.0.0",

package/src/functions-templates/javascript/token-hider/package-lock.json

@@ -19,9 +19,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
-      "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.3.tgz",
+      "integrity": "sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -198,9 +198,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
-      "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.3.tgz",
+      "integrity": "sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",

package/src/functions-templates/rust/hello-world/Cargo.toml

@@ -11,4 +11,4 @@ http = "0.2.8"
 lambda_runtime = "0.7.3"
 log = "0.4.17"
 simple_logger = "1.16.0"
-tokio = "1.24.2"
+tokio = "1.25.0"

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

@@ -3,6 +3,16 @@ import { fileURLToPath } from 'url'
 
 import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } from '../../utils/command-helpers.mjs'
 
+// TODO: Import from `@netlify/edge-bundler` once it exports this type.
+/**
+ * @typedef InSourceDeclaration
+ * @type {object}
+ * @property {string} [cache]
+ * @property {string} function
+ * @property {string | string[]} [path]
+ * @property {string | string[]} [excludedPath]
+ */
+
 /**
  * @typedef EdgeFunction
  * @type {object}
@@ -21,10 +31,11 @@ import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } from '
  * @typedef EdgeFunctionDeclarationWithPattern
  * @type {object}
  * @property {string} function
- * @property {RegExp} pattern
+ * @property {string} pattern
  */
 
-/** @typedef {(EdgeFunctionDeclarationWithPath | EdgeFunctionDeclarationWithPattern) } EdgeFunctionDeclaration */
+/** @typedef {(EdgeFunctionDeclarationWithPath | EdgeFunctionDeclarationWithPattern)} EdgeFunctionDeclaration */
+/** @typedef {Awaited<ReturnType<typeof import('@netlify/edge-bundler').serve>>} RunIsolate */
 
 export class EdgeFunctionsRegistry {
   /**
@@ -37,7 +48,7 @@ export class EdgeFunctionsRegistry {
    * @param {() => Promise<object>} opts.getUpdatedConfig
    * @param {EdgeFunction[]} opts.internalFunctions
    * @param {string} opts.projectDir
-   * @param {(functions: EdgeFunction[], env?: NodeJS.ProcessEnv) => Promise<object>} opts.runIsolate
+   * @param {RunIsolate} opts.runIsolate
    */
   constructor({
     bundler,
@@ -50,9 +61,6 @@ export class EdgeFunctionsRegistry {
     projectDir,
     runIsolate,
   }) {
-    /**
-     * @type {import('@netlify/edge-bundler')}
-     */
     this.bundler = bundler
 
     /**
@@ -76,7 +84,7 @@ export class EdgeFunctionsRegistry {
     this.internalFunctions = internalFunctions
 
     /**
-     * @type {(functions: EdgeFunction[], env?: NodeJS.ProcessEnv) => Promise<object>}
+     * @type {RunIsolate}
      */
     this.runIsolate = runIsolate
 
@@ -91,7 +99,7 @@ export class EdgeFunctionsRegistry {
     this.declarationsFromConfig = this.getDeclarationsFromConfig(config)
 
     /**
-     * @type {EdgeFunctionDeclaration[]}
+     * @type {InSourceDeclaration[]}
      */
     this.declarationsFromSource = []
 
@@ -287,7 +295,7 @@ export class EdgeFunctionsRegistry {
    */
   async matchURLPath(urlPath) {
     const declarations = this.mergeDeclarations()
-    const manifest = await this.bundler.generateManifest({
+    const manifest = this.bundler.generateManifest({
       declarations,
       functions: this.functions,
     })
@@ -309,14 +317,14 @@ export class EdgeFunctionsRegistry {
     return { functionNames, orphanedDeclarations }
   }
 
-  async matchURLPathAgainstOrphanedDeclarations(urlPath) {
+  matchURLPathAgainstOrphanedDeclarations(urlPath) {
     // `generateManifest` will only include functions for which there is both a
     // function file and a config declaration, but we want to catch cases where
     // a config declaration exists without a matching function file. To do that
     // we compute a list of functions from the declarations (the `path` doesn't
     // really matter).
     const functions = this.declarationsFromConfig.map((declaration) => ({ name: declaration.function, path: '' }))
-    const manifest = await this.bundler.generateManifest({
+    const manifest = this.bundler.generateManifest({
       declarations: this.declarationsFromConfig,
       functions,
     })
@@ -346,12 +354,33 @@ export class EdgeFunctionsRegistry {
     const declarations = [...this.declarationsFromConfig]
 
     this.declarationsFromSource.forEach((declarationFromSource) => {
-      const index = declarations.findIndex(({ function: func }) => func === declarationFromSource.function)
-
-      if (index === -1) {
-        declarations.push(declarationFromSource)
+      const { path: pathOrPaths, ...configProps } = declarationFromSource
+
+      // Find any declarations in the config for the function.
+      const indexes = declarations
+        .filter(({ function: func }) => func === declarationFromSource.function)
+        .map((_, index) => index)
+
+      // If the in-source declaration doesn't have a path, add its properties
+      // to any existing declarations for the function.
+      if (pathOrPaths === undefined) {
+        indexes.forEach((index) => {
+          declarations[index] = { ...declarations[index], ...configProps }
+        })
       } else {
-        declarations[index] = { ...declarations[index], ...declarationFromSource }
+        // The in-source declaration has a path, and those take precedence.
+        // Discard any config declarations first.
+        indexes.forEach((index) => {
+          declarations.splice(index, 1)
+        })
+
+        // The path may be an array or a string, so let's normalize that first.
+        const paths = Array.isArray(pathOrPaths) ? pathOrPaths : [pathOrPaths]
+
+        // Create a new declaration for each path.
+        paths.forEach((path) => {
+          declarations.push({ ...configProps, path })
+        })
       }
     })
 

package/src/recipes/vscode/settings.mjs

@@ -1,17 +1,18 @@
 import { mkdir, readFile, stat, writeFile } from 'fs/promises'
 import { dirname, relative } from 'path'
 
+// eslint-disable-next-line import/no-namespace
+import * as JSONC from 'comment-json'
 import unixify from 'unixify'
 
 export const applySettings = (existingSettings, { denoBinary, edgeFunctionsPath, repositoryRoot }) => {
   const relativeEdgeFunctionsPath = unixify(relative(repositoryRoot, edgeFunctionsPath))
-  const settings = {
-    ...existingSettings,
+  const settings = JSONC.assign(existingSettings, {
     'deno.enable': true,
     'deno.enablePaths': existingSettings['deno.enablePaths'] || [],
     'deno.unstable': true,
     'deno.importMap': '.netlify/edge-functions-import-map.json',
-  }
+  })
 
   // If the Edge Functions path isn't already in `deno.enabledPaths`, let's add
   // it.
@@ -38,11 +39,11 @@ export const getSettings = async (settingsPath) => {
       throw new Error(`${settingsPath} is not a valid file.`)
     }
 
-    const file = await readFile(settingsPath)
+    const file = await readFile(settingsPath, 'utf8')
 
     return {
       fileExists: true,
-      settings: JSON.parse(file),
+      settings: JSONC.parse(file),
     }
   } catch (error) {
     if (error.code !== 'ENOENT') {
@@ -57,7 +58,7 @@ export const getSettings = async (settingsPath) => {
 }
 
 export const writeSettings = async ({ settings, settingsPath }) => {
-  const serializedSettings = JSON.stringify(settings, null, 2)
+  const serializedSettings = JSONC.stringify(settings, null, 2)
 
   await mkdir(dirname(settingsPath), { recursive: true })
   await writeFile(settingsPath, serializedSettings)