mbta · thecristen · Oct 3, 2024 · Sep 9, 2024 · Sep 9, 2024 · Sep 10, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -8,8 +8,6 @@ deps
 erl_crash.dump
 build.sh
 deploy.sh
-/priv/static/*
-!/priv/static/icon-svg/
 aws
 dotcom-build.zip
 bin

diff --git a/.gitignore b/.gitignore
@@ -49,10 +49,9 @@ node_modules
 /**/react_renderer/dist
 
 # Since we are building assets from assets,
-# we ignore priv/static. You may want to comment
-# this depending on your deployment strategy.
-/priv/static/*
-!/priv/static/icon-svg/
+# we ignore certain directories in priv/static.
+/priv/static/css
+/priv/static/js
 
 # The config/prod.secret.exs file by default contains sensitive
 # data and you should not commit it into version control.

diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -1,7 +1,5 @@
-// TailwindCSS
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
+// MBTA METRO
+@import '../../deps/mbta_metro/priv/static/assets/default.css';
 
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////

diff --git a/assets/js/algolia-result.js b/assets/js/algolia-result.js
@@ -451,11 +451,11 @@ function _sortFeatures(features) {
 
 function _getCommuterRailZone(hit) {
   if (hit.zone) {
-    return [`<span class="c-icon__cr-zone">Zone ${hit.zone}</span>`];
+    return [`<span class="c-icon__cr-zone text-sm">Zone ${hit.zone}</span>`];
   }
   if (hit.icon === "station") {
     // the north/south station popular result
-    return [`<span class="c-icon__cr-zone">Zone 1A</span>`];
+    return [`<span class="c-icon__cr-zone text-sm">Zone 1A</span>`];
   }
   return [];
 }

diff --git a/assets/js/app.js b/assets/js/app.js
@@ -1,4 +1,5 @@
 /* eslint-disable */
+import { Hooks } from "mbta_metro";
 import "../vendor/fixedsticky";
 import "../vendor/accessible-date-picker";
 import "bootstrap/dist/js/umd/collapse";
@@ -43,7 +44,7 @@ import pslPageSetup from "./psl-page-setup.js";
 import tabbedNav from "./tabbed-nav.js";
 import { accordionInit } from "../ts/ui/accordion";
 import initializeSentry from "../ts/sentry";
-import Hooks from "../ts/phoenix-hooks/index.ts";
+import DotcomHooks from "../ts/phoenix-hooks/index.ts";
 
 // Establish Phoenix Socket and LiveView configuration.
 import { Socket } from "phoenix";
@@ -55,7 +56,7 @@ let csrfToken = document
 
 let liveSocket = new LiveSocket("/live", Socket, {
   params: { _csrf_token: csrfToken },
-  hooks: Hooks
+  hooks: { ...Hooks, ...DotcomHooks }
 });
 
 // connect if there are any LiveViews on the page

diff --git a/assets/package-lock.json b/assets/package-lock.json
diff --git a/assets/package.json b/assets/package.json
@@ -30,7 +30,7 @@
     "leaflet": "^1.4.0",
     "leaflet-rotatedmarker": "^0.2.0",
     "lodash": "^4.17.21",
-    "mbta_metro": "^0.0.13",
+    "mbta_metro": "^0.0.18",
     "mobile-detect": "^1.4.5",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",

