test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anonrig merged 10 commits into from
Jan 10, 2024
Merged

test(cloudflare): add example astro package #10108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b1974b
test(cloudflare): add example astro package
anonrig Jan 8, 2024
512d73a
build: add github workflow for deploying
anonrig Jan 8, 2024
ba6a6ab
fixup
anonrig Jan 8, 2024
3ee5977
add empty test:assert version
anonrig Jan 9, 2024
fa584e6
fix astro build
anonrig Jan 9, 2024
209beb2
add missing commands
anonrig Jan 9, 2024
613582b
fixup
anonrig Jan 9, 2024
0e15a1f
remove github token from cloudflare deploy
anonrig Jan 10, 2024
ffbc45a
use correct directory
anonrig Jan 10, 2024
75f1a88
fix lint errors
anonrig Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
matrix:
test-application:
[
'cloudflare-astro',
'node-express-app',
'create-react-app',
'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
timeout-minutes: 5
run: yarn test:assert

- name: Deploy Astro to Cloudflare
uses: cloudflare/pages-action@v1
if: matrix.test-application == 'cloudflare-astro'
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
directory: dist
workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

job_required_jobs_passed:
name: All required jobs passed or were skipped
needs:
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down
21 changes: 21 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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
24 changes: 24 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
output: 'hybrid',
adapter: cloudflare({
imageService: 'passthrough',
}),
integrations: [
sentry({
enabled: Boolean(dsn),
dsn,
sourceMapsUploadOptions: {
enabled: false,
},
clientInitPath: 'sentry.client.mjs',
serverInitPath: 'sentry.server.mjs',
}),
],
});
27 changes: 27 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
"name": "cloudflare-astro",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
"astro": "astro",
"build": "astro build",
"build:bundle": "astro build",
"clean": "npx rimraf node_modules,pnpm-lock.yaml",
"dev": "astro dev",
"preview": "astro preview",
"start": "astro dev",
"test:prod": "pnpm -v",
"test:dev": "pnpm -v",
"test:build": "pnpm install && pnpm build",
"test:assert": "pnpm -v"
},
"dependencies": {
"@astrojs/cloudflare": "8.1.0",
"@sentry/astro": "latest || *",
"astro": "4.1.1"
},
"volta": {
"extends": "../../package.json"
}
}
9 changes: 9 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
dsn: process.env.E2E_TEST_DSN,
});
5 changes: 5 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
dsn: process.env.E2E_TEST_DSN,
});
61 changes: 61 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
title: string;
body: string;
href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
<a href={href}>
<h2>
{title}
<span>&rarr;</span>
</h2>
<p>
{body}
</p>
</a>
</li>
<style>
.link-card {
list-style: none;
display: flex;
padding: 1px;
background-color: #23262d;
background-image: none;
background-size: 400%;
border-radius: 7px;
background-position: 100%;
transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
}
.link-card > a {
width: 100%;
text-decoration: none;
line-height: 1.4;
padding: calc(1.5rem - 1px);
border-radius: 8px;
color: white;
background-color: #23262d;
opacity: 0.8;
}
h2 {
margin: 0;
font-size: 1.25rem;
transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
}
p {
margin-top: 0.5rem;
margin-bottom: 0;
}
.link-card:is(:hover, :focus-within) {
background-position: 0;
background-image: var(--accent-gradient);
}
.link-card:is(:hover, :focus-within) h2 {
color: rgb(var(--accent-light));
}
</style>
1 change: 1 addition & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />
51 changes: 51 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="description" content="Astro description" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<title>{title}</title>
</head>
<body>
<slot />
</body>
</html>
<style is:global>
:root {
--accent: 136, 58, 234;
--accent-light: 224, 204, 250;
--accent-dark: 49, 10, 101;
--accent-gradient: linear-gradient(
45deg,
rgb(var(--accent)),
rgb(var(--accent-light)) 30%,
white 60%
);
}
html {
font-family: system-ui, sans-serif;
background: #13151a;
background-size: 224px;
}
code {
font-family:
Menlo,
Monaco,
Lucida Console,
Liberation Mono,
DejaVu Sans Mono,
Bitstream Vera Sans Mono,
Courier New,
monospace;
}
</style>
123 changes: 123 additions & 0 deletions dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
<main>
<svg
class="astro-a"
width="495"
height="623"
viewBox="0 0 495 623"
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
fill="url(#paint0_linear_1805_24383)"></path>
<defs>
<linearGradient
id="paint0_linear_1805_24383"
x1="247.358"
y1="0"
x2="247.358"
y2="622.479"
gradientUnits="userSpaceOnUse"
>
<stop stop-opacity="0.9"></stop>
<stop offset="1" stop-opacity="0.2"></stop>
</linearGradient>
</defs>
</svg>
<h1>Welcome to <span class="text-gradient">Astro</span></h1>
<p class="instructions">
To get started, open the directory <code>src/pages</code> in your project.<br />
<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
</p>
<ul role="list" class="link-card-grid">
<Card
href="https://docs.astro.build/"
title="Documentation"
body="Learn how Astro works and explore the official API docs."
/>
<Card
href="https://astro.build/integrations/"
title="Integrations"
body="Supercharge your project with new frameworks and libraries."
/>
<Card
href="https://astro.build/themes/"
title="Themes"
body="Explore a galaxy of community-built starter themes."
/>
<Card
href="https://astro.build/chat/"
title="Community"
body="Come say hi to our amazing Discord community. ❤️"
/>
</ul>
</main>
</Layout>

