Skip to content

Commit

Permalink
Try modelling every dependency as a dev dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
dopenguin committed Mar 8, 2024
1 parent b1d54be commit 4ac431c
Show file tree
Hide file tree
Showing 17 changed files with 258 additions and 184 deletions.
331 changes: 224 additions & 107 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.0.0-alpha.7

- Fix: Model every dependency as a devDependency.

## 2.0.0-alpha.6

- Fix: Remove vuetify plugin for rollup.
Expand Down
12 changes: 4 additions & 8 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,10 @@
"bundle": "tsc --declaration --emitDeclarationOnly && rollup -c",
"preversion": "npm run bundle"
},
"peerDependencies": {
"ol": "^7.1.0",
"olcs": "2.13.1"
},
"dependencies": {
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.2.1",
"@masterportal/masterportalapi": "2.8.0",
"@polar/lib-custom-types": "^1.4.0",
"@polar/lib-idx": "1.1.0-alpha.1",
"@polar/lib-get-cluster": "1.1.0-alpha.1",
"@polar/lib-invisible-style": "1.1.0-alpha.1",
Expand All @@ -49,13 +46,12 @@
"i18next-vue": "^1.1.0",
"lodash.merge": "^4.6.2",
"lodash.kebabcase": "^4.1.1",
"ol": "^7.1.0",
"olcs": "2.13.1",
"vue": "^2.6.14",
"vuetify": "^2.5.9",
"vuex": "^3.6.2"
},
"devDependencies": {
"@polar/lib-custom-types": "^1.4.0"
},
"nx": {
"includedScripts": [
"bundle"
Expand Down
1 change: 0 additions & 1 deletion packages/core/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const external = createFilter(
'olcs',
'vue',
'vuetify',
'vuetify/lib/components',
'vuex',
],
null,
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/components/MapContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ 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'
Expand All @@ -63,7 +62,6 @@ export default Vue.extend({
components: {
MapUi,
MoveHandle,
VApp,
},
props: {
mapConfiguration: {
Expand Down
8 changes: 0 additions & 8 deletions packages/core/src/components/MoveHandle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
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 {
Expand Down Expand Up @@ -55,12 +53,6 @@ function calculateTop(
export default Vue.extend({
name: 'MoveHandle',
components: {
VBtn,
VCardActions,
VIcon,
VSpacer,
},
props: {
closeLabel: {
type: String,
Expand Down
6 changes: 5 additions & 1 deletion packages/plugins/AddressSearch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# CHANGELOG

## 2.0.0-alpha.4

- Fix: Model every dependency as a devDependency.

## 2.0.0-alpha.3

- Fix: Remove vuetify plugin for rollup.
- - Fix: Import vuetify components so they can be externalized by rollup.
- Fix: Import vuetify components, so they can be externalized by rollup.

## 2.0.0-alpha.2

Expand Down
13 changes: 4 additions & 9 deletions packages/plugins/AddressSearch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,16 @@
"bundle": "tsc --declaration --emitDeclarationOnly && rollup -c",
"preversion": "npm run bundle"
},
"peerDependencies": {
"devDependencies": {
"@polar/lib-custom-types": "^1.0.0",
"@polar/lib-get-features": "2.0.0-alpha.1",
"@masterportal/masterportalapi": "2.8.0",
"@repositoryname/vuex-generators": "^1.1.2",
"lodash.debounce": "^4.0.8",
"ol": "7.1.0",
"vue": "^2.6.14",
"vuetify": "^2.5.9",
"vuex": "^3.6.2"
},
"dependencies": {
"@polar/lib-get-features": "2.0.0-alpha.1",
"lodash.debounce": "^4.0.8"
},
"devDependencies": {
"@polar/lib-custom-types": "^1.0.0"
},
"nx": {
"includedScripts": [
"bundle"
Expand Down
1 change: 0 additions & 1 deletion packages/plugins/AddressSearch/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const external = createFilter(
'lodash.debounce',
'ol/**',
'vue',
'vuetify/lib/components',
'vuex',
],
null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<script lang="ts">
import Vue from 'vue'
import { VContainer, VToolbar } from 'vuetify/lib/components'
import { mapGetters } from 'vuex'
import GroupSelect from './GroupSelect.vue'
import Results from './Results.vue'
Expand All @@ -26,8 +25,6 @@ export default Vue.extend({
GroupSelect,
SearchInput,
Results,
VContainer,
VToolbar,
},
computed: {
...mapGetters(['clientWidth', 'hasSmallWidth', 'hasWindowSize']),
Expand Down
4 changes: 0 additions & 4 deletions packages/plugins/AddressSearch/src/components/GroupSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@

<script lang="ts">
import Vue from 'vue'
import { VSelect } from 'vuetify/lib/components'
import { mapGetters, mapActions } from 'vuex'
export default Vue.extend({
name: 'AddressSearchGroupSelect',
components: {
VSelect,
},
computed: {
...mapGetters('plugin/addressSearch', [
'selectedGroupId',
Expand Down
4 changes: 0 additions & 4 deletions packages/plugins/AddressSearch/src/components/Input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@

<script lang="ts">
import Vue from 'vue'
import { VTextField } from 'vuetify/lib/components'
import { mapActions, mapGetters } from 'vuex'
import { focusFirstResult } from '../utils/focusFirstResult'
export default Vue.extend({
name: 'AddressSearchInput',
components: {
VTextField,
},
computed: {
...mapGetters('plugin/addressSearch', [
'featureListsWithCategory',
Expand Down
16 changes: 0 additions & 16 deletions packages/plugins/AddressSearch/src/components/Results.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,28 +96,12 @@

<script lang="ts">
import Vue from 'vue'
import {
VBtn,
VCard,
VIcon,
VList,
VListItem,
VSubheader,
} from 'vuetify/lib/components'
import { mapGetters, mapActions } from 'vuex'
import { focusFirstResult } from '../utils/focusFirstResult'
import { emTitleByInput } from '../utils/emTitleByInput'
export default Vue.extend({
name: 'AddressSearchResults',
components: {
VBtn,
VCard,
VIcon,
VList,
VListItem,
VSubheader,
},
data: () => ({
openCategories: [] as string[],
}),
Expand Down
3 changes: 2 additions & 1 deletion packages/plugins/Gfi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# CHANGELOG

## unpublished
## 2.0.0-alpha.3

- Fix: Remove vuetify plugin for rollup.
- Fix: Model every dependency as a devDependency.

## 2.0.0-alpha.2

Expand Down
20 changes: 8 additions & 12 deletions packages/plugins/Gfi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,21 @@
"bundle": "tsc --declaration --emitDeclarationOnly && rollup -c",
"preversion": "npm run bundle"
},
"peerDependencies": {
"devDependencies": {
"@masterportal/masterportalapi": "2.8.0",
"@polar/lib-custom-types": "^1.2.0",
"@polar/lib-get-cluster": "1.1.0-alpha.1",
"@polar/lib-invisible-style": "1.1.0-alpha.1",
"@polar/lib-test-mount-parameters": "^1.1.0",
"@polar/lib-tooltip": "1.1.0-alpha.1",
"@repositoryname/vuex-generators": "^1.1.2",
"just-compare": "^2.3.0",
"lodash.debounce": "^4.0.8",
"i18next": "^23.7.16",
"ol": "^7.1.0",
"vue": "^2.6.14",
"vuex": "^3.6.2"
},
"dependencies": {
"@polar/lib-get-cluster": "1.1.0-alpha.1",
"@polar/lib-invisible-style": "1.1.0-alpha.1",
"@polar/lib-tooltip": "1.1.0-alpha.1",
"just-compare": "^2.3.0",
"lodash.debounce": "^4.0.8"
},
"devDependencies": {
"@polar/lib-custom-types": "^1.2.0",
"@polar/lib-test-mount-parameters": "^1.1.0"
},
"nx": {
"includedScripts": [
"bundle"
Expand Down
4 changes: 4 additions & 0 deletions packages/plugins/Pins/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.0.0-alpha.2

- Fix: Model every dependency as a devDependency.

## 2.0.0-alpha.1

- Breaking: As a result of the bundling with `rollup`, the styles of the package need to be imported via `@polar/plugin-pins/styles.css`.
Expand Down
10 changes: 3 additions & 7 deletions packages/plugins/Pins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,12 @@
"bundle": "tsc --declaration --emitDeclarationOnly && rollup -c",
"preversion": "npm run bundle"
},
"peerDependencies": {
"@repositoryname/vuex-generators": "^1.1.2",
"ol": "^7.1.0"
},
"dependencies": {
"@polar/lib-passes-boundary-check": "2.1.0-alpha.1"
},
"devDependencies": {
"@polar/lib-custom-types": "^1.0.0",
"@polar/lib-passes-boundary-check": "2.1.0-alpha.1",
"@polar/lib-test-mount-parameters": "^1.0.0",
"@repositoryname/vuex-generators": "^1.1.2",
"ol": "^7.1.0",
"vue": "^2.6.14"
},
"nx": {
Expand Down

0 comments on commit 4ac431c

Please sign in to comment.