Skip to content

chore(clerk-react,shared): Temp fix for ESLint errors#1887

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
tmilewski wants to merge 3 commits into from
Closed

chore(clerk-react,shared): Temp fix for ESLint errors #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
291a37e
build(repo): Narrow Turborepo inputs for tasks
tmilewski Oct 14, 2023
c64e8e6
build(repo): Consolidate common inputs
tmilewski Oct 14, 2023
a4213bf
chore(clerk-react,shared): Temp fix for ESLint errors
tmilewski Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/dull-ducks-dance.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/perfect-dots-doubt.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
0 setupJest.afterEnv.ts → jest.setup-after-env.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
"version": "npx changeset version && ./scripts/version-info.sh",
"version:snapshot": "./scripts/snapshot.mjs",
"version:staging": "./scripts/staging.mjs",
"release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
"release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
"release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
"release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
"release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
"release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
"release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
"release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
"update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
}
}
1 change: 1 addition & 0 deletions packages/backend/src/tokens/factory.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
publishableKey: runtimePublishableKey || buildtimePublishableKey,
proxyUrl: runtimeProxyUrl || buildProxyUrl,
isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
domain: (runtimeDomain || buildtimeDomain) as any,
userAgent: runtimeUserAgent || buildUserAgent,
});
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome-extension/jest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

roots: ['<rootDir>/src'],
testEnvironment: 'jsdom',
setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

