From 2f14ed692d46ba36eab4e48fbdc40454c80152b3 Mon Sep 17 00:00:00 2001 From: cdemi Date: Fri, 10 Mar 2023 15:32:11 +0100 Subject: [PATCH 1/4] Only send cache header when static resource is 200 #9393 --- packages/adapter-node/src/handler.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js index b7660db2030f..a7950b499f88 100644 --- a/packages/adapter-node/src/handler.js +++ b/packages/adapter-node/src/handler.js @@ -37,7 +37,7 @@ function serve(path, client = false) { client && ((res, pathname) => { // only apply to build directory, not e.g. version.json - if (pathname.startsWith(`/${manifest.appPath}/immutable/`)) { + if (pathname.startsWith(`/${manifest.appPath}/immutable/`) && res.statusCode === 200) { res.setHeader('cache-control', 'public,max-age=31536000,immutable'); } }) @@ -93,8 +93,7 @@ const ssr = async (req, res) => { if (address_header && !(address_header in req.headers)) { throw new Error( - `Address header was specified with ${ - ENV_PREFIX + 'ADDRESS_HEADER' + `Address header was specified with ${ENV_PREFIX + 'ADDRESS_HEADER' }=${address_header} but is absent from request` ); } @@ -116,8 +115,7 @@ const ssr = async (req, res) => { if (xff_depth > addresses.length) { throw new Error( - `${ENV_PREFIX + 'XFF_DEPTH'} is ${xff_depth}, but only found ${ - addresses.length + `${ENV_PREFIX + 'XFF_DEPTH'} is ${xff_depth}, but only found ${addresses.length } addresses` ); } From 37877801e63f86e6fa90c26332b15a39e6036f64 Mon Sep 17 00:00:00 2001 From: cdemi Date: Fri, 10 Mar 2023 15:34:25 +0100 Subject: [PATCH 2/4] Added changeset --- .changeset/khaki-schools-invent.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/khaki-schools-invent.md diff --git a/.changeset/khaki-schools-invent.md b/.changeset/khaki-schools-invent.md new file mode 100644 index 000000000000..8c88bd92f627 --- /dev/null +++ b/.changeset/khaki-schools-invent.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-node': patch +--- + +Only send cache header when static resource is 200 From 31535fa014c673cfdc8be29887a039d3f94ac89d Mon Sep 17 00:00:00 2001 From: cdemi Date: Fri, 10 Mar 2023 15:55:55 +0100 Subject: [PATCH 3/4] Prettified adapter-node --- packages/adapter-node/src/handler.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js index a7950b499f88..b14a842dc96a 100644 --- a/packages/adapter-node/src/handler.js +++ b/packages/adapter-node/src/handler.js @@ -93,7 +93,8 @@ const ssr = async (req, res) => { if (address_header && !(address_header in req.headers)) { throw new Error( - `Address header was specified with ${ENV_PREFIX + 'ADDRESS_HEADER' + `Address header was specified with ${ + ENV_PREFIX + 'ADDRESS_HEADER' }=${address_header} but is absent from request` ); } @@ -115,7 +116,8 @@ const ssr = async (req, res) => { if (xff_depth > addresses.length) { throw new Error( - `${ENV_PREFIX + 'XFF_DEPTH'} is ${xff_depth}, but only found ${addresses.length + `${ENV_PREFIX + 'XFF_DEPTH'} is ${xff_depth}, but only found ${ + addresses.length } addresses` ); } From 43f37af6e43516455c4ca6d9c20714553b409efc Mon Sep 17 00:00:00 2001 From: Christopher Demicoli Date: Mon, 13 Mar 2023 19:48:09 +0100 Subject: [PATCH 4/4] Update .changeset/khaki-schools-invent.md Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- .changeset/khaki-schools-invent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/khaki-schools-invent.md b/.changeset/khaki-schools-invent.md index 8c88bd92f627..dffecfd0549f 100644 --- a/.changeset/khaki-schools-invent.md +++ b/.changeset/khaki-schools-invent.md @@ -2,4 +2,4 @@ '@sveltejs/adapter-node': patch --- -Only send cache header when static resource is 200 +fix: only send cache header when static resource is 200