Updates to reflect /router (0.8.2)

Consolidate Router imports
lambda-lambda-lambda · Apr 26, 2024 · d9bad84 · d9bad84
1 parent f4de7a3
commit d9bad84
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {