Merge pull request #158 from swarmion/chore/shared-serverless-constraint

chore: use shared serverless constraint

Author: fargito

backend/core/serverless.ts

@@ -2,6 +2,7 @@ import { AWS } from '@serverless/typescript';
 
 import { httpApiResourceContract } from '@swarmion-starter/core-contracts';
 import {
+  frameworkVersion,
   projectName,
   sharedEsbuildConfig,
   sharedParams,
@@ -13,15 +14,15 @@ import { functions } from './functions';
 
 const serverlessConfiguration: AWS = {
   service: `${projectName}-core`, // Keep it short to have role name below 64
-  frameworkVersion: '>=3.0.0',
+  frameworkVersion,
   configValidationMode: 'error',
   plugins: ['serverless-esbuild'],
   provider: {
     ...sharedProviderConfig,
     httpApi: {
       payload: '2.0',
       cors: {
-        // @ts-ignore we use a configuration per environment so we put it as a serverless variable
+        // @ts-expect-error we use a configuration per environment so we put it as a serverless variable
         allowedOrigins: '${param:apiGatewayCorsAllowedOrigins}',
         allowedHeaders: ['Content-Type', 'Authorization', 'Origin'],
         allowedMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],

backend/forum/serverless.ts

@@ -2,6 +2,7 @@ import { AWS } from '@serverless/typescript';
 
 import { httpApiResourceContract } from '@swarmion-starter/core-contracts';
 import {
+  frameworkVersion,
   projectName,
   sharedEsbuildConfig,
   sharedParams,
@@ -12,7 +13,7 @@ import { functions } from './functions';
 
 const serverlessConfiguration: AWS = {
   service: `${projectName}-forum`, // Keep it short to have role name below 64
-  frameworkVersion: '>=3.0.0',
+  frameworkVersion,
   configValidationMode: 'error',
   plugins: ['serverless-esbuild', 'serverless-iam-roles-per-function'],
   provider: {

backend/users/serverless.ts

@@ -2,6 +2,7 @@ import { AWS } from '@serverless/typescript';
 
 import { httpApiResourceContract } from '@swarmion-starter/core-contracts';
 import {
+  frameworkVersion,
   projectName,
   sharedEsbuildConfig,
   sharedParams,
@@ -12,7 +13,7 @@ import { functions } from './functions';
 
 const serverlessConfiguration: AWS = {
   service: `${projectName}-users`, // Keep it short to have role name below 64
-  frameworkVersion: '>=3.0.0',
+  frameworkVersion,
   configValidationMode: 'error',
   plugins: ['serverless-esbuild', 'serverless-iam-roles-per-function'],
   provider: {

contracts/core-contracts/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@swarmion/serverless-contracts": "0.5.4"
+    "@swarmion/serverless-contracts": "0.5.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",

contracts/forum-contracts/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@swarmion/serverless-contracts": "0.5.4"
+    "@swarmion/serverless-contracts": "0.5.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",

contracts/users-contracts/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@swarmion/serverless-contracts": "0.5.4"
+    "@swarmion/serverless-contracts": "0.5.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",

frontend/cloudfront/serverless.ts

@@ -2,14 +2,15 @@ import { AWS } from '@serverless/typescript';
 import type { Lift } from 'serverless-lift';
 
 import {
+  frameworkVersion,
   projectName,
   sharedParams,
   sharedProviderConfig,
 } from '@swarmion-starter/serverless-configuration';
 
 const serverlessConfiguration: AWS & Lift = {
   service: `${projectName}-frontend`, // Keep it short to have role name below 64
-  frameworkVersion: '>=3.0.0',
+  frameworkVersion,
   plugins: ['serverless-lift'],
   provider: sharedProviderConfig,
   params: sharedParams,

package.json

@@ -39,7 +39,7 @@
     "@nrwl/linter": "^13.10.1",
     "@nrwl/tao": "^13.10.1",
     "@nrwl/workspace": "^13.10.1",
-    "@swarmion/nx-plugin": "0.5.4",
+    "@swarmion/nx-plugin": "0.5.5",
     "@types/jest": "^27.4.1",
     "@typescript-eslint/eslint-plugin": "^5.19.0",
     "@typescript-eslint/parser": "^5.19.0",

packages/serverless-configuration/src/sharedConfig.ts

@@ -1,5 +1,6 @@
 export const projectName = 'swarmion-starter';
 export const region = 'eu-west-1';
+export const frameworkVersion = '>=3.0.0';
 
 export const defaultEnvironment = 'dev';
 

packages/serverless-helpers/src/helpers/mergeStageParams.ts

@@ -9,7 +9,7 @@ const mergeStageParams = <
   return Object.keys(commonStageParams).reduce(
     (prev, stage) => ({
       ...prev,
-      // @ts-ignore TODO ignore inner typing here
+      // @ts-expect-error TODO ignore inner typing here
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       [stage]: { ...commonStageParams[stage], ...serviceStageParams[stage] },
     }),