diff --git a/assets/static/fonts/Inter-Black.woff2 b/assets/static/fonts/Inter-Black.woff2
diff --git a/assets/static/fonts/Inter-BlackItalic.woff2 b/assets/static/fonts/Inter-BlackItalic.woff2
diff --git a/assets/static/fonts/Inter-Bold.woff2 b/assets/static/fonts/Inter-Bold.woff2
diff --git a/assets/static/fonts/Inter-BoldItalic.woff2 b/assets/static/fonts/Inter-BoldItalic.woff2
diff --git a/assets/static/fonts/Inter-ExtraBold.woff2 b/assets/static/fonts/Inter-ExtraBold.woff2
diff --git a/assets/static/fonts/Inter-ExtraBoldItalic.woff2 b/assets/static/fonts/Inter-ExtraBoldItalic.woff2
diff --git a/assets/static/fonts/Inter-ExtraLight.woff2 b/assets/static/fonts/Inter-ExtraLight.woff2
diff --git a/assets/static/fonts/Inter-ExtraLightItalic.woff2 b/assets/static/fonts/Inter-ExtraLightItalic.woff2
diff --git a/assets/static/fonts/Inter-Italic.woff2 b/assets/static/fonts/Inter-Italic.woff2
diff --git a/assets/static/fonts/Inter-Light.woff2 b/assets/static/fonts/Inter-Light.woff2
diff --git a/assets/static/fonts/Inter-LightItalic.woff2 b/assets/static/fonts/Inter-LightItalic.woff2
diff --git a/assets/static/fonts/Inter-Medium.woff2 b/assets/static/fonts/Inter-Medium.woff2
diff --git a/assets/static/fonts/Inter-MediumItalic.woff2 b/assets/static/fonts/Inter-MediumItalic.woff2
diff --git a/assets/static/fonts/Inter-Regular.woff2 b/assets/static/fonts/Inter-Regular.woff2
diff --git a/assets/static/fonts/Inter-SemiBold.woff2 b/assets/static/fonts/Inter-SemiBold.woff2
diff --git a/assets/static/fonts/Inter-SemiBoldItalic.woff2 b/assets/static/fonts/Inter-SemiBoldItalic.woff2
diff --git a/assets/static/fonts/Inter-Thin.woff2 b/assets/static/fonts/Inter-Thin.woff2
diff --git a/assets/static/fonts/Inter-ThinItalic.woff2 b/assets/static/fonts/Inter-ThinItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Black.woff2 b/assets/static/fonts/InterDisplay-Black.woff2
diff --git a/assets/static/fonts/InterDisplay-BlackItalic.woff2 b/assets/static/fonts/InterDisplay-BlackItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Bold.woff2 b/assets/static/fonts/InterDisplay-Bold.woff2
diff --git a/assets/static/fonts/InterDisplay-BoldItalic.woff2 b/assets/static/fonts/InterDisplay-BoldItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-ExtraBold.woff2 b/assets/static/fonts/InterDisplay-ExtraBold.woff2
diff --git a/assets/static/fonts/InterDisplay-ExtraBoldItalic.woff2 b/assets/static/fonts/InterDisplay-ExtraBoldItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-ExtraLight.woff2 b/assets/static/fonts/InterDisplay-ExtraLight.woff2
diff --git a/assets/static/fonts/InterDisplay-ExtraLightItalic.woff2 b/assets/static/fonts/InterDisplay-ExtraLightItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Italic.woff2 b/assets/static/fonts/InterDisplay-Italic.woff2
diff --git a/assets/static/fonts/InterDisplay-Light.woff2 b/assets/static/fonts/InterDisplay-Light.woff2
diff --git a/assets/static/fonts/InterDisplay-LightItalic.woff2 b/assets/static/fonts/InterDisplay-LightItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Medium.woff2 b/assets/static/fonts/InterDisplay-Medium.woff2
diff --git a/assets/static/fonts/InterDisplay-MediumItalic.woff2 b/assets/static/fonts/InterDisplay-MediumItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Regular.woff2 b/assets/static/fonts/InterDisplay-Regular.woff2
diff --git a/assets/static/fonts/InterDisplay-SemiBold.woff2 b/assets/static/fonts/InterDisplay-SemiBold.woff2
diff --git a/assets/static/fonts/InterDisplay-SemiBoldItalic.woff2 b/assets/static/fonts/InterDisplay-SemiBoldItalic.woff2
diff --git a/assets/static/fonts/InterDisplay-Thin.woff2 b/assets/static/fonts/InterDisplay-Thin.woff2
diff --git a/assets/static/fonts/InterDisplay-ThinItalic.woff2 b/assets/static/fonts/InterDisplay-ThinItalic.woff2
diff --git a/assets/static/fonts/InterVariable-Italic.woff2 b/assets/static/fonts/InterVariable-Italic.woff2
diff --git a/assets/static/fonts/InterVariable.woff2 b/assets/static/fonts/InterVariable.woff2
diff --git a/assets/static/google778e4cfd8ca77f44.html b/assets/static/google778e4cfd8ca77f44.html
diff --git a/assets/static/loaderio-392aa6a67825336b70393c6be61d56ce b/assets/static/loaderio-392aa6a67825336b70393c6be61d56ce
diff --git a/assets/static/loaderio-b4c35b9431db61b4421fcf03e17c3818 b/assets/static/loaderio-b4c35b9431db61b4421fcf03e17c3818
diff --git a/assets/static_page/apple-touch-icon.png b/assets/static_page/apple-touch-icon.png
diff --git a/assets/static_page/error-bus.gif b/assets/static_page/error-bus.gif
diff --git a/assets/static_page/favicon.ico b/assets/static_page/favicon.ico
diff --git a/assets/static_page/maintenance.html b/assets/static_page/maintenance.html
diff --git a/assets/static_page/mbta-logo-t-favicon.png b/assets/static_page/mbta-logo-t-favicon.png
diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js
@@ -1,17 +1,17 @@
 // See the Tailwind configuration guide for advanced usage
 // https://tailwindcss.com/docs/configuration
 
+const plugin = require("tailwindcss/plugin");
+
 const {
   colors,
   content,
   fontFamily,
   plugins,
   safelist
 } = require("mbta_metro");
-const plugin = require("tailwindcss/plugin");
 
 module.exports = {
-  important: true,
   corePlugins: {
     preflight: false
   },
@@ -22,9 +22,9 @@ module.exports = {
     "./ts/**/*.ts",
     "./ts/**/*.tsx",
     "../lib/dotcom_web.ex",
-    "../lib/dotcom_web/**/*.*ex",
-    "../deps/mbta_metro/lib/mbta_metro/**/*.ex" // remove after updating Elixir lib
+    "../lib/dotcom_web/**/*.*ex"
   ],
+  safelist: [...safelist],
   theme: {
     extend: {
       colors: {
@@ -35,7 +35,6 @@ module.exports = {
       ...fontFamily
     }
   },
-  safelist: [...safelist],
   plugins: [
     ...plugins,
     require("@tailwindcss/forms"),