Skip to content

Commit 413f173

Browse files
Merge pull request #32 from contentstack/fix/ECO-1186_upgrade_all_libraries
refactor - updated the libraries and fixed eslint errors
2 parents af3cef7 + 93730d0 commit 413f173

File tree

7 files changed

+2347
-2605
lines changed

7 files changed

+2347
-2605
lines changed

package-lock.json

Lines changed: 2272 additions & 2527 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111
"lint": "vue-cli-service lint"
1212
},
1313
"dependencies": {
14-
"@alenaksu/json-viewer": "^0.3.4",
15-
"@contentstack/live-preview-utils": "^1.0.1",
16-
"@contentstack/utils": "^1.1.1",
17-
"contentstack": "^3.15.0",
18-
"core-js": "^3.8.3",
19-
"moment": "^2.29.2",
20-
"register-service-worker": "^1.7.1",
21-
"vue": "^3.2.27",
14+
"@alenaksu/json-viewer": "^1.0.1",
15+
"@contentstack/live-preview-utils": "^1.1.0",
16+
"@contentstack/utils": "^1.1.2",
17+
"contentstack": "^3.15.2",
18+
"core-js": "^3.23.4",
19+
"moment": "^2.29.4",
20+
"register-service-worker": "^1.7.2",
21+
"vue": "^3.2.37",
2222
"vue-class-component": "^8.0.0-0",
23-
"vue-json-pretty": "^1.8.2",
23+
"vue-json-pretty": "^2.1.1",
2424
"vue-json-tree-viewer": "^1.0.2",
2525
"vue-meta": "^2.4.0",
26-
"vue-router": "^4.0.12",
26+
"vue-router": "^4.1.2",
2727
"vue-skeletor": "^1.0.6",
2828
"vuex": "^4.0.2"
2929
},
3030
"devDependencies": {
31-
"@types/node": "^17.0.34",
32-
"@typescript-eslint/eslint-plugin": "^5.4.0",
33-
"@typescript-eslint/parser": "^5.4.0",
34-
"@vue/cli-plugin-babel": "~5.0.0",
35-
"@vue/cli-plugin-eslint": "~5.0.0",
36-
"@vue/cli-plugin-typescript": "~5.0.0",
37-
"@vue/cli-plugin-vuex": "~5.0.0",
38-
"@vue/cli-service": "~5.0.0",
39-
"@vue/compiler-sfc": "^3.2.27",
40-
"@vue/eslint-config-typescript": "^9.1.0",
31+
"@types/node": "^18.0.3",
32+
"@typescript-eslint/eslint-plugin": "^5.30.6",
33+
"@typescript-eslint/parser": "^5.30.6",
34+
"@vue/cli-plugin-babel": "~5.0.8",
35+
"@vue/cli-plugin-eslint": "~5.0.8",
36+
"@vue/cli-plugin-typescript": "~5.0.8",
37+
"@vue/cli-plugin-vuex": "~5.0.8",
38+
"@vue/cli-service": "~5.0.8",
39+
"@vue/compiler-sfc": "^3.2.37",
40+
"@vue/eslint-config-typescript": "^11.0.0",
4141
"babel-eslint": "^10.1.0",
42-
"eslint": "^7.32.0",
43-
"eslint-config-prettier": "^8.1.0",
44-
"eslint-plugin-prettier": "^3.3.1",
45-
"eslint-plugin-vue": "^8.0.3",
46-
"typescript": "~4.5.5"
42+
"eslint": "^8.19.0",
43+
"eslint-config-prettier": "^8.5.0",
44+
"eslint-plugin-prettier": "^4.2.1",
45+
"eslint-plugin-vue": "^9.2.0",
46+
"typescript": "~4.7.4"
4747
},
4848
"eslintConfig": {
4949
"root": true,

src/App.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<template>
22
<div>
3-
<Header />
3+
<HeaderComponent />
44
<router-view :key="$route.path" />
5-
<Footer />
5+
<FooterComponent />
66
</div>
77
</template>
88

99
<script>
10-
import Header from '@/components/HeaderContent.vue';
11-
import Footer from '@/components/FooterContent.vue';
10+
import HeaderComponent from '@/components/HeaderContent.vue';
11+
import FooterComponent from '@/components/FooterContent.vue';
1212
1313
export default {
1414
name: 'App',
1515
components: {
16-
Header,
17-
Footer
18-
}
16+
HeaderComponent,
17+
FooterComponent,
18+
},
1919
};
2020
</script>

