Skip to content

Commit 45ff630

Browse files
titouanmathistitouanmathis
committed
Merge branch 'release/2.6.0'
2 parents 753c19b + dbe4cce commit 45ff630

27 files changed

+17019
-21217
lines changed

‎.github/renovate.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>studiometa/renovate"
5+
]
6+
}

‎.github/workflows/export-size.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: export-size
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
- develop
8+
9+
jobs:
10+
export-size:
11+
runs-on: macos-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
with:
15+
fetch-depth: '0'
16+
- uses: titouanmathis/export-size-action@main
17+
with:
18+
github_token: ${{ secrets.GITHUB_TOKEN }}
19+
build_script: npm run build
20+
paths: dist
21+
node-version: 22

‎.github/workflows/publish.yml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: publish-and-release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*.*.*'
7+
8+
jobs:
9+
publish-and-release:
10+
runs-on: macos-latest
11+
permissions:
12+
contents: write
13+
id-token: write
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: 22
20+
registry-url: https://registry.npmjs.org/
21+
22+
- name: Get npm cache directory
23+
id: npm-cache-dir
24+
shell: bash
25+
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
26+
27+
- uses: actions/cache@v4
28+
id: npm-cache
29+
with:
30+
path: |
31+
${{ steps.npm-cache-dir.outputs.dir }}
32+
**/node_modules
33+
.eslintcache
34+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
35+
restore-keys: ${{ runner.os }}-node-
36+
37+
- run: npm install --no-audit --no-fund
38+
39+
- run: npm run build
40+
41+
- name: Test
42+
run: npm run test -- -- --retry=3 --coverage.enabled
43+
44+
- name: Upload coverage to Codecov
45+
uses: codecov/codecov-action@v4
46+
with:
47+
token: ${{ secrets.CODECOV_TOKEN }}
48+
directory: ./packages/coverage
49+
flags: unittests
50+
fail_ci_if_error: false
51+
verbose: true
52+
53+
- run: |
54+
NPM_TAG='latest'
55+
IS_PRERELEASE=false
56+
57+
if [[ $GITHUB_REF_NAME =~ 'alpha' || $GITHUB_REF_NAME =~ 'beta' || $GITHUB_REF_NAME =~ 'rc' ]]; then
58+
NPM_TAG='next'
59+
IS_PRERELEASE=true
60+
fi
61+
62+
echo "NPM_TAG=$NPM_TAG" >> $GITHUB_ENV
63+
echo "IS_PRERELEASE=$IS_PRERELEASE" >> $GITHUB_ENV
64+
65+
- uses: JS-DevTools/npm-publish@v3
66+
with:
67+
provenance: true
68+
package: dist/
69+
tag: ${{ env.NPM_TAG }}
70+
token: ${{ secrets.NPM_TOKEN }}
71+
72+
- uses: ncipollo/release-action@v1
73+
with:
74+
tag: ${{ github.ref }}
75+
name: v${{ github.ref_name }}
76+
body: Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ github.ref_name }}/CHANGELOG.md) for details.
77+
draft: false
78+
prerelease: ${{ env.IS_PRERELEASE }}

‎.github/workflows/release.yml

-63
This file was deleted.

‎.github/workflows/tests.yml

+41-31
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,57 @@
1-
name: Tests
1+
name: tests
22

33
on:
44
push:
55
branches:
6-
- feature/vue-3
6+
- master
7+
- develop
78
pull_request:
89

910
jobs:
10-
11-
Build:
11+
build:
1212
runs-on: macos-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v2
16-
with:
17-
node-version: 20
18-
cache: npm
19-
- name: Install modules
20-
run: npm install
21-
- name: Build the package
22-
run: npm run build
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
16+
with:
17+
node-version: 22
18+
cache: npm
19+
- name: Install dependencies
20+
run: npm install
21+
- name: Build
22+
run: npm run build
2323

24-
Code-Quality:
24+
code-quality:
2525
runs-on: macos-latest
2626
steps:
27-
- uses: actions/checkout@v2
28-
- uses: actions/setup-node@v2
29-
with:
30-
node-version: 20
31-
cache: npm
32-
- name: Install modules
33-
run: npm install
34-
- name: Run code quality tests
35-
run: npm run lint -- --format=compact
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-node@v4
29+
with:
30+
node-version: 22
31+
cache: npm
32+
- name: Install dependencies
33+
run: npm install
34+
- name: Run code quality tests
35+
run: npm run lint
3636

37-
Export-Size:
38-
runs-on: ubuntu-latest
37+
unit:
38+
runs-on: macos-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-node@v4
4142
with:
42-
fetch-depth: '0'
43-
- uses: titouanmathis/export-size-action@main
43+
node-version: 22
44+
cache: npm
45+
- name: Install dependencies
46+
run: npm install
47+
- name: Run tests
48+
run: npm run test -- -- --retry=3 --coverage.enabled
49+
- name: Upload coverage to Codecov
50+
uses: codecov/codecov-action@v4
4451
with:
45-
github_token: ${{ secrets.GITHUB_TOKEN }}
46-
build_script: npm run build
47-
paths: dist
52+
files: ./packages/coverage/clover.xml
53+
flags: unittests
54+
fail_ci_if_error: false
55+
verbose: true
56+
env:
57+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ yarn-error.log*
2727
/packages/docs/.vitepress/cache
2828
/packages/demo/.nuxt/
2929
/packages/demo/.output/
30+
/packages/coverage/

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

‎CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file. The format
44

55
## [Unreleased]
66

7+
## [v2.6.0](https://github.com/studiometa/vue-mapbox-gl/compare/2.5.0...2.6.0) (2025-01-02)
8+
9+
### Added
10+
11+
- Add a `MapboxFullscreenControl` component ([#177](https://github.com/studiometa/vue-mapbox-gl/pull/177), [36fff83](https://github.com/studiometa/vue-mapbox-gl/commit/36fff83))
12+
- Expose the marker instance ([#195](https://github.com/studiometa/vue-mapbox-gl/pull/195), [08b1cab](https://github.com/studiometa/vue-mapbox-gl/commit/08b1cab))
13+
- Add support for renderless marker ([#196](https://github.com/studiometa/vue-mapbox-gl/pull/196), [91cb2e3](https://github.com/studiometa/vue-mapbox-gl/commit/91cb2e3))
14+
15+
### Changed
16+
17+
- Improve performance by using shallowRef instead of ref ([#194](https://github.com/studiometa/vue-mapbox-gl/pull/194), [a34ce76](https://github.com/studiometa/vue-mapbox-gl/commit/a34ce76))
18+
19+
### Fixed
20+
21+
- Fix typo in heading of accessToken prop ([#192](https://github.com/studiometa/vue-mapbox-gl/pull/192), [f0d6587](https://github.com/studiometa/vue-mapbox-gl/commit/f0d6587))
22+
- Fix binding of events ([#124](https://github.com/studiometa/vue-mapbox-gl/pull/124), [9d71b7e](https://github.com/studiometa/vue-mapbox-gl/commit/9d71b7e))
23+
724
## [v2.5.0](https://github.com/studiometa/vue-mapbox-gl/compare/2.4.0...2.5.0) (2024-03-05)
825

926
### Added

0 commit comments

Comments
 (0)