From 44e420b6c53fc6fb19b05cd5963aff56759d6550 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 11 Feb 2021 18:42:27 -0500
Subject: [PATCH] Minify: Return `Date` objects from `statFile()`

---
 src/node/utils/Minify.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 4ff5a8297..df98d4490 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -152,7 +152,6 @@ const minify = async (req, res) => {
     return;
   }
   if (date) {
-    date = new Date(date);
     date.setMilliseconds(0);
     res.setHeader('last-modified', date.toUTCString());
     res.setHeader('date', (new Date()).toUTCString());
@@ -250,7 +249,7 @@ const statFile = async (filename, dirStatLimit) => {
     // everything.
     return [await lastModifiedDateOfEverything(), true];
   } else if (filename === 'js/require-kernel.js') {
-    return [requireLastModified(), true];
+    return [_requireLastModified, true];
   } else {
     let stats;
     try {
@@ -263,13 +262,13 @@ const statFile = async (filename, dirStatLimit) => {
       }
       throw err;
     }
-    return [stats.mtime.getTime(), stats.isFile()];
+    return [stats.mtime, stats.isFile()];
   }
 };
 
 const lastModifiedDateOfEverything = async () => {
   const folders2check = [`${ROOT_DIR}js/`, `${ROOT_DIR}css/`];
-  let latestModification = 0;
+  let latestModification = null;
   // go through this two folders
   await Promise.all(folders2check.map(async (path) => {
     // read the files in the folder
@@ -283,12 +282,9 @@ const lastModifiedDateOfEverything = async () => {
       // get the stat data of this file
       const stats = await fs.stat(`${path}/${filename}`);
 
-      // get the modification time
-      const modificationTime = stats.mtime.getTime();
-
       // compare the modification time to the highest found
-      if (modificationTime > latestModification) {
-        latestModification = modificationTime;
+      if (latestModification == null || stats.mtime > latestModification) {
+        latestModification = stats.mtime;
       }
     }));
   }));
@@ -298,7 +294,6 @@ const lastModifiedDateOfEverything = async () => {
 // This should be provided by the module, but until then, just use startup
 // time.
 const _requireLastModified = new Date();
-const requireLastModified = () => _requireLastModified.toUTCString();
 const requireDefinition = () => `var require = ${RequireKernel.kernelSource};\n`;
 
 const getFileCompressed = async (filename, contentType) => {