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/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dry-pears-approve.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/types': patch
'@clerk/vue': patch
---

Improve runtime prop checking for single-file components
2 changes: 1 addition & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -990,7 +990,7 @@ export type SignInCombinedProps = RoutingOptions & {
LegacyRedirectProps &
AfterSignOutUrl;

interface TransferableOption {
export interface TransferableOption {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm getting a transitive type dependency error because the SignInProps is exported but not the TransferableOption interface that it depends on

/**
* Indicates whether or not sign in attempts are transferable to the sign up flow.
* When set to false, prevents opaque sign ups when a user attempts to sign in via OAuth with an email that doesn't exist.
Expand Down
10 changes: 7 additions & 3 deletions packages/vue/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,11 @@
"dist"
],
"scripts": {
"build": "tsup",
"build": "tsup --onSuccess \"pnpm build:dts\"",
"build:dts": "vue-tsc --declaration --emitDeclarationOnly -p tsconfig.build.json",
"dev": "tsup --watch",
"lint": "eslint src/",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm",
"lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error",
"lint:publint": "publint",
"publish:local": "pnpm yalc push --replace --sig",
"test": "vitest",
Expand All@@ -56,8 +57,11 @@
},
"devDependencies": {
"@testing-library/vue": "^8.1.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vue.ts/tsx-auto-props": "^0.6.0",
"vue": "3.5.12"
"unplugin-vue": "^5.2.1",
"vue": "3.5.12",
"vue-tsc": "^2.0.24"
Comment on lines +62 to +64

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

unplugin-vue - esbuild plugin to tranform .vue files to JS
vue-tsc - dts emit with .vue file support

},
"peerDependencies": {
"vue": "^3.2.0"
Expand Down
54 changes: 0 additions & 54 deletions packages/vue/src/components/SignInButton.ts

This file was deleted.

48 changes: 48 additions & 0 deletions packages/vue/src/components/SignInButton.vue
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<script setup lang="ts">
import { useAttrs, useSlots } from 'vue';
import type { SignInProps } from '@clerk/types';
import { useClerk } from '../composables/useClerk';
import { assertSingleChild, normalizeWithDefaultValue } from '../utils';

type SignInButtonProps = Pick<
SignInProps,
'fallbackRedirectUrl' | 'forceRedirectUrl' | 'signUpForceRedirectUrl' | 'signUpFallbackRedirectUrl' | 'initialValues'
> & {
mode?: 'modal' | 'redirect';
};

const props = defineProps<SignInButtonProps>();

const clerk = useClerk();
const slots = useSlots();
const attrs = useAttrs();

function getChildComponent() {
const children = normalizeWithDefaultValue(slots.default?.({}), 'Sign in');
return assertSingleChild(children, 'SignInButton');
}

function clickHandler() {
const { mode, ...opts } = props;

if (mode === 'modal') {
return clerk.value?.openSignIn(opts);
}

void clerk.value?.redirectToSignIn({
...opts,
signInFallbackRedirectUrl: props.fallbackRedirectUrl,
signInForceRedirectUrl: props.forceRedirectUrl,
});
}
</script>

<template>
<component
:is="getChildComponent"
v-bind="attrs"
@click="clickHandler"
>
<slot />
</component>
</template>
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/vue';
import { vi } from 'vitest';
import { defineComponent, h, ref } from 'vue';

import { SignInButton } from '../SignInButton';
import SignInButton from '../SignInButton.vue';

const mockRedirectToSignIn = vi.fn();
const originalError = console.error;
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
export {
SignUp,
SignIn,
UserProfile,
UserButton,
OrganizationSwitcher,
Expand All@@ -10,6 +9,7 @@ export {
GoogleOneTap,
Waitlist,
} from './uiComponents';
export { default as SignIn } from './ui-components/SignIn.vue';

export {
ClerkLoaded,
Expand All@@ -25,7 +25,7 @@ export {
RedirectToOrganizationProfile,
} from './controlComponents';

export { SignInButton } from './SignInButton';
export { default as SignInButton } from './SignInButton.vue';
export { SignUpButton } from './SignUpButton';
export { SignOutButton } from './SignOutButton';
export { SignInWithMetamaskButton } from './SignInWithMetamaskButton';
18 changes: 18 additions & 0 deletions packages/vue/src/components/ui-components/SignIn.vue

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is the <SignIn /> component and functions the same as before only that we moved it into a single-file component (SFC) and that the Esbuild Vue plugin (check tsup config) can convert the typescript type props to runtime type props

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
<script setup lang="ts">
import { Portal } from '../uiComponents';
import { useClerk } from '../../composables';
import type { SignInProps } from '@clerk/types';

const clerk = useClerk();

const props = defineProps<SignInProps>();
</script>

<template>
<Portal
:mount="clerk?.mountSignIn"
:unmount="clerk?.unmountSignIn"
:props="props"
:update-props="(clerk as any)?.__unstable__updateProps"
/>
</template>
15 changes: 1 addition & 14 deletions packages/vue/src/components/uiComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
OrganizationListProps,
OrganizationProfileProps,
OrganizationSwitcherProps,
SignInProps,
SignUpProps,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -61,7 +60,7 @@ const CustomPortalsRenderer = defineComponent((props: CustomPortalsRendererProps
* The component only mounts when Clerk is fully loaded and automatically
* handles cleanup on unmount.
*/
const Portal = defineComponent((props: MountProps) => {
export const Portal = defineComponent((props: MountProps) => {
const portalRef = ref<HTMLDivElement | null>(null);
const isPortalMounted = ref(false);
// Make the props reactive so the watcher can react to changes
Expand DownExpand Up@@ -258,18 +257,6 @@ export const GoogleOneTap = defineComponent((props: GoogleOneTapProps) => {
});
});

export const SignIn = defineComponent((props: SignInProps) => {
const clerk = useClerk();

return () =>
h(Portal, {
mount: clerk.value?.mountSignIn,
unmount: clerk.value?.unmountSignIn,
updateProps: (clerk.value as any)?.__unstable__updateProps,
props,
});
});

export const SignUp = defineComponent((props: SignUpProps) => {
const clerk = useClerk();

Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/env.d.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
declare module '*.vue' {
import type { DefineComponent } from 'vue';

const component: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>;
export default component;
}
9 changes: 9 additions & 0 deletions packages/vue/tsconfig.build.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "./dist"
},
"include": ["src/**/*.ts", "src/**/*.vue"],
"exclude": ["src/**/*.test.ts"]
}
1 change: 0 additions & 1 deletion packages/vue/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
"noEmit": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": false,
"skipLibCheck": true
Expand Down
5 changes: 4 additions & 1 deletion packages/vue/tsup.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import autoPropsPlugin from '@vue.ts/tsx-auto-props/esbuild';
import { defineConfig, type Options } from 'tsup';
import vuePlugin from 'unplugin-vue/esbuild';

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

Expand All@@ -13,8 +14,10 @@ export default defineConfig(() => {
bundle: true,
sourcemap: true,
minify: false,
dts: true,
dts: false,
esbuildPlugins: [
// Adds .vue files support
vuePlugin() as EsbuildPlugin,
Comment on lines +17 to +20

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This vuePlugin transforms .vue files to JavaScript. We also turned off dts generation of tsup so that the vue-tsc module will generate it instead

// Automatically generates runtime props from TypeScript types/interfaces for all
// control and UI components, adding them to Vue components during build via
// Object.defineProperty
Expand Down
2 changes: 2 additions & 0 deletions packages/vue/vitest.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
},
plugins: [vue()],

@wobsorianowobsorianoJan 15, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Required when testing .vue SFC files

});
Loading