Sync Dev to Main #1178
Merged
Sync Dev to Main #1178
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## [1.40.1-develop.1](v1.40.0...v1.40.1-develop.1) (2025-11-24) ### Bug Fixes * stationed pokemon not updating in popup ([cb3ff09](cb3ff09))
## [1.40.1-develop.2](v1.40.1-develop.1...v1.40.1-develop.2) (2025-11-25) ### Bug Fixes * incorrect escape shiny rate tooltip ([ebf31da](ebf31da)), closes [#1160](#1160)
## [1.40.1-develop.3](v1.40.1-develop.2...v1.40.1-develop.3) (2025-11-25) ### Bug Fixes * missing translations ([238f602](238f602))
Bumps [express](https://github.com/expressjs/express) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@v5.0.1...v5.1.0) --- updated-dependencies: - dependency-name: express dependency-version: 5.1.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [express](https://github.com/expressjs/express) from 4.21.2 to 5.2.1. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.21.2...v5.2.1) --- updated-dependencies: - dependency-name: express dependency-version: 5.2.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.81.0 to 0.85.1. - [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md) - [Commits](domoritz/leaflet-locatecontrol@v0.81.0...v0.85.1) --- updated-dependencies: - dependency-name: leaflet.locatecontrol dependency-version: 0.85.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1165) Bumps [@turf/boolean-point-in-polygon](https://github.com/Turfjs/turf) from 7.1.0 to 7.3.1. - [Release notes](https://github.com/Turfjs/turf/releases) - [Changelog](https://github.com/Turfjs/turf/blob/master/CHANGELOG.md) - [Commits](Turfjs/turf@v7.1.0...v7.3.1) --- updated-dependencies: - dependency-name: "@turf/boolean-point-in-polygon" dependency-version: 7.3.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mygod <[email protected]>
Bumps [react-virtuoso](https://github.com/petyosi/react-virtuoso/tree/HEAD/packages/react-virtuoso) from 4.10.1 to 4.16.1. - [Release notes](https://github.com/petyosi/react-virtuoso/releases) - [Changelog](https://github.com/petyosi/react-virtuoso/blob/master/packages/react-virtuoso/CHANGELOG.md) - [Commits](https://github.com/petyosi/react-virtuoso/commits/[email protected]/packages/react-virtuoso) --- updated-dependencies: - dependency-name: react-virtuoso dependency-version: 4.16.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@emotion/react](https://github.com/emotion-js/emotion) from 11.13.0 to 11.14.0. - [Release notes](https://github.com/emotion-js/emotion/releases) - [Changelog](https://github.com/emotion-js/emotion/blob/main/CHANGELOG.md) - [Commits](https://github.com/emotion-js/emotion/compare/@emotion/[email protected]...@emotion/[email protected]) --- updated-dependencies: - dependency-name: "@emotion/react" dependency-version: 11.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [objection](https://github.com/vincit/objection.js) from 3.1.4 to 3.1.5. - [Commits](Vincit/objection.js@3.1.4...3.1.5) --- updated-dependencies: - dependency-name: objection dependency-version: 3.1.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [openai](https://github.com/openai/openai-node) from 4.58.2 to 6.9.1. - [Release notes](https://github.com/openai/openai-node/releases) - [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md) - [Commits](openai/openai-node@v4.58.2...v6.9.1) --- updated-dependencies: - dependency-name: openai dependency-version: 6.9.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.48 to 0.6.0. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](moment/moment-timezone@0.5.48...0.6.0) --- updated-dependencies: - dependency-name: moment-timezone dependency-version: 0.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## [1.40.1-develop.4](v1.40.1-develop.3...v1.40.1-develop.4) (2025-12-04) ### Bug Fixes * locatecontrol ([754e544](754e544))
## [1.40.1-develop.5](v1.40.1-develop.4...v1.40.1-develop.5) (2025-12-09) ### Bug Fixes * flyTo stops location following ([08e4eac](08e4eac))
There was a problem hiding this comment.
Pull request overview
This pull request syncs changes from the development branch to main, primarily containing dependency updates, bug fixes, and new feature additions related to location tracking and internationalization.
Reviewed changes
Copilot reviewed 11 out of 28 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| yarn.lock | Dependency updates including major version upgrades (Express 4.x → 5.x, OpenAI 4.x → 6.x, various @emotion, @Turf, and other packages) |
| package.json | Updated dependency versions to match yarn.lock changes |
| packages/types/package.json | Updated Express and Objection.js versions |
| packages/locales/package.json | Updated OpenAI version for translation tooling |
| src/services/i18n.js | Added escapeValue: false to interpolation config (appropriate for React) |
| src/pages/map/components/Layers.jsx | Migrated from control.locate to standalone locate function from leaflet.locatecontrol, added useStopFollowingOnFly hook |
| src/hooks/useStopFollowingOnFly.js | New hook to stop location following when map.flyTo is called programmatically |
| src/hooks/useLocation.js | Updated import to use LocateControl class, integrated useStopFollowingOnFly hook |
| src/features/station/useGetStationMons.js | Added lastUpdated parameter and refetch logic to update station Pokémon when data changes |
| src/features/station/StationPopup.jsx | Passes updated prop to StationMons component |
| packages/locales/lib/generated/*.json | Added 36+ new translation keys for various UI strings across multiple languages |
| config/local.example.json | Added "tappable" to available categories and new tappables permissions section |
| CHANGELOG.md | Documents recent bug fixes including flyTo location following and station Pokémon updates |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
🎉 This PR is included in version 1.40.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.