From b4879c2a414a5c34a13d8c903298a4c0ebd9ffdd Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 12 Jul 2024 12:35:18 -0700
Subject: [PATCH 1/2] chore(astro): Remove extra prefixed astro env variables

---
 packages/astro/README.md                             |  6 +++---
 .../astro/src/internal/merge-env-vars-with-params.ts | 12 ++++++------
 packages/astro/src/server/clerk-middleware.ts        |  8 ++++----
 turbo.json                                           |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/astro/README.md b/packages/astro/README.md
index 36de6c15250..c5d9c43678a 100644
--- a/packages/astro/README.md
+++ b/packages/astro/README.md
@@ -80,11 +80,11 @@ npm run dev
 ### Set environment variables
 
 ```sh
-PUBLIC_ASTRO_APP_CLERK_PUBLISHABLE_KEY=pk_(test|live)_xxxxxxx
+PUBLIC_CLERK_PUBLISHABLE_KEY=pk_(test|live)_xxxxxxx
 CLERK_SECRET_KEY=sk_(test|live)_xxxxxxx
 
-PUBLIC_ASTRO_APP_CLERK_SIGN_IN_URL=/sign-in # update this if sign in page exists on another path
-PUBLIC_ASTRO_APP_CLERK_SIGN_UP_URL=/sign-up # update this if sign up page exists on another path
+PUBLIC_CLERK_SIGN_IN_URL=/sign-in # update this if sign in page exists on another path
+PUBLIC_CLERK_SIGN_UP_URL=/sign-up # update this if sign up page exists on another path
 ```
 
 ### Update `env.d.ts`
diff --git a/packages/astro/src/internal/merge-env-vars-with-params.ts b/packages/astro/src/internal/merge-env-vars-with-params.ts
index b8aebfa02fc..2a428faf245 100644
--- a/packages/astro/src/internal/merge-env-vars-with-params.ts
+++ b/packages/astro/src/internal/merge-env-vars-with-params.ts
@@ -15,12 +15,12 @@ const mergeEnvVarsWithParams = (params?: AstroClerkIntegrationParams & { publish
   } = params || {};
 
   return {
-    signInUrl: paramSignIn || import.meta.env.PUBLIC_ASTRO_APP_CLERK_SIGN_IN_URL,
-    signUpUrl: paramSignUp || import.meta.env.PUBLIC_ASTRO_APP_CLERK_SIGN_UP_URL,
-    isSatellite: paramSatellite || import.meta.env.PUBLIC_ASTRO_APP_CLERK_IS_SATELLITE,
-    proxyUrl: paramProxy || import.meta.env.PUBLIC_ASTRO_APP_CLERK_PROXY_URL,
-    domain: paramDomain || import.meta.env.PUBLIC_ASTRO_APP_CLERK_DOMAIN,
-    publishableKey: paramPublishableKey || import.meta.env.PUBLIC_ASTRO_APP_CLERK_PUBLISHABLE_KEY || '',
+    signInUrl: paramSignIn || import.meta.env.PUBLIC_CLERK_SIGN_IN_URL,
+    signUpUrl: paramSignUp || import.meta.env.PUBLIC_CLERK_SIGN_UP_URL,
+    isSatellite: paramSatellite || import.meta.env.PUBLIC_CLERK_IS_SATELLITE,
+    proxyUrl: paramProxy || import.meta.env.PUBLIC_CLERK_PROXY_URL,
+    domain: paramDomain || import.meta.env.PUBLIC_CLERK_DOMAIN,
+    publishableKey: paramPublishableKey || import.meta.env.PUBLIC_CLERK_PUBLISHABLE_KEY || '',
     ...rest,
   };
 };
diff --git a/packages/astro/src/server/clerk-middleware.ts b/packages/astro/src/server/clerk-middleware.ts
index 989bfcb1978..c7b9224ebed 100644
--- a/packages/astro/src/server/clerk-middleware.ts
+++ b/packages/astro/src/server/clerk-middleware.ts
@@ -204,8 +204,8 @@ Missing domain and proxyUrl. A satellite application needs to specify a domain o
 1) With middleware
    e.g. export default clerkMiddleware({domain:'YOUR_DOMAIN',isSatellite:true});
 2) With environment variables e.g.
-   PUBLIC_ASTRO_APP_CLERK_DOMAIN='YOUR_DOMAIN'
-   PUBLIC_ASTRO_APP_CLERK_IS_SATELLITE='true'
+   PUBLIC_CLERK_DOMAIN='YOUR_DOMAIN'
+   PUBLIC_CLERK_IS_SATELLITE='true'
    `;
 
 export const missingSignInUrlInDev = `
@@ -215,8 +215,8 @@ Check if signInUrl is missing from your configuration or if it is not an absolut
 1) With middleware
    e.g. export default clerkMiddleware({signInUrl:'SOME_URL', isSatellite:true});
 2) With environment variables e.g.
-   PUBLIC_ASTRO_APP_CLERK_SIGN_IN_URL='SOME_URL'
-   PUBLIC_ASTRO_APP_CLERK_IS_SATELLITE='true'`;
+   PUBLIC_CLERK_SIGN_IN_URL='SOME_URL'
+   PUBLIC_CLERK_IS_SATELLITE='true'`;
 
 function decorateAstroLocal(req: Request, context: APIContext, requestState: RequestState) {
   const { reason, message, status, token } = requestState;
diff --git a/turbo.json b/turbo.json
index fcf2be44fe5..3d8af489364 100644
--- a/turbo.json
+++ b/turbo.json
@@ -17,7 +17,7 @@
     "CLERK_*",
     "GATSBY_CLERK_*",
     "NEXT_PUBLIC_CLERK_*",
-    "PUBLIC_ASTRO_APP_CLERK_*",
+    "PUBLIC_CLERK_*",
     "NODE_ENV",
     "NODE_VERSION",
     "NPM_VERSION",

From eefb0fda851dd887b1a5874007770cf591370e85 Mon Sep 17 00:00:00 2001
From: Robert Soriano <sorianorobertc@gmail.com>
Date: Fri, 12 Jul 2024 12:39:38 -0700
Subject: [PATCH 2/2] Create fair-cows-taste.md

---
 .changeset/fair-cows-taste.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fair-cows-taste.md

diff --git a/.changeset/fair-cows-taste.md b/.changeset/fair-cows-taste.md
new file mode 100644
index 00000000000..870aed9bc1a
--- /dev/null
+++ b/.changeset/fair-cows-taste.md
@@ -0,0 +1,5 @@
+---
+"@clerk/astro": patch
+---
+
+Update existing env variables that is still using `PUBLIC_ASTRO_APP` prefix to `PUBLIC_`.