<style>
main {
margin: auto;
padding: 1rem;
width: 800px;
max-width: calc(100% - 2rem);
color: white;
font-size: 20px;
line-height: 1.6;
}
.astro-a {
position: absolute;
top: -32px;
left: 50%;
transform: translatex(-50%);
width: 220px;
height: auto;
z-index: -1;
}
h1 {
font-size: 4rem;
font-weight: 700;
line-height: 1;
text-align: center;
margin-bottom: 1em;
}
.text-gradient {
background-image: var(--accent-gradient);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-size: 400%;
background-position: 0%;
}
.instructions {
margin-bottom: 2rem;
border: 1px solid rgba(var(--accent-light), 25%);
background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
padding: 1.5rem;
border-radius: 8px;
}
.instructions code {
font-size: 0.8em;
font-weight: bold;
background: rgba(var(--accent-light), 12%);
color: rgb(var(--accent-light));
border-radius: 4px;
padding: 0.3em 0.4em;
}
.instructions strong {
color: rgb(var(--accent-light));
}
.link-card-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
gap: 2rem;
padding: 0;
}
</style>
5 changes: 4 additions & 1 deletion packages/astro/src/integration/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
updateConfig({
vite: {
ssr: {
noExternal: ['@sentry/astro'],
// @sentry/node is required in case we have 2 different @sentry/node
// packages installed in the same project.
// Ref: https://github.com/getsentry/sentry-javascript/issues/10121
noExternal: ['@sentry/astro', '@sentry/node'],
},
},
});
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(cloudflare): add example astro package#10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

anonrig
merged 10 commits into

from

Jan 10, 2024
 Merged


test(cloudflare): add example astro package
#10108
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
2b1974b

test(cloudflare): add example astro package


anonrig Jan 8, 2024
512d73a

build: add github workflow for deploying


anonrig Jan 8, 2024
ba6a6ab

fixup


anonrig Jan 8, 2024
3ee5977

add empty test:assert version


anonrig Jan 9, 2024
fa584e6

fix astro build


anonrig Jan 9, 2024
209beb2

add missing commands


anonrig Jan 9, 2024
613582b

fixup


anonrig Jan 9, 2024
0e15a1f

remove github token from cloudflare deploy


anonrig Jan 10, 2024
ffbc45a

use correct directory


anonrig Jan 10, 2024
75f1a88

fix lint errors


