netlify-cli 12.14.0 → 13.0.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "12.14.0",
+  "version": "13.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "12.14.0",
+      "version": "13.0.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -109,6 +109,7 @@
         "through2-map": "^3.0.0",
         "to-readable-stream": "^2.1.0",
         "toml": "^3.0.0",
+        "ulid": "^2.3.0",
         "unixify": "^1.0.0",
         "update-notifier": "^6.0.0",
         "uuid": "^9.0.0",
@@ -22636,6 +22637,14 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/ulid": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz",
+      "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==",
+      "bin": {
+        "ulid": "bin/cli.js"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -40848,6 +40857,11 @@
         "random-bytes": "~1.0.0"
       }
     },
+    "ulid": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz",
+      "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw=="
+    },
     "unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.14.0",
+  "version": "13.0.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -174,6 +174,7 @@
     "through2-map": "^3.0.0",
     "to-readable-stream": "^2.1.0",
     "toml": "^3.0.0",
+    "ulid": "^2.3.0",
     "unixify": "^1.0.0",
     "update-notifier": "^6.0.0",
     "uuid": "^9.0.0",

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

@@ -3,7 +3,6 @@ const headers = {
   Functions: 'x-nf-edge-functions',
   Geo: 'x-nf-geo',
   Passthrough: 'x-nf-passthrough',
-  RequestID: 'X-NF-Request-ID',
   IP: 'x-nf-client-connection-ip',
   Site: 'X-NF-Site-Info',
   DebugLogging: 'x-nf-debug-logging',

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

@@ -4,7 +4,6 @@ import { relative } from 'path'
 import { cwd, env } from 'process'
 
 import getAvailablePort from 'get-port'
-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'
@@ -133,7 +132,6 @@ export const initializeProxy = async ({
       [headers.Functions]: functionNames.join(','),
       [headers.ForwardedHost]: `localhost:${passthroughPort}`,
       [headers.Passthrough]: 'passthrough',
-      [headers.RequestID]: generateUUID(),
       [headers.IP]: LOCAL_HOST,
     }
 

package/src/utils/headers.mjs

@@ -45,3 +45,5 @@ const handleHeadersErrors = function (errors) {
 const getErrorMessage = function ({ message }) {
   return message
 }
+
+export const NFRequestID = 'x-nf-request-id'

package/src/utils/proxy.mjs

@@ -31,7 +31,8 @@ import renderErrorTemplate from '../lib/render-error-template.mjs'
 
 import { NETLIFYDEVLOG, NETLIFYDEVWARN, log, chalk } from './command-helpers.mjs'
 import createStreamPromise from './create-stream-promise.mjs'
-import { headersForPath, parseHeaders } from './headers.mjs'
+import { headersForPath, parseHeaders, NFRequestID } from './headers.mjs'
+import { generateRequestID } from './request-id.mjs'
 import { createRewriter, onChanges } from './rules-proxy.mjs'
 import { signRedirect } from './sign-redirect.mjs'
 
@@ -369,6 +370,11 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
     res.end(message)
   })
   proxy.on('proxyReq', (proxyReq, req) => {
+    const requestID = generateRequestID()
+
+    proxyReq.setHeader(NFRequestID, requestID)
+    req.headers[NFRequestID] = requestID
+
     if (isEdgeFunctionsRequest(req)) {
       handleProxyRequest(req, proxyReq)
     }
@@ -383,6 +389,14 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
     }
   })
   proxy.on('proxyRes', (proxyRes, req, res) => {
+    res.setHeader('server', 'Netlify')
+
+    const requestID = req.headers[NFRequestID]
+
+    if (requestID) {
+      res.setHeader(NFRequestID, requestID)
+    }
+
     if (proxyRes.statusCode === 404 || proxyRes.statusCode === 403) {
       if (req.alternativePaths && req.alternativePaths.length !== 0) {
         req.url = req.alternativePaths.shift()

package/src/utils/request-id.mjs

@@ -0,0 +1,4 @@
+// @ts-check
+import { ulid } from 'ulid'
+
+export const generateRequestID = () => ulid()

package/src/utils/static-server.mjs

@@ -21,7 +21,8 @@ export const startStaticServer = async ({ settings }) => {
   })
 
   server.addHook('onRequest', (req, reply, done) => {
-    reply.header('X-Powered-by', 'netlify-dev')
+    reply.header('age', '0')
+    reply.header('cache-control', 'public, max-age=0, must-revalidate')
     const validMethods = ['GET', 'HEAD']
     if (!validMethods.includes(req.method)) {
       reply.code(405).send('Method Not Allowed')