Skip to content

Commit ddc2b46

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dev
2 parents e42c98b + 340908c commit ddc2b46

File tree

5 files changed

+44
-66
lines changed

5 files changed

+44
-66
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [10, 12, 14]
20+
node: [12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/[email protected].4
36+
uses: actions/[email protected].5
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -50,6 +50,6 @@ jobs:
5050

5151
- name: BundleWatch
5252
run: yarn run bundlewatch
53-
if: matrix.node == '14'
53+
if: matrix.node == '16'
5454
env:
5555
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"

‎.github/workflows/codeql.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@ name: "CodeQL"
22

33
on:
44
push:
5+
branches:
6+
- dev
7+
- master
8+
- "!dependabot/**"
59
pull_request:
10+
# The branches below must be a subset of the branches above
11+
branches:
12+
- dev
13+
- master
14+
- "!dependabot/**"
615
schedule:
716
- cron: "0 2 * * 5"
817

@@ -11,48 +20,18 @@ jobs:
1120
name: Analyze
1221
runs-on: ubuntu-latest
1322

14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
language: ["javascript"]
18-
1923
steps:
2024
- name: Checkout repository
2125
uses: actions/checkout@v2
22-
with:
23-
# We must fetch at least the immediate parents so that if this is
24-
# a pull request then we can checkout the head
25-
fetch-depth: 2
26-
27-
# If this run was triggered by a pull request event, then checkout
28-
# the head of the pull request instead of the merge commit
29-
- run: git checkout HEAD^2
30-
if: ${{ github.event_name == 'pull_request' }}
3126

3227
# Initializes the CodeQL tools for scanning.
3328
- name: Initialize CodeQL
3429
uses: github/codeql-action/init@v1
3530
with:
36-
languages: ${{ matrix.language }}
37-
# If you wish to specify custom queries, you can do so here or in a config file
38-
# By default, queries listed here will override any specified in a config file
39-
# Prefix the list here with "+" to use these queries and those in the config file
40-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
31+
languages: "javascript"
4132

42-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java)
43-
# If this step fails, then you should remove it and run the build manually (see below)
4433
- name: Autobuild
4534
uses: github/codeql-action/autobuild@v1
4635

47-
# ℹ️ Command-line programs to run using the OS shell.
48-
# 📚 https://git.io/JvXDl
49-
50-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines and
51-
# modify them (or add more) to build your code if your project uses a compiled language
52-
53-
#- run: |
54-
# make bootstrap
55-
# make release
56-
5736
- name: Perform CodeQL Analysis
5837
uses: github/codeql-action/analyze@v1

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [14]
20+
node: [16]
2121

2222
steps:
2323
- name: Clone repository
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/[email protected].4
36+
uses: actions/[email protected].5
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
matrix:
5656
os: [ubuntu-latest]
57-
node: [14]
57+
node: [16]
5858

5959
steps:
6060
- name: Clone repository
@@ -70,7 +70,7 @@ jobs:
7070
run: echo "::set-output name=dir::$(yarn cache dir)"
7171

7272
- name: Cache node_modules
73-
uses: actions/[email protected].4
73+
uses: actions/[email protected].5
7474
with:
7575
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7676
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -91,7 +91,7 @@ jobs:
9191
strategy:
9292
matrix:
9393
os: [ubuntu-latest]
94-
node: [10, 12, 14]
94+
node: [12, 14, 16]
9595

9696
steps:
9797
- name: Clone repository
@@ -107,7 +107,7 @@ jobs:
107107
run: echo "::set-output name=dir::$(yarn cache dir)"
108108

109109
- name: Cache node_modules
110-
uses: actions/[email protected].4
110+
uses: actions/[email protected].5
111111
with:
112112
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113113
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -124,7 +124,6 @@ jobs:
124124

125125
- name: CodeCov
126126
uses: codecov/codecov-action@v1
127-
if: matrix.node == '14'
128127
with:
129128
token: ${{ secrets.CODECOV_TOKEN }}
130129
flags: unittests

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
"@babel/core": "^7.14.0",
9292
"@babel/plugin-transform-modules-commonjs": "^7.14.0",
9393
"@babel/plugin-transform-runtime": "^7.13.15",
94-
"@babel/preset-env": "^7.14.0",
95-
"@babel/standalone": "^7.14.0",
94+
"@babel/preset-env": "^7.14.1",
95+
"@babel/standalone": "^7.14.1",
9696
"@nuxt/content": "^1.14.0",
9797
"@nuxtjs/google-analytics": "^2.4.0",
9898
"@nuxtjs/pwa": "^3.3.5",
@@ -139,7 +139,7 @@
139139
"postcss-cli": "^8.3.1",
140140
"prettier": "1.14.3",
141141
"require-context": "^1.1.0",
142-
"rollup": "^2.46.0",
142+
"rollup": "^2.47.0",
143143
"rollup-plugin-babel": "^4.4.0",
144144
"rollup-plugin-commonjs": "^10.1.0",
145145
"rollup-plugin-node-resolve": "^5.2.0",

