Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading
, '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); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-parents-drive.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/astro': major
---

Changed environment variable resolution order in `getContextEnvVar()` to prefer `process.env` over `import.meta.env`. Runtime environment variables (e.g., set in the Node.js adapter) now take precedence over build-time values statically replaced by Vite. This ensures that environment variables set at runtime behave as expected when deploying with the Astro Node adapter or similar runtime environments.
121 changes: 121 additions & 0 deletions packages/astro/src/server/__tests__/get-safe-env.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { getClientSafeEnv, getSafeEnv } from '../get-safe-env';

function createLocals(overrides: Partial<App.Locals> = {}): App.Locals {
return {
runtime: { env: {} as InternalEnv },
...overrides,
} as unknown as App.Locals;
}

describe('getSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
vi.stubEnv('CLERK_SECRET_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from locals.runtime.env first (Cloudflare)', () => {
const locals = createLocals({
runtime: {
env: {
PUBLIC_CLERK_PUBLISHABLE_KEY: 'pk_from_runtime',
CLERK_SECRET_KEY: 'sk_from_runtime',
} as InternalEnv,
},
});

// Also set process.env to verify runtime.env takes priority
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_runtime');
expect(env.sk).toBe('sk_from_runtime');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('reads from process.env when runtime.env is not available', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';
process.env.CLERK_SECRET_KEY = 'sk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_from_process');
expect(env.sk).toBe('sk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;
});

it('returns undefined when no env source has the value', () => {
delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
delete process.env.CLERK_SECRET_KEY;

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getSafeEnv(locals);

expect(env.pk).toBeUndefined();
expect(env.sk).toBeUndefined();
});

it('prefers keylessPublishableKey over all env sources', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({
runtime: { env: undefined as unknown as InternalEnv },
keylessPublishableKey: 'pk_keyless',
});
const env = getSafeEnv(locals);

expect(env.pk).toBe('pk_keyless');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});
});

describe('getClientSafeEnv', () => {
beforeEach(() => {
vi.stubEnv('PUBLIC_CLERK_PUBLISHABLE_KEY', '');
});

afterEach(() => {
vi.unstubAllEnvs();
});

it('reads from process.env for publishableKey', () => {
process.env.PUBLIC_CLERK_PUBLISHABLE_KEY = 'pk_from_process';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.publishableKey).toBe('pk_from_process');

delete process.env.PUBLIC_CLERK_PUBLISHABLE_KEY;
});

it('reads from process.env for all public env vars', () => {
process.env.PUBLIC_CLERK_DOMAIN = 'test.domain.com';
process.env.PUBLIC_CLERK_SIGN_IN_URL = '/sign-in';
process.env.PUBLIC_CLERK_SIGN_UP_URL = '/sign-up';

const locals = createLocals({ runtime: { env: undefined as unknown as InternalEnv } });
const env = getClientSafeEnv(locals);

expect(env.domain).toBe('test.domain.com');
expect(env.signInUrl).toBe('/sign-in');
expect(env.signUpUrl).toBe('/sign-up');

delete process.env.PUBLIC_CLERK_DOMAIN;
delete process.env.PUBLIC_CLERK_SIGN_IN_URL;
delete process.env.PUBLIC_CLERK_SIGN_UP_URL;
});
});
9 changes: 8 additions & 1 deletion packages/astro/src/server/get-safe-env.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,14 @@ function getContextEnvVar(envVarName: keyof InternalEnv, contextOrLocals: Contex
return locals.runtime.env[envVarName];
}

return import.meta.env[envVarName];
// Prefer process.env for runtime environments (e.g., Node.js adapter)
// where import.meta.env.PUBLIC_* is statically replaced at build time by Vite.
// Runtime values should take precedence over build-time values.
if (typeof process !== 'undefined' && process.env?.[envVarName]) {
return process.env[envVarName];
}

return import.meta.env[envVarName] || undefined;
}

/**
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
---
title: 'Runtime environment variables now take precedence over build-time values'
packages: ['astro']
matcher:
- 'PUBLIC_CLERK_PUBLISHABLE_KEY'
- 'PUBLIC_CLERK_DOMAIN'
- 'PUBLIC_CLERK_SIGN_IN_URL'
- 'PUBLIC_CLERK_SIGN_UP_URL'
- 'import.meta.env'
category: 'behavior-change'
warning: true
---

Environment variable resolution in `@clerk/astro` now prefers `process.env` over `import.meta.env`. This means runtime environment variables (e.g., set in the Node.js adapter or container) take precedence over values statically replaced by Vite at build time.

The new resolution order is:

1. `locals.runtime.env` (Cloudflare Workers)
2. `process.env` (Node.js runtime)
3. `import.meta.env` (Vite build-time static replacement)

Previously, `import.meta.env` was checked before `process.env`. If you rely on build-time `PUBLIC_*` values that differ from your runtime `process.env`, you may need to update your configuration to ensure the correct values are set in `process.env` at runtime.
Loading