diff --git a/CHANGELOG.md b/CHANGELOG.md index 1736970..2a7fa1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Bug fixes 🐛 - Fix `setPlaceholder` so that when `setPlaceholder` is called afterwards it return updated placeholder string [#502](https://github.com/mapbox/mapbox-gl-geocoder/pull/502) +- Fixed support of [mapbox-gl](https://github.com/mapbox/mapbox-gl-js)@3 ## 5.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 266c8e1..6579763 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,17 +19,17 @@ Lastly, run the test command from the console: ## Deploying -Follow this deploy process after all changes for the release are merged into master. You will copy and paste this checklist in the comment of the release pull request. +Follow this deploy process after all changes for the release are merged into main. You will copy and paste this checklist in the comment of the release pull request. ``` ## Release checklist -1. Create a branch off `master` and a pull request with the following changes. Copy this checklist in the comment of the pull request. - - [ ] Update the [CHANGELOG.md](https://github.com/mapbox/mapbox-gl-geocoder/blob/master/CHANGELOG.md) by comparing the last release and what is on `master`. In the changelog, replace the `master` heading with the to-be-released stable version. +1. Create a branch off `main` and a pull request with the following changes. Copy this checklist in the comment of the pull request. + - [ ] Update the [CHANGELOG.md](https://github.com/mapbox/mapbox-gl-geocoder/blob/main/CHANGELOG.md) by comparing the last release and what is on `main`. In the changelog, replace the `HEAD` heading with the to-be-released stable version. - [ ] Update the version number in `package.json` and `package-lock.json`. -3. Request a PR review and then merge it into `master`. +3. Request a PR review and then merge it into `main`. 4. Tag the release and start the build. - - [ ] Make sure you've pulled in all changes to `master` locally. + - [ ] Make sure you've pulled in all changes to `main` locally. - [ ] Build the release with `npm run prepublish && npm run docs` - [ ] Commit and push with commit message `vX.X.X` - [ ] Create the git tag for the release with `git tag -a vX.X.X -m 'vX.X.X'` diff --git a/package-lock.json b/package-lock.json index 157f317..2525794 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@mapbox/mapbox-gl-geocoder", - "version": "5.0.1", + "version": "5.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ef4149d..6ab3d8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mapbox/mapbox-gl-geocoder", - "version": "5.0.1", + "version": "5.0.2", "description": "A geocoder control for Mapbox GL JS", "main": "lib/index.js", "unpkg": "dist/mapbox-gl-geocoder.min.js",