From 7fd8a21d1cac087c5f6e7686afa4a166a904c52c Mon Sep 17 00:00:00 2001 From: zach Date: Thu, 5 Mar 2026 22:59:16 -0500 Subject: [PATCH] clerk was missing /shared npm package --- package-lock.json | 66 ++++++++++------------------------ package.json | 3 +- src/components/CardGrid.astro | 6 ++-- src/components/ClerkAuth.astro | 14 -------- src/middleware.ts | 9 +++-- src/pages/index.astro | 2 +- src/pages/partials/cards.astro | 4 +-- src/pages/pokemon.astro | 1 + 8 files changed, 34 insertions(+), 71 deletions(-) delete mode 100644 src/components/ClerkAuth.astro diff --git a/package-lock.json b/package-lock.json index c6428cd..29f1c9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@astrojs/node": "^9.5.4", "@clerk/astro": "^3.0.1", + "@clerk/shared": "^4.0.0", "@clerk/themes": "^2.4.55", "astro": "^5.17.1", "bootstrap": "^5.3.8", @@ -476,35 +477,6 @@ "astro": "^4.15.0 || ^5.0.0 || ^6.0.0" } }, - "node_modules/@clerk/astro/node_modules/@clerk/shared": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-4.0.0.tgz", - "integrity": "sha512-Z3QhVud7FM9SBgSGxyUdC+nDg6vro+5zJ5gDO1To3FDzRLWKW4xIGd5y8UBqWZMMMHWaSDiZvYlUynb+gs8PnQ==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@tanstack/query-core": "5.90.16", - "dequal": "2.0.3", - "glob-to-regexp": "0.4.1", - "js-cookie": "3.0.5", - "std-env": "^3.9.0" - }, - "engines": { - "node": ">=20.9.0" - }, - "peerDependencies": { - "react": "^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0", - "react-dom": "^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0" - }, - "peerDependenciesMeta": { - "react": { - "optional": true - }, - "react-dom": { - "optional": true - } - } - }, "node_modules/@clerk/astro/node_modules/nanoid": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz", @@ -537,7 +509,7 @@ "node": ">=20.9.0" } }, - "node_modules/@clerk/backend/node_modules/@clerk/shared": { + "node_modules/@clerk/shared": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-4.0.0.tgz", "integrity": "sha512-Z3QhVud7FM9SBgSGxyUdC+nDg6vro+5zJ5gDO1To3FDzRLWKW4xIGd5y8UBqWZMMMHWaSDiZvYlUynb+gs8PnQ==", @@ -566,10 +538,23 @@ } } }, - "node_modules/@clerk/shared": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-3.47.0.tgz", - "integrity": "sha512-EDWFysptTc58X96MGQIZ3LlcMFKLG+rhIF9kf6n+wnyQDWnfuyA8I8ge7GbjfUXMf00c//A/CGSjg7t/oupUpw==", + "node_modules/@clerk/themes": { + "version": "2.4.55", + "resolved": "https://registry.npmjs.org/@clerk/themes/-/themes-2.4.55.tgz", + "integrity": "sha512-j9q8NtAaI2f7vNBuO2RAUDmAebab2UoZCXshlTzEhsbB1UH+94fPs4KyUlsbrSNxIJNfTrM2IKxAZKos3gcCJw==", + "license": "MIT", + "dependencies": { + "@clerk/shared": "^3.47.0", + "tslib": "2.8.1" + }, + "engines": { + "node": ">=18.17.0" + } + }, + "node_modules/@clerk/themes/node_modules/@clerk/shared": { + "version": "3.47.2", + "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-3.47.2.tgz", + "integrity": "sha512-dwUT27DKq3Gr9vn9lAfc/LSe79P1rKIib8/mTWA7ZEzY7XX2Yq5UnDMCMznYrI8oVLdJrCT4ypFXRgnH306Oew==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -596,19 +581,6 @@ } } }, - "node_modules/@clerk/themes": { - "version": "2.4.55", - "resolved": "https://registry.npmjs.org/@clerk/themes/-/themes-2.4.55.tgz", - "integrity": "sha512-j9q8NtAaI2f7vNBuO2RAUDmAebab2UoZCXshlTzEhsbB1UH+94fPs4KyUlsbrSNxIJNfTrM2IKxAZKos3gcCJw==", - "license": "MIT", - "dependencies": { - "@clerk/shared": "^3.47.0", - "tslib": "2.8.1" - }, - "engines": { - "node": ">=18.17.0" - } - }, "node_modules/@drizzle-team/brocli": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.11.0.tgz", diff --git a/package.json b/package.json index 41fc6f6..781c3ca 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,13 @@ "scripts": { "dev": "astro dev --host 0.0.0.0", "build": "astro build", - "preview": "astro preview", + "preview": "astro preview --host 0.0.0.0", "astro": "astro" }, "dependencies": { "@astrojs/node": "^9.5.4", "@clerk/astro": "^3.0.1", + "@clerk/shared": "^4.0.0", "@clerk/themes": "^2.4.55", "astro": "^5.17.1", "bootstrap": "^5.3.8", diff --git a/src/components/CardGrid.astro b/src/components/CardGrid.astro index 0f71b11..03da1ed 100644 --- a/src/components/CardGrid.astro +++ b/src/components/CardGrid.astro @@ -2,7 +2,7 @@ import BackToTop from "./BackToTop.astro" ---
-
+
Inventory management placeholder
@@ -14,9 +14,9 @@ import BackToTop from "./BackToTop.astro"
-
+
-
+
diff --git a/src/components/ClerkAuth.astro b/src/components/ClerkAuth.astro deleted file mode 100644 index e783cae..0000000 --- a/src/components/ClerkAuth.astro +++ /dev/null @@ -1,14 +0,0 @@ ---- -import { SignedIn, SignedOut, UserButton, SignInButton, SignUpButton } from "@clerk/astro/components"; ---- -
- -
- - -
- - - - -
\ No newline at end of file diff --git a/src/middleware.ts b/src/middleware.ts index 84f3350..2e21078 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -7,8 +7,11 @@ const isProtectedRoute = createRouteMatcher([ ]); export const onRequest = clerkMiddleware((auth, context) => { - if (!auth().userId && isProtectedRoute(context.request)) { - // Redirect unauthenticated users to the sign-in page - return auth().redirectToSignIn(); + const { isAuthenticated, redirectToSignIn } = auth() + + if (!isAuthenticated && isProtectedRoute(context.request)) { + // Add custom logic to run before redirecting + + return redirectToSignIn() } }); diff --git a/src/pages/index.astro b/src/pages/index.astro index 262056c..96a9bed 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -27,7 +27,7 @@ import { Show, SignInButton, SignUpButton, SignOutButton } from '@clerk/astro/co
- +