From 9f5c1c27a7409499e7b69d355512b43d49222369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:51:59 +0200 Subject: [PATCH 01/22] chore(deps): bump @types/leaflet.markercluster from 1.5.4 to 1.5.5 (#994) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74ccf25b..204e0d6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@tanstack/react-query": "^5.45.1", "@tanstack/react-query-persist-client": "^5.36.0", "@types/git-username": "^1.0.5", - "@types/leaflet.markercluster": "^1.5.2", + "@types/leaflet.markercluster": "^1.5.5", "@vitejs/plugin-react-swc": "^3.6.0", "antd": "^5.22.3", "axios": "^1.7.5", @@ -10924,8 +10924,9 @@ } }, "node_modules/@types/leaflet.markercluster": { - "version": "1.5.4", - "license": "MIT", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.5.tgz", + "integrity": "sha512-TkWOhSHDM1ANxmLi+uK0PjsVcjIKBr8CLV2WoF16dIdeFmC0Cj5P5axkI3C1Xsi4+ht6EU8+BfEbbqEF9icPrg==", "dependencies": { "@types/leaflet": "*" } diff --git a/package.json b/package.json index 229859ce..a08a12dd 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@tanstack/react-query": "^5.45.1", "@tanstack/react-query-persist-client": "^5.36.0", "@types/git-username": "^1.0.5", - "@types/leaflet.markercluster": "^1.5.2", + "@types/leaflet.markercluster": "^1.5.5", "@vitejs/plugin-react-swc": "^3.6.0", "antd": "^5.22.3", "axios": "^1.7.5", From df8a2e379173a08083cecd67f61f1f6bcd94c4eb Mon Sep 17 00:00:00 2001 From: ofirc77 Date: Thu, 2 Jan 2025 19:46:34 +0200 Subject: [PATCH 02/22] fix: changing map language (#981) --- .../components/map-related/MapContent.tsx | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/pages/components/map-related/MapContent.tsx b/src/pages/components/map-related/MapContent.tsx index 67e42d33..6dfc6402 100644 --- a/src/pages/components/map-related/MapContent.tsx +++ b/src/pages/components/map-related/MapContent.tsx @@ -1,5 +1,6 @@ import { t } from 'i18next' -import { useRef } from 'react' +import { useRef, useEffect, useState } from 'react' +import { useTranslation } from 'react-i18next' import { Marker, Polyline, Popup, TileLayer, useMap } from 'react-leaflet' import { Icon, IconOptions, Marker as LeafletMarker } from 'leaflet' import { busIcon, busIconPath } from '../utils/BusIcon' @@ -29,7 +30,6 @@ export function MapContent({ positions, plannedRouteStops, showNavigationButtons const plannedRouteLineColor = 'black' const actualRouteStopMarker = getIcon(actualRouteStopMarkerPath, 20, 20) const plannedRouteStopMarker = getIcon(plannedRouteStopMarkerPath, 20, 25) - const navigateMarkers = (positionId: number) => { const loc = positions[positionId]?.loc if (!map || !loc) return @@ -39,12 +39,28 @@ export function MapContent({ positions, plannedRouteStops, showNavigationButtons marker.openPopup() } } + const { i18n } = useTranslation() + const [tileUrl, setTileUrl] = useState('https://tile-a.openstreetmap.fr/hot/{z}/{x}/{y}.png') + useEffect(() => { + const handleLanguageChange = (lng: string) => { + console.log('Language changed to:', lng) + const newUrl = + lng === 'he' + ? 'https://tile-a.openstreetmap.fr/hot/{z}/{x}/{y}.png' + : 'https://tile-a.openstreetmap.fr/osmfr/{z}/{x}/{y}.png?lang=en' + setTileUrl(newUrl) + } + i18n.on('languageChanged', handleLanguageChange) + return () => { + i18n.off('languageChanged', handleLanguageChange) + } + }, []) return ( <>
Date: Fri, 3 Jan 2025 13:51:54 +0200 Subject: [PATCH 03/22] feat: serve latest commit version (#988) --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2ebd73e..fbb55406 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,8 @@ jobs: with: node-version: 18 cache: 'npm' + - name: Get Commit Hash and generate Version File + run: echo "$(git rev-parse --short HEAD)" >> public/hash.txt - name: Run install run: npm ci - name: Build From 2bb56ee09702cd763f71981de783247b9a24edf1 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:39:53 +0200 Subject: [PATCH 04/22] docs: add ofirc77 as a contributor for code (#996) Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 94053da3..e401848d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -279,6 +279,15 @@ "contributions": [ "code" ] + }, + { + "login": "ofirc77", + "name": "ofirc77", + "avatar_url": "https://avatars.githubusercontent.com/u/170853216?v=4", + "profile": "https://github.com/ofirc77", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index c1349323..da28522e 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,9 @@ https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4 Rivka Weiss
Rivka Weiss
💻 EstherKalsmith
EstherKalsmith
💻 + + ofirc77
ofirc77
💻 + From 66d34b0b0dfd7b9495b764cd553fc7ecae5499c7 Mon Sep 17 00:00:00 2001 From: Etay Zaslavsky <105246259+EtayZaslavsky@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:14:33 +0200 Subject: [PATCH 05/22] feat: generate sitemap (#790) Co-authored-by: Noam Gaash --- .gitignore | 1 + eslint.config.js | 1 + package.json | 2 +- public/robots.txt | 3 ++- sitemap.js | 32 ++++++++++++++++++++++++++++++++ src/routes/index.tsx | 4 ++-- 6 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 sitemap.js diff --git a/.gitignore b/.gitignore index 2a59ac9a..f677308e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ # production /dist +sitemap.xml # misc .DS_Store diff --git a/eslint.config.js b/eslint.config.js index bb84658f..e747f372 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -85,6 +85,7 @@ module.exports = [ 'eslint.config.js', '.nx', 'jest.config.ts', + 'sitemap.js', 'public', ], }, diff --git a/package.json b/package.json index a08a12dd..d8bd1611 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ }, "scripts": { "start": "vite", - "build": "nx exec -- npm run _build -- ", + "build": "nx exec -- npm run _build -- && node sitemap.js", "serve": "vite preview", "test": "jest && playwright test", "test:e2e:ui": "cross-env APPLITOOLS_BATCH_ID=`uuidgen` playwright test --ui", diff --git a/public/robots.txt b/public/robots.txt index e9e57dc4..6f73023e 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,3 +1,4 @@ -# https://www.robotstxt.org/robotstxt.html User-agent: * Disallow: + +Sitemap: https://open-bus-map-search.hasadna.org.il/sitemap.xml \ No newline at end of file diff --git a/sitemap.js b/sitemap.js new file mode 100644 index 00000000..ee79eda9 --- /dev/null +++ b/sitemap.js @@ -0,0 +1,32 @@ +const fs = require("fs"); +const path = require("path"); + +const sitemap = () => { + const app = fs.readFileSync(path.join(__dirname, "/src/routes/index.tsx"), "utf8"); + const routes = app.match(/'\/[a-z_-]*'/g); + const urls = routes.map((route) => { + const url = route.slice(1, -1); + return url; + }); + + const sitemap = ` + + ${urls + .map( + (url) => ` + + https://open-bus-map-search.hasadna.org.il${url} + weekly + 0.8 + ${new Date().toISOString()} + + ` + ) + .join("\n")} + `; + fs.writeFileSync(path.join(__dirname, "/public/sitemap.xml"), sitemap); +}; + +sitemap(); + +// credit https://blog.redsols.us/blog/how-to-create-a-dynamic-sitemap-in-react/ \ No newline at end of file diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 9d7f4949..7886c94c 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -104,7 +104,7 @@ export const PAGES = [ export const HEADER_LINKS = [ { label: 'report_a_bug_title', - path: 'report-a-bug', + path: '/report-a-bug', icon: , element: , }, @@ -125,7 +125,7 @@ const HIDDEN_PAGES = [ }, ] as const -const getRoutesList = () => { +export const getRoutesList = () => { const pages = [...PAGES, ...HIDDEN_PAGES, ...HEADER_LINKS] const RedirectToHomepage = () => const routes = pages.filter((r) => r.element) From 8da17e1516e59e2a26281c1061aef29b60c0c1a6 Mon Sep 17 00:00:00 2001 From: Tom Rytt <86921461+TomRytt@users.noreply.github.com> Date: Sat, 4 Jan 2025 17:13:22 +0200 Subject: [PATCH 06/22] fix: Moved language toggle to themeContext and update theme.direction on language change (#991) --- src/layout/ThemeContext.tsx | 40 ++++++++++++---------- src/layout/header/Header.tsx | 4 +-- src/layout/header/LanguageToggle.tsx | 22 ------------ src/layout/header/LanguageToggleButton.tsx | 18 ++++++++++ src/pages/DonateModal/DonateModal.tsx | 14 ++++---- 5 files changed, 48 insertions(+), 50 deletions(-) delete mode 100644 src/layout/header/LanguageToggle.tsx create mode 100644 src/layout/header/LanguageToggleButton.tsx diff --git a/src/layout/ThemeContext.tsx b/src/layout/ThemeContext.tsx index bc76b4d7..2076e22c 100644 --- a/src/layout/ThemeContext.tsx +++ b/src/layout/ThemeContext.tsx @@ -1,4 +1,4 @@ -import { FC, PropsWithChildren, createContext, useContext } from 'react' +import { FC, PropsWithChildren, createContext, useContext, useMemo } from 'react' import { ThemeProvider as MuiThemeProvider, createTheme } from '@mui/material/styles' import ScopedCssBaseline from '@mui/material/ScopedCssBaseline' import { ConfigProvider, theme } from 'antd' @@ -8,38 +8,44 @@ import { useLocalStorage } from 'src/locale/useLocalStorage' export interface ThemeContextInterface { toggleTheme: () => void + toggleLanguage: () => void isDarkTheme?: boolean } const ThemeContext = createContext({} as ThemeContextInterface) -const darkTheme = createTheme({ - palette: { - mode: 'dark', - }, -}) - -const lightTheme = createTheme({ - palette: { - mode: 'light', - }, -}) - const { defaultAlgorithm, darkAlgorithm } = theme export const ThemeProvider: FC = ({ children }) => { const [isDarkTheme, setIsDarkTheme] = useLocalStorage('isDarkTheme') - const { i18n } = useTranslation() + const toggleTheme = () => { setIsDarkTheme((prevTheme: boolean) => !prevTheme) } + const toggleLanguage = () => { + const newLanguage = i18n.language === 'en' ? 'he' : 'en' + i18n.changeLanguage(newLanguage) + } + const contextValue = { isDarkTheme, + toggleLanguage, toggleTheme, } + // Re-create the theme when the theme changes or the language changes + const theme = useMemo(() => { + const direction = i18n.language === 'he' ? 'rtl' : 'ltr' + return createTheme({ + direction, + palette: { + mode: isDarkTheme ? 'dark' : 'light', + }, + }) + }, [isDarkTheme, i18n.language]) + return ( = ({ children }) => { colorTextBase: isDarkTheme ? '#ffffff' : '#000000', }, }}> - + {children} @@ -60,6 +66,4 @@ export const ThemeProvider: FC = ({ children }) => { ) } -export const useTheme = () => { - return useContext(ThemeContext) -} +export const useTheme = () => useContext(ThemeContext) diff --git a/src/layout/header/Header.tsx b/src/layout/header/Header.tsx index ddb62d24..d92e451a 100644 --- a/src/layout/header/Header.tsx +++ b/src/layout/header/Header.tsx @@ -8,7 +8,7 @@ import './Header.css' import ToggleThemeButton from './ToggleThemeButton' import { DonationButton } from './DonationButton' import HeaderLinks from './HeaderLinks/HeaderLinks' -import { LanguageToggle } from './LanguageToggle' +import { LanguageToggleButton } from './LanguageToggleButton' const { Header } = Layout @@ -19,7 +19,7 @@ const MainHeader = () => {
setDrawerOpen(true)} className="hideOnDesktop" /> - + diff --git a/src/layout/header/LanguageToggle.tsx b/src/layout/header/LanguageToggle.tsx deleted file mode 100644 index e057e6af..00000000 --- a/src/layout/header/LanguageToggle.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { useReducer } from 'react' -import { useTranslation } from 'react-i18next' -import { GlobalOutlined } from '@ant-design/icons' - -export const LanguageToggle = () => { - const { t, i18n } = useTranslation() - const [, handleChangeLanguage] = useReducer((state: string) => { - const newLanguage = { he: 'en', en: 'he' }[state] - i18n.changeLanguage(newLanguage) - return newLanguage! - }, 'he') - - return ( - - ) -} diff --git a/src/layout/header/LanguageToggleButton.tsx b/src/layout/header/LanguageToggleButton.tsx new file mode 100644 index 00000000..4e7447c4 --- /dev/null +++ b/src/layout/header/LanguageToggleButton.tsx @@ -0,0 +1,18 @@ +import { useTranslation } from 'react-i18next' +import { GlobalOutlined } from '@ant-design/icons' +import { useTheme } from '../ThemeContext' + +export const LanguageToggleButton = () => { + const { toggleLanguage } = useTheme() + const { t } = useTranslation() + + return ( + + ) +} diff --git a/src/pages/DonateModal/DonateModal.tsx b/src/pages/DonateModal/DonateModal.tsx index dce01bb5..0f58c223 100644 --- a/src/pages/DonateModal/DonateModal.tsx +++ b/src/pages/DonateModal/DonateModal.tsx @@ -1,7 +1,6 @@ import React from 'react' -import { Box, Grid, Modal, Typography, useMediaQuery } from '@mui/material' +import { Box, Grid, Modal, Typography, useMediaQuery, useTheme } from '@mui/material' import { useTranslation } from 'react-i18next' -import i18n from 'src/locale/allTranslations' interface DonateModalProps { isVisible: boolean onClose: () => void @@ -27,12 +26,11 @@ export const DonateModal: React.FC = ({ isVisible, onClose }) */ const shouldImgCollapse = useMediaQuery('(max-width: 950px)') const { t } = useTranslation() - - const dir = i18n.dir() + const { direction } = useTheme() return ( = ({ isVisible, onClose }) aria-labelledby="modal-modal-title" aria-describedby="modal-modal-description" sx={{ - textAlign: `${dir === 'ltr' ? 'right' : 'left'}` as const, + textAlign: `${direction === 'ltr' ? 'right' : 'left'}` as const, color: 'text.primary', // Dynamically uses the theme’s text color }}> - + @@ -75,7 +73,7 @@ export const DonateModal: React.FC = ({ isVisible, onClose }) - +

{t('donation_through_bank_title')}

{t('donation_through_bank_reccomendation')}

From 1a5b121dcac87fc40f734509421d40a623caa165 Mon Sep 17 00:00:00 2001 From: Tom Rytt <86921461+TomRytt@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:29:00 +0200 Subject: [PATCH 07/22] feat: add donate button for english donate modal (#992) --- src/locale/en.json | 2 ++ src/locale/he.json | 2 ++ src/pages/DonateModal/DonateModal.tsx | 12 +++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/locale/en.json b/src/locale/en.json index 11cce0e9..63bca777 100644 --- a/src/locale/en.json +++ b/src/locale/en.json @@ -80,6 +80,8 @@ "donation_through_bank_title": "Donation through bank transfer", "donation_through_bank_reccomendation": "It is recommended to donate a bank transfer to the public knowledge workshop bank account, as this fee is lower", + "donate_to_hasadna": "Donate to Hasadna", + "donation_link": "Donation link", "bank": "Bank", "branch": "Branch", diff --git a/src/locale/he.json b/src/locale/he.json index 008f8f41..81bb1730 100644 --- a/src/locale/he.json +++ b/src/locale/he.json @@ -79,6 +79,8 @@ "donation_through_bank_title": "תרומה דרך העברה בנקאית", "donation_through_bank_reccomendation": "מומלץ לתרום דרך העברה בנקאית לחשבון הבנק של הסדנא לידע ציבורי, מכיוון שבאפיק זה העמלה נמוכה יותר", + "donate_to_hasadna": "תרומה לסדנא", + "donation_link": "קישור לתרומה", "bank": "בנק", "branch": "סניף", diff --git a/src/pages/DonateModal/DonateModal.tsx b/src/pages/DonateModal/DonateModal.tsx index 0f58c223..22667d35 100644 --- a/src/pages/DonateModal/DonateModal.tsx +++ b/src/pages/DonateModal/DonateModal.tsx @@ -28,6 +28,12 @@ export const DonateModal: React.FC = ({ isVisible, onClose }) const { t } = useTranslation() const { direction } = useTheme() + // Use Image with Hebrew text for RTL and English text for LTR + const donateNowImageUrlEN = + 'https://www.hasadna.org.il/wp-content/uploads/2018/08/button-300x73.png' + const donateNowImageUrlHE = + 'https://www.hasadna.org.il/wp-content/uploads/2018/08/button-EN-300x73.png' + return ( = ({ isVisible, onClose }) rel="noreferrer"> קישור לתרומה תרום עכשיו From 6a377013f095fd829babbd6789c2b76d89ce46e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 08:04:26 +0200 Subject: [PATCH 08/22] chore(deps): bump babel-plugin-transform-import-meta from 2.2.1 to 2.3.2 (#1000) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 17 +++++++++++------ package.json | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 204e0d6f..8c8f03aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@vitejs/plugin-react-swc": "^3.6.0", "antd": "^5.22.3", "axios": "^1.7.5", - "babel-plugin-transform-import-meta": "^2.2.1", + "babel-plugin-transform-import-meta": "^2.3.2", "classnames": "^2.5.1", "dayjs": "^1.11.11", "geolib": "^3.3.3", @@ -12579,17 +12579,22 @@ } }, "node_modules/babel-plugin-transform-import-meta": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-import-meta/-/babel-plugin-transform-import-meta-2.2.1.tgz", - "integrity": "sha512-AxNh27Pcg8Kt112RGa3Vod2QS2YXKKJ6+nSvRtv7qQTJAdx0MZa4UHZ4lnxHUWA2MNbLuZQv5FVab4P1CoLOWw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-import-meta/-/babel-plugin-transform-import-meta-2.3.2.tgz", + "integrity": "sha512-902o4GiQqI1GqAXfD5rEoz0PJamUfJ3VllpdWaNsFTwdaNjFSFHawvBO+cp5K2j+g2h3bZ4lnM1Xb6yFYGihtA==", "dependencies": { - "@babel/template": "^7.4.4", - "tslib": "^2.4.0" + "@babel/template": "^7.25.9", + "tslib": "^2.8.1" }, "peerDependencies": { "@babel/core": "^7.10.0" } }, + "node_modules/babel-plugin-transform-import-meta/node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + }, "node_modules/babel-plugin-transform-typescript-metadata": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.2.tgz", diff --git a/package.json b/package.json index d8bd1611..48aeaa3c 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@vitejs/plugin-react-swc": "^3.6.0", "antd": "^5.22.3", "axios": "^1.7.5", - "babel-plugin-transform-import-meta": "^2.2.1", + "babel-plugin-transform-import-meta": "^2.3.2", "classnames": "^2.5.1", "dayjs": "^1.11.11", "geolib": "^3.3.3", From c80089f0a51534a70955487b17a0ebeba1258615 Mon Sep 17 00:00:00 2001 From: Yael Chen <51058584+YaelChen@users.noreply.github.com> Date: Mon, 13 Jan 2025 08:24:47 +0200 Subject: [PATCH 09/22] test: fix test for 'about' YouTube modal (#1003) --- tests/about.spec.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/about.spec.ts b/tests/about.spec.ts index a39a90aa..6c0a95f5 100644 --- a/tests/about.spec.ts +++ b/tests/about.spec.ts @@ -19,10 +19,12 @@ test.describe('About Page Tests', () => { const locator = page.locator('li').filter({ hasText: 'אודות' }) await expect(locator).toHaveClass(/menu-item-selected/) }) + test('page title should be `מהו אתר “דאטאבוס”?`', async ({ page }) => { await page.goto('/about') await expect(page.getByRole('heading', { name: 'מהו אתר “דאטאבוס”?' })).toBeVisible() }) + test('clicking dontaions link should lead to "sadna" site', async ({ page }) => { await page.goto('/about') await page.getByRole('link', { name: 'תרומות קטנות נוספות' }).click() @@ -104,4 +106,15 @@ test.describe('About Page Tests', () => { 'https://github.com/hasadna/open-bus-map-search/blob/main/CONTRIBUTING.md', ) }) + + test('the YouTube modal in "about" is visible and have the correct src', async ({ page }) => { + await page.goto('/about') + const iframeElement = await page.waitForSelector('iframe') + expect(iframeElement.isVisible()) + const videoSrc = page.locator('iframe') + await expect(videoSrc).toHaveAttribute( + 'src', + 'https://www.youtube.com/embed/videoseries?si=oTULlxq8Is188hPu&list=PL6Rh06rT7uiX1AQE-lm55hy-seL3idx3T', + ) + }) }) From ec13a2adfe94143f4e2ab8734f480300b624b706 Mon Sep 17 00:00:00 2001 From: ofirc77 Date: Wed, 15 Jan 2025 18:10:26 +0200 Subject: [PATCH 10/22] fix: fix hash.txt issue from build.yaml (#1001) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbb55406..33b6e441 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: node-version: 18 cache: 'npm' - name: Get Commit Hash and generate Version File - run: echo "$(git rev-parse --short HEAD)" >> public/hash.txt + run: echo "${{ github.event.pull_request.head.sha }}" >> public/hash.txt - name: Run install run: npm ci - name: Build From fa520031d2007469db63ba4e99287435d984048e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 21:58:33 +0200 Subject: [PATCH 11/22] chore(deps-dev): bump @types/leaflet from 1.9.14 to 1.9.16 (#1006) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c8f03aa..40cfc577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,7 +81,7 @@ "@testing-library/react": "^16.0.1", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.14", - "@types/leaflet": "^1.9.14", + "@types/leaflet": "^1.9.16", "@types/lodash.debounce": "^4.0.7", "@types/node": "^20.12.8", "@types/react": "^18.2.58", @@ -10916,9 +10916,9 @@ } }, "node_modules/@types/leaflet": { - "version": "1.9.14", - "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.14.tgz", - "integrity": "sha512-sx2q6MDJaajwhKeVgPSvqXd8rhNJSTA3tMidQGduZn9S6WBYxDkCpSpV5xXEmSg7Cgdk/5vJGhVF1kMYLzauBg==", + "version": "1.9.16", + "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.16.tgz", + "integrity": "sha512-wzZoyySUxkgMZ0ihJ7IaUIblG8Rdc8AbbZKLneyn+QjYsj5q1QU7TEKYqwTr10BGSzY5LI7tJk9Ifo+mEjdFRw==", "dependencies": { "@types/geojson": "*" } diff --git a/package.json b/package.json index 48aeaa3c..0c7d3d5a 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@testing-library/react": "^16.0.1", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.14", - "@types/leaflet": "^1.9.14", + "@types/leaflet": "^1.9.16", "@types/lodash.debounce": "^4.0.7", "@types/node": "^20.12.8", "@types/react": "^18.2.58", From b686095ea6c03346576096fa865e6620418e11ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 21:58:45 +0200 Subject: [PATCH 12/22] chore(deps-dev): bump @nx/eslint-plugin from 18.3.4 to 20.3.1 (#1007) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 748 ++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 663 insertions(+), 87 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40cfc577..63c3c0b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "@eslint/js": "~8.57.0", "@jest/globals": "^29.7.0", "@nx/eslint": "^18.2.2", - "@nx/eslint-plugin": "^18.3.4", + "@nx/eslint-plugin": "^20.3.1", "@playwright/test": "^1.46.1", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.6.17", @@ -2979,6 +2979,34 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/@emnapi/core": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", + "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", + "dev": true, + "dependencies": { + "@emnapi/wasi-threads": "1.0.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", + "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", + "dev": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz", + "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==", + "dev": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@emotion/babel-plugin": { "version": "11.13.5", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", @@ -4969,6 +4997,17 @@ "react-dom": "^17.0.0 || ^18.0.0" } }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", + "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", + "dev": true, + "dependencies": { + "@emnapi/core": "^1.1.0", + "@emnapi/runtime": "^1.1.0", + "@tybys/wasm-util": "^0.9.0" + } + }, "node_modules/@ndelangen/get-tarball": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz", @@ -5027,15 +5066,6 @@ "@nx/devkit": "18.2.2" } }, - "node_modules/@nrwl/eslint-plugin-nx": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-18.3.4.tgz", - "integrity": "sha512-IiBAxWgOZC4dIqnirpoRJ0YvDeR9HjlOyKna2CZoUj4Dr5uYOiNHbxVbfLPhsIenRLEbjttCxrA9Mm9k++bdjA==", - "dev": true, - "dependencies": { - "@nx/eslint-plugin": "18.3.4" - } - }, "node_modules/@nrwl/js": { "version": "18.2.2", "resolved": "https://registry.npmjs.org/@nrwl/js/-/js-18.2.2.tgz", @@ -5109,24 +5139,24 @@ } }, "node_modules/@nx/eslint-plugin": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-18.3.4.tgz", - "integrity": "sha512-rGQX/w+qexGWOLjHECZeZ2RDgaKEUvQW+zGBNlw/5u7tZcTYUpG10VG1j+BrwBZ1gT9YV1b/0IUYdwdEo1NNwA==", + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-20.3.1.tgz", + "integrity": "sha512-R+slt72ZLisT2uPpOJGUt/HnVf8hDWZvUcqyrSKJ8A8XZQlBYnSaFuKerse/if/en6iRAzjSWjUo9vnBIFgVIQ==", "dev": true, "dependencies": { - "@nrwl/eslint-plugin-nx": "18.3.4", - "@nx/devkit": "18.3.4", - "@nx/js": "18.3.4", - "@typescript-eslint/type-utils": "^7.3.0", - "@typescript-eslint/utils": "^7.3.0", + "@nx/devkit": "20.3.1", + "@nx/js": "20.3.1", + "@typescript-eslint/type-utils": "^8.0.0", + "@typescript-eslint/utils": "^8.0.0", "chalk": "^4.1.0", "confusing-browser-globals": "^1.0.9", + "globals": "^15.9.0", "jsonc-eslint-parser": "^2.1.0", "semver": "^7.5.3", "tslib": "^2.3.0" }, "peerDependencies": { - "@typescript-eslint/parser": "^6.13.2 || ^7.0.0", + "@typescript-eslint/parser": "^6.13.2 || ^7.0.0 || ^8.0.0", "eslint-config-prettier": "^9.0.0" }, "peerDependenciesMeta": { @@ -5135,56 +5165,29 @@ } } }, - "node_modules/@nx/eslint-plugin/node_modules/@nrwl/devkit": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-18.3.4.tgz", - "integrity": "sha512-Fty9Huqm12OYueU3uLJl3uvBUl5BvEyPfvw8+rLiNx9iftdEattM8C+268eAbIRRSLSOVXlWsJH4brlc6QZYYw==", - "dev": true, - "dependencies": { - "@nx/devkit": "18.3.4" - } - }, - "node_modules/@nx/eslint-plugin/node_modules/@nrwl/js": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nrwl/js/-/js-18.3.4.tgz", - "integrity": "sha512-oyiMoxzDVGQe5E4UFGO/WAOU211HEIdRxSEOfs1lPhvA8lKbUa0IWDqPOugNws/YHAr+vUTU3sZDJ3uU3RJuYQ==", - "dev": true, - "dependencies": { - "@nx/js": "18.3.4" - } - }, - "node_modules/@nx/eslint-plugin/node_modules/@nrwl/workspace": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nrwl/workspace/-/workspace-18.3.4.tgz", - "integrity": "sha512-ziPHZcSYj46aPYrRHaKu56/SmYCijLT5vIm/UaoWD5v5Fy5CRigO/ezUImsHGHMEZWfHt44s4jsv7QdJWAXe7w==", - "dev": true, - "dependencies": { - "@nx/workspace": "18.3.4" - } - }, "node_modules/@nx/eslint-plugin/node_modules/@nx/devkit": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-18.3.4.tgz", - "integrity": "sha512-M3htxl5WvlNKK5KNOndCAApbyBCZNTFFs+rtdwvudNZk5+84zAAPaWzSoX9C4XLAW78/f98LzF68/ch05aN12A==", + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.3.1.tgz", + "integrity": "sha512-Z6VdBg5GRu2Vg9FpeQJY+zQ1TvBoMWk8cTCZOf8J6myjoWYbksRfpWfNIvEk9OUsEMhpg98vxH2Cc8JR1zfiew==", "dev": true, "dependencies": { - "@nrwl/devkit": "18.3.4", "ejs": "^3.1.7", "enquirer": "~2.3.6", "ignore": "^5.0.4", + "minimatch": "9.0.3", "semver": "^7.5.3", "tmp": "~0.2.1", "tslib": "^2.3.0", "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": ">= 16 <= 19" + "nx": ">= 19 <= 21" } }, "node_modules/@nx/eslint-plugin/node_modules/@nx/js": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nx/js/-/js-18.3.4.tgz", - "integrity": "sha512-+MPacp/B09e5QwaFQBkev9pW862ZpmesqR2lUUnFAXUBKtjYVIAmhJWHOtevqC1om4OxvTsbluYHsbAkAUzlMA==", + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/js/-/js-20.3.1.tgz", + "integrity": "sha512-IHf1rLiwH1NUMphedJJMfstehD94IkwU4YxOkUMRA1tPbrmidF391gh70pE4VMkji/jzzkQXYhNsrNnAN6LRpw==", "dev": true, "dependencies": { "@babel/core": "^7.23.2", @@ -5194,26 +5197,26 @@ "@babel/preset-env": "^7.23.2", "@babel/preset-typescript": "^7.22.5", "@babel/runtime": "^7.22.6", - "@nrwl/js": "18.3.4", - "@nx/devkit": "18.3.4", - "@nx/workspace": "18.3.4", - "@phenomnomnominal/tsquery": "~5.0.1", + "@nx/devkit": "20.3.1", + "@nx/workspace": "20.3.1", + "@zkochan/js-yaml": "0.0.7", "babel-plugin-const-enum": "^1.0.1", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-typescript-metadata": "^0.3.1", "chalk": "^4.1.0", "columnify": "^1.6.0", "detect-port": "^1.5.1", - "fast-glob": "3.2.7", - "fs-extra": "^11.1.0", + "enquirer": "~2.3.6", "ignore": "^5.0.4", "js-tokens": "^4.0.0", + "jsonc-parser": "3.2.0", "minimatch": "9.0.3", "npm-package-arg": "11.0.1", "npm-run-path": "^4.0.1", "ora": "5.3.0", "semver": "^7.5.3", "source-map-support": "0.5.19", + "tinyglobby": "^0.2.10", "ts-node": "10.9.1", "tsconfig-paths": "^4.1.2", "tslib": "^2.3.0" @@ -5227,26 +5230,347 @@ } } }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-darwin-arm64": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.3.1.tgz", + "integrity": "sha512-bx++T9/8l4PK1yDTxPnROT7RG8CkWGkxKC0D7xlS/YQzE7CelDfgNYu0Bd7upZF4gafW2Uz3dd3j6WhvZLxbbg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-darwin-x64": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.3.1.tgz", + "integrity": "sha512-elg2GiSivMHU1iLFYZ+FojM2V/FmTlC8e5FKM6nZ+bIqeoBoJm8Rxxe/kEtcsPdvjj+YiKSmXOP9s45DJb9WWw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-freebsd-x64": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.3.1.tgz", + "integrity": "sha512-1iKZOCcU7bVAC2kdoukfJ7AOTLBhm69+vPff3HCJQ0DI/5ZbmiaPeBMsAVFtJ0jFGix8yYIhgvtXgDEfbXXRFQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.3.1.tgz", + "integrity": "sha512-LAteJ1/mWYdvj7zpXuWRUq1lvUiV6YVXCdFK3+7lDW+qvW3bb5zzUwbVDAF/pPeTjBrsdHDzSWOCLm/LKtYtMw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm64-gnu": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.3.1.tgz", + "integrity": "sha512-2Qf+6NcAeODELyJR+V9hjC9kl2DwJTdI7Bw+BuiyXftfPHvZ86P//FC8kPjNaJCEEm/ZStP6Jcb1zlp4Eo2wBw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm64-musl": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.3.1.tgz", + "integrity": "sha512-8S8jlN6GFQpRakZ2ZVWq6eFnLVrEObIaxnYD0QMbsMf+qiedDJt+cDh1xebcPRvgpSgJVlJ8P6hun5+K/FiQDQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-x64-gnu": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.3.1.tgz", + "integrity": "sha512-qC2On2qwYCtn/Kt8epvUn0H3NY6zG9yYhiNjkm6RvVTDmvogFQ4gtfiWSRP/EnabCRqM8FACDIO/ws5CnRBX+Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-x64-musl": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.3.1.tgz", + "integrity": "sha512-KKwHSfV1PEKW82eJ8vxZTPepoaLbaXH/aI0VOKZbBO4ytGyGUr9wFuWPsyo06rK7qtSD7w9bN7xpiBGQk0QTsg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-win32-arm64-msvc": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.3.1.tgz", + "integrity": "sha512-YujkXXHn9rhtwZRDxiaxSPOMX7JkfGmXAFdyEfxhE3Dc/HjFgI+xJZ478/atttR7DWIwGpQJVLpbFWbFFpoNNg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-win32-x64-msvc": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.3.1.tgz", + "integrity": "sha512-Os8iCamvHhE5noQKFE9D9xkiI529918tufTYmEhJ9ZmLU/ybVA0We6r7gXjYzdNfA3DtwfGXvNvUpy3u+pZXOg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@nx/eslint-plugin/node_modules/@nx/workspace": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-18.3.4.tgz", - "integrity": "sha512-H5HmEOWb9wnrNXfI2DhK6AmMVz1snuJvjT2jcMf9kxlVW0pKGTFW+OyHfSYq6Ni3OGWb1f9O63erLYHo45zPeA==", + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-20.3.1.tgz", + "integrity": "sha512-2GQX19POWzTDV8XIAc/UCNruzs77jD2WwAkYAOveiTBqJIJVd64ueOBXZw1YkZLhXTFd0C13xT1CFo2fOvyJLg==", "dev": true, "dependencies": { - "@nrwl/workspace": "18.3.4", - "@nx/devkit": "18.3.4", + "@nx/devkit": "20.3.1", "chalk": "^4.1.0", "enquirer": "~2.3.6", - "nx": "18.3.4", + "nx": "20.3.1", "tslib": "^2.3.0", "yargs-parser": "21.1.1" } }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.1.tgz", + "integrity": "sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "8.19.1", + "@typescript-eslint/visitor-keys": "8.19.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/type-utils": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.1.tgz", + "integrity": "sha512-Rp7k9lhDKBMRJB/nM9Ksp1zs4796wVNyihG9/TU9R6KCJDNkQbc2EOKjrBtLYh3396ZdpXLtr/MkaSEmNMtykw==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "8.19.1", + "@typescript-eslint/utils": "8.19.1", + "debug": "^4.3.4", + "ts-api-utils": "^2.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz", + "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.1.tgz", + "integrity": "sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "8.19.1", + "@typescript-eslint/visitor-keys": "8.19.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.1.tgz", + "integrity": "sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.19.1", + "@typescript-eslint/types": "8.19.1", + "@typescript-eslint/typescript-estree": "8.19.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.1.tgz", + "integrity": "sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "8.19.1", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@yarnpkg/parsers": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", + "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", + "dev": true, + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=18.12.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@zkochan/js-yaml": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", + "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@nx/eslint-plugin/node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, "engines": { "node": ">=0.4.0" } @@ -5262,6 +5586,18 @@ "resolve": "^1.12.0" } }, + "node_modules/@nx/eslint-plugin/node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@nx/eslint-plugin/node_modules/cosmiconfig": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", @@ -5278,20 +5614,74 @@ "node": ">=8" } }, - "node_modules/@nx/eslint-plugin/node_modules/fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "node_modules/@nx/eslint-plugin/node_modules/dotenv-expand": { + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", + "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", "dev": true, "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "dotenv": "^16.4.5" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/globals": { + "version": "15.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", + "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/js-yaml/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/lines-and-columns": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, "node_modules/@nx/eslint-plugin/node_modules/minimatch": { @@ -5309,6 +5699,89 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@nx/eslint-plugin/node_modules/nx": { + "version": "20.3.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.3.1.tgz", + "integrity": "sha512-pO48DoQAwVKBEF7/od3bc1tHBYfafgiuS/hHX3yGmhpWW58baIlxMWFp6QY9+A9Q0R+26pd6AEGnE7d1f7+i/g==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@napi-rs/wasm-runtime": "0.2.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.2", + "@zkochan/js-yaml": "0.0.7", + "axios": "^1.7.4", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^8.0.1", + "dotenv": "~16.4.5", + "dotenv-expand": "~11.0.6", + "enquirer": "~2.3.6", + "figures": "3.2.0", + "flat": "^5.0.2", + "front-matter": "^4.0.2", + "ignore": "^5.0.4", + "jest-diff": "^29.4.1", + "jsonc-parser": "3.2.0", + "lines-and-columns": "2.0.3", + "minimatch": "9.0.3", + "node-machine-id": "1.1.12", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "ora": "5.3.0", + "resolve.exports": "2.0.3", + "semver": "^7.5.3", + "string-width": "^4.2.3", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "yaml": "^2.6.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js", + "nx-cloud": "bin/nx-cloud.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "20.3.1", + "@nx/nx-darwin-x64": "20.3.1", + "@nx/nx-freebsd-x64": "20.3.1", + "@nx/nx-linux-arm-gnueabihf": "20.3.1", + "@nx/nx-linux-arm64-gnu": "20.3.1", + "@nx/nx-linux-arm64-musl": "20.3.1", + "@nx/nx-linux-x64-gnu": "20.3.1", + "@nx/nx-linux-x64-musl": "20.3.1", + "@nx/nx-win32-arm64-msvc": "20.3.1", + "@nx/nx-win32-x64-msvc": "20.3.1" + }, + "peerDependencies": { + "@swc-node/register": "^1.8.0", + "@swc/core": "^1.3.85" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/@nx/eslint-plugin/node_modules/nx/node_modules/yaml": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "dev": true, + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@nx/eslint-plugin/node_modules/ora": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", @@ -5341,6 +5814,24 @@ "source-map": "^0.6.0" } }, + "node_modules/@nx/eslint-plugin/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/@nx/eslint-plugin/node_modules/ts-api-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz", + "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==", + "dev": true, + "engines": { + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" + } + }, "node_modules/@nx/eslint-plugin/node_modules/ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -10588,6 +11079,15 @@ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true }, + "node_modules/@tybys/wasm-util": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", + "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", + "dev": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@types/aria-query": { "version": "5.0.4", "dev": true, @@ -14791,14 +15291,14 @@ } }, "node_modules/dotenv": { - "version": "16.4.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz", - "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==", + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" + "url": "https://dotenvx.com" } }, "node_modules/dotenv-expand": { @@ -17198,6 +17698,43 @@ "node": ">= 0.6" } }, + "node_modules/front-matter": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", + "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", + "dev": true, + "dependencies": { + "js-yaml": "^3.13.1" + } + }, + "node_modules/front-matter/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/front-matter/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/front-matter/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, "node_modules/fs-constants": { "version": "1.0.0", "dev": true, @@ -24353,9 +24890,9 @@ } }, "node_modules/resolve.exports": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", - "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", "dev": true, "engines": { "node": ">=10" @@ -26235,6 +26772,45 @@ "optional": true, "peer": true }, + "node_modules/tinyglobby": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.10.tgz", + "integrity": "sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==", + "dev": true, + "dependencies": { + "fdir": "^6.4.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz", + "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==", + "dev": true, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/tinypool": { "version": "0.7.0", "dev": true, diff --git a/package.json b/package.json index 0c7d3d5a..aea2b6eb 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@eslint/js": "~8.57.0", "@jest/globals": "^29.7.0", "@nx/eslint": "^18.2.2", - "@nx/eslint-plugin": "^18.3.4", + "@nx/eslint-plugin": "^20.3.1", "@playwright/test": "^1.46.1", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.6.17", From 2b4f35a02bd04013218825162861168fe4de1c22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 21:58:57 +0200 Subject: [PATCH 13/22] chore(deps): bump vite-plugin-svgr from 4.2.0 to 4.3.0 (#1008) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 30 +++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63c3c0b7..50c0bca3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "use-konami": "^1.0.1", "usehooks-ts": "^3.1.0", "vite-plugin-environment": "^1.1.3", - "vite-plugin-svgr": "^4.2.0", + "vite-plugin-svgr": "^4.3.0", "vite-tsconfig-paths": "^5.1.3", "web-vitals": "^4.2.4" }, @@ -7906,12 +7906,13 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.0.5", - "license": "MIT", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", + "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" + "picomatch": "^4.0.2" }, "engines": { "node": ">=14.0.0" @@ -7925,6 +7926,17 @@ } } }, + "node_modules/@rollup/pluginutils/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.22.4", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", @@ -27808,16 +27820,16 @@ } }, "node_modules/vite-plugin-svgr": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.2.0.tgz", - "integrity": "sha512-SC7+FfVtNQk7So0XMjrrtLAbEC8qjFPifyD7+fs/E6aaNdVde6umlVVh0QuwDLdOMu7vp5RiGFsB70nj5yo0XA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.3.0.tgz", + "integrity": "sha512-Jy9qLB2/PyWklpYy0xk0UU3TlU0t2UMpJXZvf+hWII1lAmRHrOUKi11Uw8N3rxoNk7atZNYO3pR3vI1f7oi+6w==", "dependencies": { - "@rollup/pluginutils": "^5.0.5", + "@rollup/pluginutils": "^5.1.3", "@svgr/core": "^8.1.0", "@svgr/plugin-jsx": "^8.1.0" }, "peerDependencies": { - "vite": "^2.6.0 || 3 || 4 || 5" + "vite": ">=2.6.0" } }, "node_modules/vite-tsconfig-paths": { diff --git a/package.json b/package.json index aea2b6eb..00c35929 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "use-konami": "^1.0.1", "usehooks-ts": "^3.1.0", "vite-plugin-environment": "^1.1.3", - "vite-plugin-svgr": "^4.2.0", + "vite-plugin-svgr": "^4.3.0", "vite-tsconfig-paths": "^5.1.3", "web-vitals": "^4.2.4" }, From 0c84c3d9344fe7a0c1ecf45109aec23d65e92118 Mon Sep 17 00:00:00 2001 From: Noam Gaash Date: Tue, 21 Jan 2025 09:40:32 +0200 Subject: [PATCH 14/22] ci: revert linux ubuntu version (#1017) --- .github/workflows/validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index b35ea540..a4cfce48 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -60,7 +60,7 @@ jobs: name: docker-image path: /tmp/docker-image.tar test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build env: APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }} From 885e054ecf972e23d795d8ef1572c52691635407 Mon Sep 17 00:00:00 2001 From: Noam Gaash Date: Tue, 21 Jan 2025 10:43:25 +0200 Subject: [PATCH 15/22] fix: arrival by day chart (#1016) --- .../dashboard/ArrivalByTimeChart/ArrivalByTimeChart.tsx | 4 +++- tests/dashboard.spec.ts | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/dashboard/ArrivalByTimeChart/ArrivalByTimeChart.tsx b/src/pages/dashboard/ArrivalByTimeChart/ArrivalByTimeChart.tsx index 4c87a93b..8ccd4caf 100644 --- a/src/pages/dashboard/ArrivalByTimeChart/ArrivalByTimeChart.tsx +++ b/src/pages/dashboard/ArrivalByTimeChart/ArrivalByTimeChart.tsx @@ -75,7 +75,9 @@ export default function ArrivalByTimeChart({ const pointsPerOperator = arrayGroup(data, (item) => item.id).map((operatorData) => { return allRange.map((time) => { const current = operatorData.find( - (item) => time.includes(item.gtfs_route_date!) || time.includes(item.gtfs_route_hour!), + (item) => + time.includes(item.gtfs_route_date!.split('T')[0]) || + time.includes(item.gtfs_route_hour!), ) return { id: operatorData[0].id, diff --git a/tests/dashboard.spec.ts b/tests/dashboard.spec.ts index e6dce262..7f79cd25 100644 --- a/tests/dashboard.spec.ts +++ b/tests/dashboard.spec.ts @@ -1,3 +1,4 @@ +import { expect } from '@playwright/test' import { test, urlMatcher } from './utils' test.describe('dashboard tests', () => { @@ -26,4 +27,10 @@ test.describe('dashboard tests', () => { await page.getByLabel('עבור למצב כהה').click() await page.getByLabel('עבור למצב בהיר').click() }) + + test('dashboard charts contain information', async ({ page }) => { + await expect(page.getByText('686 | קווים').first()).toBeVisible() + await expect(page.getByText('מועצה אזורית גולן').first()).toBeVisible() + await expect(page.getByRole('heading', { name: 'אגד תעבורה' })).toBeVisible() + }) }) From 2d52070ad739353746afe8c8fc17319608384e53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:27:26 +0200 Subject: [PATCH 16/22] chore(deps-dev): bump @types/node from 20.12.8 to 22.10.7 (#1013) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 15 ++++++++++----- package.json | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50c0bca3..261fe6ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,7 +83,7 @@ "@types/jest": "^29.5.14", "@types/leaflet": "^1.9.16", "@types/lodash.debounce": "^4.0.7", - "@types/node": "^20.12.8", + "@types/node": "^22.10.7", "@types/react": "^18.2.58", "@types/react-dom": "^18.3.0", "@types/styled-components": "^5.1.34", @@ -11478,11 +11478,11 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.12.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", - "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", + "version": "22.10.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", + "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.20.0" } }, "node_modules/@types/node-fetch": { @@ -11495,6 +11495,11 @@ "form-data": "^4.0.0" } }, + "node_modules/@types/node/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + }, "node_modules/@types/normalize-package-data": { "version": "2.4.4", "dev": true, diff --git a/package.json b/package.json index 00c35929..2339100e 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "@types/jest": "^29.5.14", "@types/leaflet": "^1.9.16", "@types/lodash.debounce": "^4.0.7", - "@types/node": "^20.12.8", + "@types/node": "^22.10.7", "@types/react": "^18.2.58", "@types/react-dom": "^18.3.0", "@types/styled-components": "^5.1.34", From 916d9e14ff2debda4893dd491e03d9dd30cbae30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:27:39 +0200 Subject: [PATCH 17/22] chore(deps): bump nanoid from 3.3.7 to 3.3.8 (#1018) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 261fe6ed..08e06d91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21620,7 +21620,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", From a494befa815efca3b2d24761de2469107af3d5f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:27:57 +0200 Subject: [PATCH 18/22] chore(deps-dev): bump eslint-plugin-storybook from 0.6.15 to 0.11.2 (#1012) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 162 ++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 79 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08e06d91..cb02aff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-react": "^7.37.2", "eslint-plugin-react-hooks": "^4.6.2", - "eslint-plugin-storybook": "^0.6.15", + "eslint-plugin-storybook": "^0.11.2", "identity-obj-proxy": "^3.0.0", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", @@ -9572,9 +9572,9 @@ } }, "node_modules/@storybook/csf": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.8.tgz", - "integrity": "sha512-Ntab9o7LjBCbFIao5l42itFiaSh/Qu+l16l/r/9qmV9LnYZkO+JQ7tzhdlwpgJfhs+B5xeejpdAtftDRyXNajw==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.13.tgz", + "integrity": "sha512-7xOOwCLGB3ebM87eemep89MYRFTko+D8qE7EdAAq74lgdqRR5cOUtYWJLjO2dLtP94nqoOdHJo6MdLLKzg412Q==", "dev": true, "dependencies": { "type-fest": "^2.19.0" @@ -16456,43 +16456,33 @@ } }, "node_modules/eslint-plugin-storybook": { - "version": "0.6.15", - "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.6.15.tgz", - "integrity": "sha512-lAGqVAJGob47Griu29KXYowI4G7KwMoJDOkEip8ujikuDLxU+oWJ1l0WL6F2oDO4QiyUFXvtDkEkISMOPzo+7w==", + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.11.2.tgz", + "integrity": "sha512-0Z4DUklJrC+GHjCRXa7PYfPzWC15DaVnwaOYenpgXiCEijXPZkLKCms+rHhtoRcWccP7Z8DpOOaP1gc3P9oOwg==", "dev": true, "dependencies": { - "@storybook/csf": "^0.0.1", - "@typescript-eslint/utils": "^5.45.0", - "requireindex": "^1.1.0", + "@storybook/csf": "^0.1.11", + "@typescript-eslint/utils": "^8.8.1", "ts-dedent": "^2.2.0" }, "engines": { - "node": "12.x || 14.x || >= 16" + "node": ">= 18" }, "peerDependencies": { - "eslint": ">=6" - } - }, - "node_modules/eslint-plugin-storybook/node_modules/@storybook/csf": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz", - "integrity": "sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15" + "eslint": ">=8" } }, "node_modules/eslint-plugin-storybook/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.20.0.tgz", + "integrity": "sha512-J7+VkpeGzhOt3FeG1+SzhiMj9NzGD/M6KoGn9f4dbz3YzK9hvbhVTmLj/HiTp9DazIzJ8B4XcM80LrR9Dm1rJw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "8.20.0", + "@typescript-eslint/visitor-keys": "8.20.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -16500,12 +16490,12 @@ } }, "node_modules/eslint-plugin-storybook/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.20.0.tgz", + "integrity": "sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -16513,95 +16503,108 @@ } }, "node_modules/eslint-plugin-storybook/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.20.0.tgz", + "integrity": "sha512-Y7ncuy78bJqHI35NwzWol8E0X7XkRVS4K4P4TCyzWkOJih5NDvtoRDW4Ba9YJJoB2igm9yXDdYI/+fkiiAxPzA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "8.20.0", + "@typescript-eslint/visitor-keys": "8.20.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/eslint-plugin-storybook/node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.20.0.tgz", + "integrity": "sha512-dq70RUw6UK9ei7vxc4KQtBRk7qkHZv447OUZ6RPQMQl71I3NZxQJX/f32Smr+iqWrB02pHKn2yAdHBb0KNrRMA==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.20.0", + "@typescript-eslint/types": "8.20.0", + "@typescript-eslint/typescript-estree": "8.20.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/eslint-plugin-storybook/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.20.0.tgz", + "integrity": "sha512-v/BpkeeYAsPkKCkR8BDwcno0llhzWVqPOamQrAEMdpZav2Y9OVjd9dwJyBLJWwf335B5DmlifECIkZRJCaGaHA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "8.20.0", + "eslint-visitor-keys": "^4.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/eslint-plugin-storybook/node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "node_modules/eslint-plugin-storybook/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-plugin-storybook/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/eslint-plugin-storybook/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "node_modules/eslint-plugin-storybook/node_modules/ts-api-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz", + "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==", "dev": true, "engines": { - "node": ">=4.0" + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" } }, "node_modules/eslint-scope": { @@ -24811,15 +24814,6 @@ "node": ">=0.10.0" } }, - "node_modules/requireindex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", - "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==", - "dev": true, - "engines": { - "node": ">=0.10.5" - } - }, "node_modules/requirejs": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz", diff --git a/package.json b/package.json index 2339100e..71d03e9b 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-react": "^7.37.2", "eslint-plugin-react-hooks": "^4.6.2", - "eslint-plugin-storybook": "^0.6.15", + "eslint-plugin-storybook": "^0.11.2", "identity-obj-proxy": "^3.0.0", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", From 08a8e6684bdb723b32b487bd69c75b6395b22dfc Mon Sep 17 00:00:00 2001 From: Yael Chen <51058584+YaelChen@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:18:06 +0200 Subject: [PATCH 19/22] test: edit test for youtube modal in 'report a bug' (#1002) --- tests/bugReport.spec.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/bugReport.spec.ts b/tests/bugReport.spec.ts index 387fae9f..5b5fc927 100644 --- a/tests/bugReport.spec.ts +++ b/tests/bugReport.spec.ts @@ -1,9 +1,18 @@ -import { test } from '@playwright/test' +import { test, expect } from '@playwright/test' -test('An instruction video for Report a bug', async ({ page }) => { +test('the YouTube modal in "report a bug" is visible and have the correct src', async ({ + page, +}) => { await page.goto('/') await page.getByLabel('bug').locator('svg').click() await page.getByLabel('לפתוח סרטון על העמוד הזה').locator('svg').click() + const iframeElement = await page.waitForSelector('iframe') + expect(iframeElement.isVisible()) + const videoSrc = page.locator('iframe') + await expect(videoSrc).toHaveAttribute( + 'src', + 'https://www.youtube-nocookie.com/embed?v=F6sD9Bz4Xj0&list=PL6Rh06rT7uiX1AQE-lm55hy-seL3idx3T&index=11', + ) await page.locator('iframe').contentFrame().getByLabel('Play', { exact: true }).click() await page.locator('iframe').contentFrame().getByLabel('Pause keyboard shortcut k').click() await page.getByLabel('Close', { exact: true }).click() From 69660b7f3997d55411304620924e533bb39fe741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:57:21 +0200 Subject: [PATCH 20/22] chore(deps): bump recharts from 2.12.7 to 2.15.0 (#1020) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 20 ++++++++------------ package.json | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb02aff4..63bfc5fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "react-leaflet": "^4.0.1", "react-leaflet-cluster": "^2.1.0", "react-router-dom": "^6.26.2", - "recharts": "^2.12.7", + "recharts": "^2.15.0", "sass": "^1.81.0", "styled-components": "^6.1.11", "stylis-plugin-rtl": "^2.1.1", @@ -24592,14 +24592,15 @@ } }, "node_modules/recharts": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.7.tgz", - "integrity": "sha512-hlLJMhPQfv4/3NBSAyq3gzGg4h2v69RJh6KU7b3pXYNNAELs9kEoXOjbkxdXpALqKBoVmVptGfLpxdaVYqjmXQ==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz", + "integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==", + "license": "MIT", "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", "lodash": "^4.17.21", - "react-is": "^16.10.2", + "react-is": "^18.3.1", "react-smooth": "^4.0.0", "recharts-scale": "^0.4.4", "tiny-invariant": "^1.3.1", @@ -24609,8 +24610,8 @@ "node": ">=14" }, "peerDependencies": { - "react": "^16.0.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" + "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "node_modules/recharts-scale": { @@ -24621,11 +24622,6 @@ "decimal.js-light": "^2.4.1" } }, - "node_modules/recharts/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, "node_modules/redent": { "version": "3.0.0", "dev": true, diff --git a/package.json b/package.json index 71d03e9b..b42aaa25 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "react-leaflet": "^4.0.1", "react-leaflet-cluster": "^2.1.0", "react-router-dom": "^6.26.2", - "recharts": "^2.12.7", + "recharts": "^2.15.0", "sass": "^1.81.0", "styled-components": "^6.1.11", "stylis-plugin-rtl": "^2.1.1", From c74509a1574e92e9eb7aa5b62927648581395fde Mon Sep 17 00:00:00 2001 From: Guy Keren <101594251+GuyKe5@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:57:34 +0200 Subject: [PATCH 21/22] feat: represent bearing as geographic terms (#1009) Co-authored-by: Guyke5 --- src/locale/he.json | 10 +++++++ .../map-related/MapLayers/BusToolTip.tsx | 28 ++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/locale/he.json b/src/locale/he.json index 81bb1730..f255390f 100644 --- a/src/locale/he.json +++ b/src/locale/he.json @@ -154,6 +154,16 @@ "at_time": "בשעה", "vehicle_ref": "לוחית רישוי", "drive_direction": "כיוון נסיעה", + "directions":{ + "North": "צפון", + "Northeast": "צפון-מזרח", + "East": "מזרח", + "Southeast": "דרום-מזרח", + "South": "דרום", + "Southwest": "דרום-מערב", + "West": "מערב", + "Northwest": "צפון-מערב" + }, "bearing": "מעלות", "coords": "נ.צ.", "hide_document": "הסתר מידע לגיקים", diff --git a/src/pages/components/map-related/MapLayers/BusToolTip.tsx b/src/pages/components/map-related/MapLayers/BusToolTip.tsx index a3a79487..98ce34a8 100644 --- a/src/pages/components/map-related/MapLayers/BusToolTip.tsx +++ b/src/pages/components/map-related/MapLayers/BusToolTip.tsx @@ -33,6 +33,26 @@ export function BusToolTip({ position, icon, children }: BusToolTipProps) { .finally(() => setIsLoading(false)) }, [position]) + function getDirectionFromAngle(angle: number): string { + // Normalize the angle to the range 0-360 + angle = ((angle % 360) + 360) % 360 + // Define the cardinal directions in clockwise order + const directions: string[] = [ + t('directions.North', { defaultValue: 'North' }), + t('directions.Northeast', { defaultValue: 'Northeast' }), + t('directions.East', { defaultValue: 'East' }), + t('directions.Southeast', { defaultValue: 'Southeast' }), + t('directions.South', { defaultValue: 'South' }), + t('directions.Southwest', { defaultValue: 'Southwest' }), + t('directions.West', { defaultValue: 'West' }), + t('directions.Northwest', { defaultValue: 'Northwest' }), + ] + // Divide the angle into 8 equal sections (45 degrees each) + const index: number = Math.round(angle / 45) % 8 + + return directions[index] + } + return (
{isLoading || !siriRide ? ( @@ -56,6 +76,7 @@ export function BusToolTip({ position, icon, children }: BusToolTipProps) {
  • + {' '} {`${t('from')}: `} {siriRide.gtfsRouteRouteLongName?.split('<->')[0]}
    • @@ -83,7 +104,12 @@ export function BusToolTip({ position, icon, children }: BusToolTipProps) {
  • {`${t('drive_direction')}: `} - ({position.point?.bearing} {t('bearing')}) + {/* ({position.point?.bearing} {t('bearing')}) */} + {position.point?.bearing} {t('bearing')} ( + {position.point?.bearing !== undefined + ? getDirectionFromAngle(position.point.bearing) + : t('unknown', { defaultValue: 'unknown' })} + )
  • From f75f584ae76bbe38654e1d6590e89a58732bfb1b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2025 09:16:44 +0200 Subject: [PATCH 22/22] docs: add GuyKe5 as a contributor for code (#1023) Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e401848d..2ed564d4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -288,6 +288,15 @@ "contributions": [ "code" ] + }, + { + "login": "GuyKe5", + "name": "Guy Keren", + "avatar_url": "https://avatars.githubusercontent.com/u/101594251?v=4", + "profile": "https://github.com/GuyKe5", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index da28522e..a9cdba49 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4 ofirc77
    ofirc77
    💻 + Guy Keren
    Guy Keren
    💻