Skip to content

Commit 12493bd

Browse files
authored
Merge pull request #754 from wmde/update-definecomponent
Update defineComponent
2 parents 278cd8b + 6e1463c commit 12493bd

14 files changed

+29
-33
lines changed

resources/js/Components/AuthWidget.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010

1111
<script lang="ts">
1212
13-
import Vue, { PropType } from 'vue';
13+
import type { PropType } from 'vue';
14+
import { defineComponent } from 'vue';
1415
import User from '../types/User';
1516
import { Link as WikitLink } from '@wmde/wikit-vue-components';
1617
17-
export default Vue.extend({
18+
export default defineComponent({
1819
props: {
1920
user: Object as PropType<User>
2021
},

resources/js/Components/LanguageSelector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import LanguageSelectorInput from '../Components/LanguageSelectorInput.vue';
3636
import LanguageSelectorOptionsMenu from '../Components/LanguageSelectorOptionsMenu.vue';
3737
import Language from '../types/Language';
38-
import Vue from 'vue';
38+
import { defineComponent } from 'vue';
3939
import languagedata from '@wikimedia/language-data';
4040
import closeUrl from '../../img/close.svg';
4141
42-
export default Vue.extend( {
42+
export default defineComponent( {
4343
name: 'LanguageSelector',
4444
components: {
4545
LanguageSelectorInput,

resources/js/Components/LanguageSelectorInput.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
</template>
3030

3131
<script lang="ts">
32-
import Vue from 'vue';
32+
import { defineComponent } from 'vue';
3333
import searchUrl from '../../img/search.svg';
3434
import clearUrl from '../../img/clear.svg';
3535
36-
export default Vue.extend( {
36+
export default defineComponent( {
3737
name: 'LanguageSelectorInput',
3838
props: {
3939
value: {

resources/js/Components/LanguageSelectorOptionsMenu.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535

3636
<script lang="ts">
3737
import Language from '../types/Language';
38-
import Vue, { PropType } from 'vue';
38+
import type { PropType } from 'vue';
39+
import { defineComponent } from 'vue';
3940
40-
export default Vue.extend( {
41+
export default defineComponent( {
4142
name: 'LanguageSelectorOptionsMenu',
4243
props: {
4344
languages: {

resources/js/Components/LoadingOverlay.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</template>
77

88
<script lang="ts">
9-
import Vue from 'vue';
9+
import { defineComponent } from 'vue';
1010
11-
export default Vue.extend({
11+
export default defineComponent({
1212
name: 'LoadingOverlay',
1313
props: {
1414
delay: {

resources/js/Components/MismatchRow.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@
107107
<script lang="ts">
108108
import { formatISO } from 'date-fns';
109109
110-
import Vue, { PropType } from 'vue';
110+
import type { PropType } from 'vue';
111+
import { defineComponent } from 'vue';
111112
import {
112113
Button as WikitButton,
113114
Dialog as WikitDialog,
@@ -133,7 +134,7 @@ interface MismatchRowState {
133134
decision: ReviewMenuItem;
134135
}
135136
136-
export default Vue.extend({
137+
export default defineComponent({
137138
components: {
138139
WikitButton,
139140
WikitLink,

resources/js/Components/MismatchesTable.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
</template>
2424

2525
<script lang="ts">
26-
import Vue, { PropType } from 'vue';
26+
import type { PropType } from 'vue';
27+
import { defineComponent } from 'vue';
2728
import { Table as WikitTable } from '@wmde/wikit-vue-components';
2829
2930
import MismatchRow from './MismatchRow.vue';
3031
3132
import { LabelledMismatch } from '../types/Mismatch';
3233
33-
export default Vue.extend({
34+
export default defineComponent({
3435
components: {
3536
MismatchRow,
3637
WikitTable,

resources/js/Components/WikidataToolFooter.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
</template>
3232

3333
<script lang="ts">
34-
import Vue, { PropType } from 'vue';
34+
import type { PropType } from 'vue';
35+
import { defineComponent } from 'vue';
3536
import { Link as WikitLink } from '@wmde/wikit-vue-components';
3637
3738
interface FooterLabels {
@@ -45,7 +46,7 @@ interface FooterUrls {
4546
issues: string;
4647
}
4748
48-
export default Vue.extend({
49+
export default defineComponent({
4950
name: 'WikidataToolFooter',
5051
components: {
5152
WikitLink,

resources/js/Pages/Error.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</template>
77

88
<script>
9-
import Vue from 'vue';
9+
import { defineComponent } from 'vue';
1010
11-
export default Vue.extend({
11+
export default defineComponent({
1212
props: {
1313
title: String,
1414
description: String

resources/js/Pages/Home.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@
117117
Message,
118118
TextArea
119119
} from '@wmde/wikit-vue-components';
120-
121-
import defineComponent from '../types/defineComponent';
120+
import { defineComponent } from 'vue';
122121
123122
interface HomeState {
124123
form: {

resources/js/Pages/Layout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import AuthWidget from '../Components/AuthWidget.vue';
7575
import LanguageSelector from '../Components/LanguageSelector.vue';
7676
import WikidataToolFooter from '../Components/WikidataToolFooter.vue';
7777
import { DirectiveBinding } from 'vue/types/options';
78-
import defineComponent from '../types/defineComponent';
78+
import { defineComponent } from 'vue';
7979
import User from '../types/User';
8080
import languagedata from '@wikimedia/language-data';
8181

resources/js/Pages/Playground.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
</template>
264264

265265
<script lang="ts">
266-
import defineComponent from '../types/defineComponent';
266+
import { defineComponent } from 'vue';
267267
import { Head as InertiaHead } from '@inertiajs/inertia-vue3'
268268
269269
import {

resources/js/Pages/Results.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,13 @@
146146
Icon,
147147
Message } from '@wmde/wikit-vue-components';
148148
149+
import { CdxDialog } from "@wikimedia/codex";
150+
149151
import LoadingOverlay from '../Components/LoadingOverlay.vue';
150152
import MismatchesTable from '../Components/MismatchesTable.vue';
151153
import Mismatch, {ReviewDecision, LabelledMismatch} from '../types/Mismatch';
152154
import User from '../types/User';
153-
import defineComponent from '../types/defineComponent';
155+
import { defineComponent } from 'vue';
154156
import axios from 'axios';
155157
156158
interface MismatchDecision {

resources/js/types/defineComponent.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)