Fix last updated date on product pages

gulpfile.ts

@@ -50,10 +50,10 @@ gulp.task("build general pages", () => {
 gulp.task(
   "build pages",
   gulp.parallel(
-    ...getProductPageBuildTasks(products),
-    ...getDirectoryPagesTasks(products),
-    "build general pages",
-    "build api"
+      ...getProductPageBuildTasks(products),
+      ...getDirectoryPagesTasks(products),
+      "build general pages",
+      "build api"
   )
 );
 

package.json

@@ -14,14 +14,14 @@
     "@fortawesome/fontawesome-free": "^5.15.1",
     "@iarna/toml": "^2.2.5",
     "@types/gulp": "^4.0.7",
-    "@types/jest": "^25.2.3",
+    "@types/jest": "^26",
     "@types/node": "^14.14.14",
     "@typescript-eslint/eslint-plugin": "^3.10.1",
     "@typescript-eslint/parser": "^3.10.1",
     "a17t": "^0.2.9",
     "autoprefixer": "^10.2.6",
     "axios": "^0.21.1",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27",
     "babel-plugin-polyfill-corejs2": "^0.2.0",
     "babel-plugin-polyfill-corejs3": "^0.2.0",
     "babel-plugin-polyfill-regenerator": "^0.2.0",
@@ -42,8 +42,8 @@
     "handlebars-helpers": "^0.10.0",
     "image-size": "^0.8.3",
     "is-core-module": "^2.4.0",
-    "jest": "^26.6.3",
-    "jest-cli": "^26.6.3",
+    "jest": "^27",
+    "jest-cli": "^27",
     "jest-junit": "^11.1.0",
     "jssoup": "0.0.11",
     "lunr": "^2.3.9",
@@ -53,6 +53,7 @@
     "queue-microtask": "^1.2.3",
     "run-sequence": "^2.2.1",
     "sharp": "^0.25.4",
+    "simple-git": "^2.40.0",
     "tailwindcss": "^2.1.2",
     "toml": "^3.0.0",
     "ts-node": "^8.10.2",

src/build/utils.ts

@@ -43,12 +43,14 @@ export function getProductPageBuildTasks(products: Product[]) {
   const productPageBuildTasks = [];
   for (const product of products) {
     const taskName = `build ${product.slug}`;
-    gulp.task(taskName, () => {
+
+    gulp.task(taskName, async () => {
       return gulp
         .src("./src/templates/pages/product.hbs")
         .pipe(
           hbsFactory({
             product: product,
+            lastUpdated: await product.lastUpdated,
             description: `${product.name} has a score of ${product.score}/10 on PrivacySpy, an open project to rate and annotate privacy policies.`,
           })
         )

src/parsing/index.ts

@@ -2,6 +2,9 @@ import fs from "fs";
 import toml from "@iarna/toml";
 import { RubricQuestion, RubricSelection, Product, Contributor } from "./types";
 import { getQuestionBySlug, getOptionBySlug } from "./utils";
+import simpleGit, {SimpleGit} from 'simple-git';
+
+const git: SimpleGit = simpleGit();
 
 export function loadContributors(): Contributor[] {
   const data: object = toml.parse(
@@ -51,11 +54,14 @@ export function loadProducts(
   for (const file of files) {
     const rubric: RubricSelection[] = [];
 
+    const lastUpdated = git.log({file: "products/" + file}).then(x => x.latest ? new Date(x.latest.date).toDateString() : "Unknown");
+
     const product: Product = {
       contributors: [],
       updates: [],
       hostnames: [],
       sources: [],
+      lastUpdated,
       ...(toml.parse(
         fs.readFileSync("products/" + file, {
           encoding: "utf-8",

src/parsing/types.ts

@@ -49,6 +49,6 @@ export interface Product {
   children: Product[];
   rubric: RubricSelection[];
   updates: Update[];
-  lastUpdated: Date;
+  lastUpdated: Promise<Date>;
   contributors: Contributor[];
 }

src/templates/pages/product.hbs

@@ -80,7 +80,7 @@
     <section class="w-full mt-10 text-center md:text-left md:w-1/5 md:mt-0">
       <div class="mb-6">
         <p class="text-sm text-gray-400">Last Updated</p>
-        <p class="mt-1 text-sm text-black">May 5, 2020</p>
+        <p class="mt-1 text-sm text-black">{{lastUpdated}}</p>
       </div>
       <div class="my-6">
         <p class="text-sm text-gray-400">Sources</p>

src/tests/product.test.ts

@@ -31,6 +31,11 @@ for (const product of products) {
       expect(product.slug.toLowerCase()).toEqual(product.slug);
     });
 
+    // The following isn't a particularly useful test, but it ensures that Jest waits for all handles to close.
+    test(`last updated must load`, async () => {
+      expect(await product.lastUpdated).toBeDefined();
+    });
+
     describe(`must have hostname(s) {hostnames}`, () => {
       test("that exist", () => {
         expect(product.hostnames.length).toBeGreaterThan(0);

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
     "target": "es6",
-    "esModuleInterop": true,
+    "esModuleInterop": true
   }
 }