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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,7 +296,7 @@ jobs:
matrix:
test-name: [
"generic",
# "express",
"express",
"ap-flows",
"localhost",
"sessions",
Expand DownExpand Up@@ -367,7 +367,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
Expand DownExpand Up@@ -468,7 +469,8 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: "latest"
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
E2E_PROJECT: ${{ matrix.test-project }}
E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/nightly-checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ name: Nightly upstream tests
on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'
- cron: "0 7 * * *"

jobs:
integration-tests:
Expand All@@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
test-name: ['nextjs']
test-name: ["nextjs"]

steps:
- name: Checkout Repo
Expand DownExpand Up@@ -64,11 +64,12 @@ jobs:
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
E2E_NEXTJS_VERSION: 'canary'
E2E_NPM_FORCE: 'true'
E2E_REACT_DOM_VERSION: '19.1.0'
E2E_REACT_VERSION: '19.1.0'
E2E_CLERK_JS_VERSION: "latest"
E2E_CLERK_UI_VERSION: "latest"
E2E_NEXTJS_VERSION: "canary"
E2E_NPM_FORCE: "true"
E2E_REACT_DOM_VERSION: "19.1.0"
E2E_REACT_VERSION: "19.1.0"
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}

Expand All@@ -91,8 +92,8 @@ jobs:
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ steps.integration_tests.outputs.exit_code == '0' && 'success' || 'failure' }}
notify_when: 'failure'
notification_title: 'Integration Test Failure - ${{ matrix.test-name }}'
notify_when: "failure"
notification_title: "Integration Test Failure - ${{ matrix.test-name }}"
message_format: |
*Job:* ${{ github.workflow }} (${{ matrix.test-name }})
*Status:* ${{ steps.integration_tests.outputs.exit_code == '0' && 'Success' || 'Failed' }}
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
.setName('react-parcel')
.useTemplate(templates['react-parcel'])
.setEnvFormatter('public', key => `${key}`)
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || clerkReactLocal);
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || clerkReactLocal);
```

Here's what each thing is doing:
Expand Down
6 changes: 5 additions & 1 deletion integration/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,11 @@ export const constants = {
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_VERSION: process.env.E2E_CLERK_VERSION,
E2E_CLERK_JS_VERSION: process.env.E2E_CLERK_JS_VERSION,
/**
* The version of the dependency to use, controlled programmatically.
*/
E2E_CLERK_UI_VERSION: process.env.E2E_CLERK_UI_VERSION,
/**
* Key used to encrypt request data for Next.js dynamic keys.
* @ref https://clerk.com/docs/references/nextjs/clerk-middleware#dynamic-keys
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/custom-flows.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const reactVite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

export const customFlows = {
reactVite,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/elements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@ const nextAppRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_VERSION || linkPackage('elements'));
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/elements', constants.E2E_CLERK_JS_VERSION || linkPackage('elements'));

export const elements = {
nextAppRouter,
Expand Down
5 changes: 3 additions & 2 deletions integration/presets/express.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,9 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/express', constants.E2E_CLERK_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_VERSION || linkPackage('clerk-js'));
.addDependency('@clerk/express', constants.E2E_CLERK_JS_VERSION || linkPackage('express'))
.addDependency('@clerk/clerk-js', constants.E2E_CLERK_JS_VERSION || linkPackage('clerk-js'))
.addDependency('@clerk/ui', constants.E2E_CLERK_UI_VERSION || linkPackage('ui'));

export const express = {
vite,
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/next.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const appRouter = applicationConfig()
.addDependency('next', constants.E2E_NEXTJS_VERSION)
.addDependency('react', constants.E2E_REACT_VERSION)
.addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
.addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/nextjs', constants.E2E_CLERK_JS_VERSION || linkPackage('nextjs'))
.addDependency('@clerk/shared', linkPackage('shared'));

const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev');
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/nuxt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ const nuxtNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/nuxt', constants.E2E_CLERK_VERSION || linkPackage('nuxt'));
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'));

export const nuxt = {
node: nuxtNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react-router.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const reactRouterNode = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

const reactRouterLibrary = applicationConfig()
.setName('react-router-library')
Expand All@@ -21,7 +21,7 @@ const reactRouterLibrary = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/react-router', constants.E2E_CLERK_VERSION || linkPackage('react-router'));
.addDependency('@clerk/react-router', constants.E2E_CLERK_JS_VERSION || linkPackage('react-router'));

export const reactRouter = {
reactRouterNode,
Expand Down
4 changes: 2 additions & 2 deletions integration/presets/react.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ const cra = applicationConfig()
.addScript('dev', 'pnpm start')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm start')
.addDependency('@clerk/react', constants.E2E_CLERK_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_VERSION || linkPackage('themes'));
.addDependency('@clerk/react', constants.E2E_CLERK_JS_VERSION || linkPackage('react'))
.addDependency('@clerk/themes', constants.E2E_CLERK_JS_VERSION || linkPackage('themes'));

const vite = cra
.clone()
Expand Down
2 changes: 1 addition & 1 deletion integration/presets/vue.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ const vite = applicationConfig()
.addScript('dev', 'pnpm dev')
.addScript('build', 'pnpm build')
.addScript('serve', 'pnpm preview')
.addDependency('@clerk/vue', constants.E2E_CLERK_VERSION || linkPackage('vue'))
.addDependency('@clerk/vue', constants.E2E_CLERK_JS_VERSION || linkPackage('vue'))
.addDependency('@clerk/localizations', linkPackage('localizations'));

export const vue = {
Expand Down
5 changes: 3 additions & 2 deletions integration/templates/express-vite/src/client/main.ts
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
import { Clerk } from '@clerk/clerk-js';
import { ClerkUi } from '@clerk/ui/entry';

const publishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;

document.addEventListener('DOMContentLoaded', async function () {
const clerk = new Clerk(publishableKey);

await clerk.load({
clerkJSUrl: import.meta.env.VITE_CLERK_JS_URL,
clerkUiUrl: import.meta.env.VITE_CLERK_UI_URL,
clerkUiCtor: Promise.resolve(ClerkUi),
});

if (clerk.isSignedIn) {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@
"require": "./dist/ui.js",
"default": "./dist/ui.mjs"
},
"./entry": {
"types": "./dist/types/entry.d.ts",
"import": "./dist/entry.mjs",
"require": "./dist/entry.js",
"default": "./dist/entry.mjs"
},
"./internal": {
"types": "./dist/types/internal.d.ts",
"import": "./dist/ui.mjs",
Expand Down
54 changes: 51 additions & 3 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ const isDevelopment = mode => !isProduction(mode);
const variants = {
uiBrowser: 'ui.browser',
ui: 'ui',
entry: 'entry',
};

const variantToSourceFile = {
[variants.uiBrowser]: './src/index.browser.ts',
[variants.ui]: './src/index.ts',
[variants.entry]: './src/entry.ts',
};

/**
Expand DownExpand Up@@ -243,7 +245,54 @@ const prodConfig = mode => {
},
});

return [uiBrowser, uiEsm, uiCjs];
// Entry ESM module bundle (no chunks)
const entryEsm = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
experiments: {
outputModule: true,
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
},
plugins: [
// Bundle everything into a single file for ESM
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

// Entry CJS module bundle (no chunks)
const entryCjs = merge(
entryForVariant(variants.entry),
common({ mode, variant: variants.entry }),
commonForProdBundled(),
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
},
plugins: [
// Bundle everything into a single file for CJS
new rspack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
],
optimization: {
splitChunks: false,
},
},
);

return [uiBrowser, uiEsm, uiCjs, entryEsm, entryCjs];
};

/**
Expand All@@ -261,8 +310,7 @@ const devConfig = (mode, env) => {
rules: [svgLoader(), ...typescriptLoaderDev()],
},
plugins: [new ReactRefreshPlugin({ overlay: { sockHost: devUrl.host } })],
// devtool: 'eval-cheap-source-map',
devtool: false,
devtool: 'eval-cheap-source-map',
output: {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/entry.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export { ClerkUi } from './ClerkUi';
Loading