moduleDirectories: ['node_modules', '<rootDir>/src'],
transform: {
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/jest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
displayName: 'clerk-js',
injectGlobals: true,

testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
roots: ['<rootDir>/src'],
setupFiles: ['./setupJest.ts'],
setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
setupFiles: ['./jest.setup.ts'],
setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
testRegex: [
'/__tests__/(.+/)*.*.test.[jt]sx?$',
'/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down
0 packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts
View file
Open in desktop
File renamed without changes.
0 packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts
View file
Open in desktop
File renamed without changes.
0 packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/clerk-js/tsconfig.test.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"include": ["src/**/*", "./setupJestAfterEnv.ts"],
"include": ["src/**/*", "./jest.setup-after-env.ts"],
"exclude": ["node_modules"]
}
69 changes: 69 additions & 0 deletions packages/clerk-js/turbo.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
"extends": ["//"],
"pipeline": {
"build": {
"inputs": [
"*.d.ts",
"**/package.json",
"bundlewatch.config.json",
"headless/**",
"src/**",
"tsconfig.json",
"tsconfig.build.json",
"tsconfig.declarations.json",
"tsup.config.ts",
"webpack.config.js",

"!**/**/*.test.*",
"!**/test/**",
"!**/tests/**",
"!**/__tests__/**",
"!**/__mocks__/**",
"!**/__snapshots__/**",
"!coverage/**",
"!examples/**",
"!node_modules/**"
]
},
"test": {
"inputs": [
"*.d.ts",
"**/package.json",
"bundlewatch.config.json",
"jest.*",
"src/**",
"svgTransform.js",
"tests/**",
"tsconfig.json",
"tsconfig.*.json",
"tsup.config.ts",
"webpack.config.js",

"!**/__snapshots__/**",
"!coverage/**",
"!examples/**",
"!node_modules/**"
]
},
"test:ci": {
"dependsOn": ["build"],
"inputs": [
"*.d.ts",
"**/package.json",
"bundlewatch.config.json",
"jest.*",
"src/**",
"tests/**",
"tsconfig.json",
"tsconfig.*.json",
"tsup.config.ts",
"webpack.config.js",

"!**/__snapshots__/**",
"!coverage/**",
"!examples/**",
"!node_modules/**"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/react/jest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

roots: ['<rootDir>/src'],
testEnvironment: 'jsdom',
setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

moduleDirectories: ['node_modules', '<rootDir>/src'],
transform: {
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/controlComponents.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
const { client, session } = clerk;
// TODO: Remove temp use of __unstable__environment
const { __unstable__environment } = clerk as any;
// @ts-expect-error - TODO: Remove temp use of __unstable__environment
const { __unstable__environment } = clerk;

const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down
24 changes: 16 additions & 8 deletions packages/react/src/components/uiComponents.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
<Portal
mount={clerk.mountSignIn}
unmount={clerk.unmountSignIn}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
<Portal
mount={clerk.mountSignUp}
unmount={clerk.unmountSignUp}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
<Portal
mount={clerk.mountUserProfile}
unmount={clerk.unmountUserProfile}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
<Portal
mount={clerk.mountUserButton}
unmount={clerk.unmountUserButton}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
<Portal
mount={clerk.mountOrganizationProfile}
unmount={clerk.unmountOrganizationProfile}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
<Portal
mount={clerk.mountCreateOrganization}
unmount={clerk.unmountCreateOrganization}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
<Portal
mount={clerk.mountOrganizationSwitcher}
unmount={clerk.unmountOrganizationSwitcher}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
<Portal
mount={clerk.mountOrganizationList}
unmount={clerk.unmountOrganizationList}
updateProps={(clerk as any).__unstable__updateProps}
// @ts-expect-error - TODO: update usage of __unstable__updateProps
updateProps={clerk.__unstable__updateProps}
props={props}
/>
);
Expand Down
6 changes: 5 additions & 1 deletion packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
options?: SignOutOptions,
): Promise<void> => {
const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
const callback =
typeof signOutCallbackOrOptions === 'function'
? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
: () => this.clerkjs?.signOut(signOutCallbackOrOptions);

if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/utils/loadClerkJsScript.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
const { frontendApi, publishableKey } = opts;

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-node/jest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
transform: {
'^.+\\.ts$': 'ts-jest',
},
setupFiles: ['<rootDir>/setupEnvVars.js'],
setupFiles: ['<rootDir>/jest.setup.js'],
collectCoverage: true,
// Jest currently does not support package.json subpath imports
// so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down
0 packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js
View file
Open in desktop
File renamed without changes.
28 changes: 28 additions & 0 deletions packages/sdk-node/turbo.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
"extends": ["//"],
"pipeline": {
"build": {
"inputs": [
"*.d.ts",
"**/package.json",
"cjs/**",
"esm/**",
"src/**",
"scripts/**",
"tsconfig.json",
"tsconfig.declarations.json",
"tsup.config.ts",

"!**/**/*.test.*",
"!**/test/**",
"!**/tests/**",
"!**/__tests__/**",
"!**/__mocks__/**",
"!**/__snapshots__/**",
"!coverage/**",
"!examples/**",
"!node_modules/**"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/shared/jest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

testEnvironment: 'jsdom',
roots: ['<rootDir>/src'],
setupFiles: ['./setupJest.ts'],
setupFiles: ['./jest.setup.ts'],

collectCoverage: false,
coverageProvider: 'v8',
Expand Down
0 packages/shared/setupJest.ts → packages/shared/jest.setup.ts
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion packages/shared/src/hooks/useOrganization.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
ActiveSessionResource,
ClerkPaginationParams,
GetDomainsParams,
GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
isLoaded: !isMembershipsLoading && !isInvitationsLoading,
organization,
membershipList,
membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
membership: getCurrentOrganizationMembership(
(session as ActiveSessionResource).user.organizationMemberships,
organization.id,
), // your membership in the current org
invitationList,
unstable__mutate: () => {
void mutateMembershipList();
Expand Down
16 changes: 8 additions & 8 deletions tsconfig.eslint.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
"allowJs": true
},
"include": [
".eslintrc.js",
"commitlint.config.js",
"jest.*.ts",
"integration/*/*.js",
"integration/**/*.ts",
"integration/**/*.tsx",
"packages/*/src",
"packages/*/*.js",
"packages/**/*.ts",
"packages/**/*.tsx",
"packages/*/*.js",
"integration/**/*.ts",
"integration/**/*.tsx",
"integration/*/*.js",
".eslintrc.js",
"commitlint.config.js",
"scripts/*.mjs",
"setupJest.afterEnv.ts"
"scripts/*.mjs"
]
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore(clerk-react,shared): Temp fix for ESLint errors by tmilewski · Pull Request #1887 · clerk/javascript · GitHub
Skip to content
chore(clerk-react,shared): Temp fix for ESLint errors#1887

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(clerk-react,shared): Temp fix for ESLint errors by tmilewski · Pull Request #1887 · clerk/javascript · GitHub
Skip to content
chore(clerk-react,shared): Temp fix for ESLint errors#1887

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(clerk-react,shared): Temp fix for ESLint errors by tmilewski · Pull Request #1887 · clerk/javascript · GitHub
Skip to content
chore(clerk-react,shared): Temp fix for ESLint errors#1887

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

tmilewski
wants to merge
3
commits into

from

 Closed


chore(clerk-react,shared): Temp fix for ESLint errors
#1887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
291a37e

build(repo): Narrow Turborepo inputs for tasks


tmilewski Oct 14, 2023
c64e8e6

build(repo): Consolidate common inputs


tmilewski Oct 14, 2023
a4213bf

chore(clerk-react,shared): Temp fix for ESLint errors


tmilewski Oct 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/dull-ducks-dance.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

2 changes: 2 additions & 0 deletions
.changeset/perfect-dots-doubt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

0
setupJest.afterEnv.ts → jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,10 +88,10 @@
 "version": "npx changeset version && ./scripts/version-info.sh",
 "version:snapshot": "./scripts/snapshot.mjs",
 "version:staging": "./scripts/staging.mjs",
 "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
 "release:snapshot": "TURBO_FORCE=true ORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
 "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
 "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
 "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
 }
}

1 change: 1 addition & 0 deletions
packages/backend/src/tokens/factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,6 +106,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 publishableKey: runtimePublishableKey || buildtimePublishableKey,
 proxyUrl: runtimeProxyUrl || buildProxyUrl,
 isSatellite: runtimeIsSatellite || buildtimeIsSatellite,
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 domain: (runtimeDomain || buildtimeDomain) as any,
 userAgent: runtimeUserAgent || buildUserAgent,
 });
Expand Down

2 changes: 1 addition & 1 deletion
packages/chrome-extension/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/clerk-js/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ const config = {
 displayName: 'clerk-js',
 injectGlobals: true,

 testEnvironment: '<rootDir>/jsdom-with-timezone.ts',
 testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFilesAfterEnv: ['./setupJestAfterEnv.ts'],
 setupFiles: ['./jest.setup.ts'],
 setupFilesAfterEnv: ['./jest.setup-after-env.ts'],
 testRegex: [
 '/__tests__/(.+/)*.*.test.[jt]sx?$',
 '/ui/.*/__tests__/.*.test.[jt]sx?$',
Expand Down

0
packages/clerk-js/jsdom-with-timezone.ts → ...ages/clerk-js/jest.jsdom-with-timezone.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJestAfterEnv.ts → packages/clerk-js/jest.setup-after-env.ts

View file


Open in desktop


File renamed without changes.


0
packages/clerk-js/setupJest.ts → packages/clerk-js/jest.setup.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
 "extends": "./tsconfig.json",
 "include": ["src/**/*", "./setupJestAfterEnv.ts"],
 "include": ["src/**/*", "./jest.setup-after-env.ts"],
 "exclude": ["node_modules"]
}

69 changes: 69 additions & 0 deletions
packages/clerk-js/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "headless/**",
 "src/**",
 "tsconfig.json",
 "tsconfig.build.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "svgTransform.js",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 },
 "test:ci": {
 "dependsOn": ["build"],
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "bundlewatch.config.json",
 "jest.*",
 "src/**",
 "tests/**",
 "tsconfig.json",
 "tsconfig.*.json",
 "tsup.config.ts",
 "webpack.config.js",

 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/react/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {

 roots: ['<rootDir>/src'],
 testEnvironment: 'jsdom',
 setupFilesAfterEnv: ['<rootDir>../../setupJest.afterEnv.ts'],
 setupFilesAfterEnv: ['<rootDir>../../jest.setup-after-env.ts'],

 moduleDirectories: ['node_modules', '<rootDir>/src'],
 transform: {
Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/controlComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,8 @@ export const ClerkLoading = ({ children }: React.PropsWithChildren<unknown>): JS

export const RedirectToSignIn = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToSignInProps>) => {
 const { client, session } = clerk;
 // TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk as any;
 // @ts-expect-error - TODO: Remove temp use of __unstable__environment
 const { __unstable__environment } = clerk;

 const hasActiveSessions = client.activeSessions && client.activeSessions.length > 0;

Expand Down

24 changes: 16 additions & 8 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,8 @@ export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>
 <Portal
 mount={clerk.mountSignIn}
 unmount={clerk.unmountSignIn}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -83,7 +84,8 @@ export const SignUp = withClerk(({ clerk, ...props }: WithClerkProp<SignUpProps>
 <Portal
 mount={clerk.mountSignUp}
 unmount={clerk.unmountSignUp}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -94,7 +96,8 @@ export const UserProfile = withClerk(({ clerk, ...props }: WithClerkProp<UserPro
 <Portal
 mount={clerk.mountUserProfile}
 unmount={clerk.unmountUserProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -105,7 +108,8 @@ export const UserButton = withClerk(({ clerk, ...props }: WithClerkProp<UserButt
 <Portal
 mount={clerk.mountUserButton}
 unmount={clerk.unmountUserButton}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -116,7 +120,8 @@ export const OrganizationProfile = withClerk(({ clerk, ...props }: WithClerkProp
 <Portal
 mount={clerk.mountOrganizationProfile}
 unmount={clerk.unmountOrganizationProfile}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -127,7 +132,8 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
 <Portal
 mount={clerk.mountCreateOrganization}
 unmount={clerk.unmountCreateOrganization}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -138,7 +144,8 @@ export const OrganizationSwitcher = withClerk(({ clerk, ...props }: WithClerkPro
 <Portal
 mount={clerk.mountOrganizationSwitcher}
 unmount={clerk.unmountOrganizationSwitcher}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand All@@ -149,7 +156,8 @@ export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<Or
 <Portal
 mount={clerk.mountOrganizationList}
 unmount={clerk.unmountOrganizationList}
 updateProps={(clerk as any).__unstable__updateProps}
 // @ts-expect-error - TODO: update usage of __unstable__updateProps
 updateProps={clerk.__unstable__updateProps}
 props={props}
 />
 );
Expand Down

6 changes: 5 additions & 1 deletion
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,7 +732,11 @@ export default class IsomorphicClerk {
 signOutCallbackOrOptions?: SignOutCallback | SignOutOptions,
 options?: SignOutOptions,
 ): Promise<void> => {
 const callback = () => this.clerkjs?.signOut(signOutCallbackOrOptions as any, options);
 const callback =
 typeof signOutCallbackOrOptions === 'function'
 ? () => this.clerkjs?.signOut(signOutCallbackOrOptions, options)
 : () => this.clerkjs?.signOut(signOutCallbackOrOptions);

 if (this.clerkjs && this.#loaded) {
 return callback() as Promise<void>;
 } else {
Expand Down

1 change: 1 addition & 0 deletions
packages/react/src/utils/loadClerkJsScript.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ type LoadClerkJsScriptOptions = Omit<IsomorphicClerkOptions, 'proxyUrl' | 'domai
 domain: string;
};

// eslint-disable-next-line @typescript-eslint/require-await
export const loadClerkJsScript = async (opts: LoadClerkJsScriptOptions) => {
 const { frontendApi, publishableKey } = opts;

Expand Down

2 changes: 1 addition & 1 deletion
packages/sdk-node/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ module.exports = {
 transform: {
 '^.+\\.ts$': 'ts-jest',
 },
 setupFiles: ['<rootDir>/setupEnvVars.js'],
 setupFiles: ['<rootDir>/jest.setup.js'],
 collectCoverage: true,
 // Jest currently does not support package.json subpath imports
 // so we manually map them to the actual files. See @clerk/backend/package.json
Expand Down

0
packages/sdk-node/setupEnvVars.js → packages/sdk-node/jest.setup.js

View file


Open in desktop


File renamed without changes.


28 changes: 28 additions & 0 deletions
packages/sdk-node/turbo.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
{
 "extends": ["//"],
 "pipeline": {
 "build": {
 "inputs": [
 "*.d.ts",
 "**/package.json",
 "cjs/**",
 "esm/**",
 "src/**",
 "scripts/**",
 "tsconfig.json",
 "tsconfig.declarations.json",
 "tsup.config.ts",

 "!**/**/*.test.*",
 "!**/test/**",
 "!**/tests/**",
 "!**/__tests__/**",
 "!**/__mocks__/**",
 "!**/__snapshots__/**",
 "!coverage/**",
 "!examples/**",
 "!node_modules/**"
 ]
 }
 }
}

2 changes: 1 addition & 1 deletion
packages/shared/jest.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const config = {

 testEnvironment: 'jsdom',
 roots: ['<rootDir>/src'],
 setupFiles: ['./setupJest.ts'],
 setupFiles: ['./jest.setup.ts'],

 collectCoverage: false,
 coverageProvider: 'v8',
Expand Down

0
packages/shared/setupJest.ts → packages/shared/jest.setup.ts

View file


Open in desktop


File renamed without changes.


6 changes: 5 additions & 1 deletion
packages/shared/src/hooks/useOrganization.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
 ActiveSessionResource,
 ClerkPaginationParams,
 GetDomainsParams,
 GetInvitationsParams,
Expand DownExpand Up@@ -365,7 +366,10 @@ export const useOrganization: UseOrganization = params => {
 isLoaded: !isMembershipsLoading && !isInvitationsLoading,
 organization,
 membershipList,
 membership: getCurrentOrganizationMembership(session!.user.organizationMemberships, organization.id), // your membership in the current org
 membership: getCurrentOrganizationMembership(
 (session as ActiveSessionResource).user.organizationMemberships,
 organization.id,
 ), // your membership in the current org
 invitationList,
 unstable__mutate: () => {
 void mutateMembershipList();
Expand Down

16 changes: 8 additions & 8 deletions
tsconfig.eslint.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@
 "allowJs": true
 },
 "include": [
 ".eslintrc.js",
 "commitlint.config.js",
 "jest.*.ts",
 "integration/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "packages/*/src",
 "packages/*/*.js",
 "packages/**/*.ts",
 "packages/**/*.tsx",
 "packages/*/*.js",
 "integration/**/*.ts",
 "integration/**/*.tsx",
 "integration/*/*.js",
 ".eslintrc.js",
 "commitlint.config.js",
 "scripts/*.mjs",
 "setupJest.afterEnv.ts"
 "scripts/*.mjs"
 ]
}
Loading