From 8cf2f8bf9c5279ccf0d5ccc889a29d8af3a430f9 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Tue, 2 Feb 2021 17:55:01 +0300
Subject: [PATCH 1/2] fix(v2): add base url to opensearch.xml

---
 packages/docusaurus-theme-search-algolia/src/index.js           | 2 +-
 .../docusaurus-theme-search-algolia/src/templates/opensearch.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-search-algolia/src/index.js b/packages/docusaurus-theme-search-algolia/src/index.js
index 186857bd608c..dd48a4df0de5 100644
--- a/packages/docusaurus-theme-search-algolia/src/index.js
+++ b/packages/docusaurus-theme-search-algolia/src/index.js
@@ -59,7 +59,7 @@ function theme(context) {
           path.join(outDir, OPEN_SEARCH_FILENAME),
           renderOpenSearchTemplate({
             title,
-            url,
+            url: url + baseUrl,
             favicon: normalizeUrl([url, favicon]),
           }),
         );
diff --git a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
index adb802ee7e8d..4d6f5878779b 100644
--- a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
+++ b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
@@ -14,7 +14,7 @@ module.exports = `
   <InputEncoding>UTF-8</InputEncoding>
   <Image width="16" height="16" type="image/x-icon"><%= it.favicon %></Image>
   <Url type="text/html" method="get" template="<%= it.url %>/search?q={searchTerms}"/>
-  <Url type="application/opensearchdescription+xml" rel="self" template="<%= it.url %>/opensearch.xml" />
+  <Url type="application/opensearchdescription+xml" rel="self" template="<%= it.url %>opensearch.xml" />
   <moz:SearchForm><%= it.url %></moz:SearchForm>
 </OpenSearchDescription>
 `;

From ab09b086ca3524ee53a86ebc2638acfbf09a3c1f Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Tue, 2 Feb 2021 19:20:52 +0300
Subject: [PATCH 2/2] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sébastien Lorber <slorber@users.noreply.github.com>
---
 packages/docusaurus-theme-search-algolia/src/index.js           | 2 +-
 .../docusaurus-theme-search-algolia/src/templates/opensearch.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-search-algolia/src/index.js b/packages/docusaurus-theme-search-algolia/src/index.js
index dd48a4df0de5..ffc015b67600 100644
--- a/packages/docusaurus-theme-search-algolia/src/index.js
+++ b/packages/docusaurus-theme-search-algolia/src/index.js
@@ -60,7 +60,7 @@ function theme(context) {
           renderOpenSearchTemplate({
             title,
             url: url + baseUrl,
-            favicon: normalizeUrl([url, favicon]),
+            favicon: normalizeUrl([url, baseUrl, favicon]),
           }),
         );
       } catch (err) {
diff --git a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
index 4d6f5878779b..1284223c7d47 100644
--- a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
+++ b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
@@ -13,7 +13,7 @@ module.exports = `
   <Description>Search <%= it.title %></Description>
   <InputEncoding>UTF-8</InputEncoding>
   <Image width="16" height="16" type="image/x-icon"><%= it.favicon %></Image>
-  <Url type="text/html" method="get" template="<%= it.url %>/search?q={searchTerms}"/>
+  <Url type="text/html" method="get" template="<%= it.url %>search?q={searchTerms}"/>
   <Url type="application/opensearchdescription+xml" rel="self" template="<%= it.url %>opensearch.xml" />
   <moz:SearchForm><%= it.url %></moz:SearchForm>
 </OpenSearchDescription>