@rimelight/ui 0.0.16 → 0.0.17

package/src/plugins/starlightAddons/middleware.ts

@@ -1,132 +1,132 @@
-import { defineRouteMiddleware } from "@astrojs/starlight/route-data"
-import type { APIContext } from "astro"
-import { getRelativeLocaleUrl } from "astro:i18n"
-import picomatch from "picomatch"
-import config from "virtual:starlight-sidebar-topics/config"
-import options from "virtual:starlight-sidebar-topics/options"
-import type { StarlightSidebarTopicsSharedConfig } from "./libs/config"
-import type { StarlightSidebarTopicsSharedOptions } from "./libs/config"
-import type { StarlightEntry } from "./libs/content"
-
-import type { StarlightSidebarTopicsRouteData } from "./data"
-import { getTranslation } from "./libs/i18n"
-import { ensureLeadingSlash } from "./libs/pathname"
-import { throwPluginError } from "./libs/plugin"
-import {
-  getCurrentTopic,
-  getTopicById,
-  isTopicFirstPage,
-  isTopicLastPage,
-  type Topic
-} from "./libs/sidebar"
-
-type StarlightRouteLike = {
-  entry: StarlightEntry
-  hasSidebar: boolean
-  id: string
-  pagination: { prev?: unknown; next?: unknown }
-  sidebar: any[]
-}
-
-export const onRequest = defineRouteMiddleware((context) => {
-  // Locals are augmented to include starlightRoute for typing without casts
-  const { starlightRoute } = context.locals
-  const { entry, hasSidebar, id, pagination, sidebar } = starlightRoute
-
-  const topicsConfig = config as unknown as StarlightSidebarTopicsSharedConfig
-  const topicsOptions = options as unknown as StarlightSidebarTopicsSharedOptions
-
-  let currentTopic: Topic | undefined
-
-  if (hasSidebar) {
-    currentTopic = getCurrentTopic(topicsConfig, sidebar, id, entry)
-
-    if (!currentTopic) {
-      const normalizedId = ensureLeadingSlash(id)
-
-      for (const [topicId, patterns] of Object.entries(topicsOptions.topics)) {
-        if (!picomatch(patterns)(normalizedId)) continue
-        currentTopic = getTopicById(topicsConfig, sidebar, topicId)
-        break
-      }
-    }
-
-    if (!currentTopic) {
-      if (picomatch(options.exclude)(ensureLeadingSlash(id))) {
-        attachRouteData(context, currentTopic)
-        return
-      }
-
-      throwPluginError(
-        `Failed to find the topic for the \`${id}\` page.`,
-        `Either include this page in the sidebar configuration of the desired topic using the \`items\` property, associate an unlisted page with a topic using the \`topic\` frontmatter property or the \`topics\` option, or exclude this page from any topic using the \`exclude\` option.
-
-Learn more in the following guides:
-
-- [Unlisted pages](https://starlight-sidebar-topics.netlify.app/docs/guides/unlisted-pages/)
-- [Excluded pages](https://starlight-sidebar-topics.netlify.app/docs/guides/excluded-pages/)`
-      )
-    }
-
-    starlightRoute.sidebar = currentTopic.sidebar
-
-    if (isTopicFirstPage(sidebar, id)) {
-      pagination.prev = undefined
-    }
-
-    if (isTopicLastPage(sidebar, id)) {
-      pagination.next = undefined
-    }
-  }
-
-  attachRouteData(context, currentTopic)
-})
-
-function attachRouteData(context: APIContext, currentTopic: Topic | undefined) {
-  context.locals.starlightSidebarTopics = getRouteData(context.currentLocale, currentTopic)
-}
-
-function getRouteData(
-  currentLocale: APIContext["currentLocale"],
-  currentTopic: Topic | undefined
-): StarlightSidebarTopicsRouteData {
-  // Build route data with strongly typed config
-  const topicConfigs = config as unknown as StarlightSidebarTopicsSharedConfig
-  return {
-    isPageWithTopic: currentTopic !== undefined,
-    topics: topicConfigs.map((topic) => {
-      const isLinkTopic = topic.type === "link"
-
-      const topicRouteData: StarlightSidebarTopicsRouteData["topics"][number] = {
-        isCurrent:
-          isLinkTopic || !currentTopic
-            ? false
-            : topic.label === currentTopic.config.label && topic.link === currentTopic.config.link,
-        label:
-          typeof topic.label === "string"
-            ? topic.label
-            : getTranslation(currentLocale, topic.label, topic.link, "topic label"),
-        link:
-          !isLinkTopic && currentLocale
-            ? getRelativeLocaleUrl(currentLocale, topic.link)
-            : topic.link
-      }
-
-      if (topic.badge) {
-        topicRouteData.badge = {
-          text:
-            typeof topic.badge.text === "string"
-              ? topic.badge.text
-              : getTranslation(currentLocale, topic.badge.text, topic.link, "topic badge text"),
-          variant: topic.badge.variant
-        }
-      }
-
-      if (topic.icon) {
-        topicRouteData.icon = topic.icon
-      }
-
-      return topicRouteData
-    })
-  }
-}
+import { defineRouteMiddleware } from "@astrojs/starlight/route-data"
+import type { APIContext } from "astro"
+import { getRelativeLocaleUrl } from "astro:i18n"
+import picomatch from "picomatch"
+import config from "virtual:starlight-sidebar-topics/config"
+import options from "virtual:starlight-sidebar-topics/options"
+import type { StarlightSidebarTopicsSharedConfig } from "./libs/config"
+import type { StarlightSidebarTopicsSharedOptions } from "./libs/config"
+import type { StarlightEntry } from "./libs/content"
+
+import type { StarlightSidebarTopicsRouteData } from "./data"
+import { getTranslation } from "./libs/i18n"
+import { ensureLeadingSlash } from "./libs/pathname"
+import { throwPluginError } from "./libs/plugin"
+import {
+  getCurrentTopic,
+  getTopicById,
+  isTopicFirstPage,
+  isTopicLastPage,
+  type Topic
+} from "./libs/sidebar"
+
+type StarlightRouteLike = {
+  entry: StarlightEntry
+  hasSidebar: boolean
+  id: string
+  pagination: { prev?: unknown; next?: unknown }
+  sidebar: any[]
+}
+
+export const onRequest = defineRouteMiddleware((context) => {
+  // Locals are augmented to include starlightRoute for typing without casts
+  const { starlightRoute } = context.locals
+  const { entry, hasSidebar, id, pagination, sidebar } = starlightRoute
+
+  const topicsConfig = config as unknown as StarlightSidebarTopicsSharedConfig
+  const topicsOptions = options as unknown as StarlightSidebarTopicsSharedOptions
+
+  let currentTopic: Topic | undefined
+
+  if (hasSidebar) {
+    currentTopic = getCurrentTopic(topicsConfig, sidebar, id, entry)
+
+    if (!currentTopic) {
+      const normalizedId = ensureLeadingSlash(id)
+
+      for (const [topicId, patterns] of Object.entries(topicsOptions.topics)) {
+        if (!picomatch(patterns)(normalizedId)) continue
+        currentTopic = getTopicById(topicsConfig, sidebar, topicId)
+        break
+      }
+    }
+
+    if (!currentTopic) {
+      if (picomatch(options.exclude)(ensureLeadingSlash(id))) {
+        attachRouteData(context, currentTopic)
+        return
+      }
+
+      throwPluginError(
+        `Failed to find the topic for the \`${id}\` page.`,
+        `Either include this page in the sidebar configuration of the desired topic using the \`items\` property, associate an unlisted page with a topic using the \`topic\` frontmatter property or the \`topics\` option, or exclude this page from any topic using the \`exclude\` option.
+
+Learn more in the following guides:
+
+- [Unlisted pages](https://starlight-sidebar-topics.netlify.app/docs/guides/unlisted-pages/)
+- [Excluded pages](https://starlight-sidebar-topics.netlify.app/docs/guides/excluded-pages/)`
+      )
+    }
+
+    starlightRoute.sidebar = currentTopic.sidebar
+
+    if (isTopicFirstPage(sidebar, id)) {
+      pagination.prev = undefined
+    }
+
+    if (isTopicLastPage(sidebar, id)) {
+      pagination.next = undefined
+    }
+  }
+
+  attachRouteData(context, currentTopic)
+})
+
+function attachRouteData(context: APIContext, currentTopic: Topic | undefined) {
+  context.locals.starlightSidebarTopics = getRouteData(context.currentLocale, currentTopic)
+}
+
+function getRouteData(
+  currentLocale: APIContext["currentLocale"],
+  currentTopic: Topic | undefined
+): StarlightSidebarTopicsRouteData {
+  // Build route data with strongly typed config
+  const topicConfigs = config as unknown as StarlightSidebarTopicsSharedConfig
+  return {
+    isPageWithTopic: currentTopic !== undefined,
+    topics: topicConfigs.map((topic) => {
+      const isLinkTopic = topic.type === "link"
+
+      const topicRouteData: StarlightSidebarTopicsRouteData["topics"][number] = {
+        isCurrent:
+          isLinkTopic || !currentTopic
+            ? false
+            : topic.label === currentTopic.config.label && topic.link === currentTopic.config.link,
+        label:
+          typeof topic.label === "string"
+            ? topic.label
+            : getTranslation(currentLocale, topic.label, topic.link, "topic label"),
+        link:
+          !isLinkTopic && currentLocale
+            ? getRelativeLocaleUrl(currentLocale, topic.link)
+            : topic.link
+      }
+
+      if (topic.badge) {
+        topicRouteData.badge = {
+          text:
+            typeof topic.badge.text === "string"
+              ? topic.badge.text
+              : getTranslation(currentLocale, topic.badge.text, topic.link, "topic badge text"),
+          variant: topic.badge.variant
+        }
+      }
+
+      if (topic.icon) {
+        topicRouteData.icon = topic.icon
+      }
+
+      return topicRouteData
+    })
+  }
+}

