fix(*): Apply fixes reported before ship week#2589

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dimkl merged 6 commits into from
Jan 16, 2024
Merged

fix(*): Apply fixes reported before ship week #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9bd5232
fix(clerk-js): Typo in error message
dimkl Jan 12, 2024
dd6a7b9
chore(backend): Re-use `parseError` helper from @clerk/shared/error
dimkl Jan 15, 2024
1976932
chore(clerk-js): Drop parseError and parseErrors import from ./intern…
dimkl Jan 15, 2024
7d84fc8
fix(nextjs): Fix error message of auth() to also mention clerkMiddleware
dimkl Jan 15, 2024
a7d676e
fix(nextjs): Update examples in error messages to use clerkMiddleware
dimkl Jan 15, 2024
7f12fff
chore(repo): Add changeset
dimkl Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/giant-bags-stare.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.
13 changes: 1 addition & 12 deletions packages/backend/src/api/request.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
}
return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
return {
code: error.code,
message: error.message,
longMessage: error.long_message,
meta: {
paramName: error?.meta?.param_name,
sessionId: error?.meta?.session_id,
},
};
}
2 changes: 0 additions & 2 deletions packages/clerk-js/src/core/resources/Error.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
isKnownError,
isMetamaskError,
isUserLockedError,
parseError,
parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';
3 changes: 2 additions & 1 deletion packages/clerk-js/src/core/resources/Verification.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
ClerkAPIError,
SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
pathRoot = '';
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/warnings.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
cannotRenderComponentWhenSessionExists:
'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
cannotRenderSignUpComponentWhenSessionExists:
'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
cannotRenderSignInComponentWhenSessionExists:
'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
cannotRenderComponentWhenUserDoesNotExist:
Expand Down
8 changes: 4 additions & 4 deletions packages/nextjs/src/server/errors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
`Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
`Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
- clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down

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

Skip to content
fix(*): Apply fixes reported before ship week#2589

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 6 commits into

from

Jan 16, 2024
 Merged


fix(*): Apply fixes reported before ship week
#2589
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
9bd5232

fix(clerk-js): Typo in error message


dimkl Jan 12, 2024
dd6a7b9

chore(backend): Re-use `parseError` helper from @clerk/shared/error


dimkl Jan 15, 2024
1976932

chore(clerk-js): Drop parseError and parseErrors import from ./intern…


dimkl Jan 15, 2024
7d84fc8

fix(nextjs): Fix error message of auth() to also mention clerkMiddleware


dimkl Jan 15, 2024
a7d676e

fix(nextjs): Update examples in error messages to use clerkMiddleware


dimkl Jan 15, 2024
7f12fff

chore(repo): Add changeset


dimkl Jan 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/giant-bags-stare.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/nextjs': patch
---

Update `@clerk/nextjs` error messages to refer to `clerkMiddleware()` and deprecated `authMiddleware()` and fix a typo in `cannotRenderSignUpComponentWhenSessionExists` error message.

13 changes: 1 addition & 12 deletions
packages/backend/src/api/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
import snakecaseKeys from 'snakecase-keys';

Expand DownExpand Up@@ -168,15 +169,3 @@ function parseErrors(data: unknown): ClerkAPIError[] {
 }
 return [];
}

function parseError(error: ClerkAPIErrorJSON): ClerkAPIError {
 return {
 code: error.code,
 message: error.message,
 longMessage: error.long_message,
 meta: {
 paramName: error?.meta?.param_name,
 sessionId: error?.meta?.session_id,
 },
 };
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/core/resources/Error.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,5 @@ export {
 isKnownError,
 isMetamaskError,
 isUserLockedError,
 parseError,
 parseErrors,
} from '@clerk/shared/error';
export type { MetamaskError } from '@clerk/shared/error';

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/Verification.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { parseError } from '@clerk/shared/error';
import type {
 ClerkAPIError,
 SignUpVerificationJSON,
Expand All@@ -10,7 +11,7 @@ import type {
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource, parseError } from './internal';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
 pathRoot = '';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/warnings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const warnings = {
 cannotRenderComponentWhenSessionExists:
 'The <SignUp/> and <SignIn/> components cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the Home URL instead.',
 cannotRenderSignUpComponentWhenSessionExists:
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value setted in `afterSignUp` URL instead.',
 'The <SignUp/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the value set in `afterSignUp` URL instead.',
 cannotRenderSignInComponentWhenSessionExists:
 'The <SignIn/> component cannot render when a user is already signed in, unless the application allows multiple sessions. Since a user is signed in and this application only allows a single session, Clerk is redirecting to the `afterSignIn` URL instead.',
 cannotRenderComponentWhenUserDoesNotExist:
Expand Down

8 changes: 4 additions & 4 deletions
packages/nextjs/src/server/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ export const missingDomainAndProxy = `
Missing domain and proxyUrl. A satellite application needs to specify a domain or a proxyUrl.

1) With middleware
 e.g. export default authMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'
Expand All@@ -13,7 +13,7 @@ Invalid signInUrl. A satellite application requires a signInUrl for development
Check if signInUrl is missing from your configuration or if it is not an absolute URL

1) With middleware
 e.g. export default authMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true}); // or the deprecated authMiddleware()
2) With environment variables e.g.
 NEXT_PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
 NEXT_PUBLIC_CLERK_IS_SATELLITE='true'`;
Expand All@@ -31,8 +31,8 @@ Alternatively, you can set your own ignoredRoutes. See https://clerk.com/docs/ne
export const getAuthAuthHeaderMissing = () => authAuthHeaderMissing('getAuth');

export const authAuthHeaderMissing = (helperName = 'auth') =>
 `Clerk: ${helperName}() was called but Clerk can't detect usage of authMiddleware(). Please ensure the following:
- authMiddleware() is used in your Next.js Middleware.
 `Clerk: ${helperName}() was called but Clerk can't detect usage of clerkMiddleware() (or the deprecated authMiddleware()). Please ensure the following:
-  clerkMiddleware() (or the deprecated authMiddleware()) is used in your Next.js Middleware.
- Your Middleware matcher is configured to match this route or page.
- If you are using the src directory, make sure the Middleware file is inside of it.

Expand Down