Sync develop to main (#18)

danswann · Oct 6, 2023 · fb22eb4 · fb22eb4
1 parent 4e5261f
commit fb22eb4
Show file tree

Hide file tree

Showing 13 changed files with 318 additions and 267 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: weekly
+    target-branch: develop
+  - package-ecosystem: npm
+    directory: /packages/web
+    schedule:
+      interval: weekly
+    target-branch: develop
diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -13,7 +13,7 @@ jobs:
     name: Run linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ vars.NODE_VERSION_STRING }}
@@ -30,7 +30,7 @@ jobs:
     name: Run typechecks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ vars.NODE_VERSION_STRING }}

diff --git a/.github/workflows/push_develop_deploy.yml b/.github/workflows/push_develop_deploy.yml
@@ -16,7 +16,7 @@ jobs:
     name: Deploy to development AWS account
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ vars.NODE_VERSION_STRING }}

diff --git a/.github/workflows/push_main_deploy.yml b/.github/workflows/push_main_deploy.yml
@@ -16,7 +16,7 @@ jobs:
     name: Deploy to production AWS account
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ vars.NODE_VERSION_STRING }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,14 +15,14 @@
   "devDependencies": {
     "@tsconfig/node18": "^18.2.1",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "aws-cdk-lib": "2.91.0",
+    "aws-cdk-lib": "2.95.1",
     "constructs": "10.2.69",
     "eslint": "^8.48.0",
     "eslint-config-standard-with-typescript": "^39.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-n": "^16.0.2",
     "eslint-plugin-promise": "^6.1.1",
-    "sst": "^2.24.16",
+    "sst": "2.26.11",
     "typescript": "^5.2.2"
   },
   "workspaces": []

diff --git a/packages/web/package-lock.json b/packages/web/package-lock.json
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -33,7 +33,7 @@
     "@types/react-dom": "18.x",
     "eslint": "latest",
     "eslint-config-next": "latest",
-    "sst": "latest",
+    "sst": "2.26.11",
     "typescript": "latest"
   }
 }
diff --git a/packages/web/src/content/images/grouch.jpg b/packages/web/src/content/images/grouch.jpg
diff --git a/packages/web/src/content/images/grouch.png b/packages/web/src/content/images/grouch.png
diff --git a/packages/web/src/content/images/projects/soundlink.png b/packages/web/src/content/images/projects/soundlink.png
diff --git a/packages/web/src/content/images/projects/trg.png b/packages/web/src/content/images/projects/trg.png
diff --git a/stacks/Site.ts b/stacks/Site.ts
@@ -28,13 +28,12 @@ export function Site({ stack }: StackContext) {
     waitForInvalidation: process.env.CI == undefined ? true : false,
 
     // Nextjs Lambda function settings
-    timeout: '5 seconds',
     memorySize: '256 MB',
     imageOptimization: {
       memorySize: '512 MB'
     },
     runtime: 'nodejs18.x',
-    warm: stack.stage === STAGE_PRODUCTION ? 20 : undefined,
+    warm: stack.stage === STAGE_PRODUCTION ? 10 : undefined,
 
     // General CDK settings forwarded to CDK construct
     cdk: {