Skip to content
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.

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

feat(sdks): Add sdkMetadata to Clerk singleton, populate it for each SDK #1857

Merged
merged 9 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .changeset/nasty-ties-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'gatsby-plugin-clerk': patch
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
'@clerk/fastify': patch
'@clerk/nextjs': patch
'@clerk/clerk-react': patch
'@clerk/remix': patch
'@clerk/types': patch
'@clerk/clerk-expo': patch
---

Introduce a new property on the core Clerk singleton, `sdkMetadata`. This will be populated by each host SDK. This metadata will be used to make logging and debugging easier.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ yarn-error.log
testem.log
/typings
**/coverage/**
*.tsbuildinfo

# System Files
.DS_Store
Expand Down
9 changes: 9 additions & 0 deletions packages/chrome-extension/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { name, version } = require('./package.json');

module.exports = {
displayName: 'clerk-js',
injectGlobals: true,
Expand All @@ -13,4 +16,10 @@ module.exports = {

testRegex: ['/src/.*.test.[jt]sx?$'],
testPathIgnorePatterns: ['/node_modules/'],

globals: {
__DEV__: true,
PACKAGE_NAME: name,
PACKAGE_VERSION: version,
},
};
5 changes: 5 additions & 0 deletions packages/chrome-extension/src/ClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import type { TokenCache } from './cache';
import { ChromeStorageCache } from './cache';
import { buildClerk } from './singleton';

Clerk.sdkMetadata = {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
};

__internal__setErrorThrowerOptions({
packageName: '@clerk/chrome-extension',
});
Expand Down
7 changes: 7 additions & 0 deletions packages/chrome-extension/src/globals.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export {};

declare global {
const PACKAGE_NAME: string;
const PACKAGE_VERSION: string;
const __DEV__: boolean;
}
7 changes: 7 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import type {
PublishableKey,
RedirectOptions,
Resources,
SDKMetadata,
SetActiveParams,
SignInProps,
SignInRedirectOptions,
Expand Down Expand Up @@ -144,7 +145,13 @@ const defaultOptions: ClerkOptions = {

export default class Clerk implements ClerkInterface {
public static mountComponentRenderer?: MountComponentRenderer;

public static version: string = __PKG_VERSION__;
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
};

public client?: ClientResource;
public session?: ActiveSessionResource | null;
public organization?: OrganizationResource | null;
Expand Down
7 changes: 5 additions & 2 deletions packages/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@
"dist"
],
"scripts": {
"build": "tsc -p tsconfig.build.json",
"dev": "tsc -p tsconfig.build.json --watch",
"build": "tsup",
"dev": "tsup --watch",
"dev:publish": "npm run dev -- --env.publish",
"build:declarations": "tsc -p tsconfig.declarations.json",
Copy link
Member

Choose a reason for hiding this comment

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

I know that we do this in the other packages but IMO we should just use tsup to also output the types and not use TSC

But that can happen in another PR

"publish:local": "npx yalc push --replace --sig",
"clean": "rimraf ./dist",
"lint": "eslint src/"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/expo/src/globals.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export {};

declare global {
const PACKAGE_NAME: string;
const PACKAGE_VERSION: string;
}
5 changes: 5 additions & 0 deletions packages/expo/src/singleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import type { HeadlessBrowserClerk } from '@clerk/clerk-react';

import type { TokenCache } from './cache';

Clerk.sdkMetadata = {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
};

const KEY = '__clerk_client_jwt';

export let clerk: HeadlessBrowserClerk;
Expand Down
22 changes: 0 additions & 22 deletions packages/expo/tsconfig.build.json

This file was deleted.

12 changes: 12 additions & 0 deletions packages/expo/tsconfig.declarations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"skipLibCheck": true,
"noEmit": false,
"declaration": true,
"emitDeclarationOnly": true,
"declarationMap": true,
"sourceMap": false,
"declarationDir": "./dist"
}
}
24 changes: 22 additions & 2 deletions packages/expo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
{
"extends": "./tsconfig.build.json",
"compilerOptions": {
"outDir": "dist",
Copy link
Member

Choose a reason for hiding this comment

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

We should extend this from a root/base tsconfig.json

But that's for another PR

"baseUrl": ".",
"lib": ["es6", "dom"],
"jsx": "react",
"module": "commonjs",
"moduleResolution": "node",
"importHelpers": true,
"declaration": true,
"declarationMap": false,
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"resolveJsonModule": true,
"sourceMap": false,
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"allowJs": true,
"target": "ES2019",
"noEmitOnError": false,
"incremental": true
}
},
"include": ["src"]
}
30 changes: 30 additions & 0 deletions packages/expo/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
import { version as clerkJsVersion } from '../clerk-js/package.json';
import { name, version } from './package.json';

export default defineConfig(overrideOptions => {
const isWatch = !!overrideOptions.watch;
const shouldPublish = !!overrideOptions.env?.publish;

const options: Options = {
format: 'cjs',
outDir: './dist',
entry: ['./src/**/*.{ts,tsx,js,jsx}'],
bundle: false,
clean: true,
minify: false,
sourcemap: true,
legacyOutput: true,
define: {
PACKAGE_NAME: `"${name}"`,
PACKAGE_VERSION: `"${version}"`,
JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
__DEV__: `${isWatch}`,
},
};

