From 0c11fad159898cdc69fd9ab63269b72468ecaf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Tue, 10 Sep 2024 02:58:54 +0200 Subject: [PATCH 1/6] Merge commit from fork Co-authored-by: Chris de Almeida --- index.js | 3 +-- test/test.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index b7d3984..3f3e64e 100644 --- a/index.js +++ b/index.js @@ -195,8 +195,7 @@ function createRedirectDirectoryListener () { // reformat the URL var loc = encodeUrl(url.format(originalUrl)) - var doc = createHtmlDocument('Redirecting', 'Redirecting to ' + - escapeHtml(loc) + '') + var doc = createHtmlDocument('Redirecting', 'Redirecting to ' + escapeHtml(loc)) // send redirect response res.statusCode = 301 diff --git a/test/test.js b/test/test.js index e1e3fd1..7bce038 100644 --- a/test/test.js +++ b/test/test.js @@ -483,7 +483,7 @@ describe('serveStatic()', function () { request(server) .get('/users') .expect('Location', '/users/') - .expect(301, //, done) + .expect(301, /\/users\//, done) }) it('should redirect directories with query string', function (done) { @@ -505,7 +505,7 @@ describe('serveStatic()', function () { .get('/snow') .expect('Location', '/snow%20%E2%98%83/') .expect('Content-Type', /html/) - .expect(301, />Redirecting to \/snow%20%E2%98%83\/<\/a>Redirecting to \/snow%20%E2%98%83\/ Date: Tue, 10 Sep 2024 03:04:32 +0200 Subject: [PATCH 2/6] 1.16.0 --- HISTORY.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 6b58456..fde1d72 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,9 @@ +1.16.0 / 2024-09-10 +=================== + +* Remove link renderization in html while redirecting + + 1.15.0 / 2022-03-24 =================== diff --git a/package.json b/package.json index 9d935f5..47d9789 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "serve-static", "description": "Serve static files", - "version": "1.15.0", + "version": "1.16.0", "author": "Douglas Christopher Wilson ", "license": "MIT", "repository": "expressjs/serve-static", From 4263f496876980c165a3104d087c1ebaa046ad3d Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 11 Sep 2024 12:06:34 -0500 Subject: [PATCH 3/6] fix(deps): send@0.19.0 --- HISTORY.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index fde1d72..e8a58d4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ +unreleased +=================== + +* deps: send@0.19.0 + 1.16.0 / 2024-09-10 =================== diff --git a/package.json b/package.json index 47d9789..98648a7 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "devDependencies": { "eslint": "7.32.0", From 77a8255688cc4affc70e6dc9aa02e3ced4957e77 Mon Sep 17 00:00:00 2001 From: Wes Todd Date: Wed, 11 Sep 2024 12:13:59 -0500 Subject: [PATCH 4/6] 1.16.1 --- HISTORY.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index e8a58d4..96c95f7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,4 @@ -unreleased +1.16.1 / 2024-09-11 =================== * deps: send@0.19.0 diff --git a/package.json b/package.json index 98648a7..2d72f0a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "serve-static", "description": "Serve static files", - "version": "1.16.0", + "version": "1.16.1", "author": "Douglas Christopher Wilson ", "license": "MIT", "repository": "expressjs/serve-static", From f454d37c68fdad04b582cb9ac0cd165ab6d19114 Mon Sep 17 00:00:00 2001 From: Wes Todd Date: Wed, 11 Sep 2024 12:38:26 -0500 Subject: [PATCH 5/6] fix(deps): encodeurl@~2.0.0 --- HISTORY.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 96c95f7..23436df 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ +unreleased +================== + +* deps: encodeurl@~2.0.0 + 1.16.1 / 2024-09-11 =================== diff --git a/package.json b/package.json index 2d72f0a..638af11 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "MIT", "repository": "expressjs/serve-static", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "0.19.0" From ec9c5ecfb09368519e4698ffbbe1882de00d0ef2 Mon Sep 17 00:00:00 2001 From: Wes Todd Date: Wed, 11 Sep 2024 13:24:09 -0500 Subject: [PATCH 6/6] 1.16.2 --- HISTORY.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 23436df..dccf667 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,5 @@ -unreleased -================== +1.16.2 / 2024-09-11 +=================== * deps: encodeurl@~2.0.0 diff --git a/package.json b/package.json index 638af11..49d7542 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "serve-static", "description": "Serve static files", - "version": "1.16.1", + "version": "1.16.2", "author": "Douglas Christopher Wilson ", "license": "MIT", "repository": "expressjs/serve-static",