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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); chore(clerk-js,ui): upgrade to Rspack 2 by jacekradko · Pull Request #8382 · clerk/javascript · GitHub
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
6 changes: 6 additions & 0 deletions .changeset/rspack-2-upgrade.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/ui': patch
---

Upgrade build tooling to Rspack 2 (No user-facing API changes).
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "549KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "71.24KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "114KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "316KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "72KB" },
Expand Down
19 changes: 10 additions & 9 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,18 +57,18 @@
],
"scripts": {
"build": "pnpm build:bundle && pnpm build:declarations",
"build:analyze": "rspack build --config rspack.config.js --env production --env variant=\"clerk.browser\" --env analysis --analyze",
"build:bundle": "pnpm clean && rspack build --config rspack.config.js --env production",
"build:analyze": "rspack build --config rspack.config.mjs --env production --env variant=\"clerk.browser\" --env analysis",
"build:bundle": "pnpm clean && rspack build --config rspack.config.mjs --env production",
"build:declarations": "tsc -p tsconfig.declarations.json",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.js --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
"build:sandbox": "pnpm --filter @clerk/ui build:umd && rspack build --config rspack.config.mjs --env production --env sandbox",
"build:stats": "rspack build --config rspack.config.mjs --env production --json=stats.json --env variant=\"clerk.browser\"",
"bundlewatch": "FORCE_COLOR=1 bundlewatch --config bundlewatch.config.json",
"bundlewatch:fix": "node bundlewatch-fix.mjs",
"clean": "rimraf ./dist",
"dev": "rspack serve --config rspack.config.js",
"dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",
"dev": "rspack serve --config rspack.config.mjs",
"dev:origin": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000}",
"dev:sandbox": "pnpm -w dev:sandbox",
"dev:sandbox:serve": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"dev:sandbox:serve": "rspack serve --config rspack.config.mjs --env devOrigin=http://localhost:${PORT:-4000} --env sandbox=1",
"format": "node ../../scripts/format-package.mjs",
"format:check": "node ../../scripts/format-package.mjs --check",
"lint": "eslint src",
Expand All@@ -79,7 +79,7 @@
"test:sandbox:integration": "playwright test",
"test:sandbox:integration:ui": "playwright test --ui",
"test:sandbox:integration:update-snapshots": "playwright test --update-snapshots",
"watch": "rspack build --config rspack.config.js --env production --watch"
"watch": "rspack build --config rspack.config.mjs --env production --watch"
},
"browserslist": "last 2 years",
"dependencies": {
Expand All@@ -105,9 +105,10 @@
"@clerk/msw": "workspace:^",
"@clerk/testing": "workspace:^",
"@emotion/react": "11.14.0",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@types/cloudflare-turnstile": "^0.2.2",
"@types/webpack-env": "^1.18.8",
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
// @ts-check
const rspack = require('@rspack/core');
const packageJSON = require('./package.json');
const path = require('path');
const { merge } = require('webpack-merge');
const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
const { svgLoader, typescriptLoaderProd, typescriptLoaderDev } = require('../../scripts/rspack-common');
import rspack from '@rspack/core';
import path from 'path';
import { fileURLToPath } from 'url';
import { createRequire } from 'module';
import { merge } from 'webpack-merge';
import ReactRefreshPlugin from '@rspack/plugin-react-refresh';
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import { svgLoader, typescriptLoaderProd, typescriptLoaderDev } from '../../scripts/rspack-common.js';
import packageJSON from './package.json' with { type: 'json' };

const require = createRequire(import.meta.url);
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const isProduction = mode => mode === 'production';
const isDevelopment = mode => !isProduction(mode);
Expand DownExpand Up@@ -185,7 +191,7 @@ const commonForProd = () => {
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
optimization: {
Expand DownExpand Up@@ -305,7 +311,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand All@@ -329,7 +335,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
plugins: [
// Include the lazy chunks in the bundle as well
Expand DownExpand Up@@ -378,7 +384,7 @@ const prodConfig = ({ mode, env, analysis }) => {
},
output: {
filename: '[name].mjs',
libraryTarget: 'module',
library: { type: 'module' },
},
},
);
Expand All@@ -392,7 +398,7 @@ const prodConfig = ({ mode, env, analysis }) => {
{
output: {
filename: '[name].js',
libraryTarget: 'commonjs',
library: { type: 'commonjs' },
},
},
);
Expand DownExpand Up@@ -443,7 +449,7 @@ const devConfig = ({ mode, env }) => {
publicPath: isSandbox ? `` : `${devUrl.origin}/npm`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -463,11 +469,8 @@ const devConfig = ({ mode, env }) => {
}
: {}),
},
cache: true,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
};
Expand DownExpand Up@@ -507,7 +510,7 @@ const devConfig = ({ mode, env }) => {
return entryToConfigMap[variant];
};

module.exports = env => {
export default env => {
const mode = env.production ? 'production' : 'development';
const analysis = !!env.analysis;

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"src/**",
"tsconfig.json",
"tsconfig.declarations.json",
"rspack.config.js",
"rspack.config.mjs",

"!**/*.test.*",
"!**/test/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/query/useQuery.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { DefaultError, NoInfer, QueryKey } from '@tanstack/query-core';
import type { DefaultError, QueryKey } from '@tanstack/query-core';
import { QueryObserver } from '@tanstack/query-core';

import type { DefinedInitialDataOptions, UndefinedInitialDataOptions } from './queryOptions';
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@
],
"scripts": {
"build": "pnpm build:umd && pnpm build:esm && pnpm check:no-rhc && pnpm type-check",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze --analyze",
"build:analyze": "rspack build --config rspack.config.js --env production --env analyze",
"build:esm": "tsdown",
"build:rsdoctor": "RSDOCTOR=true rspack build --config rspack.config.js --env production",
"build:umd": "rspack build --config rspack.config.js --env production",
Expand DownExpand Up@@ -114,9 +114,10 @@
"devDependencies": {
"@clerk/headless": "workspace:^",
"@floating-ui/react-dom": "^2.1.8",
"@rsdoctor/rspack-plugin": "^0.4.13",
"@rsdoctor/rspack-plugin": "^1.5.9",
"@rspack/cli": "catalog:rspack",
"@rspack/core": "catalog:rspack",
"@rspack/dev-server": "catalog:rspack",
"@rspack/plugin-react-refresh": "catalog:rspack",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^6.5.1",
Expand Down
11 changes: 4 additions & 7 deletions packages/ui/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ const commonForProdBrowser = ({ targets = 'last 2 years', useCoreJs = false } =
output: {
path: path.resolve(__dirname, 'dist'),
filename: '[name].js',
libraryTarget: 'umd',
library: { type: 'umd' },
globalObject: 'globalThis',
},
module: {
Expand DownExpand Up@@ -265,7 +265,7 @@ const devConfig = (mode, env) => {
publicPath: `${devUrl.origin}/npm/`,
crossOriginLoading: 'anonymous',
filename: `[name].js`,
libraryTarget: 'umd',
library: { type: 'umd' },
},
optimization: {
minimize: false,
Expand All@@ -281,11 +281,8 @@ const devConfig = (mode, env) => {
liveReload: false,
client: { webSocketURL: `auto://${devUrl.host}/ws` },
},
cache: false,
experiments: {
cache: {
type: 'memory',
},
cache: {
type: 'memory',
},
lazyCompilation: false,
// Only externalize React when using the shared variant (e.g., with @clerk/react).
Expand Down
Loading
Loading