Bundle DocSearch with yarn

7 files changed, 10 insertions, 20 deletions

diff --git a/layouts/404.html b/layouts/404.html
index 6a844008..eaf565d8 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -16,9 +16,9 @@
       </div>
     </div>
   </section>
-  <script src="/frontend/shared/global_imports.js"></script>
+  <script src="<%= @items['/frontend/shared/global_imports.*'].path %>"></script>
+  <script src="<%= @items['/frontend/search/docsearch.*'].path %>"></script>
   <script src="<%= @items['/frontend/404/404.*'].path %>"></script>
-  <%= render '/docsearch.*' %>
   <% if production? %>
   <%# Add analytics only in production %>
     <%= render '/analytics.*' %>
diff --git a/layouts/archives.html b/layouts/archives.html
index ad3a6249..fb9eaaaa 100644
--- a/layouts/archives.html
+++ b/layouts/archives.html
@@ -23,12 +23,12 @@
     </div>
     <div class="doc-nav"></div>
   </div>
-  <script src="/frontend/shared/global_imports.js"></script>
+  <script src="<%= @items['/frontend/shared/global_imports.*'].path %>"></script>
   <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
+  <script src="<%= @items['/frontend/search/docsearch.*'].path %>"></script>
   <script src="<%= @items['/frontend/header/index.*'].path %>"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/clipboardjs.*'].path %>"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
-  <%= render '/docsearch.*' %>
   <% if production? %>
   <%# Add analytics only in production %>
     <%= render '/analytics.*' %>
diff --git a/layouts/default.html b/layouts/default.html
index c216fdc4..320a8f87 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -93,12 +93,12 @@
         </div>
       </div>
     </section>
-    <script src="/frontend/shared/global_imports.js"></script>
+    <script src="<%= @items['/frontend/shared/global_imports.*'].path %>"></script>
+    <script src="<%= @items['/frontend/search/docsearch.*'].path %>"></script>
     <script src="<%= @items['/assets/javascripts/toggle_popover.*'].path %>"></script>
     <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
     <script src="<%= @items['/assets/javascripts/clipboardjs.*'].path %>"></script>
     <script src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
-    <%= render '/docsearch.*' %>
     <script src="<%= @items['/assets/javascripts/mermaid.*'].path %>"></script>
     <% if production? %>
     <%# Add analytics only in production %>
diff --git a/layouts/docsearch.html b/layouts/docsearch.html
deleted file mode 100644
index 71a89ceb..00000000
--- a/layouts/docsearch.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Algolia docsearch https://community.algolia.com/docsearch/ -->
-<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3.0.0/dist/umd/index.min.js"></script>
-<script src="<%= @items['/assets/javascripts/docsearch.*'].path %>"></script>
diff --git a/layouts/head.html b/layouts/head.html
index 753bdf08..9a0d1fdf 100644
--- a/layouts/head.html
+++ b/layouts/head.html
@@ -31,6 +31,7 @@
 
 <link rel="stylesheet" href="/assets/stylesheets/gitlab-ui/index.css">
 <link rel="stylesheet" href="/assets/stylesheets/gitlab-ui/utility_classes.css">
+<link rel="stylesheet" href="/frontend/search/docsearch.css">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/stylesheet.*'].path %>">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/highlight.*'].path %>">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/footer.*'].path %>">
@@ -38,10 +39,6 @@
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/help.*'].path %>">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/font-awesome.min.*'].path %>">
 
-<!-- Docsearch https://community.algolia.com/docsearch/ - via CDN -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3.0.0/dist/style.css" />
-<!-- end of docsearch -->
-
 <% if production? %>
   <%# Adds GTM only in production %>
   <!-- add cookie consent  -->
diff --git a/layouts/home.html b/layouts/home.html
index 7d442674..6c5bb728 100644
--- a/layouts/home.html
+++ b/layouts/home.html
@@ -8,14 +8,14 @@
     <%= render '/gtm.*' %>
     <%= render '/header.*' %>
     <%= yield %>
-    <%= render '/docsearch.*' %>
     <% if production? and ENV['CI_COMMIT_REF_NAME'] == ENV['CI_DEFAULT_BRANCH'] %>
     <%# Add analytics only in production %>
       <%= render '/analytics.*' %>
     <% end %>
     <%= render '/schema-microdata.*' %>
     <script src="<%= @items['/frontend/header/index.*'].path %>"></script>
-    <script src="/frontend/shared/global_imports.js"></script>
-    <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
+    <script src="<%= @items['/frontend/shared/global_imports.*'].path %>"></script>
+    <script src="<%= @items['/frontend/search/docsearch.*'].path %>"></script>
+    <script src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
   </body>
 </html>
diff --git a/layouts/redirect.html b/layouts/redirect.html
index 7cd451fb..0d64c3e0 100644
--- a/layouts/redirect.html
+++ b/layouts/redirect.html
@@ -9,9 +9,6 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
     <link rel="stylesheet" href="<%= @items['/assets/stylesheets/stylesheet.*'].path %>">
     <link rel="stylesheet" href="<%= @items['/assets/stylesheets/footer.*'].path %>">
-    <!-- Docsearch https://community.algolia.com/docsearch/ - via CDN -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3.0.0/dist/style.css" />
-    <!-- end of docsearch -->
     <script async src="<%= @items['/assets/javascripts/docs.*'].path %>"></script>
     <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,400italic' rel='stylesheet' type='text/css'>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
@@ -27,6 +24,5 @@
         <%= render '/footer.*' %>
       </div>
     </div>
-    <%= render '/docsearch.*' %>
   </body>
 </html>