package/src/middleware/sri.ts

@@ -1,78 +0,0 @@
-import { defineMiddleware } from "astro:middleware"
-// @ts-ignore - virtual module generated by the SRI integration
-import { manifest } from "virtual:sri-manifest"
-
-declare const HTMLRewriter: any
-
-function assertManifest(obj: unknown): asserts obj is Record<string, string> {
-  if (!obj || typeof obj !== "object") throw new Error("Expected manifest")
-}
-
-/**
- * SRI Middleware Injects integrity attributes into script tags based on the pre-generated manifest.
- * Handles both SSR streaming (via HTMLRewriter) and post-rendering fallback.
- */
-export const sri = defineMiddleware(async (_, next) => {
-  const response = await next()
-  const contentType = response.headers.get("content-type") || ""
-
-  // Only process HTML responses
-  if (!contentType.includes("text/html")) {
-    return response
-  }
-
-  // Use Cloudflare's HTMLRewriter if available (SSR Production/Preview)
-  if (typeof HTMLRewriter !== "undefined") {
-    return new HTMLRewriter()
-      .on("script[src]", {
-        element(el: any) {
-          const src = el.getAttribute("src")
-          if (src && manifest[src]) {
-            el.setAttribute("integrity", manifest[src])
-            el.setAttribute("crossorigin", "anonymous")
-          }
-        }
-      })
-      .on('link[rel="stylesheet"][href]', {
-        element(el: any) {
-          const href = el.getAttribute("href")
-          if (href && manifest[href]) {
-            el.setAttribute("integrity", manifest[href])
-            el.setAttribute("crossorigin", "anonymous")
-          }
-        }
-      })
-      .transform(response)
-  }
-
-  // Fallback for Dev
-  let modifiedHtml = await response.text()
-
-  // Simple RegEx replacement for Dev inspection
-  assertManifest(manifest)
-
-  const entries = Object.entries(manifest)
-  for (const [url, hash] of entries) {
-    if (!hash) continue
-
-    // Look for script tags with the specific URL
-    const scriptRegex = new RegExp(`(<script[^>]+src=["']${url}["'][^>]*)(/?>)`, "g")
-    modifiedHtml = modifiedHtml.replace(
-      scriptRegex,
-      `$1 integrity="${hash}" crossorigin="anonymous"$2`
-    )
-
-    // Look for link tags with the specific URL
-    const linkRegex = new RegExp(`(<link[^>]+href=["']${url}["'][^>]*)(/?>)`, "g")
-    modifiedHtml = modifiedHtml.replace(
-      linkRegex,
-      `$1 integrity="${hash}" crossorigin="anonymous"$2`
-    )
-  }
-
-  return new Response(modifiedHtml, {
-    status: response.status,
-    statusText: response.statusText,
-    headers: response.headers
-  })
-})