‎yarn.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,10 @@
574574
dependencies:
575575
"@babel/helper-plugin-utils" "^7.12.13"
576576

577-
"@babel/plugin-transform-block-scoping@^7.13.16":
578-
version "7.13.16"
579-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892"
580-
integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg==
577+
"@babel/plugin-transform-block-scoping@^7.14.1":
578+
version "7.14.1"
579+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"
580+
integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==
581581
dependencies:
582582
"@babel/helper-plugin-utils" "^7.13.0"
583583

@@ -811,10 +811,10 @@
811811
"@babel/helper-create-regexp-features-plugin" "^7.12.13"
812812
"@babel/helper-plugin-utils" "^7.12.13"
813813

814-
"@babel/preset-env@^7.13.12", "@babel/preset-env@^7.14.0":
815-
version "7.14.0"
816-
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5"
817-
integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ==
814+
"@babel/preset-env@^7.13.12", "@babel/preset-env@^7.14.1":
815+
version "7.14.1"
816+
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93"
817+
integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ==
818818
dependencies:
819819
"@babel/compat-data" "^7.14.0"
820820
"@babel/helper-compilation-targets" "^7.13.16"
@@ -853,7 +853,7 @@
853853
"@babel/plugin-transform-arrow-functions" "^7.13.0"
854854
"@babel/plugin-transform-async-to-generator" "^7.13.0"
855855
"@babel/plugin-transform-block-scoped-functions" "^7.12.13"
856-
"@babel/plugin-transform-block-scoping" "^7.13.16"
856+
"@babel/plugin-transform-block-scoping" "^7.14.1"
857857
"@babel/plugin-transform-classes" "^7.13.0"
858858
"@babel/plugin-transform-computed-properties" "^7.13.0"
859859
"@babel/plugin-transform-destructuring" "^7.13.17"
@@ -883,7 +883,7 @@
883883
"@babel/plugin-transform-unicode-escapes" "^7.12.13"
884884
"@babel/plugin-transform-unicode-regex" "^7.12.13"
885885
"@babel/preset-modules" "^0.1.4"
886-
"@babel/types" "^7.14.0"
886+
"@babel/types" "^7.14.1"
887887
babel-plugin-polyfill-corejs2 "^0.2.0"
888888
babel-plugin-polyfill-corejs3 "^0.2.0"
889889
babel-plugin-polyfill-regenerator "^0.2.0"
@@ -916,10 +916,10 @@
916916
dependencies:
917917
regenerator-runtime "^0.13.4"
918918

919-
"@babel/standalone@^7.14.0":
920-
version "7.14.0"
921-
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.14.0.tgz#fe62e8f0df0c3d3217189bd37d72c39397bbb71f"
922-
integrity sha512-PPkwh7AQyP+QBHUavMBNSnAVsW4xFe76CQn3d8kWorwwu9l5R7QDjA9v4GkF6jHhL5fen6so20eqY1KDaJjMEQ==
919+
"@babel/standalone@^7.14.1":
920+
version "7.14.1"
921+
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.14.1.tgz#2c5f6908f03108583eea75bdcc94eb29e720fbac"
922+
integrity sha512-HFkwJyIv91mP38447ERwnVgw9yhx2/evs+r0+1hdAXf1Q1fBypPwtY8YOqsPniqoYCEVbBIqYELt0tNrOAg/Iw==
923923

924924
"@babel/template@^7.12.13", "@babel/template@^7.3.3":
925925
version "7.12.13"
@@ -944,10 +944,10 @@
944944
debug "^4.1.0"
945945
globals "^11.1.0"
946946

947-
"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
948-
version "7.14.0"
949-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802"
950-
integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==
947+
"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
948+
version "7.14.1"
949+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
950+
integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
951951
dependencies:
952952
"@babel/helper-validator-identifier" "^7.14.0"
953953
to-fast-properties "^2.0.0"
@@ -12160,10 +12160,10 @@ rollup-pluginutils@^2.8.1:
1216012160
dependencies:
1216112161
estree-walker "^0.6.1"
1216212162

12163-
rollup@^2.46.0:
12164-
version "2.46.0"
12165-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.46.0.tgz#8cacf89d2ee31a34755f1af40a665168f592b829"
12166-
integrity sha512-qPGoUBNl+Z8uNu0z7pD3WPTABWRbcOwIrO/5ccDJzmrtzn0LVf6Lj91+L5CcWhXl6iWf23FQ6m8Jkl2CmN1O7Q==
12163+
rollup@^2.47.0:
12164+
version "2.47.0"
12165+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.47.0.tgz#9d958aeb2c0f6a383cacc0401dff02b6e252664d"
12166+
integrity sha512-rqBjgq9hQfW0vRmz+0S062ORRNJXvwRpzxhFXORvar/maZqY6za3rgQ/p1Glg+j1hnc1GtYyQCPiAei95uTElg==
1216712167
optionalDependencies:
1216812168
fsevents "~2.3.1"
1216912169

0 commit comments

Comments
 (0)