diff --git a/package-lock.json b/package-lock.json index 49048346d..361f84bc8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19091,6 +19091,7 @@ "@repositoryname/vuex-generators": "^1.1.2", "ol": "7.1.0", "vue": "^2.6.14", + "vuetify": "^2.5.9", "vuex": "^3.6.2" } }, @@ -19221,6 +19222,7 @@ "i18next": "^23.7.16", "ol": "^7.1.0", "vue": "^2.6.14", + "vuetify": "^2.5.9", "vuex": "^3.6.2" } }, diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index c9199b176..4a5bff483 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,8 +1,9 @@ # CHANGELOG -## unpublished +## 2.0.0-alpha.5 - Fix: Remove vuetify plugin for rollup. +- Fix: Import vuetify components so they can be externalized by rollup. ## 2.0.0-alpha.5 diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 6a284f4a0..ad10e1f61 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -23,6 +23,7 @@ const external = createFilter( 'olcs', 'vue', 'vuetify', + 'vuetify/lib/components', 'vuex', ], null, diff --git a/packages/core/src/components/MapContainer.vue b/packages/core/src/components/MapContainer.vue index ae001c8bf..f407b6576 100644 --- a/packages/core/src/components/MapContainer.vue +++ b/packages/core/src/components/MapContainer.vue @@ -51,6 +51,7 @@ import Hammer from 'hammerjs' import i18next from 'i18next' import { defaults } from 'ol/interaction' import { LanguageOption, MoveHandleProperties } from '@polar/lib-custom-types' +import { VApp } from 'vuetify/lib/components' import { SMALL_DISPLAY_HEIGHT, SMALL_DISPLAY_WIDTH } from '../utils/constants' import { addClusterStyle } from '../utils/addClusterStyle' import MapUi from './MapUi.vue' @@ -62,6 +63,7 @@ export default Vue.extend({ components: { MapUi, MoveHandle, + VApp, }, props: { mapConfiguration: { diff --git a/packages/core/src/components/MoveHandle.vue b/packages/core/src/components/MoveHandle.vue index f01d9df6c..7fbdf0081 100644 --- a/packages/core/src/components/MoveHandle.vue +++ b/packages/core/src/components/MoveHandle.vue @@ -23,6 +23,8 @@ import Vue from 'vue' import { mapGetters, mapMutations } from 'vuex' +import { VBtn, VCardActions, VIcon, VSpacer } from 'vuetify/lib/components' + type EndEventName = 'touchend' | 'mouseup' type MoveEventName = 'touchmove' | 'mousemove' interface MoveEventNames { @@ -53,6 +55,12 @@ function calculateTop( export default Vue.extend({ name: 'MoveHandle', + components: { + VBtn, + VCardActions, + VIcon, + VSpacer, + }, props: { closeLabel: { type: String, diff --git a/packages/plugins/AddressSearch/CHANGELOG.md b/packages/plugins/AddressSearch/CHANGELOG.md index e2cc838a0..650861e51 100644 --- a/packages/plugins/AddressSearch/CHANGELOG.md +++ b/packages/plugins/AddressSearch/CHANGELOG.md @@ -1,8 +1,9 @@ # CHANGELOG -## unpublished +## 2.0.0-alpha.3 - Fix: Remove vuetify plugin for rollup. +- - Fix: Import vuetify components so they can be externalized by rollup. ## 2.0.0-alpha.2 diff --git a/packages/plugins/AddressSearch/package.json b/packages/plugins/AddressSearch/package.json index 05a235808..37752dadc 100644 --- a/packages/plugins/AddressSearch/package.json +++ b/packages/plugins/AddressSearch/package.json @@ -36,6 +36,7 @@ "@repositoryname/vuex-generators": "^1.1.2", "ol": "7.1.0", "vue": "^2.6.14", + "vuetify": "^2.5.9", "vuex": "^3.6.2" }, "dependencies": { diff --git a/packages/plugins/AddressSearch/rollup.config.js b/packages/plugins/AddressSearch/rollup.config.js index ec4bfc07b..6991ab920 100644 --- a/packages/plugins/AddressSearch/rollup.config.js +++ b/packages/plugins/AddressSearch/rollup.config.js @@ -14,6 +14,7 @@ const external = createFilter( 'lodash.debounce', 'ol/**', 'vue', + 'vuetify/lib/components', 'vuex', ], null, diff --git a/packages/plugins/AddressSearch/src/components/AddressSearch.vue b/packages/plugins/AddressSearch/src/components/AddressSearch.vue index 2738de673..7695af9ab 100644 --- a/packages/plugins/AddressSearch/src/components/AddressSearch.vue +++ b/packages/plugins/AddressSearch/src/components/AddressSearch.vue @@ -14,6 +14,7 @@