Skip to content

fix(clerk-react): ESM support#2216

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dimkl merged 1 commit into from
Nov 29, 2023
Merged

fix(clerk-react): ESM support #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions .changeset/new-points-turn.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).
26 changes: 12 additions & 14 deletions packages/react/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
},
"license": "MIT",
"author": "Clerk",
"sideEffects": [
"./dist/cjs/index.js",
"./dist/cjs/polyfills.js",
"./dist/esm/index.js",
"./dist/esm/polyfills.js"
],
"exports": {
".": {
"types": "./dist/types/index.d.ts",
"import": "./dist/esm/index.js",
"require": "./dist/cjs/index.js"
}
"import": {
"types": "./dist/index.d.mts",
"default": "./dist/index.mjs"
},
"require": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
}
},
"./package.json": "./package.json"
},
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"types": "./dist/types/index.d.ts",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"scripts": {
"build": "tsup",
"build:declarations": "tsc -p tsconfig.declarations.json",
"clean": "rimraf ./dist",
"dev": "tsup --watch",
"dev:publish": "npm run dev -- --env.publish",
Expand Down
12 changes: 0 additions & 12 deletions packages/react/tsconfig.declarations.json
View file
Open in desktop

This file was deleted.

30 changes: 11 additions & 19 deletions packages/react/tsup.config.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

const common: Options = {
entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
bundle: false,
return {
entry: {
index: 'src/index.ts',
},
onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
format: ['cjs', 'esm'],
bundle: true,
clean: true,
minify: false,
sourcemap: true,
legacyOutput: true,
dts: true,
external: ['react', 'react-dom'],
define: {
PACKAGE_NAME: `"${name}"`,
PACKAGE_VERSION: `"${version}"`,
JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
__DEV__: `${isWatch}`,
},
};

const esm: Options = {
...common,
format: 'esm',
};

const cjs: Options = {
...common,
format: 'cjs',
outDir: './dist/cjs',
};

return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(clerk-react): ESM support by dimkl · Pull Request #2216 · clerk/javascript · GitHub
Skip to content
fix(clerk-react): ESM support#2216

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});

, '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); }
})();
})();
fix(clerk-react): ESM support by dimkl · Pull Request #2216 · clerk/javascript · GitHub
Skip to content
fix(clerk-react): ESM support#2216

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 1 commit into

from

Nov 29, 2023
 Merged


fix(clerk-react): ESM support
#2216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 7 additions & 0 deletions
.changeset/new-points-turn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-react': minor
---

Fix `@clerk/clerk-react` bundle output to resolve issues with vite / rollup ESM module imports.
We have also used the `bundle` output to export a single index.ts and dropped the unnecessary
published files / folders (eg `__tests__`).

26 changes: 12 additions & 14 deletions
packages/react/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,28 +22,26 @@
 },
 "license": "MIT",
 "author": "Clerk",
 "sideEffects": [
 "./dist/cjs/index.js",
 "./dist/cjs/polyfills.js",
 "./dist/esm/index.js",
 "./dist/esm/polyfills.js"
 ],
 "exports": {
 ".": {
 "types": "./dist/types/index.d.ts",
 "import": "./dist/esm/index.js",
 "require": "./dist/cjs/index.js"
 }
 "import": {
 "types": "./dist/index.d.mts",
 "default": "./dist/index.mjs"
 },
 "require": {
 "types": "./dist/index.d.ts",
 "default": "./dist/index.js"
 }
 },
 "./package.json": "./package.json"
 },
 "main": "./dist/cjs/index.js",
 "module": "./dist/esm/index.js",
 "types": "./dist/types/index.d.ts",
 "main": "./dist/index.js",
 "types": "./dist/index.d.ts",
 "files": [
 "dist"
 ],
 "scripts": {
 "build": "tsup",
 "build:declarations": "tsc -p tsconfig.declarations.json",
 "clean": "rimraf ./dist",
 "dev": "tsup --watch",
 "dev:publish": "npm run dev -- --env.publish",
Expand Down

12 changes: 0 additions & 12 deletions
packages/react/tsconfig.declarations.json

View file


Open in desktop


This file was deleted.


30 changes: 11 additions & 19 deletions
packages/react/tsup.config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
import type { Options } from 'tsup';
import { defineConfig } from 'tsup';

import { runAfterLast } from '../../scripts/utils';
// @ts-expect-error for `import module with '.json' extension`
import { version as clerkJsVersion } from '../clerk-js/package.json';
// @ts-expect-error for `import module with '.json' extension`
import { name, version } from './package.json';

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

 const common: Options = {
 entry: ['./src/**/*.{ts,tsx,js,jsx}', '!./src/**/*.test.{ts,tsx}'],
 bundle: false,
 return {
 entry: {
 index: 'src/index.ts',
 },
 onSuccess: shouldPublish ? 'npm run publish:local' : undefined,
 format: ['cjs', 'esm'],
 bundle: true,
 clean: true,
 minify: false,
 sourcemap: true,
 legacyOutput: true,
 dts: true,
 external: ['react', 'react-dom'],
 define: {
 PACKAGE_NAME: `"${name}"`,
 PACKAGE_VERSION: `"${version}"`,
 JS_PACKAGE_VERSION: `"${clerkJsVersion}"`,
 __DEV__: `${isWatch}`,
 },
 };

 const esm: Options = {
 ...common,
 format: 'esm',
 };

 const cjs: Options = {
 ...common,
 format: 'cjs',
 outDir: './dist/cjs',
 };

 return runAfterLast(['npm run build:declarations', shouldPublish && 'npm run publish:local'])(esm, cjs);
});