feat!: serverless-express@5

.github/workflows/release-on-push-to-mainline.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x]
+        node-version: [18.x]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+node_modules/.bin/commitlint -e $GIT_PARAMS

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+node_modules/.bin/lint-staged

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm test

__tests__/unit.js

@@ -10,6 +10,7 @@ const apiGatewayEventSource = eventSources.getEventSource({ eventSourceName: 'AW
 
 test('getPathWithQueryStringParams: no params', () => {
   const event = {
+    resource: '/',
     path: '/foo/bar'
   }
   const pathWithQueryStringParams = serverlessExpressEventSourcesUtils.getPathWithQueryStringParams({ event })
@@ -18,6 +19,7 @@ test('getPathWithQueryStringParams: no params', () => {
 
 test('getPathWithQueryStringParams: 1 param', () => {
   const event = {
+    resource: '/',
     path: '/foo/bar',
     multiValueQueryStringParameters: {
       bizz: 'bazz'
@@ -29,6 +31,7 @@ test('getPathWithQueryStringParams: 1 param', () => {
 
 test('getPathWithQueryStringParams: to be url-encoded param', () => {
   const event = {
+    resource: '/',
     path: '/foo/bar',
     multiValueQueryStringParameters: {
       redirect_uri: 'http://lvh.me:3000/cb'
@@ -40,6 +43,7 @@ test('getPathWithQueryStringParams: to be url-encoded param', () => {
 
 test('getPathWithQueryStringParams: 2 params', () => {
   const event = {
+    resource: '/',
     path: '/foo/bar',
     multiValueQueryStringParameters: {
       bizz: 'bazz',
@@ -52,6 +56,7 @@ test('getPathWithQueryStringParams: 2 params', () => {
 
 test('getPathWithQueryStringParams: array param', () => {
   const event = {
+    resource: '/',
     path: '/foo/bar',
     multiValueQueryStringParameters: {
       bizz: [
@@ -64,8 +69,52 @@ test('getPathWithQueryStringParams: array param', () => {
   expect(pathWithQueryStringParams).toEqual('/foo/bar?bizz=bazz&bizz=buzz')
 })
 
+test('getPathWithQueryStringParams: pathParameters.proxy', () => {
+  const event = {
+    resource: '/foo/{proxy+}',
+    path: '/foo/123',
+    pathParameters: {
+      proxy: '123'
+    }
+  }
+  const pathWithQueryStringParams = serverlessExpressEventSourcesUtils.getPathWithQueryStringParams({ event })
+  expect(pathWithQueryStringParams).toEqual('/123')
+})
+
+test('getPathWithQueryStringParams: customDomain and no path parameters', () => {
+  const event = {
+    resource: '/foo',
+    path: '/baz/foo',
+    requestContext: {
+      customDomain: {
+        basePathMatched: 'baz'
+      }
+    }
+  }
+  const pathWithQueryStringParams = serverlessExpressEventSourcesUtils.getPathWithQueryStringParams({ event })
+  expect(pathWithQueryStringParams).toEqual('/')
+})
+
+test('getPathWithQueryStringParams: customDomain and path parameters', () => {
+  const event = {
+    resource: '/foo/{proxy+}',
+    path: '/baz/foo/123',
+    pathParameters: {
+      proxy: '123'
+    },
+    requestContext: {
+      customDomain: {
+        basePathMatched: 'baz'
+      }
+    }
+  }
+  const pathWithQueryStringParams = serverlessExpressEventSourcesUtils.getPathWithQueryStringParams({ event })
+  expect(pathWithQueryStringParams).toEqual('/123')
+})
+
 function getReqRes (multiValueHeaders = {}) {
   const event = {
+    resource: '/',
     path: '/foo',
     httpMethod: 'GET',
     body: 'Hello serverless!',

examples/basic-starter-api-gateway-v2-typescript/scripts/local.ts

@@ -1,6 +1,6 @@
 import apiGatewayEvent from "../api-gateway-event.json";
 import * as lambdaFunction from "../src/lambda";
-import { Context, Callback } from "aws-lambda";
+import type { Context, Callback } from "aws-lambda";
 
 const context = {} as Context;
 

examples/basic-starter-nestjs/src/lambda.ts

@@ -1,7 +1,7 @@
 import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import serverlessExpress from '@vendia/serverless-express';
-import { Context, Handler } from 'aws-lambda';
+import type { Context, Handler } from 'aws-lambda';
 import express from 'express';
 
 import { AppModule } from './app.module';

examples/sails-example/package.json

@@ -49,6 +49,6 @@
   "author": "brett",
   "license": "",
   "engines": {
-    "node": "^12.4"
+    "node": ">=18"
   }
-}
+}