Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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" + '
feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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('^' + ".*" + ' feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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('^' + ".*" + ' feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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" + ' feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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('^' + ".*" + ' feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts
, '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); } })(); })(); feat(nextjs): Support rendering ClerkProvider in client components by brkalow · Pull Request #1840 · clerk/javascript · GitHub
Skip to content

feat(nextjs): Support rendering ClerkProvider in client components - #1840

Merged
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider
Oct 18, 2023
Merged

feat(nextjs): Support rendering ClerkProvider in client components#1840
brkalow merged 7 commits into
mainfrom
brk.feat/app-router-client-provider

Conversation

@brkalow

@brkalowbrkalow commented Oct 6, 2023

Copy link
Copy Markdown
Member

Description

Allow ClerkProvider to be rendered in client components in App Router. This is accomplished by introducing a "compat" layer that uses next/compat/router to detect the presence of the pages router. If detected, we render the pages provider, otherwise we render the app router provider.

fixes JS-573

Checklist

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

Type of change

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

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Oct 6, 2023

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 83f81fb

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

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

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

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

@brkalow

Copy link
Copy Markdown
MemberAuthor

!snapshot

@clerk-cookie

Copy link
Copy Markdown
Collaborator

Hey @brkalow - the snapshot version command generated the following package versions:

PackageVersion
@clerk/backend0.30.3-snapshot.e42e882
@clerk/chrome-extension0.4.6-snapshot.e42e882
@clerk/clerk-js4.60.1-snapshot.e42e882
@clerk/clerk-expo0.19.8-snapshot.e42e882
@clerk/fastify0.6.13-snapshot.e42e882
gatsby-plugin-clerk4.4.14-snapshot.e42e882
@clerk/nextjs4.25.3-snapshot.e42e882
@clerk/clerk-react4.26.3-snapshot.e42e882
@clerk/remix3.0.5-snapshot.e42e882
@clerk/clerk-sdk-node4.12.12-snapshot.e42e882
@clerk/shared0.24.3-snapshot.e42e882

Tip: use the snippet copy button below to quickly install the required packages.

# @clerk/backend
npm i @clerk/backend@0.30.3-snapshot.e42e882
# @clerk/chrome-extension
npm i @clerk/chrome-extension@0.4.6-snapshot.e42e882
# @clerk/clerk-js
npm i @clerk/clerk-js@4.60.1-snapshot.e42e882
# @clerk/clerk-expo
npm i @clerk/clerk-expo@0.19.8-snapshot.e42e882
# @clerk/fastify
npm i @clerk/fastify@0.6.13-snapshot.e42e882
# gatsby-plugin-clerk
npm i gatsby-plugin-clerk@4.4.14-snapshot.e42e882
# @clerk/nextjs
npm i @clerk/nextjs@4.25.3-snapshot.e42e882
# @clerk/clerk-react
npm i @clerk/clerk-react@4.26.3-snapshot.e42e882
# @clerk/remix
npm i @clerk/remix@3.0.5-snapshot.e42e882
# @clerk/clerk-sdk-node
npm i @clerk/clerk-sdk-node@4.12.12-snapshot.e42e882
# @clerk/shared
npm i @clerk/shared@0.24.3-snapshot.e42e882

@@ -0,0 +1,19 @@
'use client';

import { useRouter } from 'next/compat/router';

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a stable export we can rely on being available?

Or are we reaching into private APIs here?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I believe it is stable and reliable, based on PR: vercel/next.js#42502.

export function ClerkProvider(props: NextClerkProviderProps) {
const router = useRouter();

const Provider = router ? PageClerkProvider : ClientClerkProvider;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The solution here makes perfect sense to me :)
Do you think we could merge the two client providers into one? I took a quick look and they look pretty similar.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis possibly, the difficulty is they rely on the two different router hooks, which is why we need this layer. We could abstract the dependency on the router into a prop and use this layer to compute the prop to pass down to single provider.

@brkalow
brkalow marked this pull request as ready for review October 18, 2023 04:51
@brkalow
brkalow requested a review from a team as a code ownerOctober 18, 2023 04:51
import type { Application } from '../models/application';
import { appConfigs } from '../presets';

test.describe('next build @nextjs', () => {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@nikosdouvlis Any feedback on the test? 🙏

Comment threadpackage.json
"test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
"test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

As discussed in the initial RFC, I added a @nextjs tag as well.

Comment on lines +76 to +79
log: (msg: string) => {
buildOutput += `\n${msg}`;
log(msg);
},

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Captures and makes the build output available by way of app.buildOutput. This allows us to assert on the output.

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

@brkalow
brkalow added this pull request to the merge queue Oct 18, 2023
Merged via the queue into main with commit a0e6783Oct 18, 2023
@brkalow
brkalow deleted the brk.feat/app-router-client-provider branch October 18, 2023 14:36
@clerk-cookieclerk-cookie mentioned this pull request Oct 18, 2023
@clerk-cookie

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 18, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@brkalow@clerk-cookie@nikosdouvlis@dimkl@anagstef@LekoArts