Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env by mlafeldt · Pull Request #8136 · clerk/javascript · GitHub
Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env by mlafeldt · Pull Request #8136 · clerk/javascript · GitHub
Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env by mlafeldt · Pull Request #8136 · clerk/javascript · GitHub
Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env by mlafeldt · Pull Request #8136 · clerk/javascript · GitHub
Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env by mlafeldt · Pull Request #8136 · clerk/javascript · GitHub
Skip to content

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env - #8136

Merged
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback
Mar 20, 2026
Merged

fix(astro): Restore Cloudflare Pages compatibility broken by cloudflare:workers env#8136
jescalan merged 1 commit into
clerk:mainfrom
mlafeldt:fix/astro-cloudflare-env-fallback

Conversation

@mlafeldt

@mlafeldtmlafeldt commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

On Cloudflare Pages (Astro v5), cloudflare:workers env may be available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are only present in the fetch handler's env param (locals.runtime.env).

The current code short-circuits on cloudflareEnv without checking whether the requested key actually exists, preventing the fallback chain from ever reaching locals.runtime.env. This causes all SSR pages to break with [object Object] responses.

Fix: check if the value is defined before returning from the cloudflareEnv branch, allowing the fallback to locals.runtime.env.

Follow-up fix to #7890

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Fixed environment-variable fallback on Cloudflare Pages so required secrets are sourced from runtime fallbacks when the platform omits them.
  • Tests
    • Added a test validating the fallback chain for env values on Cloudflare Pages.
  • Chores
    • Added a changeset recording a patch release for the fix.

@changeset-bot

changeset-botBot commented Mar 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: eec0c0f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/astroPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

@mlafeldt is attempting to deploy a commit to the Clerk Production Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai

coderabbitaiBot commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9cace598-1f37-499d-9751-d5fe9adcf44d

📥 Commits

Reviewing files that changed from the base of the PR and between f093e77 and eec0c0f.

📒 Files selected for processing (3)
  • .changeset/fix-astro-cf-pages-env-fallback.md
  • packages/astro/src/server/__tests__/get-safe-env.test.ts
  • packages/astro/src/server/get-safe-env.ts

📝 Walkthrough

Walkthrough

This pull request adds a Cloudflare Pages environment variable resolution fix to the @clerk/astro package. Changes include a new changeset marking a patch release, an updated getContextEnvVar implementation in get-safe-env.ts that treats missing keys from the cloudflare:workers env as absent and continues to fallback sources, and a new test verifying the fallback chain retrieves variables from locals.runtime.env when they are not present in the Workers environment.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately describes the main fix: restoring Cloudflare Pages compatibility by addressing the cloudflare:workers env issue, which directly matches the core problem solved in the changeset.
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Mathias!

…re:workers env
On Cloudflare Pages (Astro v5), `cloudflare:workers` env may be
available but lack dashboard secrets (CLERK_SECRET_KEY, etc.) that are
only present in the fetch handler's env param (locals.runtime.env).
The current code short-circuits on cloudflareEnv without checking
whether the requested key actually exists, preventing the fallback
chain from ever reaching locals.runtime.env. This causes all SSR pages
to break with `[object Object]` responses.
Fix: check if the value is defined before returning from the
cloudflareEnv branch, allowing the fallback to locals.runtime.env.
@jescalan
jescalanforce-pushed the fix/astro-cloudflare-env-fallback branch from f093e77 to eec0c0fCompareMarch 20, 2026 20:36
@vercel

vercelBot commented Mar 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 20, 2026 8:57pm

Request Review

@jescalan
jescalan enabled auto-merge (squash) March 20, 2026 21:28
@jescalan
jescalan disabled auto-merge March 20, 2026 21:28
@jescalan
jescalan merged commit 9b71736 into clerk:mainMar 20, 2026
19 of 23 checks passed
@mlafeldt
mlafeldt deleted the fix/astro-cloudflare-env-fallback branch March 23, 2026 10:47
wobsoriano pushed a commit that referenced this pull request Mar 26, 2026
Chat-JPTeasdale pushed a commit to Chat-JPTeasdale/javascript that referenced this pull request Mar 28, 2026
Add initCloudflareWorkersEnv() and cloudflare:workers module env check
to the shared getEnvVariable() function. This allows Clerk to read
environment variables directly from the Cloudflare Workers runtime,
following the same pattern used in @clerk/astro (PRs clerk#7889, clerk#8136).
Needed for TanStack Start, Hono, and other frameworks on CF Workers
where process.env and import.meta.env are not available at runtime.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@mlafeldt@wobsoriano@jescalan