From 1a102a0f7ff694fe8a599cf89774b753054cc2bc Mon Sep 17 00:00:00 2001 From: squidfunk Date: Wed, 20 Sep 2023 14:26:05 +0200 Subject: [PATCH] Fixed asset URLs after restructuring --- material/templates/base.html | 8 ++++---- tools/build/index.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/material/templates/base.html b/material/templates/base.html index d0f688fad..913511d33 100644 --- a/material/templates/base.html +++ b/material/templates/base.html @@ -44,10 +44,10 @@ {% endif %} {% endblock %} {% block styles %} - + {% if config.theme.palette %} {% set palette = config.theme.palette %} - + {% endif %} {% include "partials/icons.html" %} {% endblock %} @@ -222,7 +222,7 @@ "base": base_url, "features": features, "translations": {}, - "search": "assets/javascripts/workers/search.js" | url + "search": "assets/javascripts/workers/search.a264c092.min.js" | url } -%} {%- if config.extra.version -%} {%- set _ = app.update({ "version": config.extra.version }) -%} @@ -250,7 +250,7 @@ {% endblock %} {% block scripts %} - + {% for script in config.extra_javascript %} {{ script | script_tag }} {% endfor %} diff --git a/tools/build/index.ts b/tools/build/index.ts index c82f2a43c..9506c8b33 100644 --- a/tools/build/index.ts +++ b/tools/build/index.ts @@ -169,7 +169,7 @@ const sources$ = copyAll("**/*.py", { const stylesheets$ = resolve("**/[!_]*.scss", { cwd: "src" }) .pipe( mergeMap(file => zip( - of(ext(file, ".css").replace("overrides/", "")), + of(ext(file, ".css").replace(/(overrides|templates)\//, "")), transformStyle({ from: `src/${file}`, to: ext(`${base}/${file}`, ".css") @@ -181,7 +181,7 @@ const stylesheets$ = resolve("**/[!_]*.scss", { cwd: "src" }) const javascripts$ = resolve("**/{custom,bundle,search}.ts", { cwd: "src" }) .pipe( mergeMap(file => zip( - of(ext(file, ".js").replace("overrides/", "")), + of(ext(file, ".js").replace(/(overrides|templates)\//, "")), transformScript({ from: `src/${file}`, to: ext(`${base}/${file}`, ".js") @@ -210,7 +210,7 @@ const manifest$ = merge( scan((prev, mapping) => ( mapping.reduce((next, [key, value]) => ( next.set(key, value.replace( - new RegExp(`${base}\\/(overrides\\/)?`), + new RegExp(`${base}\\/(overrides|templates)\\/`), "" )) ), prev)