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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};
, '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
9 changes: 9 additions & 0 deletions .changeset/shiny-pants-jump.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/astro': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
'@clerk/vue': minor
---

Remove `treatPendingAsSignedOut` from Clerk options
1 change: 0 additions & 1 deletion packages/astro/src/env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ interface InternalEnv {
readonly PUBLIC_CLERK_SIGN_UP_URL?: string;
readonly PUBLIC_CLERK_TELEMETRY_DISABLED?: string;
readonly PUBLIC_CLERK_TELEMETRY_DEBUG?: string;
readonly PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT?: string;
}

interface ImportMeta {
Expand Down
11 changes: 1 addition & 10 deletions packages/astro/src/integration/create-integration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,15 +19,7 @@ type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

function createIntegration<Params extends HotloadAstroClerkIntegrationParams>() {
return (params?: Params): AstroIntegration => {
const {
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
enableEnvSchema = true,
treatPendingAsSignedOut,
} = params || {};
const { proxyUrl, isSatellite, domain, signInUrl, signUpUrl, enableEnvSchema = true } = params || {};

// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
Expand DownExpand Up@@ -65,7 +57,6 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
/**
* Convert the integration params to environment variable in order for it to be readable from the server
*/
...buildEnvVarFromOption(treatPendingAsSignedOut, 'PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT'),
...buildEnvVarFromOption(signInUrl, 'PUBLIC_CLERK_SIGN_IN_URL'),
...buildEnvVarFromOption(signUpUrl, 'PUBLIC_CLERK_SIGN_UP_URL'),
...buildEnvVarFromOption(isSatellite, 'PUBLIC_CLERK_IS_SATELLITE'),
Expand Down
9 changes: 2 additions & 7 deletions packages/astro/src/react/hooks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import { authAsyncStorage } from '#async-local-storage';

import { $authStore, $clerkStore } from '../stores/external';
import { $authStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';

/**
Expand DownExpand Up@@ -87,7 +87,6 @@ type UseAuth = (options?: PendingSessionOptions) => UseAuthReturn;
*/
export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
const authContext = useAuthStore();
const clerkContext = useStore($clerkStore);

const getToken: GetToken = useCallback(createGetToken(), []);
const signOut: SignOut = useCallback(createSignOut(), []);
Expand DownExpand Up@@ -117,11 +116,7 @@ export const useAuth: UseAuth = ({ treatPendingAsSignedOut } = {}) => {
has,
},
options: {
treatPendingAsSignedOut:
// Fallback from option provided via SSR / CSR contexts
treatPendingAsSignedOut ??
clerkContext?.__internal_getOption?.('treatPendingAsSignedOut') ??
import.meta.env.PUBLIC_CLERK_TREAT_PENDING_AS_SIGNED_OUT,
treatPendingAsSignedOut,
},
});

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,6 @@ const defaultOptions: ClerkOptions = {
signUpFallbackRedirectUrl: undefined,
signInForceRedirectUrl: undefined,
signUpForceRedirectUrl: undefined,
treatPendingAsSignedOut: true,
newSubscriptionRedirectUrl: undefined,
};

Expand DownExpand Up@@ -360,10 +359,8 @@ export class Clerk implements ClerkInterface {
}

get isSignedIn(): boolean {
const { treatPendingAsSignedOut } = this.#options;

const hasPendingSession = this?.session?.status === 'pending';
if (treatPendingAsSignedOut && hasPendingSession) {
if (hasPendingSession) {
return false;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,7 @@ export const useAuth = (initialAuthStateOrOptions: UseAuthOptions = {}): UseAuth
signOut,
},
{
treatPendingAsSignedOut:
treatPendingAsSignedOut ?? isomorphicClerk.__internal_getOption?.('treatPendingAsSignedOut'),
treatPendingAsSignedOut,
},
);
};
Expand Down
5 changes: 2 additions & 3 deletions packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ import type {
SignUpFallbackRedirectUrl,
SignUpForceRedirectUrl,
} from './redirects';
import type { PendingSessionOptions, SessionTask, SignedInSessionResource } from './session';
import type { SessionTask, SignedInSessionResource } from './session';
import type { SessionVerificationLevel } from './sessionVerification';
import type { SignInResource } from './signIn';
import type { SignUpResource } from './signUp';
Expand DownExpand Up@@ -962,8 +962,7 @@ type ClerkOptionsNavigation =
routerDebug?: boolean;
};

export type ClerkOptions = PendingSessionOptions &
ClerkOptionsNavigation &
export type ClerkOptions = ClerkOptionsNavigation &
SignInForceRedirectUrl &
SignInFallbackRedirectUrl &
SignUpForceRedirectUrl &
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/composables/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ type UseAuth = (options?: PendingSessionOptions) => ToComputedRefs<UseAuthReturn
* </template>
*/
export const useAuth: UseAuth = (options = {}) => {
const { clerk, authCtx, ...contextOptions } = useClerkContext();
const { clerk, authCtx } = useClerkContext();

const getToken: GetToken = createGetToken(clerk);
const signOut: SignOut = createSignOut(clerk);
Expand All@@ -100,7 +100,7 @@ export const useAuth: UseAuth = (options = {}) => {
has,
},
options: {
treatPendingAsSignedOut: options.treatPendingAsSignedOut ?? contextOptions.treatPendingAsSignedOut,
treatPendingAsSignedOut: options.treatPendingAsSignedOut,
},
});

Expand Down
2 changes: 0 additions & 2 deletions packages/vue/src/plugin.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ export const clerkPlugin: Plugin<[PluginOptions]> = {
sessionCtx,
userCtx,
organizationCtx,
treatPendingAsSignedOut:
options.treatPendingAsSignedOut ?? clerk.value?.__internal_getOption?.('treatPendingAsSignedOut'),
});
},
};