From 743018cd4df26277bcfb0bb765bc49c6850b3ea9 Mon Sep 17 00:00:00 2001 From: Jacek Date: Thu, 16 Jan 2025 19:55:31 -0600 Subject: [PATCH 1/5] fix(repo): Standardize ambient global.d.ts --- packages/astro/src/globals.d.ts | 6 ------ packages/chrome-extension/src/global.d.ts | 3 +++ packages/chrome-extension/src/globals.d.ts | 7 ------- packages/clerk-js/src/global.d.ts | 18 ++++++++++++++++++ packages/clerk-js/src/globals.d.ts | 21 --------------------- packages/elements/src/types/global.d.ts | 3 +++ packages/elements/src/types/globals.d.ts | 7 ------- packages/expo/src/global.d.ts | 2 ++ packages/expo/src/globals.d.ts | 6 ------ packages/express/src/global.d.ts | 2 ++ packages/express/src/globals.d.ts | 6 ------ packages/express/tsconfig.json | 2 +- packages/react-router/src/global.d.ts | 2 ++ packages/react-router/src/globals.d.ts | 6 ------ packages/react/src/global.d.ts | 6 ++++++ packages/react/src/globals.d.ts | 9 --------- packages/remix/src/global.d.ts | 2 ++ packages/remix/src/globals.d.ts | 6 ------ packages/shared/global.d.ts | 10 +++------- packages/tanstack-start/src/global.d.ts | 4 ++++ packages/tanstack-start/src/globals.d.ts | 8 -------- 21 files changed, 46 insertions(+), 90 deletions(-) delete mode 100644 packages/astro/src/globals.d.ts create mode 100644 packages/chrome-extension/src/global.d.ts delete mode 100644 packages/chrome-extension/src/globals.d.ts delete mode 100644 packages/clerk-js/src/globals.d.ts create mode 100644 packages/elements/src/types/global.d.ts delete mode 100644 packages/elements/src/types/globals.d.ts create mode 100644 packages/expo/src/global.d.ts delete mode 100644 packages/expo/src/globals.d.ts create mode 100644 packages/express/src/global.d.ts delete mode 100644 packages/express/src/globals.d.ts create mode 100644 packages/react-router/src/global.d.ts delete mode 100644 packages/react-router/src/globals.d.ts create mode 100644 packages/react/src/global.d.ts delete mode 100644 packages/react/src/globals.d.ts create mode 100644 packages/remix/src/global.d.ts delete mode 100644 packages/remix/src/globals.d.ts create mode 100644 packages/tanstack-start/src/global.d.ts delete mode 100644 packages/tanstack-start/src/globals.d.ts diff --git a/packages/astro/src/globals.d.ts b/packages/astro/src/globals.d.ts deleted file mode 100644 index f14f854fd7d..00000000000 --- a/packages/astro/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; -} diff --git a/packages/chrome-extension/src/global.d.ts b/packages/chrome-extension/src/global.d.ts new file mode 100644 index 00000000000..09ed4b48d45 --- /dev/null +++ b/packages/chrome-extension/src/global.d.ts @@ -0,0 +1,3 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; diff --git a/packages/chrome-extension/src/globals.d.ts b/packages/chrome-extension/src/globals.d.ts deleted file mode 100644 index 72b67abb156..00000000000 --- a/packages/chrome-extension/src/globals.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; - const __DEV__: boolean; -} diff --git a/packages/clerk-js/src/global.d.ts b/packages/clerk-js/src/global.d.ts index 9ceed16624c..d36180bcc12 100644 --- a/packages/clerk-js/src/global.d.ts +++ b/packages/clerk-js/src/global.d.ts @@ -3,4 +3,22 @@ declare module '@clerk/ui/styles.css' { export default content; } +declare module '*.svg' { + const value: React.FC>; + export default value; +} + declare const BUILD_ENABLE_NEW_COMPONENTS: string; +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; + +/** + * Build time feature flags. + */ +declare const __BUILD_DISABLE_RHC__: string; + +interface Window { + __unstable__onBeforeSetActive: () => Promise | void; + __unstable__onAfterSetActive: () => Promise | void; +} diff --git a/packages/clerk-js/src/globals.d.ts b/packages/clerk-js/src/globals.d.ts deleted file mode 100644 index 68777127f2e..00000000000 --- a/packages/clerk-js/src/globals.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -declare global { - const __DEV__: boolean; - const __PKG_NAME__: string; - const __PKG_VERSION__: string; - /** - * Build time feature flags. - */ - const __BUILD_DISABLE_RHC__: string; - - interface Window { - __unstable__onBeforeSetActive: () => Promise | void; - __unstable__onAfterSetActive: () => Promise | void; - } -} - -declare module '*.svg' { - const value: React.FC>; - export default value; -} - -export {}; diff --git a/packages/elements/src/types/global.d.ts b/packages/elements/src/types/global.d.ts new file mode 100644 index 00000000000..09ed4b48d45 --- /dev/null +++ b/packages/elements/src/types/global.d.ts @@ -0,0 +1,3 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; diff --git a/packages/elements/src/types/globals.d.ts b/packages/elements/src/types/globals.d.ts deleted file mode 100644 index 72b67abb156..00000000000 --- a/packages/elements/src/types/globals.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; - const __DEV__: boolean; -} diff --git a/packages/expo/src/global.d.ts b/packages/expo/src/global.d.ts new file mode 100644 index 00000000000..b07387ba7cd --- /dev/null +++ b/packages/expo/src/global.d.ts @@ -0,0 +1,2 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; diff --git a/packages/expo/src/globals.d.ts b/packages/expo/src/globals.d.ts deleted file mode 100644 index f14f854fd7d..00000000000 --- a/packages/expo/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; -} diff --git a/packages/express/src/global.d.ts b/packages/express/src/global.d.ts new file mode 100644 index 00000000000..b07387ba7cd --- /dev/null +++ b/packages/express/src/global.d.ts @@ -0,0 +1,2 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; diff --git a/packages/express/src/globals.d.ts b/packages/express/src/globals.d.ts deleted file mode 100644 index f14f854fd7d..00000000000 --- a/packages/express/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; -} diff --git a/packages/express/tsconfig.json b/packages/express/tsconfig.json index 0f6fe206f62..32969ca7c37 100644 --- a/packages/express/tsconfig.json +++ b/packages/express/tsconfig.json @@ -19,5 +19,5 @@ "types": ["jest"] }, "exclude": ["node_modules"], - "include": ["src/index.ts", "src/globals.d.ts"] + "include": ["src/index.ts", "src/global.d.ts"] } diff --git a/packages/react-router/src/global.d.ts b/packages/react-router/src/global.d.ts new file mode 100644 index 00000000000..b07387ba7cd --- /dev/null +++ b/packages/react-router/src/global.d.ts @@ -0,0 +1,2 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; diff --git a/packages/react-router/src/globals.d.ts b/packages/react-router/src/globals.d.ts deleted file mode 100644 index f14f854fd7d..00000000000 --- a/packages/react-router/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; -} diff --git a/packages/react/src/global.d.ts b/packages/react/src/global.d.ts new file mode 100644 index 00000000000..35d2bef1521 --- /dev/null +++ b/packages/react/src/global.d.ts @@ -0,0 +1,6 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; +declare const JS_PACKAGE_VERSION: string; + +declare const __BUILD_DISABLE_RHC__: boolean; diff --git a/packages/react/src/globals.d.ts b/packages/react/src/globals.d.ts deleted file mode 100644 index af26a664708..00000000000 --- a/packages/react/src/globals.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; - const JS_PACKAGE_VERSION: string; - const __DEV__: boolean; - var __BUILD_DISABLE_RHC__: boolean; // eslint-disable-line no-var -} diff --git a/packages/remix/src/global.d.ts b/packages/remix/src/global.d.ts new file mode 100644 index 00000000000..b07387ba7cd --- /dev/null +++ b/packages/remix/src/global.d.ts @@ -0,0 +1,2 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; diff --git a/packages/remix/src/globals.d.ts b/packages/remix/src/globals.d.ts deleted file mode 100644 index f14f854fd7d..00000000000 --- a/packages/remix/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; -} diff --git a/packages/shared/global.d.ts b/packages/shared/global.d.ts index d080e40fece..09ed4b48d45 100644 --- a/packages/shared/global.d.ts +++ b/packages/shared/global.d.ts @@ -1,7 +1,3 @@ -export {}; - -declare global { - const PACKAGE_VERSION: string; - const JS_PACKAGE_VERSION: string; - const __DEV__: boolean; -} +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; diff --git a/packages/tanstack-start/src/global.d.ts b/packages/tanstack-start/src/global.d.ts new file mode 100644 index 00000000000..cac9755918b --- /dev/null +++ b/packages/tanstack-start/src/global.d.ts @@ -0,0 +1,4 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; +declare const __DEV__: boolean; +declare const JS_PACKAGE_VERSION: string; diff --git a/packages/tanstack-start/src/globals.d.ts b/packages/tanstack-start/src/globals.d.ts deleted file mode 100644 index 35c17622984..00000000000 --- a/packages/tanstack-start/src/globals.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export {}; - -declare global { - const PACKAGE_NAME: string; - const PACKAGE_VERSION: string; - const JS_PACKAGE_VERSION: string; - const __DEV__: boolean; -} From a302a318cd68375afb66e73ccbbefeab2ed5a2bf Mon Sep 17 00:00:00 2001 From: Jacek Date: Thu, 16 Jan 2025 20:14:00 -0600 Subject: [PATCH 2/5] WIP --- packages/clerk-js/src/global.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/clerk-js/src/global.d.ts b/packages/clerk-js/src/global.d.ts index d36180bcc12..30bc32d54d1 100644 --- a/packages/clerk-js/src/global.d.ts +++ b/packages/clerk-js/src/global.d.ts @@ -9,8 +9,8 @@ declare module '*.svg' { } declare const BUILD_ENABLE_NEW_COMPONENTS: string; -declare const PACKAGE_NAME: string; -declare const PACKAGE_VERSION: string; +declare const __PKG_NAME__: string; +declare const __PKG_VERSION__: string; declare const __DEV__: boolean; /** From 2640d1b49eb16a074059cefa1e663bb425293f69 Mon Sep 17 00:00:00 2001 From: Jacek Date: Thu, 16 Jan 2025 20:21:47 -0600 Subject: [PATCH 3/5] fix builds --- packages/astro/.gitignore | 2 +- packages/astro/src/global.d.ts | 2 ++ packages/clerk-js/src/ui/common/BlockButtons.tsx | 1 + packages/clerk-js/src/ui/elements/Select.tsx | 1 + packages/shared/global.d.ts | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/astro/src/global.d.ts diff --git a/packages/astro/.gitignore b/packages/astro/.gitignore index 17fa296850d..9eeb28e2648 100644 --- a/packages/astro/.gitignore +++ b/packages/astro/.gitignore @@ -32,4 +32,4 @@ pnpm-debug.log* *.d.ts.map !env.d.ts !client.d.ts -!globals.d.ts +!global.d.ts diff --git a/packages/astro/src/global.d.ts b/packages/astro/src/global.d.ts new file mode 100644 index 00000000000..b07387ba7cd --- /dev/null +++ b/packages/astro/src/global.d.ts @@ -0,0 +1,2 @@ +declare const PACKAGE_NAME: string; +declare const PACKAGE_VERSION: string; diff --git a/packages/clerk-js/src/ui/common/BlockButtons.tsx b/packages/clerk-js/src/ui/common/BlockButtons.tsx index 615c041cb62..824f3249385 100644 --- a/packages/clerk-js/src/ui/common/BlockButtons.tsx +++ b/packages/clerk-js/src/ui/common/BlockButtons.tsx @@ -25,6 +25,7 @@ export const AddBlockButton = (props: BlockButtonProps) => { sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })} leftIcon={ ({ width: theme.sizes.$2x5, diff --git a/packages/clerk-js/src/ui/elements/Select.tsx b/packages/clerk-js/src/ui/elements/Select.tsx index d0151873fa0..0d7502f5f26 100644 --- a/packages/clerk-js/src/ui/elements/Select.tsx +++ b/packages/clerk-js/src/ui/elements/Select.tsx @@ -425,6 +425,7 @@ export const SelectButton = ( elementDescriptor={descriptors.selectButtonIcon} elementId={descriptors.selectButtonIcon.setId(elementId)} size='md' + /* @ts-expect-error FIXME: icon prop typing */ icon={icon || ChevronDown} sx={iconSx} /> diff --git a/packages/shared/global.d.ts b/packages/shared/global.d.ts index 09ed4b48d45..b91055a700d 100644 --- a/packages/shared/global.d.ts +++ b/packages/shared/global.d.ts @@ -1,3 +1,4 @@ declare const PACKAGE_NAME: string; declare const PACKAGE_VERSION: string; +declare const JS_PACKAGE_VERSION: string; declare const __DEV__: boolean; From a55385e4e7b83f79cd9c9def939e4c5d693ca618 Mon Sep 17 00:00:00 2001 From: Jacek Date: Fri, 17 Jan 2025 08:15:19 -0600 Subject: [PATCH 4/5] WIP --- packages/react/src/global.d.ts | 7 +++++-- packages/react/src/isomorphicClerk.ts | 2 +- packages/react/tsconfig.test.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/react/src/global.d.ts b/packages/react/src/global.d.ts index 35d2bef1521..e411d835dcd 100644 --- a/packages/react/src/global.d.ts +++ b/packages/react/src/global.d.ts @@ -1,6 +1,9 @@ declare const PACKAGE_NAME: string; declare const PACKAGE_VERSION: string; -declare const __DEV__: boolean; declare const JS_PACKAGE_VERSION: string; +declare const __DEV__: boolean; -declare const __BUILD_DISABLE_RHC__: boolean; +declare module globalThis { + // eslint-disable-next-line no-var + var __BUILD_DISABLE_RHC__: boolean; +} diff --git a/packages/react/src/isomorphicClerk.ts b/packages/react/src/isomorphicClerk.ts index f27c3385467..3511895c398 100644 --- a/packages/react/src/isomorphicClerk.ts +++ b/packages/react/src/isomorphicClerk.ts @@ -61,7 +61,7 @@ import type { } from './types'; import { isConstructor } from './utils'; -if (typeof __BUILD_DISABLE_RHC__ === 'undefined') { +if (typeof globalThis.__BUILD_DISABLE_RHC__ === 'undefined') { globalThis.__BUILD_DISABLE_RHC__ = false; } diff --git a/packages/react/tsconfig.test.json b/packages/react/tsconfig.test.json index 1422309b11e..6b210bdf380 100644 --- a/packages/react/tsconfig.test.json +++ b/packages/react/tsconfig.test.json @@ -8,6 +8,6 @@ "importHelpers": false, "sourceMap": true }, - "include": ["src/globals.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx"], + "include": ["src/global.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx"], "exclude": [] } From 93ae25fc60b9bc21e4041623ef752bf91c068789 Mon Sep 17 00:00:00 2001 From: Jacek Date: Fri, 17 Jan 2025 08:45:31 -0600 Subject: [PATCH 5/5] changeset --- .changeset/weak-rivers-clean.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .changeset/weak-rivers-clean.md diff --git a/.changeset/weak-rivers-clean.md b/.changeset/weak-rivers-clean.md new file mode 100644 index 00000000000..a90ae56f72f --- /dev/null +++ b/.changeset/weak-rivers-clean.md @@ -0,0 +1,15 @@ +--- +'@clerk/chrome-extension': patch +'@clerk/tanstack-start': patch +'@clerk/react-router': patch +'@clerk/clerk-js': patch +'@clerk/elements': patch +'@clerk/express': patch +'@clerk/shared': patch +'@clerk/astro': patch +'@clerk/clerk-react': patch +'@clerk/remix': patch +'@clerk/clerk-expo': patch +--- + +Standardizing ambient declaration files for all SDKs