Skip to content

Commit ae78ec5

Browse files
authored
Merge branch 'dev' into dev
2 parents 4acb268 + f1de1b3 commit ae78ec5

File tree

5 files changed

+748
-278
lines changed

5 files changed

+748
-278
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v2
2525

2626
- name: Set Node.js version
27-
uses: actions/setup-node@v1
27+
uses: actions/setup-node@v2.1.2
2828
with:
2929
node-version: ${{ matrix.node }}
3030

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v2
2525

2626
- name: Set Node.js version
27-
uses: actions/setup-node@v1
27+
uses: actions/setup-node@v2.1.2
2828
with:
2929
node-version: ${{ matrix.node }}
3030

@@ -61,7 +61,7 @@ jobs:
6161
uses: actions/checkout@v2
6262

6363
- name: Set Node.js version
64-
uses: actions/setup-node@v1
64+
uses: actions/setup-node@v2.1.2
6565
with:
6666
node-version: ${{ matrix.node }}
6767

@@ -98,7 +98,7 @@ jobs:
9898
uses: actions/checkout@v2
9999

100100
- name: Set Node.js version
101-
uses: actions/setup-node@v1
101+
uses: actions/setup-node@v2.1.2
102102
with:
103103
node-version: ${{ matrix.node }}
104104

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@
9999
"vue-functional-data-merge": "^3.1.0"
100100
},
101101
"devDependencies": {
102-
"@babel/cli": "^7.12.0",
103-
"@babel/core": "^7.12.0",
104-
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
105-
"@babel/plugin-transform-runtime": "^7.12.0",
106-
"@babel/preset-env": "^7.12.0",
107-
"@babel/standalone": "^7.12.0",
102+
"@babel/cli": "^7.12.1",
103+
"@babel/core": "^7.12.1",
104+
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
105+
"@babel/plugin-transform-runtime": "^7.12.1",
106+
"@babel/preset-env": "^7.12.1",
107+
"@babel/standalone": "^7.12.1",
108108
"@nuxt/content": "^1.10.0",
109109
"@nuxtjs/google-analytics": "^2.4.0",
110110
"@nuxtjs/pwa": "^3.2.2",
@@ -148,12 +148,12 @@
148148
"lodash": "^4.17.20",
149149
"marked": "^1.2.0",
150150
"node-sass": "^4.14.1",
151-
"nuxt": "^2.14.6",
151+
"nuxt": "^2.14.7",
152152
"postcss": "^8.1.1",
153153
"postcss-cli": "^8.1.0",
154154
"prettier": "1.14.3",
155155
"require-context": "^1.1.0",
156-
"rollup": "^2.30.0",
156+
"rollup": "^2.31.0",
157157
"rollup-plugin-babel": "^4.4.0",
158158
"rollup-plugin-commonjs": "^10.1.0",
159159
"rollup-plugin-node-resolve": "^5.2.0",

0 commit comments

Comments
 (0)