Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build errors #100

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"resolutions": {
"**/webpack": "5",
"@types/node": "^20",
"@types/node": "16.4.3",
"glob": "7.2.3"
},
"scripts": {
Expand Down
5 changes: 2 additions & 3 deletions pkg/capi/components/ExperimentalBanner.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<script lang="ts">
import { defineComponent } from 'vue';
import Banner from '@components/Banner/Banner.vue';

export default defineComponent({
export default {
name: 'ExperimentalWarningBanner',

components: { Banner },

});
};
</script>

<template><Banner color="warning" label-key="capi.experimental" /></template>
8 changes: 4 additions & 4 deletions pkg/capi/edit/cluster.x-k8s.io.cluster/ClusterConfig.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang='ts'>
import { defineComponent, PropType } from 'vue';
import { PropType } from 'vue';
import { set, clone } from '@shell/utils/object';
import { clear } from '@shell/utils/array';
import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
Expand All @@ -13,7 +13,7 @@ import ClusterClassVariables from '../../components/CCVariables/index.vue';
import {
versionTest, versionValidator, hostValidator, portValidator, cidrValidator, cidrArrayValid
} from '../../util/validators';
import { ClusterClass, Worker } from '../../types/capi';
import { ClusterClass, Worker, CAPIClusterTopology, CAPIClusterNetwork, CAPIClusterCPEndpoint } from '../../types/capi';
import CardGrid from '../../components/CardGrid.vue';
import WorkerItem from './WorkerItem.vue';
import NetworkSection from './NetworkSection.vue';
Expand All @@ -40,7 +40,7 @@ const defaultCPEndpointConfig: CAPIClusterCPEndpoint = {
port: 49152
};

export default defineComponent({
export default {
name: 'ClusterConfig',
components: {
CruResource,
Expand Down Expand Up @@ -307,7 +307,7 @@ export default defineComponent({
this.setNamespace();
}
}
});
};
</script>
<template>
<CruResource
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { mapGetters } from 'vuex';
import { _EDIT } from '@shell/config/query-params';
import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';

export default defineComponent({
export default {
name: 'ControlPlaneEndpointSection',
components: { LabeledInput },
emits: ['update:value'],
Expand All @@ -31,7 +30,7 @@ export default defineComponent({
return this.mode === _EDIT;
}
}
});
};
</script>
<template>
<div>
Expand Down
5 changes: 2 additions & 3 deletions pkg/capi/edit/cluster.x-k8s.io.cluster/NetworkSection.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { mapGetters } from 'vuex';
import { _EDIT } from '@shell/config/query-params';
import ArrayList from '@shell/components/form/ArrayList.vue';
import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';

export default defineComponent({
export default {
components: {
LabeledInput,
ArrayList
Expand Down Expand Up @@ -35,7 +34,7 @@ export default defineComponent({
return this.mode === _EDIT;
},
}
});
};
</script>
<template>
<div>
Expand Down
5 changes: 2 additions & 3 deletions pkg/capi/edit/cluster.x-k8s.io.cluster/WorkerItem.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<script lang="ts">
import { defineComponent } from 'vue';
import debounce from 'lodash/debounce';
import { removeAt } from '@shell/utils/array';
import { clone } from '@shell/utils/object';
import { _EDIT, _VIEW } from '@shell/config/query-params';
import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';

export default defineComponent({
export default {
components: { LabeledSelect, LabeledInput },
emits: ['add', 'remove', 'update:value'],
props: {
Expand Down Expand Up @@ -140,7 +139,7 @@ export default defineComponent({
key.value.name = val.data
}
}
});
};
</script>
<template>
<div>
Expand Down
8 changes: 3 additions & 5 deletions pkg/capi/edit/cluster.x-k8s.io.cluster/index.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { SUB_TYPE } from '@shell/config/query-params';
import { set } from '@shell/utils/object';
import CreateEditView from '@shell/mixins/create-edit-view';
import Loading from '@shell/components/Loading.vue';
import CruResource from '@shell/components/CruResource.vue';
import type { Route } from 'vue-router';
import { CAPI, QUERY_PARAMS, ClusterClass } from '../../types/capi';
import ClusterConfig from './ClusterConfig.vue';

export default defineComponent({
export default {
name: 'CreateCluster',
components: {
CruResource,
Expand Down Expand Up @@ -51,7 +49,7 @@ export default defineComponent({
});
},
data() {
const route = this.$route as Route;
const route = this.$route;
const subType = route.query[SUB_TYPE] || null;
const classFromURL = route.query[QUERY_PARAMS.CLASS];
const curClass = this.value?.spec?.topology?.class;
Expand All @@ -77,7 +75,7 @@ export default defineComponent({
});
}
}
});
};
</script>

<template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang='ts'>
import { defineComponent } from 'vue';
import { mapGetters } from 'vuex';
import CreateEditView from '@shell/mixins/create-edit-view';
import { clear } from '@shell/utils/array';
Expand Down Expand Up @@ -55,7 +54,7 @@ interface Hash {
coreProviderSecret: Secret[]
}

export default defineComponent({
export default {
name: 'ProviderConfig',
components: {
CruResource,
Expand Down Expand Up @@ -229,7 +228,7 @@ export default defineComponent({
}
}
}
});
};
</script>

<template>
Expand Down
5 changes: 2 additions & 3 deletions pkg/capi/edit/turtles-capi.cattle.io.capiprovider/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang="ts">
import { defineComponent } from 'vue';
import CreateEditView from '@shell/mixins/create-edit-view';
import CruResource from '@shell/components/CruResource.vue';
import SelectIconGrid from '@shell/components/SelectIconGrid.vue';
Expand All @@ -19,7 +18,7 @@ type Route = {
query: {[index: string]:any},
};

export default defineComponent({
export default {
name: 'CreateProvider',

components: {
Expand Down Expand Up @@ -113,7 +112,7 @@ export default defineComponent({
this.$emit('set-subtype', this.$store.getters['i18n/withFallback'](`cluster.provider."${ type }"`, null, type));
},
},
});
};
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion pkg/capi/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
"**/*.vue"
],
"exclude": [
"../../node_modules"
"node_modules",
]
}
Loading