src/components/DevTools.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default defineComponent({
124124
}
125125
},
126126
mounted: function mounted() {
127-
let jsonData = this.filterObject(this.response);
127+
const jsonData = this.filterObject(this.response);
128128
this.response = JSON.stringify(jsonData);
129129
},
130130
updated() {

src/components/FooterContent.vue

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
</template>
4848

4949
<script lang="ts">
50-
5150
interface navFooterList {
5251
title: string;
5352
url: string;
@@ -56,31 +55,31 @@ interface navFooterList {
5655
import { defineComponent } from 'vue';
5756
import Stack from '../plugins/contentstack';
5857
import { onEntryChange } from '../plugins/contentstack';
59-
import Links from '../typescript/data'
58+
import Links from '../typescript/data';
6059
6160
export default defineComponent({
6261
name: 'FooterContent',
6362
data() {
6463
return {
65-
data: null
64+
data: null,
6665
};
6766
},
6867
created() {
6968
this.getData();
7069
},
7170
methods: {
7271
async getData() {
73-
let response = await Stack.getEntries({
72+
const response = await Stack.getEntries({
7473
contentTypeUid: 'footer',
75-
jsonRtePath: ['copyright']
74+
jsonRtePath: ['copyright'],
7675
});
77-
let responsePages: [navFooterList] = await Stack.getEntries({
78-
contentTypeUid: 'page'
76+
const responsePages: [navFooterList] = await Stack.getEntries({
77+
contentTypeUid: 'page',
7978
});
8079
81-
let navFooterList = response[0].navigation.link;
80+
const navFooterList = response[0].navigation.link;
8281
if (responsePages.length !== response.length) {
83-
responsePages.forEach(entry => {
82+
responsePages.forEach((entry) => {
8483
const fFound = response[0].navigation.link.find(
8584
(link: Links) => link.title === entry.title
8685
);
@@ -91,14 +90,14 @@ export default defineComponent({
9190
}
9291
this.data = response[0];
9392
this.$store.dispatch('setFooter', response[0]);
94-
}
93+
},
9594
},
9695
mounted() {
9796
onEntryChange(() => {
9897
if (process.env.VUE_APP_CONTENTSTACK_LIVE_PREVIEW === 'true') {
9998
this.getData();
10099
}
101100
});
102-
}
101+
},
103102
});
104103
</script>

src/components/HeaderContent.vue

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
</template>
5252

5353
<script lang="ts">
54-
5554
interface navHeaderList {
5655
title: string;
5756
url: string;
@@ -61,56 +60,56 @@ import { defineComponent } from 'vue';
6160
import Stack from '../plugins/contentstack';
6261
import { onEntryChange } from '../plugins/contentstack';
6362
import Tooltip from '../components/ToolTip.vue';
64-
import Links from '../typescript/data'
63+
import Links from '../typescript/data';
6564
6665
export default defineComponent({
6766
name: 'HeaderContent',
6867
components: {
69-
Tooltip
68+
Tooltip,
7069
},
7170
data() {
7271
return {
73-
data: null
72+
data: null,
7473
};
7574
},
7675
created() {
7776
this.getData();
7877
},
7978
methods: {
8079
async getData() {
81-
let response = await Stack.getEntries({
80+
const response = await Stack.getEntries({
8281
contentTypeUid: 'header',
8382
referenceFieldPath: `navigation_menu.page_reference`,
84-
jsonRtePath: ['notification_bar.announcement_text']
83+
jsonRtePath: ['notification_bar.announcement_text'],
8584
});
86-
let responsePages: [navHeaderList] = await Stack.getEntries({
87-
contentTypeUid: 'page'
85+
const responsePages: [navHeaderList] = await Stack.getEntries({
86+
contentTypeUid: 'page',
8887
});
89-
let navHeaderList = response[0].navigation_menu;
88+
const navHeaderList = response[0].navigation_menu;
9089
if (responsePages.length !== response.length) {
91-
responsePages.forEach(entry => {
90+
responsePages.forEach((entry) => {
9291
const hFound = response[0].navigation_menu.find(
9392
(navLink: Links) => navLink.label === entry.title
9493
);
9594
9695
if (!hFound) {
9796
navHeaderList.push({
9897
label: entry.title,
99-
page_reference: [{ title: entry.title, url: entry.url }]
98+
page_reference: [{ title: entry.title, url: entry.url }],
10099
});
101100
}
102101
});
103102
}
104103
this.data = response[0];
105104
this.$store.dispatch('setHeader', response[0]);
106-
}
105+
},
107106
},
108107
mounted() {
109108
onEntryChange(() => {
110109
if (process.env.VUE_APP_CONTENTSTACK_LIVE_PREVIEW === 'true') {
111110
this.getData();
112111
}
113112
});
114-
}
113+
},
115114
});
116115
</script>

src/components/RenderComponents.vue

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
title="about-content"
2222
:data="component.hero_banner"
2323
/>
24-
<Section
24+
<SectionComponent
2525
v-if="component.section"
2626
:key="index"
2727
:data="component.section"
@@ -66,17 +66,16 @@
6666
</template>
6767

6868
<script lang="ts">
69-
7069
interface Component {
71-
HeroBanner: object;
72-
Section: object
73-
SectionWithBuckets: object;
74-
SectionWithCards: object;
75-
AboutSectionBucket: object;
76-
TeamSection: object;
77-
BlogSection: object;
78-
SectionWithEmbedObject: object
79-
Devtools: object
70+
HeroBanner: object;
71+
Section: object;
72+
SectionWithBuckets: object;
73+
SectionWithCards: object;
74+
AboutSectionBucket: object;
75+
TeamSection: object;
76+
BlogSection: object;
77+
SectionWithEmbedObject: object;
78+
Devtools: object;
8079
}
8180
8281
interface Page {
@@ -93,9 +92,9 @@ interface Locale {
9392
9493
import { defineComponent, PropType } from 'vue';
9594
import HeroBanner from '../components/HeroBanner.vue';
96-
import Section from '../components/SectionContent.vue';
95+
import SectionComponent from '../components/SectionContent.vue';
9796
import SectionWithCards from '../components/SectionWithCards.vue';
98-
import AboutSectionBucket from "../components/AboutSectionBucket.vue";
97+
import AboutSectionBucket from '../components/AboutSectionBucket.vue';
9998
import TeamSection from '../components/TeamSection.vue';
10099
import SectionWithEmbedObject from '../components/SectionWithEmbedObject.vue';
101100
import SectionWithBuckets from '../components/SectionWithBuckets.vue';
@@ -104,33 +103,33 @@ import Devtools from '../components/DevTools.vue';
104103
export default defineComponent({
105104
components: {
106105
HeroBanner,
107-
Section,
106+
SectionComponent,
108107
SectionWithBuckets,
109108
SectionWithCards,
110109
AboutSectionBucket,
111110
TeamSection,
112111
BlogSection,
113112
SectionWithEmbedObject,
114-
Devtools
113+
Devtools,
115114
},
116115
117116
props: {
118117
components: {
119118
required: true,
120-
type: Object as PropType<Component>
119+
type: Object as PropType<Component>,
121120
},
122121
page: {
123122
required: true,
124-
type: Object as PropType<Page>
123+
type: Object as PropType<Page>,
125124
},
126125
entryUid: {
127126
required: true,
128-
type: Object as PropType<EntryUid>
127+
type: Object as PropType<EntryUid>,
129128
},
130129
locale: {
131130
required: true,
132-
type: Object as PropType<Locale>
133-
}
134-
}
131+
type: Object as PropType<Locale>,
132+
},
133+
},
135134
});
136135
</script>

0 commit comments

Comments
 (0)