Skip to content

Commit 2901259

Browse files
committed
Merge branch 'release/2.7.0-alpha.3'
2 parents 638d0a5 + 7977d6c commit 2901259

18 files changed

+3172
-4147
lines changed

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: macos-latest
12+
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-node@v4

CHANGELOG.md

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

55
## [Unreleased]
66

7+
## [v2.7.0-alpha.3](https://github.com/studiometa/vue-mapbox-gl/compare/2.7.0-alpha.2...2.7.0-alpha.3) (2025-01-24)
8+
9+
### Fixed
10+
11+
- Fix build on ubuntu ([23ca250](https://github.com/studiometa/vue-mapbox-gl/commit/23ca250))
12+
13+
### Changed
14+
15+
- Update dependencies ([#243](https://github.com/studiometa/vue-mapbox-gl/pull/243))
16+
717
## [v2.7.0-alpha.2](https://github.com/studiometa/vue-mapbox-gl/compare/2.7.0-alpha.1...2.7.0-alpha.2) (2025-01-24)
818

919
### Fixed

package-lock.json

+3,124-4,108
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@studiometa/vue-mapbox-gl-workspace",
33
"private": true,
4-
"version": "2.7.0-alpha.2",
4+
"version": "2.7.0-alpha.3",
55
"type": "module",
66
"workspaces": [
77
"packages/*"
@@ -17,7 +17,8 @@
1717
"fix": "npm run lint:eslint -- --fix",
1818
"build": "rm -rf dist && npm run build:vite && npm run build:cp",
1919
"build:vite": "vite build",
20-
"build:cp": "cp packages/vue-mapbox-gl/package.json dist/ && cp README.md dist/ && sed -i '' 's/index\\.ts/index\\.js/' dist/package.json",
20+
"build:cp": "cp packages/vue-mapbox-gl/package.json dist/ && cp README.md dist/ && npm run build:fix-extension",
21+
"build:fix-extension": "echo \"$(cat dist/package.json | sed 's/index\\.ts/index\\.js/')\" > dist/package.json && cat dist/package.json",
2122
"prepublishOnly": "npm run build",
2223
"test": "npm run test -w @studiometa/vue-mapbox-gl-tests"
2324
},
@@ -30,7 +31,7 @@
3031
"dependencies": {
3132
"@vitejs/plugin-vue": "5.2.1",
3233
"@vue/tsconfig": "0.7.0",
33-
"vite": "6.0.9",
34+
"vite": "6.0.11",
3435
"vite-plugin-dts": "4.5.0",
3536
"vue-tsc": "2.2.0"
3637
}

packages/demo/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@studiometa/vue-mapbox-gl-demo",
3-
"version": "2.7.0-alpha.2",
3+
"version": "2.7.0-alpha.3",
44
"scripts": {
55
"dev": "nuxt dev",
66
"build": "nuxt build"
77
},
88
"dependencies": {
99
"@mapbox/mapbox-gl-geocoder": "^5.0.3",
1010
"@studiometa/vue-mapbox-gl": "*",
11-
"mapbox-gl": "^3.9.1",
12-
"nuxt": "^3.15.0",
11+
"mapbox-gl": "^3.9.3",
12+
"nuxt": "^3.15.2",
1313
"vue": "^3.5.13"
1414
}
1515
}

packages/docs/.vitepress/components/MapboxClusterWithCustomImageDemo.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup>
2-
import { ref } from "vue";
2+
import { ref } from 'vue';
33
import { MapboxMap, MapboxImage, MapboxCluster } from '@studiometa/vue-mapbox-gl';
44
55
const mapCenter = ref([0, 0]);

packages/docs/.vitepress/components/MapboxGeocoderDemo.vue

-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@
1818
@mb-clear="log('clear', $event)" />
1919
</MapboxMap>
2020
</template>
21-
22-

packages/docs/.vitepress/components/MapboxGeocoderDemoWithoutMap.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<script setup>
2-
import { ref } from 'vue';
32
import { MapboxGeocoder } from '@studiometa/vue-mapbox-gl';
43
import '@mapbox/mapbox-gl-geocoder/lib/mapbox-gl-geocoder.css';
54
6-
const props = defineProps({
5+
defineProps({
76
reverseGeocode: {
87
type: Boolean,
98
default: false,

packages/docs/.vitepress/components/MapboxImagesDemo.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup>
2-
import { ref } from "vue";
2+
import { ref } from 'vue';
33
import { MapboxMap, MapboxImages, MapboxLayer } from '@studiometa/vue-mapbox-gl';
44
55
const mapCenter = ref([0, 0]);

packages/docs/.vitepress/components/MapboxMarkerCustomHtmlDemo.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup>
2-
import { ref } from "vue";
2+
import { ref } from 'vue';
33
import { MapboxMap, MapboxMarker } from '@studiometa/vue-mapbox-gl';
44
55
const mapCenter = ref([0, 0]);

packages/docs/.vitepress/components/MapboxMarkerPopupDemo.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup>
2-
import { ref } from "vue";
2+
import { ref } from 'vue';
33
import { MapboxMap, MapboxMarker } from '@studiometa/vue-mapbox-gl';
44
55
const mapCenter = ref([0, 0]);
@@ -13,7 +13,7 @@
1313
:center="mapCenter"
1414
:zoom="1">
1515
<MapboxMarker :lng-lat="[0, 0]" popup>
16-
<template v-slot:popup>
16+
<template #popup>
1717
<p>Hello world!</p>
1818
</template>
1919
</MapboxMarker>

packages/docs/.vitepress/components/StoreLocatorArchitecture.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
'div',
77
{
88
class: `shadow-lg rounded p-4 ${props.color} ${attrs.class ? data.class : ''}`,
9-
'data-element': props.el
9+
'data-element': props.el,
1010
},
11-
slots
11+
slots,
1212
);
1313
}
1414
DataElement.props = ['el', 'color', 'class'];
@@ -21,7 +21,7 @@
2121
Component.props = ['name'];
2222
2323
return Component;
24-
};
24+
}
2525
2626
const DataRegion = createDataComponent('region', 'bg-blue-200');
2727
const DataSlot = createDataComponent('slot', 'bg-green-300');

packages/docs/.vitepress/components/StoreLocatorDemo.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
lng: geometry.coordinates[0],
2020
id: getId(),
2121
...properties,
22-
}))
22+
})),
2323
);
2424
</script>
2525

