Merge branch 'release/2.7.0-alpha.3'

titouanmathis · titouanmathis · commit 29012598b1cd · 2025-01-24T14:09:25.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format
 
 ## [Unreleased]
 
+## [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)
+
+### Fixed
+
+- Fix build on ubuntu ([23ca250](https://github.com/studiometa/vue-mapbox-gl/commit/23ca250))
+
+### Changed
+
+- Update dependencies ([#243](https://github.com/studiometa/vue-mapbox-gl/pull/243))
+
 ## [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)
 
 ### Fixed
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@studiometa/vue-mapbox-gl-workspace",
   "private": true,
-  "version": "2.7.0-alpha.2",
+  "version": "2.7.0-alpha.3",
   "type": "module",
   "workspaces": [
     "packages/*"
@@ -17,7 +17,8 @@
     "fix": "npm run lint:eslint -- --fix",
     "build": "rm -rf dist && npm run build:vite && npm run build:cp",
     "build:vite": "vite build",
-    "build:cp": "cp packages/vue-mapbox-gl/package.json dist/ && cp README.md dist/ && sed -i '' 's/index\\.ts/index\\.js/' dist/package.json",
+    "build:cp": "cp packages/vue-mapbox-gl/package.json dist/ && cp README.md dist/ && npm run build:fix-extension",
+    "build:fix-extension": "echo \"$(cat dist/package.json | sed 's/index\\.ts/index\\.js/')\" > dist/package.json && cat dist/package.json",
     "prepublishOnly": "npm run build",
     "test": "npm run test -w @studiometa/vue-mapbox-gl-tests"
   },
@@ -30,7 +31,7 @@
   "dependencies": {
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/tsconfig": "0.7.0",
-    "vite": "6.0.9",
+    "vite": "6.0.11",
     "vite-plugin-dts": "4.5.0",
     "vue-tsc": "2.2.0"
   }
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@studiometa/vue-mapbox-gl-demo",
-  "version": "2.7.0-alpha.2",
+  "version": "2.7.0-alpha.3",
   "scripts": {
     "dev": "nuxt dev",
     "build": "nuxt build"
   },
   "dependencies": {
     "@mapbox/mapbox-gl-geocoder": "^5.0.3",
     "@studiometa/vue-mapbox-gl": "*",
-    "mapbox-gl": "^3.9.1",
-    "nuxt": "^3.15.0",
+    "mapbox-gl": "^3.9.3",
+    "nuxt": "^3.15.2",
     "vue": "^3.5.13"
   }
 }
diff --git a/packages/docs/.vitepress/components/MapboxClusterWithCustomImageDemo.vue b/packages/docs/.vitepress/components/MapboxClusterWithCustomImageDemo.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref } from "vue";
+  import { ref } from 'vue';
   import { MapboxMap, MapboxImage, MapboxCluster } from '@studiometa/vue-mapbox-gl';
 
   const mapCenter = ref([0, 0]);
diff --git a/packages/docs/.vitepress/components/MapboxGeocoderDemo.vue b/packages/docs/.vitepress/components/MapboxGeocoderDemo.vue
@@ -18,5 +18,3 @@
       @mb-clear="log('clear', $event)" />
   </MapboxMap>
 </template>
-
-
diff --git a/packages/docs/.vitepress/components/MapboxGeocoderDemoWithoutMap.vue b/packages/docs/.vitepress/components/MapboxGeocoderDemoWithoutMap.vue
@@ -1,9 +1,8 @@
 <script setup>
-  import { ref } from 'vue';
   import { MapboxGeocoder } from '@studiometa/vue-mapbox-gl';
   import '@mapbox/mapbox-gl-geocoder/lib/mapbox-gl-geocoder.css';
 
-  const props = defineProps({
+  defineProps({
     reverseGeocode: {
       type: Boolean,
       default: false,
diff --git a/packages/docs/.vitepress/components/MapboxImagesDemo.vue b/packages/docs/.vitepress/components/MapboxImagesDemo.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref } from "vue";
+  import { ref } from 'vue';
   import { MapboxMap, MapboxImages, MapboxLayer } from '@studiometa/vue-mapbox-gl';
 
   const mapCenter = ref([0, 0]);
diff --git a/packages/docs/.vitepress/components/MapboxMarkerCustomHtmlDemo.vue b/packages/docs/.vitepress/components/MapboxMarkerCustomHtmlDemo.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref } from "vue";
+  import { ref } from 'vue';
   import { MapboxMap, MapboxMarker } from '@studiometa/vue-mapbox-gl';
 
   const mapCenter = ref([0, 0]);
diff --git a/packages/docs/.vitepress/components/MapboxMarkerPopupDemo.vue b/packages/docs/.vitepress/components/MapboxMarkerPopupDemo.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref } from "vue";
+  import { ref } from 'vue';
   import { MapboxMap, MapboxMarker } from '@studiometa/vue-mapbox-gl';
 
   const mapCenter = ref([0, 0]);
@@ -13,7 +13,7 @@
     :center="mapCenter"
     :zoom="1">
     <MapboxMarker :lng-lat="[0, 0]" popup>
-      <template v-slot:popup>
+      <template #popup>
         <p>Hello world!</p>
       </template>
     </MapboxMarker>
diff --git a/packages/docs/.vitepress/components/StoreLocatorArchitecture.vue b/packages/docs/.vitepress/components/StoreLocatorArchitecture.vue
@@ -6,9 +6,9 @@
       'div',
       {
         class: `shadow-lg rounded p-4 ${props.color} ${attrs.class ? data.class : ''}`,
-        'data-element': props.el
+        'data-element': props.el,
       },
-      slots
+      slots,
     );
   }
   DataElement.props = ['el', 'color', 'class'];
@@ -21,7 +21,7 @@
     Component.props = ['name'];
 
     return Component;
-  };
+  }
 
   const DataRegion = createDataComponent('region', 'bg-blue-200');
   const DataSlot = createDataComponent('slot', 'bg-green-300');
