From 84fbd608f1a24b9d2d97fc54a47135553648b222 Mon Sep 17 00:00:00 2001
From: Matthias Mohr <m.mohr@uni-muenster.de>
Date: Wed, 3 Nov 2021 18:10:39 +0100
Subject: [PATCH] Fix bundling issue with Leaflet, v2.6.2 (really)

---
 CHANGELOG.md                     | 1 +
 components/Collection.vue        | 4 +---
 components/Item.vue              | 4 ----
 components/internal/StacMixin.js | 3 ++-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73430e0..f637c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Improved UX for blocks (context-sensitive cursors etc.)
 - Rendering of data types has been improved
 - Process return values consisting of multiple data types don't always return `any`
+- Don't include Leaflet multiple times (bundles got larger starting with v2.6.0)
 
 ## [2.6.1] - 2021-09-07
 
diff --git a/components/Collection.vue b/components/Collection.vue
index 25e566f..39532a5 100644
--- a/components/Collection.vue
+++ b/components/Collection.vue
@@ -151,14 +151,12 @@
 import Utils from '../utils';
 import { Formatters } from '@radiantearth/stac-fields';
 import StacMixin from './internal/StacMixin.js';
-import StacAsset from './internal/StacAsset.vue';
 import { isoDuration, en } from '@musement/iso-duration';
 
 export default {
 	name: 'Collection',
 	components: {
-		ObjectTree: () => import('./ObjectTree.vue'),
-		StacAsset
+		ObjectTree: () => import('./ObjectTree.vue')
 	},
 	mixins: [StacMixin],
 	// Mixins don't work properly in web components,
diff --git a/components/Item.vue b/components/Item.vue
index 9353391..32ba4b0 100644
--- a/components/Item.vue
+++ b/components/Item.vue
@@ -57,16 +57,12 @@
 </template>
 
 <script>
-import StacAsset from './internal/StacAsset.vue';
 import StacMixin from './internal/StacMixin.js';
 import Utils from '../utils';
 
 export default {
 	name: 'Item',
 	mixins: [StacMixin],
-	components: {
-		StacAsset
-	},
 	// Mixins don't work properly in web components,
 	// see https://github.com/vuejs/vue-web-component-wrapper/issues/30
 	props: {...StacMixin.props},
diff --git a/components/internal/StacMixin.js b/components/internal/StacMixin.js
index 4ca3818..3ed6be8 100644
--- a/components/internal/StacMixin.js
+++ b/components/internal/StacMixin.js
@@ -10,6 +10,7 @@ export default {
 		Description: () => import('../Description.vue'),
 		DeprecationNotice: () => import('../DeprecationNotice.vue'),
 		LinkList: () => import('../LinkList.vue'),
+		StacAsset: () => import('../internal/StacAsset.vue'),
 		StacFields: () => import('../internal/StacFields.vue')
 	},
 	props: {
@@ -110,7 +111,7 @@ export default {
 				// is running. For all other cases store Leaflet in this.map.leaflet, which can be used in other places.
 				let hasLeaflet = () => Utils.isObject(window.L) && Versions.validate(window.L.version) && Versions.compare(window.L.version, "1.x.x", "=");
 				if (!hasLeaflet()) {
-					window.L = require('leaflet');
+					window.L = await import('leaflet');
 				}
 				if (!hasLeaflet()) {
 					console.warn("Leaflet is not available");