Skip to content

Commit

Permalink
Updated vue.
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixRilling committed Oct 29, 2022
1 parent eb3880b commit 004c7ce
Show file tree
Hide file tree
Showing 32 changed files with 120 additions and 118 deletions.
109 changes: 60 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"test": "vue-cli-service test:unit"
},
"dependencies": {
"@vue/composition-api": "^1.7.0",
"axios": "^0.27.2",
"base64-js": "^1.5.1",
"bootstrap": "^4.6.1",
Expand All @@ -41,7 +40,7 @@
"pako": "^2.0.4",
"reflect-metadata": "^0.1.13",
"tippy.js": "^6.3.7",
"vue": "~2.6.14",
"vue": "^2.7.13",
"vue-select": "^3.18.3",
"vuedraggable": "github:FelixRilling/Vue.Draggable#fb1243deb651bc3d97f9df71834d0aeab98e4dd2",
"vuex": "^3.6.2"
Expand Down Expand Up @@ -76,6 +75,6 @@
"ts-jest": "^27.0.4",
"ts-mockito": "^2.6.1",
"typescript": "~4.7.4",
"vue-template-compiler": "~2.6.14"
"vue-template-compiler": "^2.7.13"
}
}
2 changes: 1 addition & 1 deletion src/application/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { getLogger, TYPES } from "@/core/lib";
import { applicationContainer } from "./inversify.config";
import { APPLICATION_TYPES } from "./types";
import { DECK_REPLACE } from "./store/modules/deck";
import { computed, defineComponent, onMounted } from "@vue/composition-api";
import { computed, defineComponent, onMounted } from "vue";
import { BOverlay } from "bootstrap-vue";
import { showError } from "./composition/feedback";
import YgoDeck from "./components/deck/YgoDeck.vue";
Expand Down
4 changes: 2 additions & 2 deletions src/application/components/YgoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</template>

<script lang="ts">
import type { PropType } from "@vue/composition-api";
import { computed, defineComponent } from "@vue/composition-api";
import type { PropType } from "vue";
import { computed, defineComponent } from "vue";
import type { Card } from "@/core/lib";
import type { ResourceService } from "@/ygoprodeck/lib";
import { YGOPRODECK_TYPES } from "@/ygoprodeck/lib";
Expand Down
10 changes: 2 additions & 8 deletions src/application/components/YgoFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,8 @@ import {
Environment,
TYPES,
} from "@/core/lib";
import type { PropType } from "@vue/composition-api";
import {
computed,
defineComponent,
reactive,
readonly,
watch,
} from "@vue/composition-api";
import type { PropType } from "vue";
import { computed, defineComponent, reactive, readonly, watch } from "vue";
import { clone } from "lodash";
import VSelect from "vue-select";
Expand Down
4 changes: 2 additions & 2 deletions src/application/components/YgoPrice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ import type {
Vendor,
} from "@/core/lib";
import { DEFAULT_VENDOR_ARR, TYPES } from "@/core/lib";
import type { PropType } from "@vue/composition-api";
import { computed, defineComponent, ref } from "@vue/composition-api";
import type { PropType } from "vue";
import { computed, defineComponent, ref } from "vue";
import { BTooltip } from "bootstrap-vue";
const priceService = applicationContainer.get<PriceService>(TYPES.PriceService);
Expand Down
4 changes: 2 additions & 2 deletions src/application/components/builder/YgoBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import { SortingOrder, SortingStrategy, TYPES } from "@/core/lib";
import YgoFilter from "../YgoFilter.vue";
import YgoSortingOptions from "./YgoSortingOptions.vue";
import YgoBuilderMatches from "./YgoBuilderMatches.vue";
import type { PropType } from "@vue/composition-api";
import { computed, defineComponent, ref } from "@vue/composition-api";
import type { PropType } from "vue";
import { computed, defineComponent, ref } from "vue";
import { BSidebar } from "bootstrap-vue";
import { useStore } from "../../store/store";
Expand Down
4 changes: 2 additions & 2 deletions src/application/components/builder/YgoBuilderMatches.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
</template>

<script lang="ts">
import type { PropType } from "@vue/composition-api";
import { computed, defineComponent } from "@vue/composition-api";
import type { PropType } from "vue";
import { computed, defineComponent } from "vue";
import { browserSupportsTouch } from "@/browser-common/lib";
import type { Card, CardCountFunction, DeckService } from "@/core/lib";
import { CardTypeCategory, TYPES } from "@/core/lib";
Expand Down
4 changes: 2 additions & 2 deletions src/application/components/builder/YgoSortingOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</template>

<script lang="ts">
import type { PropType } from "@vue/composition-api";
import { defineComponent, reactive } from "@vue/composition-api";
import type { PropType } from "vue";
import { defineComponent, reactive } from "vue";
import type { SortingOptions } from "@/core/lib";
import { SortingOrder, SortingStrategy } from "@/core/lib";
import { clone } from "lodash";
Expand Down

0 comments on commit 004c7ce

Please sign in to comment.