Merge branch 'next' into chore/update-mpapi

Author: warm-coolguy

examples/iceberg/components/IcebergMap.vue

@@ -198,7 +198,7 @@ const exportPluginActive = computed({
 		if (!map.value) {
 			return
 		}
-		return Boolean(getStore(map.value, 'export'))
+		return getStore(map.value, 'core').usedPlugins.includes('export')
 	},
 	set: (value: boolean) => {
 		if (!map.value) {

package-lock.json

@@ -127,10 +127,10 @@
 		"vite-plugin-checker": "^0.14.1",
 		"vite-plugin-commonjs": "^0.10.4",
 		"vite-plugin-kern-extra-icons": "^0.6.1",
-		"vite-plugin-vue-devtools": "^8.1.2",
+		"vite-plugin-vue-devtools": "^8.1.3",
 		"vitest": "^4.1.8",
 		"vue": "^3.5.38",
-		"vue-tsc": "^3.3.4",
+		"vue-tsc": "^3.3.5",
 		"xml2js": "^0.6.2"
 	},
 	"//": "Relevant overrides until the respective packages fix these vulnerable versions themselves.",

package.json

@@ -4,7 +4,7 @@
 			:id="`polar-${type}-${value}-${idSuffix}`"
 			v-model="model"
 			:class="`polar-input kern-form-check__${type}`"
-			:name="value"
+			:name="name"
 			:value="value"
 			:type="type"
 			:disabled="disabled"
@@ -23,6 +23,7 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
 	idSuffix: string
+	name: string
 	type: T
 	value: string
 	disabled?: boolean

src/components/PolarInput.ce.vue

@@ -41,12 +41,15 @@ import {
 	watch,
 } from 'vue'
 
-import type { MapConfiguration, MasterportalApiServiceRegister } from '../types'
-
 import { useT } from '../composables/useT'
 import { useCoreStore } from '../stores'
 import { useMainStore } from '../stores/main'
 import { useMoveHandleStore } from '../stores/moveHandle'
+import {
+	CoreId,
+	type MapConfiguration,
+	type MasterportalApiServiceRegister,
+} from '../types'
 import { loadKern } from '../utils/loadKern'
 import { teardownMarkers } from '../utils/map/setupMarkers'
 import { mapZoomOffset } from '../utils/mapZoomOffset'
@@ -76,10 +79,10 @@ const overlay =
 
 const isMacOS = navigator.userAgent.indexOf('Mac') !== -1
 const noCommandOnZoom = useT(() =>
-	t(($) => $.overlay.noCommandOnZoom, { ns: 'core' })
+	t(($) => $.overlay.noCommandOnZoom, { ns: CoreId })
 )
 const noControlOnZoom = useT(() =>
-	t(($) => $.overlay.noControlOnZoom, { ns: 'core' })
+	t(($) => $.overlay.noControlOnZoom, { ns: CoreId })
 )
 
 function wheelEffect(event: WheelEvent) {
@@ -95,7 +98,7 @@ function wheelEffect(event: WheelEvent) {
 }
 
 const oneFingerPan = useT(() =>
-	t(($) => $.overlay.oneFingerPan, { ns: 'core' })
+	t(($) => $.overlay.oneFingerPan, { ns: CoreId })
 )
 let hammer: { destroy: () => void } | null = null
 function updateListeners() {

src/core/components/PolarContainer.ce.vue

@@ -4,7 +4,7 @@
 		class="polar-map"
 		tabindex="0"
 		role="region"
-		:aria-label="$t(($) => $.canvas.label, { ns: 'core' })"
+		:aria-label="$t(($) => $.canvas.label, { ns: CoreId })"
 		@wheel="(e) => $emit('wheel', e)"
 	/>
 </template>
@@ -19,6 +19,7 @@ import { storeToRefs } from 'pinia'
 import { markRaw, onBeforeUnmount, onMounted, useTemplateRef, watch } from 'vue'
 
 import { useMainStore } from '../stores/main'
+import { CoreId } from '../types'
 import { checkServiceAvailability } from '../utils/checkServiceAvailability'
 import { createKeyboardInteractions } from '../utils/interactions'
 import { setupMarkers } from '../utils/map/setupMarkers'

src/core/components/PolarMap.ce.vue

@@ -6,3 +6,5 @@ export * from './types/moveHandle'
 export * from './types/plugin'
 export * from './types/theme'
 export * from './types/utils'
+
+export const CoreId = 'core'

src/core/types.ts

@@ -2,7 +2,7 @@ import type { ResourceKey } from 'i18next'
 
 import type { BundledPluginId, BundledPluginLocaleResources } from '@/core'
 import type { resourcesEn as core } from '@/core/locales'
-import type { CoreId } from '@/core/vuePlugins/i18next'
+import type { CoreId } from '@/core/types'
 
 /** @internal */
 export interface Locale {

src/core/types/locales.ts

@@ -3,10 +3,11 @@ import { t } from 'i18next'
 
 import { notifyUser } from '@/lib/notifyUser'
 
-import type {
-	MapConfiguration,
-	MasterportalApiServiceRegister,
-	ServiceAvailabilityCheck,
+import {
+	CoreId,
+	type MapConfiguration,
+	type MasterportalApiServiceRegister,
+	type ServiceAvailabilityCheck,
 } from '../types'
 
 export function checkServiceAvailability(
@@ -44,7 +45,7 @@ export function checkServiceAvailability(
 					if (statusCode !== 200) {
 						notifyUser('warning', () =>
 							t(($) => $.error.serviceUnavailable, {
-								ns: 'core',
+								ns: CoreId,
 								serviceId,
 								serviceName,
 							})

src/core/utils/checkServiceAvailability.ts

@@ -5,8 +5,7 @@ import LanguageDetector from 'i18next-browser-languagedetector'
 import I18NextVue from 'i18next-vue'
 
 import locales from '../locales'
-
-export const CoreId = 'core'
+import { CoreId } from '../types'
 
 export const I18Next: Plugin = {
 	async install(app) {