Fixed instant loading when used with use_directory_urls: false

squidfunk · Mar 7, 2021 · 66a6713 · 66a6713
1 parent 1d790c9
commit 66a6713
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...assets/javascripts/bundle.d1d4d62b.min.js → ...assets/javascripts/bundle.6946554b.min.js b/...assets/javascripts/bundle.d1d4d62b.min.js → ...assets/javascripts/bundle.6946554b.min.js
diff --git a/...ts/javascripts/bundle.d1d4d62b.min.js.map → ...ts/javascripts/bundle.6946554b.min.js.map b/...ts/javascripts/bundle.d1d4d62b.min.js.map → ...ts/javascripts/bundle.6946554b.min.js.map
diff --git a/material/base.html b/material/base.html
@@ -217,7 +217,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.d1d4d62b.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.6946554b.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

diff --git a/src/assets/javascripts/integrations/instant/index.ts b/src/assets/javascripts/integrations/instant/index.ts
@@ -105,9 +105,9 @@ function preprocess(urls: string[]): string[] {
     return urls
 
   /* Take the first two URLs and remove everything after the last slash */
-  const [root, next] = urls.slice(0, 2).map(url => (
-    url.replace(/[^/]+$/, "")
-  ))
+  const [root, next] = urls
+    .sort((a, b) => a.length - b.length)
+    .map(url => url.replace(/[^/]+$/, ""))
 
   /* Compute common prefix */
   let index = 0