astro-accelerator 5.9.16 → 5.9.18

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.9.16",
+    "version": "5.9.18",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -33,11 +33,11 @@
         "dts": "tsc ./tests/locate-content.js ./tests/locate-navigation.js ./tests/locate-search.js --allowJs --declaration --emitDeclarationOnly"
     },
     "dependencies": {
-        "@astrojs/mdx": "^4.3.0",
-        "astro": "^5.11.0",
-        "astro-accelerator-utils": "^0.3.48",
+        "@astrojs/mdx": "^4.3.3",
+        "astro": "^5.12.9",
+        "astro-accelerator-utils": "^0.3.50",
         "cspell": "^8.19.4",
-        "csv": "^6.4.0",
+        "csv": "^6.4.1",
         "glob": "^11.0.3",
         "hast-util-from-selector": "^3.0.1",
         "html-to-text": "^9.0.5",
@@ -48,7 +48,7 @@
         "sharp": "^0.33.5"
     },
     "devDependencies": {
-        "@playwright/test": "^1.54.0"
+        "@playwright/test": "^1.54.2"
     },
     "files": [
         ".npmrc",

package/src/pages/authors/[author]/[page].astro

@@ -79,6 +79,12 @@ export async function getData() {
       }
     });
   });
+
+  sourcePosts.filter(PostFiltering.isAuthor).forEach((p) => {
+    if (!data.authors.includes(p.frontmatter.id)) {
+      data.authors.push(p.frontmatter.id);
+    }
+  });
     
   return data;
 }
@@ -93,7 +99,7 @@ export async function getStaticPaths({ paginate }: any) {
     });
     return paginate(filtered, { 
         params: { author: a.toLowerCase() },
-        props: { pubDate: filtered[0].frontmatter.pubDate },
+        props: { pubDate: filtered[0]?.frontmatter.pubDate ?? new Date() },
         pageSize: SITE.pageSize 
     });
   }).flat();
@@ -146,4 +152,4 @@ stats.stop();
   </div>
   <ArticleList lang={ lang } posts={ page.data } />
   <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
-</Default>
+</Default>

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');
+    }
+}

package/src/themes/accelerator/utilities/img.mjs

@@ -88,19 +88,22 @@ async function recurseFiles(directory) {
                     if (!fs.existsSync(metaPath)) {
                         console.log('Processing:', metaPath);
                         filesToProcess.push(info);
+                    } else {
+                        const data = fs.readFileSync(metaPath, 'utf8');
+                        const jsonData = JSON.parse(data);
+                        const date90DaysAgo = new Date(
+                            Date.now() - 90 * 24 * 60 * 60 * 1000
+                        );
+
+                        if (
+                            !jsonData.updated ||
+                            new Date(jsonData.updated) < date90DaysAgo
+                        ) {
+                            console.log('Processing:', metaPath);
+                            filesToProcess.push(info);
+                        }
                     }
 
-                    // The code below uses modified dates (and will update more images than the above)
-                    // const fullPath = path.join(imageDirectory, info.path);
-                    // const modified = fs.statSync(fullPath).mtime;
-
-                    // const destinationModified = fs.existsSync(fullDestination)
-                    //     ? fs.statSync(fullDestination).mtime
-                    //     : new Date(0);
-
-                    // if (destinationModified < modified) {
-                    //     filesToProcess.push(info);
-                    // }
                     break;
             }
         }
@@ -141,6 +144,7 @@ for (const file of filesToProcess) {
         width: info.width,
         height: info.height,
         sizeInBytes: info.size,
+        updated: new Date().toISOString(),
     };
 
     const metaFile = source + '.json';