diff --git a/packages/docs/.vitepress/components/StoreLocatorDemo.vue b/packages/docs/.vitepress/components/StoreLocatorDemo.vue
@@ -19,7 +19,7 @@
       lng: geometry.coordinates[0],
       id: getId(),
       ...properties,
-    }))
+    })),
   );
 </script>
 
@@ -78,7 +78,7 @@
   }
 
   .bg-vp-mute {
-    background-color: var(--vp-c-bg-mute);;
+    background-color: var(--vp-c-bg-mute);
   }
 
   .store-locator-demo {
@@ -107,7 +107,7 @@
   }
 
   .store-locator-demo__inner {
-    @apply rounded;
+    border-radius: 0.25rem;
     position: relative;
     width: 100%;
     height: 80vh;
@@ -147,7 +147,7 @@
   \*============================================================================*/
 
   .store-locator__region {
-    @apply rounded;
+    border-radius: 0.25rem;
     position: relative;
   }
 
diff --git a/packages/docs/.vitepress/theme/index.js b/packages/docs/.vitepress/theme/index.js
@@ -1,9 +1,10 @@
-import DefaultTheme from 'vitepress/theme'
+import DefaultTheme from 'vitepress/theme';
 import 'mapbox-gl/dist/mapbox-gl.css';
 
 export default {
   ...DefaultTheme,
   enhanceApp({ app }) {
-    app.config.globalProperties.MAPBOX_API_KEY = 'pk.eyJ1IjoiYWdlbmNlc3R1ZGlvbWV0YSIsImEiOiJjanh5ZW81aHEwOHV3M2lwZzhhNW1vdXl5In0.3hbV2QKVzZWf511JK9xCug';
-  }
-}
+    app.config.globalProperties.MAPBOX_API_KEY =
+      'pk.eyJ1IjoiYWdlbmNlc3R1ZGlvbWV0YSIsImEiOiJjanh5ZW81aHEwOHV3M2lwZzhhNW1vdXl5In0.3hbV2QKVzZWf511JK9xCug';
+  },
+};
diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -2,14 +2,14 @@
   "name": "@studiometa/vue-mapbox-gl-docs",
   "private": true,
   "type": "module",
-  "version": "2.7.0-alpha.2",
+  "version": "2.7.0-alpha.3",
   "scripts": {
     "dev": "vitepress",
     "build": "vitepress build"
   },
   "devDependencies": {
     "sass": "1.83.4",
     "tailwindcss": "3.4.17",
-    "vitepress": "1.5.0"
+    "vitepress": "1.6.3"
   }
 }
diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/vue-mapbox-gl-tests",
-  "version": "2.7.0-alpha.2",
+  "version": "2.7.0-alpha.3",
   "type": "module",
   "scripts": {
     "test": "vitest"
@@ -9,11 +9,11 @@
     "@mapbox/mapbox-gl-geocoder": "^5.0.3",
     "@studiometa/vue-mapbox-gl": "*",
     "@vitejs/plugin-vue": "5.2.1",
-    "@vitest/browser": "2.1.8",
-    "@vitest/coverage-v8": "2.1.8",
-    "mapbox-gl": "^3.9.1",
-    "playwright": "1.49.1",
-    "vitest": "2.1.8",
+    "@vitest/browser": "3.0.4",
+    "@vitest/coverage-v8": "3.0.4",
+    "mapbox-gl": "^3.9.3",
+    "playwright": "1.50.0",
+    "vitest": "3.0.4",
     "vitest-browser-vue": "0.1.0",
     "vue": "^3.5.13"
   }
diff --git a/packages/tests/vitest.config.ts b/packages/tests/vitest.config.ts
@@ -13,9 +13,9 @@ export default defineConfig({
       include: ['vue-mapbox-gl/**'],
     },
     browser: {
-      provider: 'playwright', // or 'webdriverio'
+      provider: 'playwright',
       enabled: true,
-      name: 'chromium', // browser name is required
+      instances: [{ browser: 'chromium' }],
     },
   },
 });
diff --git a/packages/vue-mapbox-gl/package.json b/packages/vue-mapbox-gl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/vue-mapbox-gl",
-  "version": "2.7.0-alpha.2",
+  "version": "2.7.0-alpha.3",
   "description": "A small components library to use Mapbox GL in Vue 3.",
   "homepage": "https://github.com/studiometa/vue-mapbox-gl#readme",
   "bugs": {
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@mapbox/mapbox-gl-geocoder": "5.0.3",
-    "@studiometa/js-toolkit": "2.12.1",
+    "@studiometa/js-toolkit": "3.0.0",
     "mapbox-gl": "3.9.3",
     "vue": "3.5.13"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@studiometa/vue-mapbox-gl-demo",`
`3`		`- "version": "2.7.0-alpha.2",`
	`3`	`+ "version": "2.7.0-alpha.3",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"dev": "nuxt dev",`
`6`	`6`	`"build": "nuxt build"`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"@mapbox/mapbox-gl-geocoder": "^5.0.3",`
`10`	`10`	`"@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",`
`13`	`13`	`"vue": "^3.5.13"`
`14`	`14`	`}`
`15`	`15`	`}`