Fixed instant loading (MkDocs 1.2.2 regression)

Author: squidfunk

Diff for: material/assets/javascripts/bundle.29db7785.min.js renamed to material/assets/javascripts/bundle.143c17e5.min.js

@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.29db7785.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.143c17e5.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

Diff for: material/assets/javascripts/bundle.143c17e5.min.js.map

@@ -16,5 +16,5 @@
 {% endblock %}
 {% block scripts %}
   {{ super() }}
-  <script src="{{ 'overrides/assets/javascripts/bundle.dba5ec94.min.js' | url }}"></script>
+  <script src="{{ 'overrides/assets/javascripts/bundle.25c9f9b3.min.js' | url }}"></script>
 {% endblock %}

Diff for: material/assets/javascripts/bundle.29db7785.min.js.map

@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 # Direct dependencies
-mkdocs>=1.1
+mkdocs>=1.2.2
 Pygments>=2.4
 markdown>=3.2
 pymdown-extensions>=7.0

Diff for: material/base.html

@@ -96,9 +96,7 @@ export interface Config {
  */
 const script = getElementOrThrow("#__config")
 const config: Config = JSON.parse(script.textContent!)
-config.base = new URL(config.base, getLocation())
-  .toString()
-  .replace(/\/$/, "")
+config.base = new URL(config.base, getLocation()).toString()
 
 /* ----------------------------------------------------------------------------
  * Functions

Diff for: material/overrides/assets/javascripts/bundle.dba5ec94.min.js renamed to material/overrides/assets/javascripts/bundle.25c9f9b3.min.js

@@ -99,7 +99,7 @@ const print$    = watchPrint()
 const config = configuration()
 const index$ = document.forms.namedItem("search")
   ? __search?.index || requestJSON<SearchIndex>(
-    `${config.base}/search/search_index.json`
+    new URL("search/search_index.json", config.base)
   )
   : NEVER
 

Diff for: material/overrides/assets/javascripts/bundle.dba5ec94.min.js.map renamed to material/overrides/assets/javascripts/bundle.25c9f9b3.min.js.map

@@ -120,7 +120,7 @@ function preprocess(urls: string[]): string[] {
   /* Replace common prefix (i.e. base) with effective base */
   const config = configuration()
   return urls.map(url => (
-    url.replace(root.slice(0, index), `${config.base}/`)
+    url.replace(root.slice(0, index), config.base)
   ))
 }
 
@@ -173,7 +173,7 @@ export function setupInstantLoading(
     favicon.href = favicon.href
 
   /* Intercept internal navigation */
-  const push$ = requestXML(`${config.base}/sitemap.xml`)
+  const push$ = requestXML(new URL("sitemap.xml", config.base))
     .pipe(
       map(sitemap => preprocess(getElements("loc", sitemap)
         .map(node => node.textContent!)

Diff for: material/overrides/main.html

@@ -117,7 +117,7 @@ export function setupSearchWorker(
         if (isSearchResultMessage(message)) {
           for (const result of message.data.items)
             for (const document of result)
-              document.location = `${config.base}/${document.location}`
+              document.location = `${new URL(document.location, config.base)}`
         }
         return message
       }),

Diff for: requirements.txt

@@ -80,7 +80,7 @@ export function mountIconSearch(
 ): Observable<Component<IconSearch>> {
   const config = configuration()
   const index$ = requestJSON<IconSearchIndex>(
-    `${config.base}/overrides/assets/javascripts/iconsearch_index.json`
+    new URL("overrides/assets/javascripts/iconsearch_index.json", config.base)
   )
 
   /* Retrieve query and result components */