diff --git a/docs/my-website/docusaurus.config.js b/docs/my-website/docusaurus.config.js
index 33ac8cd84..d0d30495e 100644
--- a/docs/my-website/docusaurus.config.js
+++ b/docs/my-website/docusaurus.config.js
@@ -26,26 +26,32 @@ const config = {
defaultLocale: 'en',
locales: ['en'],
},
-
- plugins: [
+ themes: [
[
- require.resolve("@getcanary/docusaurus-pagefind"),
+ require.resolve("@getcanary/docusaurus-theme-search-pagefind"),
{
- indexOnly: true,
styles: {
"--canary-color-primary-c": 0.1,
"--canary-color-primary-h": 270,
},
pagefind: {
ranking: {
- pageLength: 0.9,
+ // https://pagefind.app/docs/ranking
+ pageLength: 0.0,
termFrequency: 1.0,
termSimilarity: 1.0,
- termSaturation: 1.5,
+ termSaturation: 2.0,
}
- }
+ },
+ tabs: [
+ { name: "All", pattern: "**/*" },
+ { name: "Providers", pattern: "/docs/providers/**" },
+ { name: "Proxy", pattern: "/docs/proxy/**" }
+ ],
},
],
+ ],
+ plugins: [
[
'@docusaurus/plugin-ideal-image',
{
diff --git a/docs/my-website/package-lock.json b/docs/my-website/package-lock.json
index d5f92af5c..44e7a09b7 100644
--- a/docs/my-website/package-lock.json
+++ b/docs/my-website/package-lock.json
@@ -12,8 +12,8 @@
"@docusaurus/plugin-google-gtag": "^2.4.1",
"@docusaurus/plugin-ideal-image": "^2.4.1",
"@docusaurus/preset-classic": "2.4.1",
- "@getcanary/docusaurus-pagefind": "^0.0.12",
- "@getcanary/web": "^0.0.55",
+ "@getcanary/docusaurus-theme-search-pagefind": "^0.0.13",
+ "@getcanary/web": "^0.0.101",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.2.1",
"docusaurus": "^1.14.7",
@@ -3621,31 +3621,31 @@
}
},
"node_modules/@floating-ui/core": {
- "version": "1.6.5",
- "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.5.tgz",
- "integrity": "sha512-8GrTWmoFhm5BsMZOTHeGD2/0FLKLQQHvO/ZmQga4tKempYRLz8aqJGqXVuQgisnMObq2YZ2SgkwctN1LOOxcqA==",
+ "version": "1.6.7",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz",
+ "integrity": "sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==",
"dependencies": {
- "@floating-ui/utils": "^0.2.5"
+ "@floating-ui/utils": "^0.2.7"
}
},
"node_modules/@floating-ui/dom": {
- "version": "1.6.8",
- "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.8.tgz",
- "integrity": "sha512-kx62rP19VZ767Q653wsP1XZCGIirkE09E0QUGNYTM/ttbbQHqcGPdSfWFxUyyNLc/W6aoJRBajOSXhP6GXjC0Q==",
+ "version": "1.6.10",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz",
+ "integrity": "sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A==",
"dependencies": {
"@floating-ui/core": "^1.6.0",
- "@floating-ui/utils": "^0.2.5"
+ "@floating-ui/utils": "^0.2.7"
}
},
"node_modules/@floating-ui/utils": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.5.tgz",
- "integrity": "sha512-sTcG+QZ6fdEUObICavU+aB3Mp8HY4n14wYHdxK4fXjPmv3PXZZeY5RaguJmGyeH/CJQhX3fqKUtS4qc1LoHwhQ=="
+ "version": "0.2.7",
+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz",
+ "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
},
- "node_modules/@getcanary/docusaurus-pagefind": {
- "version": "0.0.12",
- "resolved": "https://registry.npmjs.org/@getcanary/docusaurus-pagefind/-/docusaurus-pagefind-0.0.12.tgz",
- "integrity": "sha512-F0OQ0Lb/GltewDEr0w+BgPbNyYpzAQZ/TtuG5rbtC3PnrOL+9pDMe/Gs0kE8AuY1uEd/YQOKr61rbY/k7kkFig==",
+ "node_modules/@getcanary/docusaurus-theme-search-pagefind": {
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/@getcanary/docusaurus-theme-search-pagefind/-/docusaurus-theme-search-pagefind-0.0.13.tgz",
+ "integrity": "sha512-w/Jz4q98cJQQtTAq8KCDI1jAW1HnHpsYpFoXaIjplLt+RoBiUKkCXocxDEI0yfKzRtmkH77dvf6LyJIdqMDWZg==",
"dependencies": {
"cli-progress": "^3.12.0",
"micromatch": "^4.0.7",
@@ -3659,17 +3659,61 @@
}
},
"node_modules/@getcanary/web": {
- "version": "0.0.55",
- "resolved": "https://registry.npmjs.org/@getcanary/web/-/web-0.0.55.tgz",
- "integrity": "sha512-DjIhTMeuLZaHT+/h+O6Keg9Gb58frPURpM4lkKrN/wmRMoCnOuly3oXIH2X37YhAoHXi4udDRJ60mtD0UZy0uw==",
+ "version": "0.0.101",
+ "resolved": "https://registry.npmjs.org/@getcanary/web/-/web-0.0.101.tgz",
+ "integrity": "sha512-/GeoSpVKq0w2HmjeF855zOeKE8a6cFcdtAsLHC0/ATJTkrAjAuAaTn5We0WX2w0UGBdzHuc94bYXJCklbTEoCg==",
"dependencies": {
"@floating-ui/dom": "^1.6.8",
"@lit-labs/observers": "^2.0.2",
"@lit/context": "^1.1.2",
"@lit/task": "^1.0.1",
- "highlight.js": "^11.10.0",
+ "@xstate/store": "^2.1.0",
"lit": "^3.1.4",
- "marked": "^13.0.2"
+ "marked": "^14.0.0",
+ "marked-footnote": "^1.2.2",
+ "picomatch": "^4.0.2",
+ "prismjs": "^1.29.0"
+ }
+ },
+ "node_modules/@getcanary/web/node_modules/@xstate/store": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@xstate/store/-/store-2.3.0.tgz",
+ "integrity": "sha512-vdIlbI4TxtadYNrGrKezrR0Y0Hid2xYBm5ohk403ZsaU7p6IjCCaacF8t8tp9qUZnYuLYzldBMhiGwBuNzmCoA==",
+ "peerDependencies": {
+ "react": "^18.2.0",
+ "solid-js": "^1.7.6"
+ },
+ "peerDependenciesMeta": {
+ "react": {
+ "optional": true
+ },
+ "solid-js": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@getcanary/web/node_modules/picomatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/@getcanary/web/node_modules/react": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+ "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
}
},
"node_modules/@hapi/hoek": {
@@ -3770,17 +3814,18 @@
"integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
},
"node_modules/@lit-labs/observers": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/@lit-labs/observers/-/observers-2.0.2.tgz",
- "integrity": "sha512-eZb5+W9Cb0e/Y5m1DNxBSGTvGB2TAVTGMnTxL/IzFhPQEcZIAHewW1eVBhN8W07A5tirRaAmmF6fGL1V20p3gQ==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@lit-labs/observers/-/observers-2.0.3.tgz",
+ "integrity": "sha512-CeftEJ2TId9iohDJHLjUXiSBVndqjIBaALjeTt8OmgWLh2dnIzwlj4WtPCiJw15uR1s6D6wyCsw0AoJC5/9QXw==",
"dependencies": {
- "@lit/reactive-element": "^1.0.0 || ^2.0.0"
+ "@lit/reactive-element": "^1.0.0 || ^2.0.0",
+ "lit-html": "^3.2.0"
}
},
"node_modules/@lit-labs/ssr-dom-shim": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz",
- "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g=="
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.1.tgz",
+ "integrity": "sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ=="
},
"node_modules/@lit/context": {
"version": "1.1.2",
@@ -12261,14 +12306,6 @@
"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
},
- "node_modules/highlight.js": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.10.0.tgz",
- "integrity": "sha512-SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==",
- "engines": {
- "node": ">=12.0.0"
- }
- },
"node_modules/history": {
"version": "4.10.1",
"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -14266,29 +14303,29 @@
"integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ=="
},
"node_modules/lit": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.4.tgz",
- "integrity": "sha512-q6qKnKXHy2g1kjBaNfcoLlgbI3+aSOZ9Q4tiGa9bGYXq5RBXxkVTqTIVmP2VWMp29L4GyvCFm8ZQ2o56eUAMyA==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/lit/-/lit-3.2.0.tgz",
+ "integrity": "sha512-s6tI33Lf6VpDu7u4YqsSX78D28bYQulM+VAzsGch4fx2H0eLZnJsUBsPWmGYSGoKDNbjtRv02rio1o+UdPVwvw==",
"dependencies": {
"@lit/reactive-element": "^2.0.4",
- "lit-element": "^4.0.4",
- "lit-html": "^3.1.2"
+ "lit-element": "^4.1.0",
+ "lit-html": "^3.2.0"
}
},
"node_modules/lit-element": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.6.tgz",
- "integrity": "sha512-U4sdJ3CSQip7sLGZ/uJskO5hGiqtlpxndsLr6mt3IQIjheg93UKYeGQjWMRql1s/cXNOaRrCzC2FQwjIwSUqkg==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.1.0.tgz",
+ "integrity": "sha512-gSejRUQJuMQjV2Z59KAS/D4iElUhwKpIyJvZ9w+DIagIQjfJnhR20h2Q5ddpzXGS+fF0tMZ/xEYGMnKmaI/iww==",
"dependencies": {
"@lit-labs/ssr-dom-shim": "^1.2.0",
"@lit/reactive-element": "^2.0.4",
- "lit-html": "^3.1.2"
+ "lit-html": "^3.2.0"
}
},
"node_modules/lit-html": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.4.tgz",
- "integrity": "sha512-yKKO2uVv7zYFHlWMfZmqc+4hkmSbFp8jgjdZY9vvR9jr4J8fH6FUMXhr+ljfELgmjpvlF7Z1SJ5n5/Jeqtc9YA==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.0.tgz",
+ "integrity": "sha512-pwT/HwoxqI9FggTrYVarkBKFN9MlTUpLrDHubTmW4SrkL3kkqW5gxwbxMMUnbbRHBC0WTZnYHcjDSCM559VyfA==",
"dependencies": {
"@types/trusted-types": "^2.0.2"
}
@@ -14691,9 +14728,9 @@
}
},
"node_modules/marked": {
- "version": "13.0.3",
- "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.3.tgz",
- "integrity": "sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==",
+ "version": "14.1.0",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-14.1.0.tgz",
+ "integrity": "sha512-P93GikH/Pde0hM5TAXEd8I4JAYi8IB03n8qzW8Bh1BIEFpEyBoYxi/XWZA53LSpTeLBiMQOoSMj0u5E/tiVYTA==",
"bin": {
"marked": "bin/marked.js"
},
@@ -14701,6 +14738,14 @@
"node": ">= 18"
}
},
+ "node_modules/marked-footnote": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/marked-footnote/-/marked-footnote-1.2.3.tgz",
+ "integrity": "sha512-ATIAPjuTlaNx3T139KNNy5X16BaYauxFEAGB0DtjonxIwRQ2DExdP6tAvUuG7UTkMGPOf6OjgIKhwXpSv7MoAg==",
+ "peerDependencies": {
+ "marked": ">=7.0.0"
+ }
+ },
"node_modules/math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
diff --git a/docs/my-website/package.json b/docs/my-website/package.json
index ca010f0cf..b0c824dab 100644
--- a/docs/my-website/package.json
+++ b/docs/my-website/package.json
@@ -18,8 +18,8 @@
"@docusaurus/plugin-google-gtag": "^2.4.1",
"@docusaurus/plugin-ideal-image": "^2.4.1",
"@docusaurus/preset-classic": "2.4.1",
- "@getcanary/docusaurus-pagefind": "^0.0.12",
- "@getcanary/web": "^0.0.55",
+ "@getcanary/docusaurus-theme-search-pagefind": "^0.0.13",
+ "@getcanary/web": "^0.0.101",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.2.1",
"docusaurus": "^1.14.7",
diff --git a/docs/my-website/src/theme/SearchBar.js b/docs/my-website/src/theme/SearchBar.js
deleted file mode 100644
index 66c8c2b5c..000000000
--- a/docs/my-website/src/theme/SearchBar.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import React from "react";
-import SearchBar from "@theme-original/SearchBar";
-
-import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
-import { usePluginData } from "@docusaurus/useGlobalData";
-
-export default function SearchBarWrapper(props) {
- const { siteConfig } = useDocusaurusContext();
- const { options } = usePluginData("docusaurus-plugin-pagefind-canary");
-
- const [path, setPath] = React.useState("");
- const [loaded, setLoaded] = React.useState(false);
-
- React.useEffect(() => {
- setPath(`${siteConfig.baseUrl}pagefind/pagefind.js`);
- }, [siteConfig]);
-
- React.useEffect(() => {
- Promise.all([
- import("@getcanary/web/components/canary-root"),
- import("@getcanary/web/components/canary-provider-pagefind"),
- import("@getcanary/web/components/canary-modal"),
- import("@getcanary/web/components/canary-trigger-logo"),
- import("@getcanary/web/components/canary-content"),
- import("@getcanary/web/components/canary-search"),
- import("@getcanary/web/components/canary-search-input"),
- import("@getcanary/web/components/canary-search-results-group"),
- import("@getcanary/web/components/canary-footer"),
- import("@getcanary/web/components/canary-callout-calendly"),
- import("@getcanary/web/components/canary-callout-discord"),
- ])
- .then(() => setLoaded(true))
- .catch(console.error);
- }, []);
-
- return (
-
- {!loaded || !path ? (
-
- ) : (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
-
-
-
- );
-}
diff --git a/docs/my-website/src/theme/SearchBar/Canary.jsx b/docs/my-website/src/theme/SearchBar/Canary.jsx
new file mode 100644
index 000000000..19f361f21
--- /dev/null
+++ b/docs/my-website/src/theme/SearchBar/Canary.jsx
@@ -0,0 +1,46 @@
+import React from "react";
+
+export default function Canary({ options }) {
+ const [loaded, setLoaded] = React.useState(false);
+
+ React.useEffect(() => {
+ Promise.all([
+ import("@getcanary/web/components/canary-root"),
+ import("@getcanary/web/components/canary-provider-pagefind"),
+ import("@getcanary/web/components/canary-modal"),
+ import("@getcanary/web/components/canary-trigger-logo"),
+ import("@getcanary/web/components/canary-content"),
+ import("@getcanary/web/components/canary-search"),
+ import("@getcanary/web/components/canary-search-input"),
+ import("@getcanary/web/components/canary-search-results-tabs"),
+ ])
+ .then(() => setLoaded(true))
+ .catch((e) =>
+ console.error("Maybe you forgot to install '@getcanary/web'?", e),
+ );
+ }, []);
+
+ if (!loaded) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/docs/my-website/src/theme/SearchBar/index.jsx b/docs/my-website/src/theme/SearchBar/index.jsx
new file mode 100644
index 000000000..96509557d
--- /dev/null
+++ b/docs/my-website/src/theme/SearchBar/index.jsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
+import { usePluginData } from "@docusaurus/useGlobalData";
+
+import Canary from "./Canary";
+
+export default function Index() {
+ const { siteConfig } = useDocusaurusContext();
+ const [path, setPath] = React.useState("");
+
+ React.useEffect(() => {
+ setPath(`${siteConfig.baseUrl}pagefind/pagefind.js`);
+ }, [siteConfig]);
+
+ const { options } = usePluginData("docusaurus-theme-search-pagefind");
+ const { styles, ...rest } = options;
+
+ React.useEffect(() => {
+ if (options.styles) {
+ Object.entries(options.styles).forEach(([key, value]) => {
+ document.body.style.setProperty(key, value);
+ });
+ }
+ }, [options]);
+
+ if (!path) {
+ return null;
+ }
+
+ return ;
+}