astro-accelerator 5.9.17 → 5.9.19

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.9.17",
+    "version": "5.9.19",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -33,9 +33,10 @@
         "dts": "tsc ./tests/locate-content.js ./tests/locate-navigation.js ./tests/locate-search.js --allowJs --declaration --emitDeclarationOnly"
     },
     "dependencies": {
-        "@astrojs/mdx": "^4.3.3",
-        "astro": "^5.12.8",
-        "astro-accelerator-utils": "^0.3.49",
+        "@astrojs/mdx": "^4.3.4",
+        "@img/sharp-linux-x64": "^0.34.3",
+        "astro": "^5.13.3",
+        "astro-accelerator-utils": "^0.3.51",
         "cspell": "^8.19.4",
         "csv": "^6.4.1",
         "glob": "^11.0.3",
@@ -48,7 +49,7 @@
         "sharp": "^0.33.5"
     },
     "devDependencies": {
-        "@playwright/test": "^1.54.2"
+        "@playwright/test": "^1.55.0"
     },
     "files": [
         ".npmrc",

package/src/themes/accelerator/components/FooterItem.astro

@@ -6,28 +6,46 @@ import { Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 
 const accelerator = new Accelerator(SITE);
-const stats = new accelerator.statistics('accelerator/components/FooterItem.astro');
+const stats = new accelerator.statistics(
+    'accelerator/components/FooterItem.astro'
+);
 stats.start();
 
 // Properties
 type Props = {
-  lang: string;
-  page: NavPage
+    lang: string;
+    page: NavPage;
 };
 const { lang, page } = Astro.props satisfies Props;
 
 // Logic
 stats.stop();
 ---
-{page.children.length > 0 && (
-<div class="footer-column">
-  <h2><Fragment set:html={page.title} /></h2>
-  <ul>
-  { page.children.sort((a, b) => a.order - b.order).map((child) => (
-    <li>
-      <a href={ child.url } aria-current={ child.ariaCurrent ? child.ariaCurrent : null } rel={ child.rel }>{ child.title }</a>
-    </li>
-  ))}
-  </ul>
-</div>
-)}
+
+{
+    page.children.length > 0 && (
+        <div class="footer-column">
+            <h2>
+                <Fragment set:html={page.title} />
+            </h2>
+            <ul>
+                {page.children
+                    .sort((a, b) => a.order - b.order)
+                    .map((child) => (
+                        <li>
+                            <a
+                                href={accelerator.urlFormatter.formatAddress(
+                                    child.url
+                                )}
+                                aria-current={
+                                    child.ariaCurrent ? child.ariaCurrent : null
+                                }
+                                rel={child.rel}>
+                                {child.title}
+                            </a>
+                        </li>
+                    ))}
+            </ul>
+        </div>
+    )
+}

package/src/themes/accelerator/components/NavigationBar.astro

@@ -7,12 +7,14 @@ import { SITE } from '@config';
 import { menu } from '@data/navigation';
 
 const accelerator = new Accelerator(SITE);
-const stats = new accelerator.statistics('accelerator/components/NavigationBar.astro');
+const stats = new accelerator.statistics(
+    'accelerator/components/NavigationBar.astro'
+);
 stats.start();
 
 // Properties
 type Props = {
-  lang: string;
+    lang: string;
 };
 const { lang } = Astro.props satisfies Props;
 
@@ -25,11 +27,26 @@ const pages = accelerator.navigation.menu(currentUrl, SITE.subfolder, menu);
 
 stats.stop();
 ---
-<nav class="site-nav-bar" id="site-nav" aria-label={ _(Translations.aria.site_navigation) }>
-  <h2 class="site-nav-title">{ _(Translations.navigation.title) }</h2>
-  <ul>
-    {pages.sort((a, b) => a.order - b.order).map((page) => (
-      <li><a href={ page.url }>{ page.title }</a></li>
-    ))}
-  </ul>
-</nav>
+
+<nav
+    class="site-nav-bar"
+    id="site-nav"
+    aria-label={_(Translations.aria.site_navigation)}>
+    <h2 class="site-nav-title">{_(Translations.navigation.title)}</h2>
+    <ul>
+        {
+            pages
+                .sort((a, b) => a.order - b.order)
+                .map((page) => (
+                    <li>
+                        <a
+                            href={accelerator.urlFormatter.formatAddress(
+                                page.url
+                            )}>
+                            {page.title}
+                        </a>
+                    </li>
+                ))
+        }
+    </ul>
+</nav>

package/src/themes/accelerator/utilities/dist-thinner.mjs

@@ -0,0 +1,135 @@
+/**
+ * This javascript file comes from Astro Accelerator
+ * Edits will be overwritten if you change the file locally
+ *
+ * @format
+ */
+
+import fs from 'fs';
+import path from 'path';
+
+const workingDirectory = process.cwd();
+
+const imageSize = await import(
+    'file://' + path.join(workingDirectory, 'src/data/image-size.mjs')
+);
+const imageModule = await import(
+    'file://' + path.join(workingDirectory, 'src/data/images.mjs')
+);
+const size = imageSize.size;
+const imagePaths = imageModule.imagePaths;
+
+const imagePath = path.join('dist', imagePaths.src);
+const outputPath = path.join('dist', imagePaths.dest);
+const imageDirectory = path.join(workingDirectory, imagePath);
+
+ const filesToProcess = [];
+
+function getDestinationFilePathless(source, s) {
+    let destination = path.join(
+        workingDirectory,
+        outputPath,
+        s.toString(),
+        source
+    );
+    destination = destination.replace(path.parse(destination).ext, '');
+    return destination;
+}
+
+async function recurseFiles(directory) {
+    const f = await fs.promises.readdir(path.join(imageDirectory, directory), {
+        withFileTypes: true,
+    });
+
+    for (const file of f) {
+        if (file.isDirectory()) {
+            const nextDirectory = path.join(directory, file.name);
+            await recurseFiles(nextDirectory);
+        } else {
+            const ext = path.parse(file.name).ext;
+
+            switch (ext) {
+                case '.jpg':
+                case '.jpeg':
+                case '.png':
+                case '.webp':
+                    const sourcePath = path.join(directory, file.name);
+
+                    const webP = sourcePath.replace(
+                        /.jpg$|.jpeg$|.png$/,
+                        '.webp'
+                    );
+                    const info = {
+                        path: sourcePath,
+                        webP: webP,
+                    };
+
+                    // Only processes images where there is no json metadata file
+                    const metaPath = path.join(
+                        workingDirectory,
+                        imagePath,
+                        sourcePath + '.json'
+                    );
+
+                    
+                    if (fs.existsSync(metaPath)) {
+                        const data = fs.readFileSync(metaPath, 'utf8');
+                        const jsonData = JSON.parse(data);
+                        const date90DaysAgo = new Date(
+                            Date.now() - 14 /* <- days */ * 24 * 60 * 60 * 1000
+                        );
+
+                        //console.log('Checking:', metaPath);
+
+                        if (jsonData.updated && new Date(jsonData.updated) < date90DaysAgo) {
+                            console.log('Processing:', metaPath);
+                            filesToProcess.push(info);
+                        }
+                    }
+
+                    break;
+            }
+        }
+    }
+}
+
+await recurseFiles('');
+
+for (const file of filesToProcess) {
+    const source = path.join(imageDirectory, file.path);
+    const destination = getDestinationFilePathless(file.path, 'x');
+
+    const ext = path.parse(source).ext;
+
+    // Delete original file
+    fs.unlinkSync(source);
+
+    // Delete the fallback file
+    switch (ext) {
+        case '.png':
+            fs.unlinkSync(destination + '.png');
+            break;
+        case '.jpg':
+        case '.jpeg':
+            fs.unlinkSync(destination + '.jpg');
+            break;
+        case '.webp':
+            fs.unlinkSync(destination + '.webp');
+            break;
+    }
+
+    const metaFile = source + '.json';
+
+    // Delete metadata file
+    fs.unlinkSync(metaFile);
+
+    // Delete resized images
+    for (const key in size) {
+        const resizeDestination = getDestinationFilePathless(
+            file.path,
+            size[key]
+        );
+
+        fs.unlinkSync(resizeDestination + '.webp');
+    }
+}