Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Merge branch 'v11-lts' of github.com:TeamOrangeServer/misskey into v1…
Browse files Browse the repository at this point in the history
…1-lts
  • Loading branch information
sousuke0422 committed Nov 5, 2021
2 parents 2113567 + 5eeba6c commit ccf4bda
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 123 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:

steps:
- uses: actions/checkout@v2
with:
submodules: true
with:
submodules: true

- name: Build image
run: docker build . --file Dockerfile --tag $IMAGE_NAME
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.10.0-alpine3.13 AS base
FROM node:16.11.1-alpine3.13 AS base

ENV NODE_ENV=production

Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@fortawesome/free-brands-svg-icons": "5.15.4",
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/vue-fontawesome": "2.0.2",
"@fortawesome/vue-fontawesome": "2.0.6",
"@koa/cors": "3.1.0",
"@koa/multer": "3.0.0",
"@koa/router": "8.0.8",
Expand All @@ -63,7 +63,7 @@
"@types/gulp-mocha": "0.0.33",
"@types/gulp-rename": "2.0.1",
"@types/gulp-replace": "1.1.0",
"@types/ioredis": "4.27.6",
"@types/ioredis": "4.27.8",
"@types/is-url": "1.2.30",
"@types/js-yaml": "4.0.3",
"@types/jsdom": "16.2.13",
Expand All @@ -73,7 +73,7 @@
"@types/koa-bodyparser": "4.3.3",
"@types/koa-cors": "0.0.2",
"@types/koa-favicon": "2.0.21",
"@types/koa-logger": "3.1.1",
"@types/koa-logger": "3.1.2",
"@types/koa-mount": "4.0.1",
"@types/koa-send": "4.1.3",
"@types/koa-views": "2.0.4",
Expand All @@ -82,7 +82,7 @@
"@types/koa__router": "8.0.8",
"@types/lolex": "5.1.2",
"@types/mocha": "9.0.0",
"@types/node": "16.10.3",
"@types/node": "16.11.1",
"@types/node-fetch": "2.5.12",
"@types/nodemailer": "6.4.4",
"@types/nprogress": "0.2.0",
Expand Down Expand Up @@ -121,12 +121,12 @@
"autobind-decorator": "2.4.0",
"autosize": "5.0.1",
"autwh": "0.1.0",
"aws-sdk": "2.1003.0",
"aws-sdk": "2.1010.0",
"bcryptjs": "2.4.3",
"blurhash": "1.1.4",
"bootstrap-vue": "2.21.2",
"broadcast-channel": "4.2.0",
"bull": "3.29.2",
"bull": "3.29.3",
"cacheable-lookup": "6.0.0",
"cafy": "15.2.1",
"cbor": "8.0.2",
Expand All @@ -137,7 +137,7 @@
"content-disposition": "0.5.3",
"crc-32": "1.2.0",
"cross-env": "7.0.3",
"css-loader": "6.3.0",
"css-loader": "6.4.0",
"cssnano": "5.0.8",
"dateformat": "4.5.1",
"diskusage": "1.1.3",
Expand All @@ -163,7 +163,7 @@
"html-minifier": "4.0.0",
"http-signature": "1.3.5",
"insert-text-at-cursor": "0.3.0",
"ioredis": "4.27.10",
"ioredis": "4.28.0",
"ip-cidr": "3.0.4",
"is-svg": "4.3.1",
"js-yaml": "4.1.0",
Expand All @@ -185,13 +185,13 @@
"langmap": "0.0.16",
"loader-utils": "2.0.0",
"lodash": "4.17.21",
"mocha": "9.1.2",
"mocha": "9.1.3",
"moji": "0.5.1",
"ms": "2.1.3",
"multer": "1.4.3",
"nested-property": "4.0.0",
"node-fetch": "2.6.5",
"nodemailer": "6.6.5",
"nodemailer": "6.7.0",
"nprogress": "0.2.0",
"object-assign-deep": "0.4.0",
"os-utils": "0.0.14",
Expand All @@ -200,8 +200,8 @@
"pg": "8.7.1",
"portscanner": "2.2.0",
"postcss": "8.3.9",
"postcss-loader": "6.1.1",
"private-ip": "2.2.1",
"postcss-loader": "6.2.0",
"private-ip": "2.3.0",
"probe-image-size": "7.2.1",
"progress-bar-webpack-plugin": "2.1.0",
"promise-limit": "2.7.0",
Expand All @@ -225,8 +225,8 @@
"rimraf": "3.0.2",
"rndstr": "1.0.0",
"s-age": "1.1.2",
"sass": "1.42.1",
"sass-loader": "12.1.0",
"sass": "1.43.2",
"sass-loader": "12.2.0",
"seedrandom": "3.0.5",
"sharp": "0.29.1",
"showdown": "1.9.1",
Expand All @@ -235,9 +235,9 @@
"speakeasy": "2.0.0",
"stringz": "2.1.0",
"stylus": "0.55.0",
"stylus-loader": "6.1.0",
"stylus-loader": "6.2.0",
"syslog-pro": "1.0.0",
"systeminformation": "5.9.6",
"systeminformation": "5.9.7",
"syuilo-password-strength": "0.0.1",
"terser-webpack-plugin": "4.2.3",
"textarea-caret": "3.1.0",
Expand All @@ -246,7 +246,7 @@
"tinycolor2": "1.4.2",
"tmp": "0.2.1",
"ts-loader": "9.2.6",
"ts-node": "10.2.1",
"ts-node": "10.3.0",
"tsc-alias": "1.3.10",
"tsconfig-paths": "3.11.0",
"tslint": "5.20.1",
Expand Down Expand Up @@ -276,14 +276,14 @@
"vuex": "3.6.2",
"vuex-persistedstate": "4.1.0",
"web-push": "3.4.5",
"webpack": "5.55.1",
"webpack-cli": "4.9.0",
"webpack": "5.58.2",
"webpack-cli": "4.9.1",
"websocket": "1.0.34",
"ws": "8.2.3",
"xev": "2.0.1"
},
"devDependencies": {
"@redocly/openapi-core": "1.0.0-beta.62",
"@redocly/openapi-core": "1.0.0-beta.63",
"conventional-changelog-cli": "2.1.1",
"npm-run-all": "4.1.5",
"shipjs": "0.24.0"
Expand Down
Loading

0 comments on commit ccf4bda

Please sign in to comment.