fumapress 0.5.4 → 0.5.5

package/css/generated.css

@@ -6,6 +6,7 @@
 @source inline("@orama/orama");
 @source inline("a");
 @source inline("above");
+@source inline("absolute");
 @source inline("absolutePath");
 @source inline("accepts");
 @source inline("active:scale-95");
@@ -374,6 +375,7 @@
 @source inline("requests");
 @source inline("resolution");
 @source inline("resolve");
+@source inline("resolveBaseUrl");
 @source inline("resolved");
 @source inline("rest");
 @source inline("result");
@@ -512,6 +514,7 @@
 @source inline("width");
 @source inline("widths");
 @source inline("will");
+@source inline("with");
 @source inline("without");
 @source inline("would");
 @source inline("wrapper");

package/dist/components/blog.js

@@ -1,8 +1,8 @@
 import { Link } from "./link.js";
+import { joinPathname } from "../lib/pathname.js";
 import { getCreationDate, getPressContext } from "../lib/shared.js";
 import { cn } from "../lib/cn.js";
 import { I18nLabel } from "./i18n.js";
-import { joinPathname } from "../lib/pathname.js";
 import { getBlogContext } from "../plugins/blog.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { CornerLeftUpIcon } from "lucide-react";

package/dist/components/flexsearch-static.js

@@ -1,4 +1,5 @@
 "use client";
+import { resolveBaseUrl } from "../lib/pathname.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useI18n } from "fumadocs-ui/contexts/i18n";
 import { SearchDialog, SearchDialogClose, SearchDialogContent, SearchDialogHeader, SearchDialogIcon, SearchDialogInput, SearchDialogList, SearchDialogOverlay } from "fumadocs-ui/components/dialog/search";
