From d9bad8485dc2147e2484f390085217c9f3831daf Mon Sep 17 00:00:00 2001 From: "Marc S. Brooks" Date: Fri, 26 Apr 2024 16:02:07 -0700 Subject: [PATCH] Updates to reflect /router (0.8.2) Consolidate Router imports --- package-lock.json | 62 +++++++++++--------- package.json | 2 +- plugins/AccessControlHeaders/test/unit.js | 11 ++-- plugins/AppConfigPlugin/test/unit.js | 11 ++-- plugins/BasicAuthHandler/test/unit.js | 11 ++-- plugins/CloudFrontCacheHeader/test/unit.js | 11 ++-- plugins/ContentNegotiationJson/test/unit.js | 11 ++-- plugins/ContentTypeJsonHeader/test/unit.js | 11 ++-- plugins/CookieParserPlugin/test/unit.js | 11 ++-- plugins/GoogleRecaptchaHandler/test/unit.js | 15 +++-- plugins/PreflightOptionsHandler/test/unit.js | 11 ++-- 11 files changed, 101 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae502f4..7801605 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,34 +6,23 @@ "": { "name": "middleware", "license": "MIT", - "dependencies": { - "chai-as-promised": "^7.1.1" - }, "devDependencies": { "@lambda-lambda-lambda/router": "latest", "@types/aws-lambda": "^8.10.111", "chai": "^4.3.7", + "chai-as-promised": "^7.1.1", "clone": "^2.1.2", "cookie": "^0.5.0", "eslint": "^7.32.0", "mocha": "^9.2.2", "nyc": "^15.1.0", "resnap": "^1.0.1", - "sinon": "^15.0.2" + "sinon": "^16.1.1" }, "engines": { "node": ">=18.0.0" } }, - "node_modules/@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -650,9 +639,9 @@ } }, "node_modules/@lambda-lambda-lambda/router": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@lambda-lambda-lambda/router/-/router-0.8.1.tgz", - "integrity": "sha512-j6x3J0C93CeuwJyqOyYnLnJv1vLZcFGYhQSuzVPUoQdfLDUR0/5bmt7Y7VtoYKenyEm4B6PFhSJRd3yqRbyPkg==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@lambda-lambda-lambda/router/-/router-0.8.2.tgz", + "integrity": "sha512-DthICxeMhxUKm2W9HeYvUK1VShTzkobbMmqbjanbFp9L3zqRIxz/OukGnq+TDhfhVmz6zSLzc94sMEOKqWWgVg==", "dev": true, "engines": { "node": ">=18.0.0" @@ -841,6 +830,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, "engines": { "node": "*" } @@ -989,6 +979,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "dev": true, "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -1006,6 +997,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, "dependencies": { "check-error": "^1.0.2" }, @@ -1033,6 +1025,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, "dependencies": { "get-func-name": "^2.0.2" }, @@ -1185,6 +1178,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "dev": true, "dependencies": { "type-detect": "^4.0.0" }, @@ -1235,9 +1229,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.748", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz", - "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==", + "version": "1.4.750", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz", + "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA==", "dev": true }, "node_modules/emoji-regex": { @@ -1670,6 +1664,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, "engines": { "node": "*" } @@ -2224,6 +2219,7 @@ "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, "dependencies": { "get-func-name": "^2.0.1" } @@ -2650,17 +2646,17 @@ } }, "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" }, "engines": { "node": ">= 0.8.0" @@ -2781,6 +2777,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, "engines": { "node": "*" } @@ -3101,11 +3098,12 @@ "dev": true }, "node_modules/sinon": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.2.0.tgz", - "integrity": "sha512-nPS85arNqwBXaIsFCkolHjGIkFo+Oxu9vbgmBJizLAhqe6P2o3Qmj3KCUoRkfhHtvgDhZdWD3risLHAUJ8npjw==", + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-16.1.1.tgz", + "integrity": "sha512-tu0DS1g4Rm2xHT9mWK5g5aTogTXWwGGz3fQK/L5fnECPkcAQ3YcbAbJ4XxOkpDDnV4EV5n+lee5neq5QyVxoSg==", "deprecated": "16.1.1", "dev": true, + "hasInstallScript": true, "dependencies": { "@sinonjs/commons": "^3.0.0", "@sinonjs/fake-timers": "^10.3.0", @@ -3331,6 +3329,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, "engines": { "node": ">=4" } @@ -3431,6 +3430,15 @@ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", "dev": true }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/workerpool": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", diff --git a/package.json b/package.json index 953c762..b5762ae 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "mocha": "^9.2.2", "nyc": "^15.1.0", "resnap": "^1.0.1", - "sinon": "^15.0.2" + "sinon": "^16.1.1" }, "engines": { "node": ">=18.0.0" diff --git a/plugins/AccessControlHeaders/test/unit.js b/plugins/AccessControlHeaders/test/unit.js index bbec34e..f5fad9a 100644 --- a/plugins/AccessControlHeaders/test/unit.js +++ b/plugins/AccessControlHeaders/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('AccessControlHeaders', function() { diff --git a/plugins/AppConfigPlugin/test/unit.js b/plugins/AppConfigPlugin/test/unit.js index 13bc3ff..68375fb 100644 --- a/plugins/AppConfigPlugin/test/unit.js +++ b/plugins/AppConfigPlugin/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('AppConfigPlugin', function() { diff --git a/plugins/BasicAuthHandler/test/unit.js b/plugins/BasicAuthHandler/test/unit.js index c1f7107..6a6c864 100644 --- a/plugins/BasicAuthHandler/test/unit.js +++ b/plugins/BasicAuthHandler/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('BasicAuthHandler', function() { diff --git a/plugins/CloudFrontCacheHeader/test/unit.js b/plugins/CloudFrontCacheHeader/test/unit.js index 6fd5638..dda037b 100644 --- a/plugins/CloudFrontCacheHeader/test/unit.js +++ b/plugins/CloudFrontCacheHeader/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('CloudFrontCacheHeader', function() { diff --git a/plugins/ContentNegotiationJson/test/unit.js b/plugins/ContentNegotiationJson/test/unit.js index 6353ed0..8df87d9 100644 --- a/plugins/ContentNegotiationJson/test/unit.js +++ b/plugins/ContentNegotiationJson/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('ContentNegotiationJson', function() { diff --git a/plugins/ContentTypeJsonHeader/test/unit.js b/plugins/ContentTypeJsonHeader/test/unit.js index 9607a6f..2809108 100644 --- a/plugins/ContentTypeJsonHeader/test/unit.js +++ b/plugins/ContentTypeJsonHeader/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('ContentTypeJsonHeader', function() { diff --git a/plugins/CookieParserPlugin/test/unit.js b/plugins/CookieParserPlugin/test/unit.js index 8a7cbf1..224acdd 100644 --- a/plugins/CookieParserPlugin/test/unit.js +++ b/plugins/CookieParserPlugin/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('CookieParserPlugin', function() { diff --git a/plugins/GoogleRecaptchaHandler/test/unit.js b/plugins/GoogleRecaptchaHandler/test/unit.js index 3c2a26e..cc21fa4 100644 --- a/plugins/GoogleRecaptchaHandler/test/unit.js +++ b/plugins/GoogleRecaptchaHandler/test/unit.js @@ -11,12 +11,15 @@ chai.use(chaiAsPromised); const expect = chai.expect; // Load modules. -const {RouterError} = require('@lambda-lambda-lambda/router/src/router/Error'); -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); -const middleware = require(PLUGIN_ROOT); +const { + RouterError, + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + +const middleware = require(PLUGIN_ROOT); afterEach(() => { sinon.restore(); diff --git a/plugins/PreflightOptionsHandler/test/unit.js b/plugins/PreflightOptionsHandler/test/unit.js index a7d486f..930836c 100644 --- a/plugins/PreflightOptionsHandler/test/unit.js +++ b/plugins/PreflightOptionsHandler/test/unit.js @@ -6,10 +6,13 @@ const chai = require('chai'); const expect = chai.expect; // Load modules. -const Request = require('@lambda-lambda-lambda/router/src/router/Request.js'); -const Response = require('@lambda-lambda-lambda/router/src/router/Response.js'); -const Stack = require('@lambda-lambda-lambda/router/src/router/Stack.js'); -const Utils = require('@lambda-lambda-lambda/router/src/router/Utils.js'); +const { + Request, + Response, + Stack, + Utils +} = require('@lambda-lambda-lambda/router/exports'); + const middleware = require(PLUGIN_ROOT); describe('PreflightOptionsHandler', function() {