Merge branch 'main' of ssh://kolaente.dev:9022/vikunja/frontend into main

This commit is contained in:
Sytone 2021-06-15 16:46:30 -07:00
commit 657f572471
4 changed files with 21 additions and 21 deletions

View File

@ -37,7 +37,7 @@ steps:
- '.cache'
- name: dependencies
image: node:12
image: node:16
pull: true
environment:
YARN_CACHE_FOLDER: .cache/yarn/
@ -68,7 +68,7 @@ steps:
- dependencies
- name: build
image: node:12
image: node:16
pull: true
environment:
YARN_CACHE_FOLDER: .cache/yarn/
@ -80,7 +80,7 @@ steps:
- dependencies
- name: test-unit
image: node:12
image: node:16
pull: true
commands:
- yarn test:unit
@ -163,7 +163,7 @@ steps:
- '.cache'
- name: build
image: node:12
image: node:16
pull: true
group: build-static
environment:
@ -238,7 +238,7 @@ steps:
- '.cache'
- name: build
image: node:12
image: node:16
pull: true
group: build-static
environment:

View File

@ -1,5 +1,5 @@
# Stage 1: Build application
FROM node:13.14.0 AS compile-image
FROM node:16.3.0 AS compile-image
WORKDIR /build

View File

@ -23,11 +23,11 @@
"lodash": "4.17.21",
"marked": "2.0.7",
"register-service-worker": "1.7.2",
"sass": "1.34.1",
"sass": "1.35.1",
"snake-case": "3.0.4",
"verte": "0.0.12",
"vue": "2.6.14",
"vue-advanced-cropper": "1.6.0",
"vue-advanced-cropper": "1.7.0",
"vue-drag-resize": "1.5.4",
"vue-easymde": "1.4.0",
"vue-shortkey": "3.1.7",
@ -49,7 +49,7 @@
"cypress": "7.5.0",
"cypress-file-upload": "5.0.7",
"eslint": "7.28.0",
"eslint-plugin-vue": "7.10.0",
"eslint-plugin-vue": "7.11.1",
"faker": "5.5.3",
"jest": "27.0.4",
"sass-loader": "10.2.0",

View File

@ -6167,10 +6167,10 @@ eslint-loader@^2.2.1:
object-hash "^1.1.4"
rimraf "^2.6.1"
eslint-plugin-vue@7.10.0:
version "7.10.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz#251749aa99e089e085275f011042c6e74189f89a"
integrity sha512-xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A==
eslint-plugin-vue@7.11.1:
version "7.11.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz#77eb4b44032d5cca79f9af21d06991d8694a314a"
integrity sha512-lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw==
dependencies:
eslint-utils "^2.1.0"
natural-compare "^1.4.0"
@ -11897,10 +11897,10 @@ sass-loader@10.2.0:
schema-utils "^3.0.0"
semver "^7.3.2"
sass@1.34.1:
version "1.34.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.34.1.tgz#30f45c606c483d47b634f1e7371e13ff773c96ef"
integrity sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==
sass@1.35.1:
version "1.35.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.1.tgz#90ecf774dfe68f07b6193077e3b42fb154b9e1cd"
integrity sha512-oCisuQJstxMcacOPmxLNiLlj4cUyN2+8xJnG7VanRoh2GOLr9RqkvI4AxA4a6LHVg/rsu+PmxXeGhrdSF9jCiQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
@ -13484,10 +13484,10 @@ vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
vue-advanced-cropper@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-1.6.0.tgz#69ab2272bee70101991d1eea4eaf2f99105ab29a"
integrity sha512-YPJhNH+nH3cOiNZcNIhqj1C3UPFA3p9Xlb0VXEPIssWorcTkhB5QxUX5wDywbmnwTexzTIkoN/ZWSH8DJFpL8Q==
vue-advanced-cropper@1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-1.7.0.tgz#8a0306009ce9983be51385df6a9d53e79fed1863"
integrity sha512-3z8b0hakcq9cBqNNAPt3OfPmOZPgcaXNjmYsxOi7cbSIJrdlS8nSbFzK1Wv4DNYvYeL0RO7OxqSz3luDvCJ8CA==
dependencies:
classnames "^2.2.6"
debounce "^1.2.0"