Merge branch 'develop' into cg-rr-fix-handlerequest-type

chargome · web-flow · commit 95e309775a4e · 2025-09-25T15:07:07.000+02:00
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json
@@ -23,5 +23,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json b/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json
@@ -29,7 +29,8 @@
     "overrides": {
       "nitropack": "2.10.0",
       "ofetch": "1.4.0",
-      "@vercel/nft": "0.29.4"
+      "@vercel/nft": "0.29.4",
+      "import-in-the-middle": "1.14.2"
     }
   },
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/package.json b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/package.json
@@ -24,5 +24,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/package.json b/dev-packages/e2e-tests/test-applications/nuxt-3/package.json
@@ -34,5 +34,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/package.json b/dev-packages/e2e-tests/test-applications/nuxt-4/package.json
@@ -34,5 +34,10 @@
         "label": "nuxt-4 (canary)"
       }
     ]
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json b/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json
@@ -34,5 +34,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json b/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
@@ -34,5 +34,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json b/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json
@@ -34,5 +34,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/package.json b/dev-packages/e2e-tests/test-applications/solidstart/package.json
@@ -34,5 +34,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "import-in-the-middle": "1.14.2"
+    }
   }
 }
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
@@ -79,7 +79,7 @@
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
-    "build:layer": "rollup -c rollup.lambda-extension.config.mjs && yarn ts-node scripts/buildLambdaLayer.ts",
+    "build:layer": "rimraf build/aws && rollup -c rollup.lambda-extension.config.mjs && yarn ts-node scripts/buildLambdaLayer.ts",
     "build:dev": "run-p build:transpile build:types",
     "build:transpile": "rollup -c rollup.npm.config.mjs && yarn build:layer",
     "build:types": "run-s build:types:core build:types:downlevel",
diff --git a/packages/aws-serverless/scripts/buildLambdaLayer.ts b/packages/aws-serverless/scripts/buildLambdaLayer.ts
@@ -51,9 +51,11 @@ async function buildLambdaLayer(): Promise<void> {
   fs.chmodSync('./build/aws/dist-serverless/sentry-extension/index.mjs', 0o755);
 
   const zipFilename = `sentry-node-serverless-${version}.zip`;
+  // Only include these directories in the zip file
+  const dirsToZip = ['nodejs', 'extensions', 'sentry-extension'];
   console.log(`Creating final layer zip file ${zipFilename}.`);
   // need to preserve the symlink above with -y
-  run(`zip -r -y ${zipFilename} .`, { cwd: 'build/aws/dist-serverless' });
+  run(`zip -r -y ${zipFilename} ${dirsToZip.join(' ')}`, { cwd: 'build/aws/dist-serverless' });
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -79,7 +81,11 @@ async function pruneNodeModules(): Promise<void> {
     './build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/build/npm/esm/awslambda-auto.js',
   ];
 
-  const { fileList } = await nodeFileTrace(entrypoints);
+  const { fileList } = await nodeFileTrace(entrypoints, {
+    // import-in-the-middle uses mixed require and import syntax in their `hook.mjs` file.
+    // So we need to set `mixedModules` to `true` to ensure that all modules are tracked.
+    mixedModules: true,
+  });
 
   const allFiles = getAllFiles('./build/aws/dist-serverless/nodejs/node_modules');
 

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,10 @@`
`23`	`23`	`},`
`24`	`24`	`"volta": {`
`25`	`25`	`"extends": "../../package.json"`
	`26`	`+ },`
	`27`	`+ "pnpm": {`
	`28`	`+ "overrides": {`
	`29`	`+ "import-in-the-middle": "1.14.2"`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,10 @@`
`24`	`24`	`},`
`25`	`25`	`"volta": {`
`26`	`26`	`"extends": "../../package.json"`
	`27`	`+ },`
	`28`	`+ "pnpm": {`
	`29`	`+ "overrides": {`
	`30`	`+ "import-in-the-middle": "1.14.2"`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,10 @@`
`34`	`34`	`},`
`35`	`35`	`"volta": {`
`36`	`36`	`"extends": "../../package.json"`
	`37`	`+ },`
	`38`	`+ "pnpm": {`
	`39`	`+ "overrides": {`
	`40`	`+ "import-in-the-middle": "1.14.2"`
	`41`	`+ }`
`37`	`42`	`}`
`38`	`43`	`}`