@meith/runtime 0.24.0 → 0.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/runtime",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -19,24 +19,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/accounts": "0.24.0",
-    "@meith/api": "0.24.0",
-    "@meith/attachments": "0.24.0",
-    "@meith/avatars": "0.24.0",
-    "@meith/core": "0.24.0",
-    "@meith/db": "0.24.0",
-    "@meith/drivers": "0.24.0",
-    "@meith/events": "0.24.0",
-    "@meith/groups": "0.24.0",
-    "@meith/i18n": "0.24.0",
-    "@meith/mail": "0.24.0",
-    "@meith/markdown": "0.24.0",
-    "@meith/marketplace": "0.24.0",
-    "@meith/moderation": "0.24.0",
-    "@meith/notifications": "0.24.0",
-    "@meith/plugin-kit": "0.24.0",
-    "@meith/settings": "0.24.0",
-    "@meith/tasks": "0.24.0",
-    "@meith/theme-default": "0.24.0"
+    "@meith/accounts": "0.25.0",
+    "@meith/api": "0.25.0",
+    "@meith/attachments": "0.25.0",
+    "@meith/avatars": "0.25.0",
+    "@meith/core": "0.25.0",
+    "@meith/db": "0.25.0",
+    "@meith/drivers": "0.25.0",
+    "@meith/events": "0.25.0",
+    "@meith/groups": "0.25.0",
+    "@meith/i18n": "0.25.0",
+    "@meith/mail": "0.25.0",
+    "@meith/markdown": "0.25.0",
+    "@meith/marketplace": "0.25.0",
+    "@meith/moderation": "0.25.0",
+    "@meith/notifications": "0.25.0",
+    "@meith/plugin-kit": "0.25.0",
+    "@meith/settings": "0.25.0",
+    "@meith/tasks": "0.25.0",
+    "@meith/theme-default": "0.25.0"
   }
 }

package/src/scheduler-bundle.ts

@@ -55,7 +55,7 @@ import { SEED_GROUP } from './groups'
 import { resolveMailBrand, type ThemeTokenRegistry } from './mail-brand'
 import { pluginMarkdownPipeline, sendAudited } from './plugin-rendering'
 import { pluginTasks } from './plugin-tasks'
-import { defaultPromotionGuards, taskWorkers } from './task-workers'
+import { defaultPromotionGuards, type InstalledThemeVersion, taskWorkers } from './task-workers'
 import { visibleForumSource } from './visible-forums'
 
 export interface SchedulerBundle {
@@ -73,6 +73,7 @@ export function buildSchedulerBundle(deps: {
   readonly files?: FileStore
   readonly images?: ImageProcessor
   readonly plugins?: readonly PluginDefinition[]
+  readonly themeVersions?: readonly InstalledThemeVersion[]
   readonly translatorForLocale?: NotificationTranslatorResolver
 }): SchedulerBundle {
   const db = deps.db ?? getDb()
@@ -291,6 +292,7 @@ export function buildSchedulerBundle(deps: {
           marketplace: {
             repository: new PostgresMarketplaceCacheRepository(db),
             plugins,
+            themes: deps.themeVersions ?? [],
             feedUrl: () => marketplaceFeedUrl(db),
             async notifyUpdate(listing) {
               await new NotificationService({ notifications }).raiseForAdministrators({
@@ -301,7 +303,7 @@ export function buildSchedulerBundle(deps: {
                   package: listing.package,
                   version: listing.version,
                 },
-                href: '/admin/plugins/browse',
+                href: listing.kind === 'plugin' ? '/admin/plugins' : '/admin/themes',
                 dedupeKey: `marketplace.update_available:${listing.key}:${listing.version}`,
               })
             },

package/src/task-workers.ts

@@ -68,11 +68,17 @@ export interface TaskWorkerDeps {
   readonly marketplace?: {
     readonly repository: MarketplaceCacheRepository
     readonly plugins: readonly PluginDefinition[]
+    readonly themes: readonly InstalledThemeVersion[]
     readonly feedUrl: () => Promise<string>
     readonly notifyUpdate: (listing: MarketplaceListing) => Promise<void>
   }
 }
 
+export interface InstalledThemeVersion {
+  readonly key: string
+  readonly version: string | null
+}
+
 export function defaultPromotionGuards(): PromotionGuards {
   return {
     protectedGroupIds: [SEED_GROUP.banned, SEED_GROUP.administrators, SEED_GROUP.superModerators],
@@ -236,6 +242,12 @@ export function taskWorkers(deps: TaskWorkerDeps): Partial<TaskWorkers> {
             themeApiMajor: THEME_API_MAJOR,
           },
           resolveInstalled: (listing) => {
+            if (listing.kind === 'theme') {
+              const theme = marketplace.themes.find((entry) => entry.key === listing.key)
+              return theme === undefined || theme.version === null
+                ? null
+                : { enabled: true, version: theme.version }
+            }
             const definition = marketplace.plugins.find((plugin) => plugin.key === listing.key)
             return definition === undefined ? null : { enabled: true, version: definition.version }
           },