chore(backend): Replace shared module with @clerk/shared imports

clerk · Sep 27, 2023 · 20c2997 · 20c2997
1 parent e71f408
commit 20c2997
Show file tree

Hide file tree

Showing 10 changed files with 10,879 additions and 14,379 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -44,6 +44,7 @@
     "test:cloudflare-workerd": "tests/cloudflare-workerd/run.sh"
   },
   "dependencies": {
+    "@clerk/shared": "^0.23.1",
     "@clerk/types": "^3.52.1",
     "@peculiar/webcrypto": "1.4.1",
     "@types/node": "16.18.6",
@@ -85,4 +86,4 @@
   "engines": {
     "node": ">=14"
   }
-}
+}
diff --git a/packages/backend/src/redirections.test.ts b/packages/backend/src/redirections.test.ts
@@ -75,7 +75,7 @@ export default (QUnit: QUnit) => {
       assert.raises(
         () => redirectToSignIn({ returnBackUrl }),
         new Error(
-          'Missing publishableKey. You can get your key at https://dashboard.clerk.com/last-active?path=api-keys.',
+          '@clerk/backend: Missing publishableKey. You can get your key at https://dashboard.clerk.com/last-active?path=api-keys.',
         ),
       );
     });
@@ -221,7 +221,7 @@ export default (QUnit: QUnit) => {
       assert.raises(
         () => redirectToSignUp({ returnBackUrl }),
         new Error(
-          'Missing publishableKey. You can get your key at https://dashboard.clerk.com/last-active?path=api-keys.',
+          '@clerk/backend: Missing publishableKey. You can get your key at https://dashboard.clerk.com/last-active?path=api-keys.',
         ),
       );
     });

diff --git a/packages/backend/src/redirections.ts b/packages/backend/src/redirections.ts
@@ -1,5 +1,4 @@
-import { missingPublishableKeyErrorMessage } from './shared';
-import { parsePublishableKey } from './shared';
+import { errorThrower, parsePublishableKey } from './shared';
 
 type RedirectAdapter = (url: string) => any;
 
@@ -46,7 +45,7 @@ export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, p
 
   const redirectToSignUp = ({ returnBackUrl }: SignUpParams = {}) => {
     if (!signUpUrl && !accountsBaseUrl) {
-      throw new Error(missingPublishableKeyErrorMessage);
+      errorThrower.throwMissingPublishableKeyError();
     }
 
     const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
@@ -55,7 +54,7 @@ export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, p
 
   const redirectToSignIn = ({ returnBackUrl }: SignInParams = {}) => {
     if (!signInUrl && !accountsBaseUrl) {
-      throw new Error(missingPublishableKeyErrorMessage);
+      errorThrower.throwMissingPublishableKeyError();
     }
 
     const accountsSignInUrl = `${accountsBaseUrl}/sign-in`;

diff --git a/packages/backend/src/shared/callWithRetry.ts b/packages/backend/src/shared/callWithRetry.ts
diff --git a/packages/backend/src/shared/index.ts b/packages/backend/src/shared/index.ts
@@ -1,15 +1,19 @@
-/*
- * This module will contain functionality that will be copied
- * from @clerk/shared and will be replaced by imports when the
- * bundling issue is fixed.
- */
-export { isDevelopmentFromApiKey, isProductionFromApiKey, isStaging } from './instance';
+export {
+  addClerkPrefix,
+  buildPublishableKey,
+  callWithRetry,
+  getClerkJsMajorVersionOrTag,
+  getScriptUrl,
+  isDevelopmentFromApiKey,
+  isProductionFromApiKey,
+  isPublishableKey,
+  isStaging,
+  parsePublishableKey,
+} from '@clerk/shared';
 
-export { addClerkPrefix, getScriptUrl, getClerkJsMajorVersionOrTag } from './url';
-export { callWithRetry } from './callWithRetry';
+import { buildErrorThrower } from '@clerk/shared';
+// TODO: replace packageName with `${PACKAGE_NAME}@${PACKAGE_VERSION}` from tsup.config.ts
+export const errorThrower = buildErrorThrower({ packageName: '@clerk/backend' });
 
-// TODO: replace it with @clerk/shared errorThrower.throwMissingPublishableKeyError()
-export const missingPublishableKeyErrorMessage = `Missing publishableKey. You can get your key at https://dashboard.clerk.com/last-active?path=api-keys.`;
-
-export { isDevOrStagingUrl } from './isDevOrStagingUrl';
-export { buildPublishableKey, isPublishableKey, parsePublishableKey } from './parsePublishableKey';
+import { createDevOrStagingUrlCache } from '@clerk/shared';
+export const { isDevOrStagingUrl } = createDevOrStagingUrlCache();
diff --git a/packages/backend/src/shared/instance.ts b/packages/backend/src/shared/instance.ts
diff --git a/packages/backend/src/shared/isDevOrStagingUrl.ts b/packages/backend/src/shared/isDevOrStagingUrl.ts
diff --git a/packages/backend/src/shared/parsePublishableKey.ts b/packages/backend/src/shared/parsePublishableKey.ts
diff --git a/packages/backend/src/shared/url.ts b/packages/backend/src/shared/url.ts