Merge branch 'url-special-chars' into data-steps

5 files changed, 21 insertions, 18 deletions

diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js
index d297a5f2..794b430b 100644
--- a/src/content/dependencies/generatePageLayout.js
+++ b/src/content/dependencies/generatePageLayout.js
@@ -509,7 +509,7 @@ export default {
 
             html.tag('link', {
               rel: 'stylesheet',
-              href: to('shared.staticFile', `site4.css?${cachebust}`),
+              href: to('shared.staticFile', 'site4.css', cachebust),
             }),
 
             html.tag('style', [
@@ -520,7 +520,7 @@ export default {
             ]),
 
             html.tag('script', {
-              src: to('shared.staticFile', `lazy-loading.js?${cachebust}`),
+              src: to('shared.staticFile', 'lazy-loading.js', cachebust),
             }),
           ]),
 
@@ -537,7 +537,7 @@ export default {
 
               html.tag('script', {
                 type: 'module',
-                src: to('shared.staticFile', `client.js?${cachebust}`),
+                src: to('shared.staticFile', 'client.js', cachebust),
               }),
             ]),
         ])
diff --git a/src/content/dependencies/linkExternalAsIcon.js b/src/content/dependencies/linkExternalAsIcon.js
index 6496d026..cd168992 100644
--- a/src/content/dependencies/linkExternalAsIcon.js
+++ b/src/content/dependencies/linkExternalAsIcon.js
@@ -39,7 +39,7 @@ export default {
       html.tag('svg', [
         html.tag('title', msg),
         html.tag('use', {
-          href: to('shared.staticFile', `icons.svg#icon-${id}`),
+          href: to('shared.staticIcon', id),
         }),
       ]));
   },
diff --git a/src/url-spec.js b/src/url-spec.js
index 0af613cc..d1e347e5 100644
--- a/src/url-spec.js
+++ b/src/url-spec.js
@@ -60,7 +60,9 @@ const urlSpec = {
       staticRoot: 'static',
 
       utilityFile: 'util/<>',
-      staticFile: 'static/<>',
+      staticFile: 'static/<>?<>',
+
+      staticIcon: 'static/icons.svg#icon-<>',
     },
   },
 
diff --git a/src/util/html.js b/src/util/html.js
index f2456565..2468b8db 100644
--- a/src/util/html.js
+++ b/src/util/html.js
@@ -475,14 +475,6 @@ export class Attributes {
           throw new Error(`Attribute value for ${key} should be primitive or array, got ${typeof val}`);
       })
       .filter(([_key, _val, keep]) => keep)
-      .map(([key, val]) => {
-        switch (key) {
-          case 'href':
-            return [key, encodeURI(val)];
-          default:
-            return [key, val];
-        }
-      })
       .map(([key, val]) =>
         typeof val === 'boolean'
           ? `${key}`
diff --git a/src/util/urls.js b/src/util/urls.js
index c2119b8d..4d099acd 100644
--- a/src/util/urls.js
+++ b/src/util/urls.js
@@ -79,16 +79,25 @@ export function generateURLs(urlSpec) {
     );
 
     const toHelper =
-      (delimiterMode) =>
+      ({device}) =>
       (key, ...args) => {
         const {
-          value: {[delimiterMode]: template},
+          value: {
+            [device ? 'device' : 'posix']: template,
+          },
         } = getValueForFullKey(relative, key);
 
         let missing = 0;
         let result = template.replaceAll(/<([0-9]+)>/g, (match, n) => {
           if (n < args.length) {
-            return args[n];
+            const value = args[n];
+            if (device) {
+              return value;
+            } else {
+              let encoded = encodeURIComponent(value);
+              encoded = encoded.replaceAll('%2F', '/');
+              return encoded;
+            }
           } else {
             missing++;
           }
@@ -106,8 +115,8 @@ export function generateURLs(urlSpec) {
       };
 
     return {
-      to: toHelper('posix'),
-      toDevice: toHelper('device'),
+      to: toHelper({device: false}),
+      toDevice: toHelper({device: true}),
     };
   };