@@ -7,7 +8,10 @@ import { flexsearchStaticClient } from "fumadocs-core/search/client/flexsearch-s
 //#region src/components/flexsearch-static.tsx
 function DefaultSearchDialog(props) {
 	const { locale } = useI18n();
-	const { search, setSearch, query } = useDocsSearch({ client: flexsearchStaticClient({ locale }) });
+	const { search, setSearch, query } = useDocsSearch({ client: flexsearchStaticClient({
+		locale,
+		from: resolveBaseUrl(import.meta.env.BASE_URL, "/api/search")
+	}) });
 	return /* @__PURE__ */ jsxs(SearchDialog, {
 		search,
 		onSearchChange: setSearch,

package/dist/components/image.js

@@ -1,4 +1,5 @@
 "use client";
+import { resolveBaseUrl } from "../lib/pathname.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { createContext, use, useMemo } from "react";
 import ReactDOM from "react-dom";
@@ -11,14 +12,14 @@ function parseLength(v) {
 	return parsed;
 }
 /**
-* resolve src to a full pathname if relative
+* resolve src to a full pathname with base URL included (or keep absolute URLs as-is)
 */
 function normalizeSrc(src, basePathname) {
-	if (src.startsWith("http://") || src.startsWith("https://")) return src;
+	if (src.startsWith("http://") || src.startsWith("https://") || src.startsWith("data:")) return src;
 	const base = new URL(basePathname, "http://localhost");
 	const resolved = new URL(src, base);
 	if (resolved.hostname !== base.hostname) throw new Error(`The src attribute "${src}" is not a valid relative path`);
-	return resolved.pathname;
+	return resolveBaseUrl(import.meta.env.BASE_URL, resolved.pathname);
 }
 const ImageContext = createContext(null);
 function ImageProvider({ provider, children }) {

package/dist/components/orama-search-static.js

@@ -1,4 +1,5 @@
 "use client";
+import { resolveBaseUrl } from "../lib/pathname.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useI18n } from "fumadocs-ui/contexts/i18n";
 import { SearchDialog, SearchDialogClose, SearchDialogContent, SearchDialogHeader, SearchDialogIcon, SearchDialogInput, SearchDialogList, SearchDialogOverlay } from "fumadocs-ui/components/dialog/search";
@@ -16,7 +17,8 @@ function DefaultSearchDialog(props) {
 	const { search, setSearch, query } = useDocsSearch({
 		type: "static",
 		initOrama,
-		locale
+		locale,
+		from: resolveBaseUrl(import.meta.env.BASE_URL, "/api/search")
 	});
 	return /* @__PURE__ */ jsxs(SearchDialog, {
 		search,

package/dist/layouts/blog.index.js

@@ -1,8 +1,8 @@
 import { Link } from "../components/link.js";
+import { joinPathname } from "../lib/pathname.js";
 import { getPressContext } from "../lib/shared.js";
 import { cn } from "../lib/cn.js";
 import { I18nLabel } from "../components/i18n.js";
-import { joinPathname } from "../lib/pathname.js";
 import { getBlogContext } from "../plugins/blog.js";
 import { OrderedBlogGrid } from "../components/blog.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";

package/dist/layouts/blog.js

@@ -1,8 +1,8 @@
 import { Link } from "../components/link.js";
+import { joinPathname } from "../lib/pathname.js";
 import { getCreationDate, getPressContext, renderBody, renderPageMeta, renderToc } from "../lib/shared.js";
 import { BlogPanel, BlogProvider } from "../components/blog-panel.js";
 import { getTags } from "../lib/shared/blog.js";
-import { joinPathname } from "../lib/pathname.js";
 import { createHomeLayout } from "./home.js";
 import { getBlogContext } from "../plugins/blog.js";
 import { LinkToHome } from "../components/blog.js";

package/dist/lib/pathname.js

@@ -1,4 +1,5 @@
 //#region src/lib/pathname.ts
+/** Join multiple (full) pathnames */
 function joinPathname(...paths) {
 	const segs = [];
 	for (let p of paths) {
@@ -10,8 +11,14 @@ function joinPathname(...paths) {
 }
 const PATHNAME_SEGMENT_REGEX = /^[A-Za-z0-9\-._~!$&'()*+,;=:@]+$/;
 /** Check if the string is a full pathname (one that does not include `.` or `..`) */
-function isPlainPathname(s) {
+function isFullPathname(s) {
 	return s.startsWith("/") && s.slice(1).split("/").every((seg) => seg !== "." && seg !== ".." && PATHNAME_SEGMENT_REGEX.test(seg));
 }
+/** add base URL to pathname */
+function resolveBaseUrl(base, pathname) {
+	if (base.endsWith("/")) base = base.slice(0, -1);
+	if (pathname.startsWith("/")) pathname = pathname.slice(1);
+	return `${base}/${pathname}`;
+}
 //#endregion
-export { isPlainPathname, joinPathname };
+export { isFullPathname, joinPathname, resolveBaseUrl };

package/dist/plugins/blog.js

@@ -1,5 +1,5 @@
-import { groupTags, groupTagsI18n } from "../lib/shared/blog.js";
 import { joinPathname } from "../lib/pathname.js";
+import { groupTags, groupTagsI18n } from "../lib/shared/blog.js";
 import { createBlogLayout, createBlogLayoutPage } from "../layouts/blog.js";
 import { createBlogTagPage, createBlogTagsPage } from "../layouts/blog.tags.js";
 import { createBlogIndexPage } from "../layouts/blog.index.js";

package/dist/plugins/image/cloudflare.client.js

@@ -1,6 +1,6 @@
 "use client";
-import { ImageProvider } from "../../components/image.js";
 import { joinPathname } from "../../lib/pathname.js";
+import { ImageProvider } from "../../components/image.js";
 import { jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 //#region src/plugins/image/cloudflare.client.tsx

package/dist/plugins/image/self-hosted.client.js

@@ -1,4 +1,5 @@
 "use client";
+import { resolveBaseUrl } from "../../lib/pathname.js";
 import { ImageProvider } from "../../components/image.js";
 import { validateImageSrc } from "./self-hosted.utils.js";
 import { jsx } from "react/jsx-runtime";
@@ -16,7 +17,7 @@ function createProvider(config) {
 				width: String(width),
 				quality: String(quality)
 			});
-			return `${config.path}?${params.toString()}`;
+			return `${resolveBaseUrl(import.meta.env.BASE_URL, config.path)}?${params.toString()}`;
 		},
 		validate(src) {
 			if (import.meta.env.DEV) {

package/dist/plugins/image/self-hosted.utils.js

@@ -1,5 +1,5 @@
 import { __toESM } from "../../_virtual/_rolldown/runtime.js";
-import { isPlainPathname } from "../../lib/pathname.js";
+import { isFullPathname } from "../../lib/pathname.js";
 import { require_http_cache_semantics } from "../../node_modules/.pnpm/http-cache-semantics@4.2.0/node_modules/http-cache-semantics/index.js";
 //#region src/plugins/image/self-hosted.utils.ts
 var import_http_cache_semantics = /* @__PURE__ */ __toESM(require_http_cache_semantics(), 1);
@@ -253,7 +253,7 @@ function validateImageSrc(config, src) {
 		};
 		return { allowed: true };
 	}
-	if (isPlainPathname(src)) return { allowed: true };
+	if (isFullPathname(src)) return { allowed: true };
 	return {
 		allowed: false,
 		reason: `Image URL "${src}" is not normalized`

package/dist/plugins/openapi.js

@@ -1,4 +1,4 @@
-import { isPlainPathname } from "../lib/pathname.js";
+import { isFullPathname, resolveBaseUrl } from "../lib/pathname.js";
 import { PayloadProvider, WithPayload } from "../components/openapi.payload.js";
 import { jsx } from "react/jsx-runtime";
 import { openapiTranslations } from "fumadocs-openapi/i18n";
@@ -16,9 +16,14 @@ function openapiPlugin(options) {
 	}
 	async function ServerPayloadProvider({ children }) {
 		const payload = {};
+		let clientProxyUrl;
+		if (typeof server.options.proxyUrl === "string") {
+			const proxyUrl = server.options.proxyUrl;
+			clientProxyUrl = isFullPathname(proxyUrl) ? resolveBaseUrl(import.meta.env.BASE_URL, proxyUrl) : proxyUrl;
+		}
 		for (const [schemaId, schema] of Object.entries(await server.getSchemas())) payload[schemaId] = {
 			bundled: schema.bundled,
-			proxyUrl: server.options.proxyUrl
+			proxyUrl: clientProxyUrl
 		};
 		return /* @__PURE__ */ jsx(PayloadProvider, {
 			payload: JSON.stringify(payload),
@@ -46,7 +51,7 @@ function openapiPlugin(options) {
 		},
 		async createPages({ createApi }) {
 			const proxyUrl = server.options.proxyUrl;
-			const { createProxy = typeof proxyUrl === "string" && isPlainPathname(proxyUrl) } = options;
+			const { createProxy = typeof proxyUrl === "string" && isFullPathname(proxyUrl) } = options;
 			if (createProxy) {
 				if (!proxyUrl) throw new Error(`[Fumapress] The "proxyUrl" option in createOpenAPI() is required to create proxy server`);
 				if (this.mode === "static") throw new Error(`[Fumapress] static mode is not compatible with proxy server`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumapress",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "An opinionated docs framework powered by Fumadocs",
   "keywords": [
     "Docs",