gtfs-to-html 2.12.0 → 2.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.12.0",
+  "version": "2.12.2",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -35,6 +35,7 @@
     "dist",
     "docker",
     "examples",
+    "scripts",
     "views/default",
     "config-sample.json"
   ],
@@ -43,30 +44,32 @@
   },
   "scripts": {
     "build": "tsup",
+    "postbuild": "node scripts/postinstall.js",
     "start": "node ./dist/app",
-    "prepare": "husky"
+    "prepare": "husky && npm run build",
+    "postinstall": "node scripts/postinstall.js"
   },
   "dependencies": {
     "@maplibre/maplibre-gl-geocoder": "^1.9.1",
-    "@turf/helpers": "^7.2.0",
-    "@turf/simplify": "^7.2.0",
+    "@turf/helpers": "^7.3.1",
+    "@turf/simplify": "^7.3.1",
     "anchorme": "^3.0.8",
     "archiver": "^7.0.1",
     "cli-table": "^0.3.11",
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.6.0",
-    "express": "^5.1.0",
-    "gtfs": "^4.18.1",
+    "express": "^5.2.1",
+    "gtfs": "^4.18.2",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    "maplibre-gl": "^5.12.0",
-    "marked": "^17.0.0",
+    "maplibre-gl": "^5.14.0",
+    "marked": "^17.0.1",
     "moment": "^2.30.1",
     "pbf": "^4.0.1",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.3",
-    "puppeteer": "^24.29.1",
+    "puppeteer": "^24.32.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     "sqlstring": "^2.3.3",
@@ -77,7 +80,7 @@
   "devDependencies": {
     "@types/archiver": "^7.0.0",
     "@types/cli-table": "^0.3.4",
-    "@types/express": "^5.0.5",
+    "@types/express": "^5.0.6",
     "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
@@ -87,11 +90,11 @@
     "@types/sanitize-html": "^2.16.0",
     "@types/sqlstring": "^2.3.2",
     "@types/toposort": "^2.0.7",
-    "@types/yargs": "^17.0.34",
+    "@types/yargs": "^17.0.35",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.6",
-    "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
+    "lint-staged": "^16.2.7",
+    "prettier": "^3.7.4",
+    "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   },
   "engines": {

package/scripts/postinstall.js

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+
+/**
+ * Postinstall Script - Copy Frontend Libraries
+ *
+ * This script copies browser-compatible JavaScript and CSS files from node_modules
+ * into the dist/frontend_libraries directory. These files are needed for the HTML
+ * timetables to work in browsers (for maps, geocoding, protocol buffers, etc.).
+ *
+ * Why this is needed:
+ * - The generated HTML files reference these libraries directly
+ * - They must be bundled with the package so they're available when installed as a dependency
+ * - npm/pnpm may hoist dependencies, so we can't rely on a fixed node_modules path
+ *
+ * This script handles multiple installation scenarios:
+ * - Direct installation (npm install in this package)
+ * - Installed as a dependency (node_modules may be hoisted to parent)
+ * - Works with both npm and pnpm
+ */
+
+import { mkdir, copyFile } from 'node:fs/promises';
+import { accessSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const targetDir = join(__dirname, '../dist/frontend_libraries');
+
+const filesToCopy = [
+  {
+    package: 'pbf',
+    source: 'dist/pbf.js',
+    target: 'pbf.js',
+  },
+  {
+    package: 'gtfs-realtime-pbf-js-module',
+    source: 'gtfs-realtime.browser.proto.js',
+    target: 'gtfs-realtime.browser.proto.js',
+  },
+  {
+    package: 'anchorme',
+    source: 'dist/browser/anchorme.min.js',
+    target: 'anchorme.min.js',
+  },
+  {
+    package: 'maplibre-gl',
+    source: 'dist/maplibre-gl.js',
+    target: 'maplibre-gl.js',
+  },
+  {
+    package: 'maplibre-gl',
+    source: 'dist/maplibre-gl.css',
+    target: 'maplibre-gl.css',
+  },
+  {
+    package: '@maplibre/maplibre-gl-geocoder',
+    source: 'dist/maplibre-gl-geocoder.js',
+    target: 'maplibre-gl-geocoder.js',
+  },
+  {
+    package: '@maplibre/maplibre-gl-geocoder',
+    source: 'dist/maplibre-gl-geocoder.css',
+    target: 'maplibre-gl-geocoder.css',
+  },
+];
+
+function resolvePackagePath(packageName) {
+  const possiblePaths = [
+    // Direct dependency (when running in development or as root package)
+    join(__dirname, '../node_modules', packageName),
+    // Hoisted dependency (when installed as a dependency in another project)
+    join(__dirname, '../../', packageName),
+    // Deeply nested
+    join(__dirname, '../../../', packageName),
+  ];
+
+  for (const path of possiblePaths) {
+    try {
+      accessSync(path);
+      return path;
+    } catch {
+      continue;
+    }
+  }
+
+  throw new Error(`Could not resolve package: ${packageName}`);
+}
+
+async function copyFrontendLibraries() {
+  try {
+    await mkdir(targetDir, { recursive: true });
+
+    for (const file of filesToCopy) {
+      try {
+        const packagePath = resolvePackagePath(file.package);
+        const sourcePath = join(packagePath, file.source);
+        const targetPath = join(targetDir, file.target);
+
+        await copyFile(sourcePath, targetPath);
+      } catch (error) {
+        console.error(
+          `Failed to copy ${file.package}/${file.source}:`,
+          error.message,
+        );
+        // Continue with other files even if one fails
+      }
+    }
+  } catch (error) {
+    console.error('Error copying frontend libraries:', error);
+    process.exit(1);
+  }
+}
+
+copyFrontendLibraries();

package/views/default/css/overview_styles.css

@@ -103,7 +103,6 @@ a:hover {
   flex-shrink: 0;
   font-weight: bold;
   color: white;
-  text-shadow: 0 0 2px rgba(0,0,0,0.5);
 }
 
 .timetable-overview .route-color-swatch-large {
@@ -120,11 +119,10 @@ a:hover {
   flex-shrink: 0;
   font-weight: bold;
   color: white;
-  text-shadow: 0 0 4px rgba(0,0,0,0.5);
 }
 
-.timetable-overview .btn-blue {
-  color: rgb(255 255 255);
+.timetable-overview .btn-active {
+  color: rgb(255, 255, 255);
   padding: 0.75rem 1.5rem;
   background-color: rgb(37 99 235);
   border-radius: 0.375rem;
@@ -135,7 +133,7 @@ a:hover {
   text-decoration: none;
 }
 
-.timetable-overview .btn-blue:hover {
+.timetable-overview .btn-active:hover {
   background-color: rgb(29 78 216);
   text-decoration: none;
 }

package/views/default/css/timetable_styles.css

@@ -201,8 +201,8 @@ a:hover {
   display: none;
 }
 
-.timetable-page .btn-blue {
-  color: rgb(255 255 255);
+.timetable-page .btn-active {
+  color: rgb(255, 255, 255);
   padding: 0.75rem 1.5rem;
   background-color: rgb(37 99 235);
   border-radius: 0.375rem;
@@ -213,12 +213,12 @@ a:hover {
   text-decoration: none;
 }
 
-.timetable-page .btn-blue:hover {
+.timetable-page .btn-active:hover {
   background-color: rgb(29 78 216);
   text-decoration: none;
 }
 
-.timetable-page .btn-gray {
+.timetable-page .btn-inactive {
   color: rgb(75 85 99);
   padding: 0.75rem 1.5rem;
   background-color: rgb(209 213 219);
@@ -230,7 +230,7 @@ a:hover {
   text-decoration: none;
 }
 
-.timetable-page .btn-gray:hover {
+.timetable-page .btn-inactive:hover {
   background-color: rgb(201, 206, 213);
   text-decoration: none;
 }
@@ -427,7 +427,6 @@ a:hover {
   flex-shrink: 0;
   font-weight: bold;
   color: white;
-  text-shadow: 0 0 2px rgba(0,0,0,0.5);
 }
 
 .timetable-page .route-color-swatch-large {
@@ -444,7 +443,6 @@ a:hover {
   flex-shrink: 0;
   font-weight: bold;
   color: white;
-  text-shadow: 0 0 4px rgba(0,0,0,0.5);
 }
 
 /* Map Styles */
@@ -678,7 +676,6 @@ a:hover {
   flex-shrink: 0;
   font-weight: bold;
   color: white;
-  text-shadow: 0 0 2px rgba(0,0,0,0.5);
 }
 
 .timetable-page .timetable-alerts .alert-header .alert-title {

package/views/default/js/system-map.js

@@ -99,7 +99,7 @@ function formatStopPopup(feature) {
   container.appendChild(routeList);
 
   const streetviewLink = document.createElement('a');
-  streetviewLink.className = 'btn-blue btn-sm';
+  streetviewLink.className = 'btn-active btn-sm';
   streetviewLink.href = `https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&heading=0&pitch=0&fov=90`;
   streetviewLink.target = '_blank';
   streetviewLink.rel = 'noopener noreferrer';

package/views/default/js/timetable-alerts.js

@@ -68,7 +68,7 @@ function formatAlertAsHtml(
   if (alert.alert.url?.translation?.[0].text) {
     const moreInfoLink = document.createElement('a');
     moreInfoLink.href = alert.alert.url.translation[0].text;
-    moreInfoLink.classList.add('btn-blue', 'btn-sm', 'alert-more-info');
+    moreInfoLink.classList.add('btn-active', 'btn-sm', 'alert-more-info');
     moreInfoLink.textContent = 'More Info';
     alertBody.appendChild(moreInfoLink);
   }
@@ -194,7 +194,7 @@ async function updateAlerts() {
       // Replace the empty message if present
       const emptyMessage = document.querySelector('.timetable-alert-empty');
       if (emptyMessage) {
-        emptyMessage.style.display = '';
+        emptyMessage.style.display = 'block';
       }
     }
   } catch (error) {

package/views/default/js/timetable-map.js

@@ -194,7 +194,7 @@ function getStopPopupHtml(feature, stop) {
   html.appendChild(routeList);
 
   const streetviewLink = document.createElement('a');
-  streetviewLink.className = 'btn-blue btn-sm';
+  streetviewLink.className = 'btn-active btn-sm';
   streetviewLink.href = `https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&heading=0&pitch=0&fov=90`;
   streetviewLink.target = '_blank';
   streetviewLink.rel = 'noopener noreferrer';

package/views/default/js/timetable-menu.js

@@ -13,8 +13,8 @@ function showSelectedTimetable() {
     .forEach((element) => {
       const label = element.closest('label');
       if (label) {
-        label.classList.toggle('btn-blue', element.checked);
-        label.classList.toggle('btn-gray', !element.checked);
+        label.classList.toggle('btn-active', element.checked);
+        label.classList.toggle('btn-inactive', !element.checked);
       }
     });
 
@@ -23,8 +23,8 @@ function showSelectedTimetable() {
     .forEach((element) => {
       const label = element.closest('label');
       if (label) {
-        label.classList.toggle('btn-blue', element.checked);
-        label.classList.toggle('btn-gray', !element.checked);
+        label.classList.toggle('btn-active', element.checked);
+        label.classList.toggle('btn-inactive', !element.checked);
       }
     });
 

package/views/default/timetable_menu.pug

@@ -27,7 +27,7 @@ if timetablePage.consolidatedTimetables.length > 1
         div
           h3= dayList
           each timetable in group
-            a.btn-blue(href=`#${cssEscape(`timetable_id_${timetable.timetable_id}`)}`)= timetable.timetable_label
+            a.btn-active(href=`#${cssEscape(`timetable_id_${timetable.timetable_id}`)}`)= timetable.timetable_label
 
   if config.menuType === 'radio'
     .timetable-radio-menu
@@ -36,13 +36,13 @@ if timetablePage.consolidatedTimetables.length > 1
         #direction_name_selector
           h3 Service Direction
           each timetable, idx in uniqueDirectionTimetables
-            label(class=idx === 0 ? 'btn-blue' : 'btn-gray')
+            label(class=idx === 0 ? 'btn-active' : 'btn-inactive')
               input.hidden(type="radio" name="directionId" autocomplete="off" value=timetable.direction_id checked=(idx === 0))
               span= timetable.direction_name || timetable.timetable_label
       div(hidden=timetablePage.dayLists.length <= 1)
         #day_list_selector
           h3 Day of Week
           each dayList, idx in timetablePage.dayLists
-            label(class=idx === 0 ? 'btn-blue' : 'btn-gray')
+            label(class=idx === 0 ? 'btn-active' : 'btn-inactive')
               input.hidden(type="radio" name="dayList" autocomplete="off" value=dayList checked=(idx === 0))
               span= dayList