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.

Sign up for GitHub

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

[TECH] Mettre à jour Node et les paquets Pix Site (PIX-1633). #220

Merged
merged 33 commits into from
Nov 20, 2020
Merged

[TECH] Mettre à jour Node et les paquets Pix Site (PIX-1633). #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ff63c7b
Bump Node version to 14.15.1
sbedeau Nov 18, 2020
4b3d9e9
Bump @fortawesome/fontawesome-svg-core to latest
sbedeau Nov 18, 2020
2fe8346
Bump @fortawesome/free-solid-svg-icons to latest
sbedeau Nov 18, 2020
79931ed
Bump @fortawesome/vue-fontawesome to latest
sbedeau Nov 18, 2020
c1d2b25
Bump @nuxtjs/axios to latest
sbedeau Nov 18, 2020
466508d
Bump @nuxtjs/eslint-config to latest
sbedeau Nov 18, 2020
0ba9e93
Bump @nuxtjs/eslint-module
sbedeau Nov 18, 2020
73801e8
Bump @nuxtjs/prismic
sbedeau Nov 18, 2020
27b650d
Bump @vue/test-utils
sbedeau Nov 18, 2020
8a94c68
Bump autoprefixer
sbedeau Nov 18, 2020
4a043ad
BUmp babel-jest
sbedeau Nov 18, 2020
dae7de8
Bump chart.js
sbedeau Nov 18, 2020
563d5aa
Bump eslint
sbedeau Nov 18, 2020
e8df63e
Bump chart.js
sbedeau Nov 18, 2020
ffa9c9b
Bump eslint-config-prettier
sbedeau Nov 18, 2020
9308d68
Bump eslint-plugin-nuxt
sbedeau Nov 18, 2020
cc475dc
Bump jest
sbedeau Nov 18, 2020
f0b9628
Bump node-sass
sbedeau Nov 18, 2020
061265a
Bump nuxt
sbedeau Nov 18, 2020
7fb64c5
Bump sass-loader
sbedeau Nov 18, 2020
f856786
Bump nuxt-i18n
sbedeau Nov 18, 2020
f98819c
Bump nuxt-winston-log
sbedeau Nov 18, 2020
d52fa4b
Bump postcss-cli
sbedeau Nov 18, 2020
ac5bfd5
Bump prettier
sbedeau Nov 18, 2020
2a0a1b9
Bump postcss-cli
sbedeau Nov 18, 2020
940d28c
Bump vue-chartjs
sbedeau Nov 18, 2020
ed55aec
Bump vue-jest
sbedeau Nov 18, 2020
99d9da6
Fix Vue Packages version mismatch
sbedeau Nov 18, 2020
96f0129
Remove deprecated mode option
sbedeau Nov 18, 2020
f69eeb6
Eslint fix - The <script> should be above the <style>
sbedeau Nov 18, 2020
0948975
Eslint fix - Custom event name must be kebab-case
sbedeau Nov 18, 2020
085cad6
Run linter autofix to fix order and notation
sbedeau Nov 18, 2020
3a64719
Take review feedbacks
sbedeau Nov 20, 2020
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
- run: npm ci
- run: npm test
- run: npm run lint
Expand Down
2 changes: 1 addition & 1 deletion components/DropdownButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
updateOption(option) {
this.selectedOption = option
this.showMenu = false
this.$emit('updateOption', this.selectedOption)
this.$emit('update-option', this.selectedOption)
},

toggleMenu() {
Expand Down
2 changes: 1 addition & 1 deletion components/FormablePage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<iframe
id="123formbuilder"
allowTransparency="true"
style="min-height: 300px; height: inherit; overflow: auto;"
style="min-height: 300px; height: inherit; overflow: auto"
width="100%"
name="123formbuilder"
marginwidth="0"
Expand Down
2 changes: 1 addition & 1 deletion components/slices/PageBanner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default {
this.$modal.show('videoModal')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je pense qu'il faut revoir la modal avec la montée de version de https://github.com/euvl/vue-js-modal#readme

Sur la home page, le bouton pour lancer la vidéo ne fonctionne plus.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bien vu, merci.

Compte tenu du message suivant, je vais roll-back le commit dédié

Version 2.0.0 release candidates will have breaking changes until it is 2.0.1. If you need a more stable version, please use 1.3.34.

},
isVideo(link) {
return link?.['banner_link_url']?.url?.includes('pix-videos/')
return link?.banner_link_url?.url?.includes('pix-videos/')
},
videoClass(link) {
return this.isVideo(link)
Expand Down
4 changes: 2 additions & 2 deletions components/slices/PageSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ export default {
return this.slice?.primary?.description
},
buttonLink() {
return this.slice?.primary?.['button_link']
return this.slice?.primary?.button_link
},
buttonText() {
return this.slice?.primary?.['button_title']
return this.slice?.primary?.button_title
},
hasImage() {
return this.image && this.image.url
Expand Down
2 changes: 1 addition & 1 deletion components/slices/Process.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
</template>

<script>
import PixImage from '@/components/PixImage'
import {
EXTRA_LARGE_SCREEN_MIN_WIDTH,
DESKTOP_MIN_WIDTH,
} from '~/config/breakpoints'
import PixImage from '@/components/PixImage'

export default {
name: 'ProcessSlice',
Expand Down
27 changes: 14 additions & 13 deletions layouts/default.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@
</div>
</template>

<script>
import HotNewsBanner from '@/components/HotNewsBanner'
import NavigationSliceZone from '@/components/NavigationSliceZone'
import FooterSliceZone from '@/components/FooterSliceZone'

export default {
components: {
FooterSliceZone,
HotNewsBanner,
NavigationSliceZone,
},
}
</script>

<style lang="scss">
html {
font-size: 16px;
Expand Down Expand Up @@ -77,16 +91,3 @@ h6 {
background-color: #35495e;
}
</style>
<script>
import HotNewsBanner from '@/components/HotNewsBanner'
import NavigationSliceZone from '@/components/NavigationSliceZone'
import FooterSliceZone from '@/components/FooterSliceZone'

export default {
components: {
FooterSliceZone,
HotNewsBanner,
NavigationSliceZone,
},
}
</script>
1 change: 0 additions & 1 deletion nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { transports } from 'winston'

export default {
mode: 'universal',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pourquoi on retire ce mode ? Est-ce le mode par défaut ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Au moment du build, un warning indique que c'est une option dépréciée

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Après vérification, c'est bien le mode par défaut https://nuxtjs.org/docs/2.x/configuration-glossary/configuration-mode

J'avoue avoir suivi naïvement le conseil du build nuxt qui disait que l'on pouvait remove safely

target: process.env.SSR_ENABLED === 'true' ? 'server' : 'static',
publicRuntimeConfig: {
languageSwitchEnabled: process.env.LANGUAGE_SWITCH_ENABLED || false,
Expand Down
Loading