anonrig Jan 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,7 @@ jobs:
 matrix:
 test-application:
 [
 'cloudflare-astro',
 'node-express-app',
 'create-react-app',
 'create-next-app',
Expand DownExpand Up@@ -944,6 +945,16 @@ jobs:
 timeout-minutes: 5
 run: yarn test:assert

 - name: Deploy Astro to Cloudflare
 uses: cloudflare/pages-action@v1
 if: matrix.test-application == 'cloudflare-astro'
 with:
 apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
 directory: dist
 workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}

 job_required_jobs_passed:
 name: All required jobs passed or were skipped
 needs:
Expand Down

1 change: 0 additions & 1 deletion
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ const job = scheduleWithCheckIn.scheduleJob('my-cron-job', '* * * * *', () => {
- fix(node): Revert to only use sync debugger for `LocalVariables` (#10077)
- fix(node): Update ANR min node version to v16.17.0 (#10107)


## 7.92.0

### Important Changes
Expand Down

21 changes: 21 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
# 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

24 changes: 24 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import cloudflare from '@astrojs/cloudflare';
import sentry from '@sentry/astro';
import { defineConfig } from 'astro/config';

const dsn = process.env.E2E_TEST_DSN;

// https://astro.build/config
export default defineConfig({
 output: 'hybrid',
 adapter: cloudflare({
 imageService: 'passthrough',
 }),
 integrations: [
 sentry({
 enabled: Boolean(dsn),
 dsn,
 sourceMapsUploadOptions: {
 enabled: false,
 },
 clientInitPath: 'sentry.client.mjs',
 serverInitPath: 'sentry.server.mjs',
 }),
 ],
});

27 changes: 27 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
{
 "name": "cloudflare-astro",
 "type": "module",
 "version": "0.0.1",
 "private": true,
 "scripts": {
 "astro": "astro",
 "build": "astro build",
 "build:bundle": "astro build",
 "clean": "npx rimraf node_modules,pnpm-lock.yaml",
 "dev": "astro dev",
 "preview": "astro preview",
 "start": "astro dev",
 "test:prod": "pnpm -v",
 "test:dev": "pnpm -v",
 "test:build": "pnpm install && pnpm build",
 "test:assert": "pnpm -v"
 },
 "dependencies": {
 "@astrojs/cloudflare": "8.1.0",
 "@sentry/astro": "latest || *",
 "astro": "4.1.1"
 },
 "volta": {
 "extends": "../../package.json"
 }
}

9 changes: 9 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/public/favicon.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.client.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

5 changes: 5 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/sentry.server.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import * as Sentry from '@sentry/astro';

Sentry.init({
 dsn: process.env.E2E_TEST_DSN,
});

61 changes: 61 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/components/Card.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
---
interface Props {
	title: string;
	body: string;
	href: string;
}

const { href, title, body } = Astro.props;
---

<li class="link-card">
	<a href={href}>
 <h2>
 {title}
 <span>&rarr;</span>
 </h2>
 <p>
 {body}
 </p>
	</a>
</li>
<style>
	.link-card {
 list-style: none;
 display: flex;
 padding: 1px;
 background-color: #23262d;
 background-image: none;
 background-size: 400%;
 border-radius: 7px;
 background-position: 100%;
 transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
 box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
	}
	.link-card > a {
 width: 100%;
 text-decoration: none;
 line-height: 1.4;
 padding: calc(1.5rem - 1px);
 border-radius: 8px;
 color: white;
 background-color: #23262d;
 opacity: 0.8;
	}
	h2 {
 margin: 0;
 font-size: 1.25rem;
 transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
	}
	p {
 margin-top: 0.5rem;
 margin-bottom: 0;
	}
	.link-card:is(:hover, :focus-within) {
 background-position: 0;
 background-image: var(--accent-gradient);
	}
	.link-card:is(:hover, :focus-within) h2 {
 color: rgb(var(--accent-light));
	}
</style>

1 change: 1 addition & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/env.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />

51 changes: 51 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/layouts/Layout.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
---
interface Props {
	title: string;
}

const { title } = Astro.props;
---

<!doctype html>
<html lang="en">
	<head>
 <meta charset="UTF-8" />
 <meta name="description" content="Astro description" />
 <meta name="viewport" content="width=device-width" />
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 <title>{title}</title>
	</head>
	<body>
 <slot />
	</body>
</html>
<style is:global>
	:root {
 --accent: 136, 58, 234;
 --accent-light: 224, 204, 250;
 --accent-dark: 49, 10, 101;
 --accent-gradient: linear-gradient(
 45deg,
 rgb(var(--accent)),
 rgb(var(--accent-light)) 30%,
 white 60%
 );
	}
	html {
 font-family: system-ui, sans-serif;
 background: #13151a;
 background-size: 224px;
	}
	code {
 font-family:
 Menlo,
 Monaco,
 Lucida Console,
 Liberation Mono,
 DejaVu Sans Mono,
 Bitstream Vera Sans Mono,
 Courier New,
 monospace;
	}
</style>

123 changes: 123 additions & 0 deletions
dev-packages/e2e-tests/test-applications/cloudflare-astro/src/pages/index.astro

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
---

<Layout title="Welcome to Astro.">
	<main>
 <svg
 class="astro-a"
 width="495"
 height="623"
 viewBox="0 0 495 623"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
 aria-hidden="true"
 >
 <path
 fill-rule="evenodd"
 clip-rule="evenodd"
 d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
 fill="url(#paint0_linear_1805_24383)"></path>
 <defs>
 <linearGradient
 id="paint0_linear_1805_24383"
 x1="247.358"
 y1="0"
 x2="247.358"
 y2="622.479"
 gradientUnits="userSpaceOnUse"
 >
 <stop stop-opacity="0.9"></stop>
 <stop offset="1" stop-opacity="0.2"></stop>
 </linearGradient>
 </defs>
 </svg>
 <h1>Welcome to <span class="text-gradient">Astro</span></h1>
 <p class="instructions">
 To get started, open the directory <code>src/pages</code> in your project.<br />
 <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
 </p>
 <ul role="list" class="link-card-grid">
 <Card
 href="https://docs.astro.build/"
 title="Documentation"
 body="Learn how Astro works and explore the official API docs."
 />
 <Card
 href="https://astro.build/integrations/"
 title="Integrations"
 body="Supercharge your project with new frameworks and libraries."
 />
 <Card
 href="https://astro.build/themes/"
 title="Themes"
 body="Explore a galaxy of community-built starter themes."
 />
 <Card
 href="https://astro.build/chat/"
 title="Community"
 body="Come say hi to our amazing Discord community. ❤️"
 />
 </ul>
	</main>
</Layout>

<style>
	main {
 margin: auto;
 padding: 1rem;
 width: 800px;
 max-width: calc(100% - 2rem);
 color: white;
 font-size: 20px;
 line-height: 1.6;
	}
	.astro-a {
 position: absolute;
 top: -32px;
 left: 50%;
 transform: translatex(-50%);
 width: 220px;
 height: auto;
 z-index: -1;
	}
	h1 {
 font-size: 4rem;
 font-weight: 700;
 line-height: 1;
 text-align: center;
 margin-bottom: 1em;
	}
	.text-gradient {
 background-image: var(--accent-gradient);
 -webkit-background-clip: text;
 -webkit-text-fill-color: transparent;
 background-size: 400%;
 background-position: 0%;
	}
	.instructions {
 margin-bottom: 2rem;
 border: 1px solid rgba(var(--accent-light), 25%);
 background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
 padding: 1.5rem;
 border-radius: 8px;
	}
	.instructions code {
 font-size: 0.8em;
 font-weight: bold;
 background: rgba(var(--accent-light), 12%);
 color: rgb(var(--accent-light));
 border-radius: 4px;
 padding: 0.3em 0.4em;
	}
	.instructions strong {
 color: rgb(var(--accent-light));
	}
	.link-card-grid {
 display: grid;
 grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
 gap: 2rem;
 padding: 0;
	}
</style>

5 changes: 4 additions & 1 deletion
packages/astro/src/integration/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,10 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
 updateConfig({
 vite: {
 ssr: {
 noExternal: ['@sentry/astro'],
 // @sentry/node is required in case we have 2 different @sentry/node
 // packages installed in the same project.
 // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
 noExternal: ['@sentry/astro', '@sentry/node'],
 },
 },
 });
Expand Down