Skip to content

Fixed BP docs search functionality #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
codingfrog27 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fixed BP docs search functionality #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/astro-theme/components/search/Pagefind.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@
export let productId: string | undefined;
export let placeholder: string;
export let locale: string;
export let baseUrl: string;

let pagefind: Pagefind;
let results: PagefindResult[] = [];
let noResultsForQuery = false;

onMount(async () => {
const url =
productId === "cheerpj3"
? new URL(window.origin + "/docs/pagefind/pagefind.js").href // Add /docs/ for CJ so search bar is able to link correctly
: new URL(window.origin + "/pagefind/pagefind.js").href; // Can't use import.meta.url because Vite prefixes the module with /@fs.
const url = new URL(window.origin + baseUrl + "pagefind/pagefind.js").href;
// @ts-ignore
const pf = await import(/* @vite-ignore */ url);
await pf.init();
Expand All @@ -35,7 +33,7 @@

const response = await pagefind.debouncedSearch(query, {
filters: { productId, language: locale },
baseUrl: import.meta.env.BASE_URL,
baseUrl,
});
if (response === null) {
// Debounce.
Expand Down
3 changes: 3 additions & 0 deletions packages/astro-theme/components/search/Search.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { t } from "../../lib/i18n";
interface Props {
filterProductId?: Product | "blog"; // data-pagefind-filter productId
}

const baseUrl = import.meta.env.BASE_URL || "/";
---

<site-search class="inline-block w-full h-10 max-w-full">
Expand Down Expand Up @@ -35,6 +37,7 @@ interface Props {
productId={Astro.props.filterProductId}
placeholder={t("Type to search...", Astro.currentLocale)}
locale={Astro.currentLocale}
{baseUrl}
>
<div
slot="no-results"
Expand Down
2 changes: 1 addition & 1 deletion sites/browserpod/astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { resolve } from "node:path";
// https://astro.build/config
export default defineConfig({
site: "https://browserpod.io",
base: "/docs",
base: "/docs/",
integrations: [
icon(),
theme({
Expand Down
2 changes: 1 addition & 1 deletion sites/cheerpj/astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { resolve } from "node:path";
// https://astro.build/config
export default defineConfig({
site: "https://cheerpj.com",
base: "/docs",
base: "/docs/",
integrations: [
icon(),
theme({
Expand Down