@@ -78,7 +78,7 @@
7878
}
7979
8080
.bg-vp-mute {
81-
background-color: var(--vp-c-bg-mute);;
81+
background-color: var(--vp-c-bg-mute);
8282
}
8383
8484
.store-locator-demo {
@@ -107,7 +107,7 @@
107107
}
108108
109109
.store-locator-demo__inner {
110-
@apply rounded;
110+
border-radius: 0.25rem;
111111
position: relative;
112112
width: 100%;
113113
height: 80vh;
@@ -147,7 +147,7 @@
147147
\*============================================================================*/
148148
149149
.store-locator__region {
150-
@apply rounded;
150+
border-radius: 0.25rem;
151151
position: relative;
152152
}
153153
+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import DefaultTheme from 'vitepress/theme'
1+
import DefaultTheme from 'vitepress/theme';
22
import 'mapbox-gl/dist/mapbox-gl.css';
33

44
export default {
55
...DefaultTheme,
66
enhanceApp({ app }) {
7-
app.config.globalProperties.MAPBOX_API_KEY = 'pk.eyJ1IjoiYWdlbmNlc3R1ZGlvbWV0YSIsImEiOiJjanh5ZW81aHEwOHV3M2lwZzhhNW1vdXl5In0.3hbV2QKVzZWf511JK9xCug';
8-
}
9-
}
7+
app.config.globalProperties.MAPBOX_API_KEY =
8+
'pk.eyJ1IjoiYWdlbmNlc3R1ZGlvbWV0YSIsImEiOiJjanh5ZW81aHEwOHV3M2lwZzhhNW1vdXl5In0.3hbV2QKVzZWf511JK9xCug';
9+
},
10+
};

packages/docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "@studiometa/vue-mapbox-gl-docs",
33
"private": true,
44
"type": "module",
5-
"version": "2.7.0-alpha.2",
5+
"version": "2.7.0-alpha.3",
66
"scripts": {
77
"dev": "vitepress",
88
"build": "vitepress build"
99
},
1010
"devDependencies": {
1111
"sass": "1.83.4",
1212
"tailwindcss": "3.4.17",
13-
"vitepress": "1.5.0"
13+
"vitepress": "1.6.3"
1414
}
1515
}

packages/tests/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/vue-mapbox-gl-tests",
3-
"version": "2.7.0-alpha.2",
3+
"version": "2.7.0-alpha.3",
44
"type": "module",
55
"scripts": {
66
"test": "vitest"
@@ -9,11 +9,11 @@
99
"@mapbox/mapbox-gl-geocoder": "^5.0.3",
1010
"@studiometa/vue-mapbox-gl": "*",
1111
"@vitejs/plugin-vue": "5.2.1",
12-
"@vitest/browser": "2.1.8",
13-
"@vitest/coverage-v8": "2.1.8",
14-
"mapbox-gl": "^3.9.1",
15-
"playwright": "1.49.1",
16-
"vitest": "2.1.8",
12+
"@vitest/browser": "3.0.4",
13+
"@vitest/coverage-v8": "3.0.4",
14+
"mapbox-gl": "^3.9.3",
15+
"playwright": "1.50.0",
16+
"vitest": "3.0.4",
1717
"vitest-browser-vue": "0.1.0",
1818
"vue": "^3.5.13"
1919
}

packages/tests/vitest.config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export default defineConfig({
1313
include: ['vue-mapbox-gl/**'],
1414
},
1515
browser: {
16-
provider: 'playwright', // or 'webdriverio'
16+
provider: 'playwright',
1717
enabled: true,
18-
name: 'chromium', // browser name is required
18+
instances: [{ browser: 'chromium' }],
1919
},
2020
},
2121
});

packages/vue-mapbox-gl/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/vue-mapbox-gl",
3-
"version": "2.7.0-alpha.2",
3+
"version": "2.7.0-alpha.3",
44
"description": "A small components library to use Mapbox GL in Vue 3.",
55
"homepage": "https://github.com/studiometa/vue-mapbox-gl#readme",
66
"bugs": {
@@ -42,7 +42,7 @@
4242
},
4343
"devDependencies": {
4444
"@mapbox/mapbox-gl-geocoder": "5.0.3",
45-
"@studiometa/js-toolkit": "2.12.1",
45+
"@studiometa/js-toolkit": "3.0.0",
4646
"mapbox-gl": "3.9.3",
4747
"vue": "3.5.13"
4848
},

0 commit comments

Comments
 (0)