Merge pull request #699 from diballesteros/version/5.4.5

fix: updated encounters for rby and frlg, updated dependencies

CHANGELOG.md

@@ -1,3 +1,26 @@
+## Version 5.4.5
+
+🐛 Bug Fix
+
+- Fixed encounter list for Safari Zone in Yellow
+- Fixed encounter list for Seafoam island in Fire Red and Leaf Green
+
+🏠 Internal
+
+- Bumped @sentry/react to 7.57.0
+- Bumped @sentry/tracing to 7.57.0
+- Bumped i18next to 23.2.6
+- Bumped react-i18next to 13.0.1
+- Bumped react-router-dom to 6.14.1
+- Bumped @cypress/code-coverage to 3.10.8
+- Bumped @types/jest to 29.5.2
+- Bumped @types/node to 20.3.3
+- Bumped @types/react to 18.2.14
+- Bumped @types/react-dom to 18.2.6
+- Bumped cypress to 12.16.0
+- Bumped sass to 1.63.6
+- Bumped sass-loader to 13.3.2
+
 ## Version 5.4.4
 
 🏠 Internal

package.json

@@ -2,7 +2,7 @@
   "name": "nuzlocke",
   "author": "Diego Ballesteros Castellanos",
   "description": "Nuzlocke tracker to record encounters with detailed information",
-  "version": "5.4.4",
+  "version": "5.4.5",
   "license": "BSD-3-Clause",
   "bugs": {
     "url": "https://github.com/diballesteros/nuzlocke/issues"
@@ -27,17 +27,17 @@
   },
   "private": true,
   "dependencies": {
-    "@sentry/react": "^7.53.1",
-    "@sentry/tracing": "^7.53.1",
+    "@sentry/react": "^7.57.0",
+    "@sentry/tracing": "^7.57.0",
     "@smogon/calc": "^0.7.0",
     "@supabase/supabase-js": "^1.35.7",
     "html-to-image": "^1.11.11",
-    "i18next": "^22.5.0",
+    "i18next": "22.4.15",
     "immer": "^10.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-i18next": "^12.3.1",
-    "react-router-dom": "^6.11.2",
+    "react-i18next": "12.2.2",
+    "react-router-dom": "^6.14.1",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.1.3",
     "react-window": "^1.8.9",
@@ -48,7 +48,7 @@
   },
   "scripts": {
     "analyze": "source-map-explorer ''build/static/js/*.js'",
-    "start": "react-scripts start",
+    "start": "react-scripts --openssl-legacy-provider start",
     "httpss": "HTTPS=true react-scripts start",
     "develop:ci": "CHOKIDAR_USEPOLLING=1 react-scripts -r @cypress/instrument-cra start --config-file=cypress.config.ts",
     "build": "react-scripts build",
@@ -77,21 +77,21 @@
     ]
   },
   "devDependencies": {
-    "@cypress/code-coverage": "^3.10.6",
+    "@cypress/code-coverage": "^3.10.8",
     "@cypress/instrument-cra": "^1.4.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.195",
-    "@types/node": "^20.2.5",
-    "@types/react": "^18.2.7",
-    "@types/react-dom": "^18.2.4",
+    "@types/node": "^20.3.3",
+    "@types/react": "^18.2.14",
+    "@types/react-dom": "^18.2.6",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-window": "^1.8.5",
     "@typescript-eslint/eslint-plugin": "5.7.0",
     "@typescript-eslint/parser": "5.7.0",
-    "cypress": "^12.13.0",
+    "cypress": "^12.16.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-localstorage-commands": "^2.2.3",
     "eslint": "8.4.1",
@@ -104,8 +104,8 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.8",
-    "sass": "^1.62.1",
-    "sass-loader": "^13.3.1",
+    "sass": "^1.63.6",
+    "sass-loader": "^13.3.2",
     "source-map-explorer": "^2.5.3"
   }
 }

src/components/PokemonType/PokemonType.tsx

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import { Type } from 'components';
 import { FAIRY_GEN } from 'constants/constant';
 import type { TPokemon } from 'constants/types';

src/components/Pokestats/elements/Image/Image.tsx

@@ -2,7 +2,7 @@ import { LegacyRef, useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon';
 import Label from 'semantic-ui-react/dist/commonjs/elements/Label';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import { PkmImage } from 'common';
 import { Moves, PokeInfo } from 'components';
 import { Tip } from 'components/Pokestats/elements';

src/components/Pokestats/elements/Summary/Summary.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
 import Button from 'semantic-ui-react/dist/commonjs/elements/Button';
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import { DisplaySettings, Image } from 'components/Pokestats/elements';
 import useStore from 'store';
 import styles from './Summary.module.scss';

src/components/Tracker/elements/Encounters/Encounters.tsx

@@ -6,7 +6,7 @@ import Confirm from 'semantic-ui-react/dist/commonjs/addons/Confirm';
 import Button from 'semantic-ui-react/dist/commonjs/elements/Button';
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon';
 import Popup from 'semantic-ui-react/dist/commonjs/modules/Popup';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import { Status } from 'components';
 import {
   Detail,

src/components/Tracker/elements/Pokemon/Pokemon.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon';
 import Popup from 'semantic-ui-react/dist/commonjs/modules/Popup';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import { PkmImage, PokemonSelector } from 'common';
 import { getGenderIcon } from 'components/PokeInfo/PokeInfo';
 import FILTERS from 'constants/filters';

src/components/Tracker/elements/ScrollList/ScrollList.tsx

@@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Button from 'semantic-ui-react/dist/commonjs/elements/Button/Button';
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon/Icon';
-import shallow from 'zustand/shallow';
+import { shallow } from 'zustand/shallow';
 import type { TEncounter } from 'constants/types';
 import { selectCaught, selectFailed, selectFainted } from 'selectors';
 import useStore from 'store';

src/constants/changelog_2.ts

@@ -1,6 +1,20 @@
 import type { TReleaseNotes } from 'constants/types';
 
 export const CHANGELOG2: TReleaseNotes = [
+  {
+    name: 'Version 5.4.5',
+    date: 1688385563589,
+    notes: [
+      {
+        description: 'Fixed encounter list for Safari Zone in Yellow',
+        type: 'FIX',
+      },
+      {
+        description: 'Fixed encounter list for Seafoam island in Fire Red and Leaf Green',
+        type: 'FIX',
+      },
+    ],
+  },
   {
     name: 'Version 5.4.3',
     date: 1685291528317,

src/constants/filters.ts

@@ -288,11 +288,19 @@ const FILTERS: { [key in string]: string[] } = {
     'Chansey',
     'Tangela',
     'Goldeen',
+    'Seaking',
     'Scyther',
     'Pinsir',
     'Magikarp',
     'Dratini',
     'Dragonair',
+    'Cubone',
+    'Marowak',
+    'Doduo',
+    'Kangaskhan',
+    'Venonat',
+    'Venomoth',
+    'Tauros',
   ],
   'rby-36': [
     'Pidgey',
@@ -1945,10 +1953,6 @@ const FILTERS: { [key in string]: string[] } = {
     'Horsea',
     'Magikarp',
     'Gyarados',
-    'Makuhita',
-    'Absol',
-    'Chingling',
-    'Bronzor',
     'Articuno',
   ],
   'frlg-43': [