fixup

Author: anonrig

.github/workflows/build-envs.yml

@@ -100,6 +100,10 @@ jobs:
               - 'packages/browser/**'
               - 'packages/replay/**'
               - 'packages/feedback/**'
+            astro:
+              - *browser
+              - 'packages/astro/**'
+              - 'dev-packages/e2e-tests/test-applications/cloudflare-astro/**'
             browser_integration:
               - *shared
               - *browser
@@ -137,6 +141,7 @@ jobs:
 
     outputs:
       commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
+      changed_astro: ${{ steps.changed.outputs.astro }}
       changed_nextjs: ${{ steps.changed.outputs.nextjs }}
       changed_ember: ${{ steps.changed.outputs.ember }}
       changed_remix: ${{ steps.changed.outputs.remix }}
@@ -262,6 +267,37 @@ jobs:
       # `job_build` can't see `job_install_deps` and what it returned)
       dependency_cache_key: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
 
+  job_deploy_cloudflare:
+    name: Cloudflare
+    needs: [job_get_metadata, job_build]
+    timeout-minutes: 15
+    runs-on: ubuntu-20.04
+    if:
+      github.event_name == 'pull_request' || needs.job_get_metadata.outputs.changed_astro == 'true'
+    steps:
+      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: 'package.json'
+      - name: Restore caches
+        uses: ./.github/actions/restore-cache
+        env:
+          DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Deploy Astro
+        uses: cloudflare/pages-action@v1
+        if: steps.cache_built_packages.outputs.cache-hit == ''
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
+          directory: build
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          workingDirectory: dev-packages/e2e-tests/test-applications/cloudflare-astro
+
   job_size_check:
     name: Size Check
     needs: [job_get_metadata, job_build]
@@ -858,6 +894,7 @@ jobs:
       matrix:
         test-application:
           [
+            'cloudflare-astro',
             'node-express-app',
             'create-react-app',
             'create-next-app',

.github/workflows/build.yml

@@ -1,6 +1,8 @@
+import cloudflare from '@astrojs/cloudflare';
+import sentry from '@sentry/astro';
 import { defineConfig } from 'astro/config';
-import cloudflare from '@astrojs/cloudflare'
-import sentry from '@sentry/astro'
+
+const dsn = process.env.E2E_TEST_DSN;
 
 // https://astro.build/config
 export default defineConfig({
@@ -10,13 +12,8 @@ export default defineConfig({
   }),
   integrations: [
     sentry({
-      dsn: '',
-      autoInstrumentation: {
-        requestHandler: true,
-      },
-      sourceMapsUploadOptions: {
-        enabled: false,
-      },
+      enabled: Boolean(dsn),
+      dsn,
       clientInitPath: 'sentry.client.mjs',
       serverInitPath: 'sentry.server.mjs',
     }),

dev-packages/env-tests/cloudflare-astro/.gitignore renamed to dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

@@ -1,12 +1,13 @@
 {
-  "name": "@sentry-internal/env-tests-cloudflare-astro",
+  "name": "cloudflare-astro",
   "type": "module",
   "version": "0.0.1",
   "private": true,
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro build",
+    "build": "yarn build:bundle",
+    "build:bundle": "astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
@@ -15,5 +16,8 @@
     "@astrojs/cloudflare": "^8.0.2",
     "@sentry/astro": "7.92.0",
     "@sentry/profiling-node": "^1.3.2"
+  },
+  "volta": {
+    "extends": "../../../package.json"
   }
 }

dev-packages/env-tests/cloudflare-astro/astro.config.mjs renamed to dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

@@ -1,7 +1,7 @@
-import * as Sentry from '@sentry/astro'
+import * as Sentry from '@sentry/astro';
 
 Sentry.init({
   dsn: process.env.E2E_TEST_DSN,
   tracesSampleRate: 1,
   integrations: [],
-})
+});

dev-packages/env-tests/cloudflare-astro/package.json renamed to dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

@@ -0,0 +1,7 @@
+import * as Sentry from '@sentry/astro';
+import { ProfilingIntegration } from '@sentry/profiling-node';
+
+Sentry.init({
+  dsn: process.env.E2E_TEST_DSN,
+  integrations: [new ProfilingIntegration()],
+});