Merge branch 'develop' into cg/fix-flaky-test

Author: chargome

.github/workflows/build.yml

@@ -847,6 +847,7 @@ jobs:
           [
             'angular-17',
             'angular-18',
+            'astro-4',
             'aws-lambda-layer-cjs',
             'aws-serverless-esm',
             'node-express',

CHANGELOG.md

@@ -10,6 +10,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @charpeni. Thank you for your contribution!
+
 ## 8.26.0
 
 ### Important Changes

dev-packages/browser-integration-tests/utils/fixtures.ts

@@ -1,3 +1,4 @@
+import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
 /* eslint-disable no-empty-pattern */

dev-packages/e2e-tests/test-applications/astro-4/.gitignore

@@ -0,0 +1,26 @@
+# build output
+dist/
+
+# generated types
+.astro/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+# jetbrains setting folder
+.idea/
+
+test-results

dev-packages/e2e-tests/test-applications/astro-4/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

dev-packages/e2e-tests/test-applications/astro-4/README.md

@@ -0,0 +1,6 @@
+# Astro 4 E2E test app
+
+- Astro 4.x
+- Output mode `hybrid` (== opt into SSR routes)
+- Node adapter
+- Configured for Tracing and Performance

dev-packages/e2e-tests/test-applications/astro-4/astro.config.mjs

@@ -0,0 +1,29 @@
+import node from '@astrojs/node';
+import sentry from '@sentry/astro';
+import { defineConfig } from 'astro/config';
+
+import spotlightjs from '@spotlightjs/astro';
+
+// https://astro.build/config
+export default defineConfig({
+  output: 'hybrid',
+  integrations: [
+    sentry({
+      debug: true,
+      sourceMapsUploadOptions: {
+        enabled: false,
+      },
+    }),
+    spotlightjs(),
+  ],
+  adapter: node({
+    mode: 'standalone',
+  }),
+  vite: {
+    build: {
+      rollupOptions: {
+        external: ['https'],
+      },
+    },
+  },
+});

dev-packages/e2e-tests/test-applications/astro-4/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "astro-hybrid-with-static-routes",
+  "type": "module",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "astro dev --force",
+    "start": "astro dev",
+    "build": "astro check && astro build",
+    "preview": "astro preview",
+    "astro": "astro",
+    "test:build": "pnpm install && npx playwright install && pnpm build",
+    "test:assert": "TEST_ENV=production playwright test"
+  },
+  "dependencies": {
+    "@astrojs/check": "^0.9.2",
+    "@astrojs/node": "^8.3.2",
+    "@playwright/test": "^1.46.0",
+    "@sentry/astro": "* || latest",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@spotlightjs/astro": "^2.1.6",
+    "astro": "^4.13.3",
+    "typescript": "^5.5.4"
+  },
+  "devDependencies": {
+    "@astrojs/internal-helpers": "^0.4.1"
+  }
+}

dev-packages/e2e-tests/test-applications/astro-4/playwright.config.mjs

@@ -0,0 +1,13 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const config = getPlaywrightConfig({
+  startCommand: 'node ./dist/server/entry.mjs',
+});
+
+export default config;