Skip to content

Commit

Permalink
chore: update nuxt + apply types fix #27
Browse files Browse the repository at this point in the history
  • Loading branch information
wazolab authored and frodrigo committed Apr 16, 2024
1 parent f7744dc commit 978c82e
Show file tree
Hide file tree
Showing 6 changed files with 4,192 additions and 5,273 deletions.
3 changes: 1 addition & 2 deletions components/DiffMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import type { PropType } from 'vue'
import { shallowRef } from 'vue'
import type { Geometry } from 'geojson'
import type { Geometry as TurfGeometry } from '@turf/helpers'
import type {
CircleLayerSpecification,
LineLayerSpecification,
Expand Down Expand Up @@ -42,7 +41,7 @@ export default defineNuxtComponent({
&& (this.baseGeom[0] === this.changeGeom[0]
|| (this.baseGeom
&& this.changeGeom
&& booleanEqual(this.baseGeom[0] as TurfGeometry, this.changeGeom[0] as TurfGeometry)))
&& booleanEqual(this.baseGeom[0], this.changeGeom[0])))
const bounds = new LngLatBounds(bbox({
type: 'GeometryCollection',
Expand Down
2 changes: 1 addition & 1 deletion components/Layout.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { PropType } from 'vue'
import type { LocaleObject } from '@nuxtjs/i18n/dist/runtime/composables'
import type { LocaleObject } from '@nuxtjs/i18n'
import type { User } from '~/libs/apiTypes'
export default defineNuxtComponent({
Expand Down
4 changes: 2 additions & 2 deletions components/UserGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
LngLatBounds,
Map,
} from 'maplibre-gl'
import type { Feature, MultiPolygon, Polygon } from 'geojson'
import type { Feature, FeatureCollection, MultiPolygon, Polygon } from 'geojson'
import bbox from '@turf/bbox'
import _ from 'underscore'
import type { UserGroup } from '~/libs/types'
Expand Down Expand Up @@ -57,7 +57,7 @@ export default defineNuxtComponent({
const geojson = {
type: 'FeatureCollection',
features: _.compact(allPolygons),
}
} as FeatureCollection
const bounds = new LngLatBounds(
bbox(geojson) as [number, number, number, number],
)
Expand Down
4 changes: 2 additions & 2 deletions libs/getAsyncData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type {
KeysOf,
_AsyncData,
_Transform,
} from 'nuxt/dist/app/composables/asyncData'
import type { NuxtApp } from 'nuxt/dist/app/nuxt'
} from '#app/composables/asyncData'
import type { NuxtApp } from '#app/nuxt'

import { useAsyncData } from '#imports'

Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
"dependencies": {
"@commitlint/types": "^19.0.3",
"@element-plus/icons-vue": "^2.0.10",
"@element-plus/nuxt": "^1.0.4",
"@turf/bbox": "^6.5.0",
"@turf/boolean-equal": "^6.5.0",
"@element-plus/nuxt": "1.0.7",
"@turf/bbox": "7.0.0-alpha.2",
"@turf/boolean-equal": "7.0.0-alpha.2",
"@turf/helpers": "7.0.0-alpha.2",
"@types/diff": "^5.0.9",
"@types/geojson": "^7946.0.10",
"dayjs": "^1.11.9",
"diff": "^5.1.0",
"element-plus": "^2.2.27",
"element-plus": "2.6.3",
"maplibre-gl": "^3.2.2",
"underscore": "^1.13.6",
"v-lazy-component": "^3.0.9",
Expand All @@ -32,8 +33,8 @@
"devDependencies": {
"@antfu/eslint-config": "^2.13.0",
"@babel/core": "^7.21.3",
"@commitlint/cli": "^17.1.2",
"@commitlint/config-conventional": "^17.1.0",
"@commitlint/cli": "^19.2.2",
"@commitlint/config-conventional": "^19.2.2",
"@nuxt/eslint": "^0.3.1",
"@nuxtjs/i18n": "^8.0.0-rc.2",
"@types/eslint": "^8.56.7",
Expand All @@ -44,7 +45,7 @@
"jest": "^29.1.2",
"jest-environment-jsdom": "^29.1.2",
"lint-staged": "^13.0.3",
"nuxt": "^3.4.2",
"nuxt": "^3.11.2",
"postcss-html": "^1.5.0",
"simple-git-hooks": "^2.11.1",
"typescript": "^5.4.5",
Expand Down
Loading

0 comments on commit 978c82e

Please sign in to comment.