feat: finalize cross platform page system for now

Author: IMB11

apps/app-frontend/src/App.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { AuthFeature, TauriModrinthClient } from '@modrinth/api-client'
 import {
 	ArrowBigUpDashIcon,
 	ChangeSkinIcon,
@@ -92,7 +93,7 @@ import {
 import { useError } from '@/store/error.js'
 import { useInstall } from '@/store/install.js'
 import { useLoading, useTheming } from '@/store/state'
-import { AuthFeature, TauriModrinthClient } from '@modrinth/api-client'
+
 import { create_profile_and_install_from_file } from './helpers/pack'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
 import { get_available_capes, get_available_skins } from './helpers/skins'
@@ -108,7 +109,7 @@ const tauriApiClient = new TauriModrinthClient({
 	userAgent: `modrinth/theseus/${getVersion()} (support@modrinth.com)`,
 	features: [
 		new AuthFeature({
-			token: getCreds,
+			token: async () => (await getCreds()).session,
 		}),
 	],
 })

apps/app-frontend/src/routes.js

@@ -1,10 +1,10 @@
+import { ServersManagePageIndex } from '@modrinth/ui'
 import { createRouter, createWebHistory } from 'vue-router'
 
 import * as Pages from '@/pages'
 import * as Instance from '@/pages/instance'
 import * as Library from '@/pages/library'
 import * as Project from '@/pages/project'
-import { ServersManagePageIndex } from '@modrinth/ui'
 
 /**
  * Configures application routing. Add page to pages/index and then add to route table here.

apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue

@@ -10,6 +10,7 @@
 <script setup lang="ts">
 // TODO: Remove this wrapper when we figure out how to do cross platform state + stripe
 import { ServersUpgradeModalWrapper as ServersUpgradeModalWrapperBase } from '@modrinth/ui'
+
 import { useGeneratedState } from '~/composables/generated'
 
 const config = useRuntimeConfig()

apps/frontend/src/components/ui/servers/marketing/MedalServerCountdown.vue

@@ -44,6 +44,7 @@ import type { UserSubscription } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import dayjsDuration from 'dayjs/plugin/duration'
 import type { ComponentPublicInstance } from 'vue'
+
 import ServersUpgradeModalWrapper from '../ServersUpgradeModalWrapper.vue'
 
 dayjs.extend(dayjsDuration)

apps/frontend/src/helpers/api.ts

@@ -1,12 +1,12 @@
 import {
+	type AbstractFeature,
+	type AuthConfig,
 	AuthFeature,
 	CircuitBreakerFeature,
 	NuxtCircuitBreakerStorage,
+	type NuxtClientConfig,
 	NuxtModrinthClient,
 	VerboseLoggingFeature,
-	type AbstractFeature,
-	type AuthConfig,
-	type NuxtClientConfig,
 } from '@modrinth/api-client'
 
 export function createModrinthClient(

apps/frontend/src/pages/servers/manage/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ServersManagePageIndex } from '@modrinth/ui'
+import { useGeneratedState } from '~/composables/generated'
 
 definePageMeta({
 	middleware: 'auth',
@@ -8,8 +9,15 @@ definePageMeta({
 useHead({
 	title: 'Servers - Modrinth',
 })
+
+const config = useRuntimeConfig()
+const generatedState = useGeneratedState()
 </script>
 
 <template>
-	<ServersManagePageIndex />
+	<ServersManagePageIndex
+		:stripe-publishable-key="config.public.stripePublishableKey"
+		:site-url="config.public.siteUrl"
+		:products="generatedState.products || []"
+	/>
 </template>

apps/frontend/src/pages/settings/billing/index.vue

@@ -626,11 +626,11 @@ import {
 	OverflowMenu,
 	PurchaseModal,
 } from '@modrinth/ui'
+import ServerListing from '@modrinth/ui/src/components/servers/ServerListing.vue'
 import { calculateSavings, formatPrice, getCurrency } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 
 import { useBaseFetch } from '@/composables/fetch.js'
-import ServerListing from '@modrinth/ui/src/components/servers/ServerListing.vue'
 import ModrinthServersIcon from '~/components/ui/servers/ModrinthServersIcon.vue'
 import ServersUpgradeModalWrapper from '~/components/ui/servers/ServersUpgradeModalWrapper.vue'
 import { useServersFetch } from '~/composables/servers/servers-fetch.ts'

packages/api-client/src/index.ts

@@ -1,21 +1,21 @@
 export { AbstractModrinthClient } from './core/abstract-client'
 export { AbstractFeature, type FeatureConfig } from './core/abstract-feature'
 export { ModrinthApiError, ModrinthServerError } from './core/errors'
-export { AuthFeature, type AuthConfig } from './features/auth'
+export { type AuthConfig, AuthFeature } from './features/auth'
 export {
-	CircuitBreakerFeature,
-	InMemoryCircuitBreakerStorage,
 	type CircuitBreakerConfig,
+	CircuitBreakerFeature,
 	type CircuitBreakerState,
 	type CircuitBreakerStorage,
+	InMemoryCircuitBreakerStorage,
 } from './features/circuit-breaker'
-export { RetryFeature, type BackoffStrategy, type RetryConfig } from './features/retry'
-export { VerboseLoggingFeature, type VerboseLoggingConfig } from './features/verbose-logging'
+export { type BackoffStrategy, type RetryConfig, RetryFeature } from './features/retry'
+export { type VerboseLoggingConfig, VerboseLoggingFeature } from './features/verbose-logging'
 export type { InferredClientModules } from './modules'
 export * from './modules/types'
 export { GenericModrinthClient } from './platform/generic'
-export { NuxtCircuitBreakerStorage, NuxtModrinthClient } from './platform/nuxt'
 export type { NuxtClientConfig } from './platform/nuxt'
-export { TauriModrinthClient } from './platform/tauri'
+export { NuxtCircuitBreakerStorage, NuxtModrinthClient } from './platform/nuxt'
 export type { TauriClientConfig } from './platform/tauri'
+export { TauriModrinthClient } from './platform/tauri'
 export * from './types'

packages/api-client/src/modules/iso3166/index.ts

@@ -1,5 +1,6 @@
 import { $fetch } from 'ofetch'
 import Papa from 'papaparse'
+
 import { AbstractModule } from '../../core/abstract-module'
 import type { ISO3166 } from './types'
 
@@ -43,12 +44,14 @@ export class ISO3166Module extends AbstractModule {
 				}),
 			])
 
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			const countriesData = Papa.parse<Record<string, any>>(countriesCSV, {
 				header: true,
 				skipEmptyLines: true,
 				transformHeader: (header) => (header.startsWith('#') ? header.slice(1) : header),
 			}).data
 
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			const subdivisionsData = Papa.parse<Record<string, any>>(subdivisionsCSV, {
 				header: true,
 				skipEmptyLines: true,

packages/api-client/src/modules/labrinth/state/index.ts

@@ -18,8 +18,11 @@ export class LabrinthStateModule extends AbstractModule {
 	 * ```
 	 */
 	public async build(): Promise<Labrinth.State.GeneratedState> {
+		const errors: unknown[] = []
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const handleError = (err: any, defaultValue: any) => {
 			console.error('Error fetching state data:', err)
+			errors.push(err)
 			return defaultValue
 		}
 
@@ -126,6 +129,7 @@ export class LabrinthStateModule extends AbstractModule {
 			muralBankDetails: muralBankDetails?.bankDetails,
 			countries: iso3166Data.countries,
 			subdivisions: iso3166Data.subdivisions,
+			errors,
 		}
 	}
 }