Skip to content

fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769

Merged
dimkl merged 5 commits into
mainfrom
fix-shared-deps-in-backend
Sep 28, 2023
Merged

fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom
fix-shared-deps-in-backend

Conversation

@dimkl

@dimkldimkl commented Sep 22, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Review it per commit

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

@dimkl
dimkl requested a review from a team as a code ownerSeptember 22, 2023 14:16
@dimkldimkl self-assigned this Sep 22, 2023
@changeset-bot

changeset-botBot commented Sep 22, 2023•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 8f52000

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

This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

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

@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from df920f3 to b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from b90c204 to 20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef approved these changes Sep 25, 2023
View reviewed changes

@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.

💯

Comment threadpackages/shared/src/utils/callWithRetry.ts Outdated
Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from 20d7932 to 5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl commented Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });

@dimkldimklSep 25, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)

dimkl
dimkl commented Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
// TODO: Check if we can merge it with `./instance.ts#isStaging()`
const DEV_OR_STAGING_SUFFIXES = [

@dimkldimklSep 25, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared

@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch 2 times, most recently from 8fef32a to f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow reviewed Sep 25, 2023
View reviewed changes

@brkalowbrkalow left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏

Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik mentioned this pull request Sep 27, 2023
Merged
24 tasks
@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from 6e815d1 to 2d79433CompareSeptember 27, 2023 12:59
@dimkl

dimkl commented Sep 27, 2023

Copy link
Copy Markdown
ContributorAuthor

@brkalow JSDocs added to the moved helpers. ptal

@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from 2d79433 to f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl requested a review from brkalowSeptember 27, 2023 13:58
@dimkl

dimkl commented Sep 27, 2023

Copy link
Copy Markdown
ContributorAuthor

Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49

@dimkl
dimklforce-pushed the fix-shared-deps-in-backend branch from f18819e to 8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl enabled auto-merge September 28, 2023 12:13
@dimkl
dimkl added this pull request to the merge queue Sep 28, 2023
Merged via the queue into main with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl deleted the fix-shared-deps-in-backend branch September 28, 2023 12:26
@clerk-cookieclerk-cookie mentioned this pull request Sep 28, 2023
Merged
@clerk-cookie

clerk-cookie commented Sep 28, 2024

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 Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@brkalowbrkalowbrkalow approved these changes
+1 more reviewer
@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend by dimkl · Pull Request #1769 · clerk/javascript · GitHub
Skip to content
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769
Merged
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Sep 28, 2023
Merged
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Conversation
@dimkl
@dimkldimkl
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend by dimkl · Pull Request #1769 · clerk/javascript · GitHub
Skip to content
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769
Merged
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Sep 28, 2023
Merged
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Conversation
@dimkl
@dimkldimkl
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

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

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend by dimkl · Pull Request #1769 · clerk/javascript · GitHub
Skip to content
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769
Merged
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Sep 28, 2023
Merged
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Conversation
@dimkl
@dimkldimkl
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend by dimkl · Pull Request #1769 · clerk/javascript · GitHub
Skip to content
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769
Merged
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Sep 28, 2023
Merged
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Conversation
@dimkl
@dimkldimkl
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend by dimkl · Pull Request #1769 · clerk/javascript · GitHub
Skip to content
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend - #1769
Merged
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Sep 28, 2023
Merged
fix(shared, nextjs): Support importing @clerk/shared in @clerk/backend#1769
dimkl merged 5 commits into
mainfrom 
fix-shared-deps-in-backend
Conversation
@dimkl
@dimkldimkl
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef

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

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Review it per commit
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
@dimkl
dimkl
requested a review
from a team
as a code ownerSeptember 22, 2023 14:16
@dimkldimkl
self-assigned this
Sep 22, 2023
@changeset-bot
changeset-botBot
commented
Sep 22, 2023•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 8f52000
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 11 packages
NameType
@clerk/sharedMinor
@clerk/backendMinor
@clerk/clerk-jsPatch
@clerk/fastifyPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-sdk-nodePatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
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
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
df920f3 to
b90c204CompareSeptember 22, 2023 14:16
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
b90c204 to
20d7932CompareSeptember 22, 2023 16:12
anagstef
anagstef
approved these changes
Sep 25, 2023
View reviewed changes
@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.

💯
Comment threadpackages/shared/src/utils/callWithRetry.ts
Outdated

Comment threadpackages/backend/src/redirections.test.ts
Comment threadpackages/backend/src/redirections.test.ts
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
20d7932 to
5d6c90bCompareSeptember 25, 2023 09:20
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/backend/src/util/shared.ts

import { buildErrorThrower } from '@clerk/shared';
// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will fix this in another PR that will update how we build and run tests in backend package (currently tsup is not used in tests)
dimkl
dimkl
commented
Sep 25, 2023
View reviewed changes
Comment threadpackages/shared/src/utils/keys.ts

export function createDevOrStagingUrlCache() {
 // TODO: Check if we can merge it with `./instance.ts#isStaging()`
 const DEV_OR_STAGING_SUFFIXES = [
@dimkldimklSep 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

I will cater this in another iteration where we will evaluate the exports of the @clerk/shared
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
2 times, most recently
from
8fef32a to
f43b75fCompareSeptember 25, 2023 16:44
brkalow
brkalow
reviewed
Sep 25, 2023
View reviewed changes
@brkalowbrkalow
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Can we add JSDoc comments to the exported methods moved to @clerk/shared as part of this? It should be quick, and leaves it better for the next person to touch this code 🙏
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/url.ts
Comment threadpackages/shared/src/utils/callWithRetry.ts
@NikpolikNikpolik
mentioned this pull request
Sep 27, 2023
 Merged

24 tasks
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
6e815d1 to
2d79433CompareSeptember 27, 2023 12:59
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
@brkalow JSDocs added to the moved helpers. ptal
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
2d79433 to
f18819eCompareSeptember 27, 2023 13:58
@dimkl
dimkl
requested a review
from brkalowSeptember 27, 2023 13:58
@dimkl
dimkl
commented
Sep 27, 2023

Copy link


Copy Markdown

ContributorAuthor
Since @clerk/nextjs depends on the @clerk/backend we should first merge this PR #1767 and then proceed with this. Otherwise we get the following error when building nextjs:
Screenshot 2023-09-27 at 17 22 49
@dimkl
dimklforce-pushed
the
fix-shared-deps-in-backend
branch
from
f18819e to
8f52000CompareSeptember 28, 2023 12:10
@dimkl
dimkl
enabled auto-merge
September 28, 2023 12:13
@dimkl
dimkl
added this pull request to the merge queue
Sep 28, 2023

Merged
via the queue into
main
with commit 6dbaa2fSep 28, 2023
@dimkl
dimkl
deleted the

fix-shared-deps-in-backend

branch
September 28, 2023 12:26
@clerk-cookieclerk-cookie
mentioned this pull request
Sep 28, 2023
 Merged

@clerk-cookie
clerk-cookie
commented
Sep 28, 2024

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
Sep 28, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@brkalowbrkalowbrkalow approved these changes

+1 more reviewer

@anagstefanagstefanagstef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dimkldimkl

Labels

backend

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@dimkl@clerk-cookie@brkalow@anagstef