return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(options);
});
7 changes: 7 additions & 0 deletions packages/fastify/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { defineConfig } from 'tsup';

import { name, version } from './package.json';

export default defineConfig(overrideOptions => {
const isProd = overrideOptions.env?.NODE_ENV === 'production';

Expand All @@ -11,5 +13,10 @@ export default defineConfig(overrideOptions => {
sourcemap: true,
format: ['cjs', 'esm'],
legacyOutput: true,
define: {
PACKAGE_NAME: `"${name}"`,
PACKAGE_VERSION: `"${version}"`,
__DEV__: `${!isProd}`,
},
};
});
7 changes: 5 additions & 2 deletions packages/gatsby-plugin-clerk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@
"api.d.ts"
],
"scripts": {
"build": "tsc -p tsconfig.build.json",
"dev": "tsc -p tsconfig.build.json --watch",
"build": "tsup",
"dev": "tsup --watch",
"dev:publish": "npm run dev -- --env.publish",
"build:declarations": "tsc -p tsconfig.declarations.json",
"publish:local": "npx yalc push --replace --sig",
"clean": "rimraf ./dist",
"lint": "eslint src/"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-clerk/src/GatsbyClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import {
import { navigate } from 'gatsby';
import React from 'react';

const SDK_METADATA = {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
};

__internal__setErrorThrowerOptions({ packageName: 'gatsby-plugin-clerk' });

export type GatsbyClerkProviderProps = {
Expand All @@ -22,6 +27,7 @@ export function ClerkProvider({ children, ...rest }: GatsbyClerkProviderProps) {
<ReactClerkProvider
navigate={to => navigate(to)}
initialState={__clerk_ssr_state || {}}
sdkMetadata={SDK_METADATA}
{...restProps}
>
{__clerk_ssr_interstitial_html ? (
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-clerk/src/globals.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export {};

declare global {
const PACKAGE_NAME: string;
const PACKAGE_VERSION: string;
}
26 changes: 0 additions & 26 deletions packages/gatsby-plugin-clerk/tsconfig.build.json

This file was deleted.

12 changes: 12 additions & 0 deletions packages/gatsby-plugin-clerk/tsconfig.declarations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"skipLibCheck": true,
"noEmit": false,
"declaration": true,
"emitDeclarationOnly": true,
"declarationMap": true,
"sourceMap": false,
"declarationDir": "./dist"
}
}
24 changes: 22 additions & 2 deletions packages/gatsby-plugin-clerk/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
{
"extends": "./tsconfig.build.json",
"compilerOptions": {
"outDir": "dist",
"baseUrl": ".",
"lib": ["es6", "dom"],
"jsx": "react",
"module": "commonjs",
"moduleResolution": "node",
"importHelpers": true,
"declaration": true,
"declarationMap": false,
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"resolveJsonModule": true,
"sourceMap": false,
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"allowJs": true,
"target": "ES2019",
"noEmitOnError": false,
"incremental": true
}
},
"include": ["src"]
}
30 changes: 30 additions & 0 deletions packages/gatsby-plugin-clerk/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
import { version as clerkJsVersion } from '../clerk-js/package.json';
import { name, version } from './package.json';

export default defineConfig(overrideOptions => {
const isWatch = !!overrideOptions.watch;
const shouldPublish = !!overrideOptions.env?.publish;

const options: Options = {
format: 'cjs',
outDir: './dist',
entry: ['./src/**/*.{ts,tsx,js,jsx}'],
bundle: false,
clean: true,
minify: false,
sourcemap: true,
legacyOutput: true,
define: {
PACKAGE_NAME: `"${name}"`,
PACKAGE_VERSION: `"${version}"`,
JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
__DEV__: `${isWatch}`,
},
};

return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(options);
});
3 changes: 3 additions & 0 deletions packages/nextjs/src/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ declare global {
}

declare global {
const PACKAGE_NAME: string;
const PACKAGE_VERSION: string;

namespace NodeJS {
interface ProcessEnv {
NEXT_PUBLIC_CLERK_FRONTEND_API: string | undefined;
Expand Down
4 changes: 4 additions & 0 deletions packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,9 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
sdkMetadata: {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
},
};
};
2 changes: 2 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ export default class IsomorphicClerk {
await global.Clerk.load(this.options);
}

global.Clerk.sdkMetadata = this.options.sdkMetadata ?? { name: PACKAGE_NAME, version: PACKAGE_VERSION };
Copy link
Member Author

Choose a reason for hiding this comment

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

For SDKs that use ClerkProvider, this is how we are passing through and setting the metadata. SDKs that access Clerk directly assign it themselves.


if (global.Clerk?.loaded || global.Clerk?.isReady()) {
return this.hydrateClerkJS(global.Clerk);
}
Expand Down
Loading