stable update time, fix marked load issue

Author: KaimingTao

app/data/yaml2json.py

@@ -3,6 +3,7 @@
 
 import argparse
 import json
+from datetime import datetime, timezone
 from pathlib import Path
 
 try:
@@ -116,6 +117,27 @@ def convert_yaml_to_json(yaml_path, tag_delimiter):
         json.dump(cards, handle, indent=2, ensure_ascii=False)
         handle.write('\n')
 
+    write_metadata(json_path)
+
+
+def write_metadata(json_path: Path) -> None:
+    project_root = json_path.parent.parent
+    metadata_path = project_root / 'src' / 'cards-metadata.js'
+
+    try:
+        last_modified = datetime.fromtimestamp(json_path.stat().st_mtime, tz=timezone.utc)
+    except OSError as exc:
+        print(f'Unable to stat {json_path}: {exc}')
+        last_modified = None
+
+    metadata_path.parent.mkdir(parents=True, exist_ok=True)
+    with metadata_path.open('w', encoding='utf-8') as handle:
+        if last_modified:
+            iso_value = last_modified.isoformat(timespec='seconds').replace('+00:00', 'Z')
+            handle.write(f"export const cardsLastModified = '{iso_value}';\n")
+        else:
+            handle.write('export const cardsLastModified = null;\n')
+
 
 def main():
     parser = argparse.ArgumentParser(description='Generate data/cards.json from a YAML source file.')

app/src/cards-metadata.js

@@ -0,0 +1 @@
+export const cardsLastModified = '2025-10-22T01:00:14Z';

app/src/cards.js

@@ -1,10 +1,8 @@
 let cardsCache = null;
 
-const cardsImportPath = '../data/cards.json';
-
 const cardsRequestUrl = (() => {
   try {
-    return new URL(cardsImportPath, import.meta.url).href;
+    return new URL('../data/cards.json', import.meta.url).href;
   } catch (error) {
     console.warn('Unable to resolve cards.json via import.meta.url, falling back to relative path', error);
     return 'data/cards.json';
@@ -112,27 +110,26 @@ function shuffleCards(cards) {
   return shuffled;
 }
 
-async function loadFromImport() {
+function loadFromBundle() {
+  if (typeof import.meta.glob !== 'function') {
+    return null;
+  }
+
   try {
-    const module = await import(cardsImportPath, { assert: { type: 'json' } });
+    const modules = import.meta.glob('../data/cards.json', { eager: true });
+    const module = modules['../data/cards.json'];
+    if (!module) {
+      return null;
+    }
+
     const payload = module.default ?? module;
     if (!Array.isArray(payload)) {
       return null;
     }
 
     return payload;
   } catch (error) {
-    try {
-      const module = await import(cardsImportPath);
-      const payload = module.default ?? module;
-      if (!Array.isArray(payload)) {
-        return null;
-      }
-
-      return payload;
-    } catch (nestedError) {
-      console.warn('Falling back to network fetch for cards', nestedError);
-    }
+    console.warn('Unable to load cards bundle via import.meta.glob', error);
     return null;
   }
 }
@@ -167,9 +164,9 @@ export async function fetchCards() {
     return cardsCache;
   }
 
-  const imported = await loadFromImport();
-  if (imported && imported.length > 0) {
-    cardsCache = prepareCards(imported, { shuffle: true });
+  const bundled = loadFromBundle();
+  if (bundled && bundled.length > 0) {
+    cardsCache = prepareCards(bundled, { shuffle: true });
     return cardsCache;
   }
 

app/src/main.js

@@ -1,5 +1,5 @@
-/* global __CARDS_LAST_MODIFIED__ */
 import { fetchCards, renderCardGrid, prepareCards } from './cards.js';
+import { cardsLastModified } from './cards-metadata.js';
 import { createModalController } from './modal.js';
 
 const app = document.getElementById('app');
@@ -24,8 +24,7 @@ if (siteUpdate) {
     timeStyle: 'short',
   });
 
-  const lastUpdatedSource = typeof __CARDS_LAST_MODIFIED__ !== 'undefined' ? __CARDS_LAST_MODIFIED__ : null;
-  const parsedLastUpdated = typeof lastUpdatedSource === 'string' ? new Date(lastUpdatedSource) : null;
+  const parsedLastUpdated = typeof cardsLastModified === 'string' ? new Date(cardsLastModified) : null;
   const resolvedDate = parsedLastUpdated && !Number.isNaN(parsedLastUpdated.getTime())
     ? parsedLastUpdated
     : new Date();

app/src/modal.js

@@ -1,5 +1,3 @@
-const MARKED_CDN_URL = 'https://cdn.jsdelivr.net/npm/marked@16.4.1/lib/marked.esm.js';
-
 let markedPromise = null;
 
 function resolveMarkedInstance() {
@@ -13,18 +11,8 @@ function resolveMarkedInstance() {
       return existing;
     }
 
-    try {
-      const module = await import('marked');
-      const candidate = module.marked ?? module.default ?? module;
-      if (candidate && typeof candidate.parse === 'function') {
-        return candidate;
-      }
-    } catch (error) {
-      console.warn('Falling back to CDN marked import', error);
-    }
-
-    const fallback = await import(MARKED_CDN_URL);
-    const candidate = fallback.marked ?? fallback.default ?? fallback;
+    const module = await import('marked');
+    const candidate = module.marked ?? module.default ?? module;
     if (!candidate || typeof candidate.parse !== 'function') {
       throw new Error('Unable to load marked parser');
     }

app/vite.config.js

@@ -1,19 +1,5 @@
 import { defineConfig } from 'vite';
 import { resolve } from 'node:path';
-import { statSync } from 'node:fs';
-
-function resolveCardsLastModified() {
-  try {
-    const stats = statSync(resolve(__dirname, 'data/cards.json'));
-    return stats.mtime.toISOString();
-  } catch (error) {
-    console.warn('Unable to stat data/cards.json for last modified timestamp', error);
-    return null;
-  }
-}
-
-const cardsLastModified = resolveCardsLastModified();
-
 export default defineConfig({
   root: '.',
   base: './',
@@ -28,7 +14,4 @@ export default defineConfig({
   preview: {
     open: true,
   },
-  define: {
-    __CARDS_LAST_MODIFIED__: cardsLastModified ? JSON.stringify(cardsLastModified) : 'null',
-  },
 });