Merge remote-tracking branch 'upstream/dev-2.x' into station-entrances

leonardehrenfried · Dec 18, 2024 · 4fd0f68 · 4fd0f68
2 parents 2eb0e7b + 2d012a3
commit 4fd0f68
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 43 deletions.
diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-17T11:50/assets/index-CMyj5Qyr.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-17T11:50/assets/index-BDL0-veX.css">
+    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-18T09:00/assets/index-DwXgkIow.js"></script>
+    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-18T09:00/assets/index-BDL0-veX.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -20,11 +20,11 @@
     "@googlemaps/polyline-codec": "1.0.28",
     "@js-temporal/polyfill": "0.4.4",
     "bootstrap": "5.3.3",
-    "graphql": "16.9.0",
+    "graphql": "16.10.0",
     "graphql-request": "7.1.2",
     "maplibre-gl": "4.7.1",
     "react": "19.0.0",
-    "react-bootstrap": "2.10.6",
+    "react-bootstrap": "2.10.7",
     "react-dom": "19.0.0",
     "react-map-gl": "7.1.7"
   },
@@ -35,7 +35,7 @@
     "@parcel/watcher": "2.5.0",
     "@testing-library/react": "16.1.0",
     "@types/react": "19.0.1",
-    "@types/react-dom": "19.0.1",
+    "@types/react-dom": "19.0.2",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "@vitejs/plugin-react": "4.3.4",
@@ -45,12 +45,12 @@
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-react": "7.37.2",
-    "eslint-plugin-react-hooks": "5.0.0",
+    "eslint-plugin-react-hooks": "5.1.0",
     "eslint-plugin-react-refresh": "0.4.16",
     "jsdom": "25.0.1",
-    "prettier": "3.4.1",
+    "prettier": "3.4.2",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vitest": "2.1.8"
   }
 }
diff --git a/client/src/components/ItineraryList/ItineraryLegDetails.tsx b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
@@ -25,11 +25,8 @@ export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean
         <span title={'Generalized cost: ¢' + leg.generalizedCost}>¢{leg.generalizedCost}</span>
       </div>
       <InterchangeInfo leg={leg} />
-      <LegTime
-        aimedTime={leg.aimedStartTime}
-        expectedTime={leg.expectedStartTime}
-        hasRealtime={leg.realtime}
-      /> - <LegTime aimedTime={leg.aimedEndTime} expectedTime={leg.expectedEndTime} hasRealtime={leg.realtime} />
+      <LegTime aimedTime={leg.aimedStartTime} expectedTime={leg.expectedStartTime} hasRealtime={leg.realtime} /> -{' '}
+      <LegTime aimedTime={leg.aimedEndTime} expectedTime={leg.expectedEndTime} hasRealtime={leg.realtime} />
       <div className="mode">
         <b>{leg.mode}</b>{' '}
         {leg.line && (