Merge branch 'develop' into lforst-min-nextjs-version

Author: lforst

.github/workflows/build.yml

@@ -44,7 +44,6 @@ env:
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/gatsby/*.d.ts
     ${{ github.workspace }}/packages/core/src/version.ts
-    ${{ github.workspace }}/packages/serverless
     ${{ github.workspace }}/packages/utils/cjs
     ${{ github.workspace }}/packages/utils/esm
 
@@ -385,7 +384,7 @@ jobs:
             ${{ github.workspace }}/packages/replay/build/bundles/**
             ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
-            ${{ github.workspace }}/packages/serverless/build/aws/dist-serverless/*.zip
+            ${{ github.workspace }}/packages/aws-serverless/build/aws/dist-serverless/*.zip
 
   job_browser_unit_tests:
     name: Browser Unit Tests
@@ -879,14 +878,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 21]
+        # For whatever reason, these segfault on Node 18, so we are skipping these for now...
+        node: [20, 21]
         remix: [1, 2]
         # Remix v2 only supports Node 18+, so run Node 14, 16 tests separately
         include:
           - node: 14
             remix: 1
-          - node: 16
-            remix: 1
+          # For whatever reason, these segfault on Node 16, so we are skipping these for now...
+          # - node: 16
+          #  remix: 1
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4

scripts/aws-deploy-local-layer.sh

@@ -13,15 +13,15 @@ set -euo pipefail
 # Remove old distribution directories and zip files.
 echo "Preparing local directories for new build..."
 rm -rf dist-serverless/
-rm -rf ./packages/serverless/build
-rm -rf ./packages/serverless/dist
-rm -rf ./packages/serverless/node_modules
+rm -rf ./packages/aws-serverless/build
+rm -rf ./packages/aws-serverless/dist
+rm -rf ./packages/aws-serverless/node_modules
 
 # Creating Lambda layer
-echo "Creating Lambda layer in ./packages/serverless/build/aws/dist-serverless..."
-cd packages/serverless
+echo "Creating Lambda layer in ./packages/aws-serverless/build/aws/dist-serverless..."
+cd packages/aws-serverless
 yarn build
-echo "Done creating Lambda layer in ./packages/serverless/build/aws/dist-serverless."
+echo "Done creating Lambda layer in ./packages/aws-serverless/build/aws/dist-serverless."
 
 # Deploying zipped Lambda layer to AWS
 ZIP=$(ls build/aws/dist-serverless | grep sentry-node-serverless | head -n 1)