Refactor migration to astro:config/client and update dependencies (#1584)

* refactor: migrate from 'virtual:studiocms/site' to 'astro:config/client' and update dependencies

* chore: bump to Astro 6.1.0 and migrate back to astro:config virtual module

Author: Adammatthiesen

.changeset/shaggy-parents-tickle.md

@@ -0,0 +1,5 @@
+---
+"studiocms": patch
+---
+
+Bump to Astro 6.1.0 and migrate back to astro:config virtual module

packages/studiocms/src/client/apiClient.ts

@@ -1,4 +1,4 @@
-import { site } from 'virtual:studiocms/site';
+import { site } from 'astro:config/client';
 import { FetchHttpClient, HttpApiClient } from '@effect/platform';
 import type { HttpApi } from '@effect/platform/HttpApi';
 import type { HttpApiGroup } from '@effect/platform/HttpApiGroup';

packages/studiocms/src/index.ts

@@ -274,7 +274,6 @@ export const studiocms = (): AstroIntegration => {
 				addVirtualImports(params, {
 					name,
 					imports: {
-						'virtual:studiocms/site': `export const site = "${config.site || 'http://localhost:4321'}";`,
 						'studiocms:config': buildVirtualConfig(options),
 						'studiocms:plugins': buildDefaultOnlyVirtual(safePluginList),
 						'studiocms:version': buildDefaultOnlyVirtual(pkgVersion),

packages/studiocms/src/virtual.d.ts

@@ -1,10 +1,3 @@
-declare module 'virtual:studiocms/site' {
-	// TODO: Migrate back to 'astro:config/client' once the upstream issue is resolved.
-	// We should not need this... astro:config/client is importing server-side code that is extremely breaking. This is a temporary shim to get around that issue, but we should investigate the root cause and remove this.
-
-	export const site: string;
-}
-
 declare module 'studiocms:client/apiClients' {
 	export const authClient: typeof import('./client/apiClient').authClient;
 	export const dashboardClient: typeof import('./client/apiClient').dashboardClient;

packages/studiocms/src/virtuals/auth/verify-email.ts

@@ -1,9 +1,9 @@
+import { site } from 'astro:config/client';
 import { StudioCMSRoutes } from 'studiocms:lib';
 import { Mailer } from 'studiocms:mailer';
 import { SDKCoreJs as sdk } from 'studiocms:sdk';
 import type { CombinedUserData } from 'studiocms:sdk/types';
 import templateEngine from 'studiocms:template-engine';
-import { site } from 'virtual:studiocms/site';
 import { CMSNotificationSettingsId } from '../../consts.js';
 import { Data, Effect, genLogger, pipeLogger } from '../../effect.js';
 import type { UserSessionData } from './types.js';

pnpm-lock.yaml

@@ -56,13 +56,13 @@ catalogs:
   astrojs-current:
     "@astrojs/node": ^10.0.0
     "@astrojs/rss": ^4.0.17
-    astro: ^6.0.8
+    astro: ^6.1.0
     vite: ^7.3.1
     zod: ^4.3.6
 
   astrojs-min:
     "@astrojs/internal-helpers": ^0.7.5 || ^0.8.0
-    astro: ^5.12.9 || ^6.0.0
+    astro: ^5.12.9 || ^6.1.0
     vite: ^6.3.4 || ^7.3.0
     zod: ^4.3.6