From fc354480d425f7df59eaac4960e2115f9d799784 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Sep 2024 11:35:01 -0500 Subject: [PATCH 1/7] Update package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2d9cc2614..22c925aa0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "cookie-signature": "1.1.0", "csurf": "1.10.0", "ejs": "3.1.10", - "express": "4.19.2", + "express": "4.21.0", "express-session": "1.17.0", "flaverr": "^1.10.0", "glob": "7.1.2", @@ -52,18 +52,18 @@ "minimist": "1.2.6", "parley": "^3.3.4", "parseurl": "1.3.2", - "path-to-regexp": "1.5.3", + "path-to-regexp": "1.9.0", "pluralize": "1.2.1", "prompt": "1.2.1", "rc": "1.2.8", - "router": "1.3.2", + "router": "2.0.0", "rttc": "^10.0.0-0", "sails-generate": "^2.0.11", "sails-stringfile": "^0.3.3", "semver": "7.5.2", "serve-favicon": "2.4.5", - "serve-static": "1.13.1", - "skipper": "^0.9.4", + "serve-static": "2.1.0", + "skipper": "^0.9.5", "sort-route-addresses": "^0.0.4", "uid-safe": "2.1.5", "vary": "1.1.2", From 52b5c1c29f56e75b88fba65b3a9d2398dc7da1ca Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Sep 2024 10:53:41 -0500 Subject: [PATCH 2/7] revert router change, change serve-static version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 22c925aa0..665e42313 100644 --- a/package.json +++ b/package.json @@ -56,13 +56,13 @@ "pluralize": "1.2.1", "prompt": "1.2.1", "rc": "1.2.8", - "router": "2.0.0", + "router": "1.3.4", "rttc": "^10.0.0-0", "sails-generate": "^2.0.11", "sails-stringfile": "^0.3.3", "semver": "7.5.2", "serve-favicon": "2.4.5", - "serve-static": "2.1.0", + "serve-static": "1.16.2", "skipper": "^0.9.5", "sort-route-addresses": "^0.0.4", "uid-safe": "2.1.5", From e9ec80346d6bab72a0a264c3171303ea478536a4 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 16 Sep 2024 12:36:44 -0500 Subject: [PATCH 3/7] update content-type test to use the correct content-type for font files --- test/integration/middleware.static.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/middleware.static.test.js b/test/integration/middleware.static.test.js index bd3e25daf..6a9157789 100644 --- a/test/integration/middleware.static.test.js +++ b/test/integration/middleware.static.test.js @@ -91,7 +91,7 @@ describe('middleware :: ', function() { }, function(err, response, body) { assert.equal(test_file.toString('utf-8'), body); - assert.equal(response.headers['content-type'], 'application/font-woff'); + assert.equal(response.headers['content-type'], 'font/woff'); return done(); } ); From de3168a9783bb22a854cb4e1a7051d7d6bab5719 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 16 Sep 2024 12:37:16 -0500 Subject: [PATCH 4/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 665e42313..3499ccf97 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ }, "dependencies": { "@sailshq/lodash": "^3.10.6", + "@sailshq/router": "^1.3.9", "async": "2.6.4", "captains-log": "^2.0.5", "chalk": "2.3.0", @@ -56,7 +57,6 @@ "pluralize": "1.2.1", "prompt": "1.2.1", "rc": "1.2.8", - "router": "1.3.4", "rttc": "^10.0.0-0", "sails-generate": "^2.0.11", "sails-stringfile": "^0.3.3", From 700f3fc77ca86ba4591ac0d892f79b0ce395fba3 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 16 Sep 2024 12:38:24 -0500 Subject: [PATCH 5/7] Use sailshq fork of router --- lib/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/router/index.js b/lib/router/index.js index 75c9e9cc7..643321dd8 100644 --- a/lib/router/index.js +++ b/lib/router/index.js @@ -5,7 +5,7 @@ var Readable = require('stream').Readable; var QS = require('querystring'); var _ = require('@sailshq/lodash'); -var router = require('router'); +var router = require('@sailshq/router'); var flaverr = require('flaverr'); var sortRouteAddresses = require('sort-route-addresses'); var buildReq = require('./req'); From 2aed57249ddf1bcfb71439fc98319d3331842f08 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 16 Sep 2024 13:17:40 -0500 Subject: [PATCH 6/7] minor commit to retry CI build --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 229836f7c..68324de7b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Since version 1.0, Sails supports `await` out of the box. This replaces nested var orgs = await Organization.find(); ``` - ## Installation   **With [node](http://nodejs.org) [installed](http://nodejs.org/en/download):** ```sh From 8bdbfe746bf24e63ecef6b9a6014fa13708ef49e Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 16 Sep 2024 13:18:17 -0500 Subject: [PATCH 7/7] revert whitespace change --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 68324de7b..229836f7c 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Since version 1.0, Sails supports `await` out of the box. This replaces nested var orgs = await Organization.find(); ``` + ## Installation   **With [node](http://nodejs.org) [installed](http://nodejs.org/en/download):** ```sh