content, url-spec: use static rather than shared, drop cachebust

Author: towerofnix

src/content/dependencies/generatePageLayout.js

@@ -10,7 +10,6 @@ export default {
   ],
 
   extraDependencies: [
-    'cachebust',
     'getColors',
     'html',
     'language',
@@ -209,7 +208,6 @@ export default {
   },
 
   generate(data, relations, slots, {
-    cachebust,
     getColors,
     html,
     language,
@@ -598,7 +596,7 @@ export default {
 
             html.tag('link', {
               rel: 'stylesheet',
-              href: to('shared.staticFile', 'site.css', cachebust),
+              href: to('static.path', 'site.css'),
             }),
 
             html.tag('style', [
@@ -608,7 +606,7 @@ export default {
             ]),
 
             html.tag('script', {
-              src: to('shared.staticFile', 'lazy-loading.js', cachebust),
+              src: to('static.path', 'lazy-loading.js'),
             }),
           ]),
 
@@ -638,7 +636,7 @@ export default {
 
               html.tag('script', {
                 type: 'module',
-                src: to('shared.staticFile', 'client.js', cachebust),
+                src: to('static.path', 'client.js'),
               }),
             ]),
         ])

src/content/dependencies/image.js

@@ -3,7 +3,6 @@ import {empty} from '#sugar';
 
 export default {
   extraDependencies: [
-    'cachebust',
     'checkIfImagePathHasCachedThumbnails',
     'getDimensionsOfImagePath',
     'getSizeOfImagePath',
@@ -82,7 +81,6 @@ export default {
   },
 
   generate(data, relations, slots, {
-    cachebust,
     checkIfImagePathHasCachedThumbnails,
     getDimensionsOfImagePath,
     getSizeOfImagePath,
@@ -172,7 +170,7 @@ export default {
     if (willReveal) {
       reveal = [
         html.tag('img', {class: 'reveal-symbol'},
-          {src: to('shared.staticFile', 'warning.svg', cachebust)}),
+          {src: to('static.path', 'warning.svg')}),
 
         html.tag('br'),
 

src/content/dependencies/linkExternalAsIcon.js

@@ -37,7 +37,7 @@ export default {
             html.tag('title', platformText),
 
           html.tag('use', {
-            href: to('shared.staticIcon', iconId),
+            href: to('static.icon', iconId),
           }),
         ]),
 

src/upd8.js

@@ -93,8 +93,6 @@ import * as buildModes from './write/build-modes/index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const CACHEBUST = 23;
-
 let COMMIT;
 try {
   COMMIT = execSync('git log --format="%h %B" -n 1 HEAD', {cwd: __dirname}).toString().trim();
@@ -2116,7 +2114,6 @@ async function main() {
       webRoutes,
       wikiData,
 
-      cachebust: '?' + CACHEBUST,
       closeLanguageWatchers,
       developersComment,
       getSizeOfAdditionalFile,

src/url-spec.js

@@ -63,17 +63,7 @@ const urlSpec = {
   },
 
   shared: {
-    paths: {
-      ...genericPaths,
-
-      utilityRoot: 'util',
-      staticRoot: 'static',
-
-      utilityFile: 'util/<>',
-      staticFile: 'static/<>?<>',
-
-      staticIcon: 'static/icons.svg#icon-<>',
-    },
+    paths: genericPaths,
   },
 
   media: {
@@ -102,7 +92,11 @@ const urlSpec = {
 
   static: {
     prefix: 'static/',
-    paths: genericPaths,
+    paths: {
+      ...genericPaths,
+
+      icon: 'icons.svg#icon-<>',
+    },
   },
 
   util: {

src/write/bind-utilities.js

@@ -19,7 +19,6 @@ import {
 
 export function bindUtilities({
   absoluteTo,
-  cachebust,
   defaultLanguage,
   getSizeOfAdditionalFile,
   getSizeOfImagePath,
@@ -36,7 +35,6 @@ export function bindUtilities({
 
   Object.assign(bound, {
     absoluteTo,
-    cachebust,
     defaultLanguage,
     getSizeOfAdditionalFile,
     getSizeOfImagePath,

src/write/build-modes/live-dev-server.js

@@ -103,7 +103,6 @@ export async function go({
   webRoutes,
   wikiData,
 
-  cachebust,
   developersComment: _developersComment,
   getSizeOfAdditionalFile,
   getSizeOfImagePath,
@@ -399,7 +398,6 @@ export async function go({
 
       const bound = bindUtilities({
         absoluteTo,
-        cachebust,
         defaultLanguage,
         getSizeOfAdditionalFile,
         getSizeOfImagePath,

src/write/build-modes/static-build.js

@@ -115,7 +115,6 @@ export async function go({
   webRoutes,
   wikiData,
 
-  cachebust,
   developersComment: _developersComment,
   getSizeOfAdditionalFile,
   getSizeOfImagePath,
@@ -306,7 +305,6 @@ export async function go({
 
         const bound = bindUtilities({
           absoluteTo,
-          cachebust,
           defaultLanguage,
           getSizeOfAdditionalFile,
           getSizeOfImagePath,

test/lib/content-function.js

@@ -52,7 +52,6 @@ export function testContentFunctions(t, message, fn) {
             to,
             urls,
 
-            cachebust: 413,
             pagePath: ['home'],
             appendIndexHTML: false,
             getColors: c => getColors(c, {chroma}),