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

chore: upgrade to node v18 and some dep #423

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
13 changes: 8 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@ module.exports = {
env: {
browser: true,
node: true,
'jest/globals': true,
},
parserOptions: {
parser: 'babel-eslint',
requireConfigFile: false,
parser: '@babel/eslint-parser',
},
extends: [
'@nuxtjs',
'@nuxtjs/eslint-config',
'prettier',
'prettier/vue',
'plugin:prettier/recommended',
'plugin:nuxt/recommended',
],
plugins: ['prettier'],
plugins: ['prettier', 'jest'],
// add your custom rules here
rules: {},
rules: {
'vue/multi-word-component-names': 'off',
},
}
42 changes: 23 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,40 @@ on:
- master

jobs:
ci:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ ubuntu-latest ]
node: [ 14 ]

build:
name: ⚙️ Build
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: Checkout 🛎
uses: actions/checkout@master

- name: Setup node env 🏗
uses: actions/setup-node@v2.1.2
- name: Setup node 🏗
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
node-version-file: ".nvmrc"
cache: "yarn"

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- name: Cache node_modules 📦
uses: actions/cache@v2
uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-yarn-e-

- name: Install dependencies 👨🏻‍💻
run: npm ci
- name: Install deps 👨🏻‍💻
run: yarn --frozen-lockfile

- name: Run linter 👀
run: npm run lint
run: yarn lint

- name: Run tests 🧪
run: npm run test
run: yarn test
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18.16.0
2 changes: 1 addition & 1 deletion components/bulletins/BulletinCardCollection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</template>

<script>
import { landingBulletinsConfig } from '@/configs/pageLanding'
import BulletinCard from './BulletinCard.vue'
import i18n from './BulletinCard.i18n'
import { landingBulletinsConfig } from '@/configs/pageLanding'
export default {
i18n,
Expand Down
6 changes: 4 additions & 2 deletions components/core/buttons/TextButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ export default {
.core-button.--bordered {
& > a {
@apply z-10 text-primary-100;
background: linear-gradient(#121023, #121023) padding-box,
background:
linear-gradient(#121023, #121023) padding-box,
linear-gradient(
276.15deg,
#61c8a4 0.74%,
Expand Down Expand Up @@ -243,7 +244,8 @@ export default {
@apply z-20 opacity-0;
border-radius: inherit;
content: '';
background: linear-gradient(#121023, #121023) padding-box,
background:
linear-gradient(#121023, #121023) padding-box,
linear-gradient(
96.26deg,
#5fbeab 5.5%,
Expand Down
2 changes: 1 addition & 1 deletion components/core/footer/FooterHistory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</template>

<script>
import i18n from './Footer.i18n'
import { landingFooterHistoryConfig } from '@/configs/pageLanding'
import ExtLink from '@/components/core/links/ExtLink'
import i18n from './Footer.i18n'
export default {
i18n,
Expand Down
4 changes: 2 additions & 2 deletions components/core/header/nav-bar/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
</template>

<script>
import navBarItems from '@/components/core/header/nav-bar/nav-bar-items'
import { ExtLink, LocaleLink } from '@/components/core/links'
import NavBarItemDropdown from './NavBarItemDropdown'
import i18n from './NavBar.i18n'
import navBarItems from '@/components/core/header/nav-bar/nav-bar-items'
import { ExtLink, LocaleLink } from '@/components/core/links'

export default {
i18n,
Expand Down
4 changes: 2 additions & 2 deletions components/core/header/nav-bar/NavBarHamburger.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@
</template>

<script>
import i18n from './NavBar.i18n'
import navBarItems from './nav-bar-items'
import IconHamburgerMenuIcon from '@/components/core/icons/IconHamburgerMenuIcon'
import NavBarItemAccordion from '@/components/core/header/nav-bar/NavBarItemAccordion'
import { ExtLink, LocaleLink } from '@/components/core/links'
import i18n from './NavBar.i18n'
import navBarItems from './nav-bar-items'
export default {
i18n,
Expand Down
4 changes: 0 additions & 4 deletions components/core/links/LocaleLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ export default {
@apply text-primary-500;
}

.underline {
@apply underline;
}

.core-localeLink:not(.highlight):not(.--customized) {
@apply text-pink-700;
}
Expand Down
6 changes: 5 additions & 1 deletion components/core/markdown/MarkdownRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ export default {
}
.markdown code {
@apply rounded-md px-1 py-0.5;
font-family: Source Sans Pro, -apple-system, Roboto, Helvetica Neue,
font-family:
Source Sans Pro,
-apple-system,
Roboto,
Helvetica Neue,
sans-serif !important;
background-color: rgba(110, 118, 129, 0.4);
}
Expand Down
2 changes: 1 addition & 1 deletion components/events/RelatedCardCollection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
</template>

<script>
import { Swiper, SwiperSlide } from 'vue-awesome-swiper'
import i18n from '@/i18n/conference/speeches.i18n'
import SpeechCard from '@/components/events/SpeechCard'
import { Swiper, SwiperSlide } from 'vue-awesome-swiper'
export default {
i18n,
name: 'RelatedCardCollection',
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ module.exports = {
'^~/(.*)$': '<rootDir>/$1',
'^vue$': 'vue/dist/vue.common.js',
},
testEnvironment: 'jsdom',
moduleFileExtensions: ['js', 'vue', 'json'],
transform: {
'^.+\\.js$': 'babel-jest',
'.*\\.(vue)$': 'vue-jest',
'.*\\.(vue)$': '@vue/vue2-jest',
},
collectCoverage: true,
collectCoverageFrom: [
Expand Down
26 changes: 13 additions & 13 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,8 @@ export default {
keepDefaultRouter: true,
},
],
],

// Modules (https://go.nuxtjs.dev/config-modules)
modules: [
// https://go.nuxtjs.dev/axios
'@nuxt/http',
// https://github.com/nuxt-community/gtm-module
'@nuxtjs/gtm',
// https://github.com/WilliamDASILVA/nuxt-facebook-pixel-module
'nuxt-facebook-pixel-module',
// https://i18n.nuxtjs.org/
'nuxt-i18n',
[
'nuxt-fontawesome',
'@nuxtjs/fontawesome',
{
component: 'fa',
imports: [
Expand All @@ -118,6 +106,18 @@ export default {
],
},
],
],

// Modules (https://go.nuxtjs.dev/config-modules)
modules: [
// https://go.nuxtjs.dev/axios
'@nuxt/http',
// https://github.com/nuxt-community/gtm-module
'@nuxtjs/gtm',
// https://github.com/WilliamDASILVA/nuxt-facebook-pixel-module
'nuxt-facebook-pixel-module',
// https://i18n.nuxtjs.org/
'@nuxtjs/i18n',
// https://github.com/nuxt-community/markdownit-module
'@nuxtjs/markdownit',
// https://sitemap.nuxtjs.org/
Expand Down
Loading