Skip to content
Snippets Groups Projects
Commit e5c50eb8 authored by tamaina's avatar tamaina
Browse files

Merge branch 'develop' into pizzax-indexeddb

parents 764da890 be313b8d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
package.json
+ 6
− 6
View file @ e5c50eb8
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"scripts": { "scripts": {
"postinstall": "node ./scripts/install-packages.js", "postinstall": "node ./scripts/install-packages.js",
"build": "node ./scripts/build.js", "build": "node ./scripts/build.js",
"start": "cd packages/backend && node --experimental-json-modules ./built/boot/index.js", "start": "cd packages/backend && node ./built/boot/index.js",
"start:test": "cd packages/backend && cross-env NODE_ENV=test node --experimental-json-modules ./built/boot/index.js", "start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js",
"init": "npm run migrate", "init": "npm run migrate",
"migrate": "cd packages/backend && npx typeorm migration:run -d ormconfig.js", "migrate": "cd packages/backend && npx typeorm migration:run -d ormconfig.js",
"migrateandstart": "npm run migrate && npm run start", "migrateandstart": "npm run migrate && npm run start",
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
"js-yaml": "4.1.0" "js-yaml": "4.1.0"
}, },
"devDependencies": { "devDependencies": {
"@types/gulp": "4.0.9", "@types/gulp": "4.0.10",
"@types/gulp-rename": "2.0.1", "@types/gulp-rename": "2.0.1",
"@typescript-eslint/parser": "5.42.1", "@typescript-eslint/parser": "5.43.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "11.0.1", "cypress": "11.1.0",
"start-server-and-test": "1.14.0", "start-server-and-test": "1.14.0",
"typescript": "4.8.4" "typescript": "4.9.3"
} }
} }
packages/backend/package.json
+ 14
− 14
View file @ e5c50eb8
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
"@peertube/http-signature": "1.7.0", "@peertube/http-signature": "1.7.0",
"@sinonjs/fake-timers": "10.0.0", "@sinonjs/fake-timers": "10.0.0",
"@syuilo/aiscript": "0.11.1", "@syuilo/aiscript": "0.11.1",
"ajv": "8.11.0", "ajv": "8.11.2",
"archiver": "5.3.1", "archiver": "5.3.1",
"autobind-decorator": "2.4.0", "autobind-decorator": "2.4.0",
"autwh": "0.1.0", "autwh": "0.1.0",
"aws-sdk": "2.1253.0", "aws-sdk": "2.1258.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"blurhash": "1.1.5", "blurhash": "2.0.4",
"bull": "4.10.1", "bull": "4.10.1",
"cacheable-lookup": "6.1.0", "cacheable-lookup": "6.1.0",
"cbor": "8.1.0", "cbor": "8.1.0",
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
"feed": "4.2.2", "feed": "4.2.2",
"file-type": "18.0.0", "file-type": "18.0.0",
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"got": "12.5.2", "got": "12.5.3",
"hpagent": "1.2.0", "hpagent": "1.2.0",
"ioredis": "4.28.5", "ioredis": "4.28.5",
"ip-cidr": "3.0.10", "ip-cidr": "3.0.11",
"is-svg": "4.3.2", "is-svg": "4.3.2",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"jsdom": "20.0.2", "jsdom": "20.0.2",
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"os-utils": "0.0.14", "os-utils": "0.0.14",
"parse5": "7.1.1", "parse5": "7.1.1",
"pg": "8.8.0", "pg": "8.8.0",
"private-ip": "2.3.4", "private-ip": "3.0.0",
"probe-image-size": "7.2.3", "probe-image-size": "7.2.3",
"promise-limit": "2.7.0", "promise-limit": "2.7.0",
"pug": "3.0.2", "pug": "3.0.2",
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
"stringz": "2.1.0", "stringz": "2.1.0",
"summaly": "2.7.0", "summaly": "2.7.0",
"syslog-pro": "1.0.0", "syslog-pro": "1.0.0",
"systeminformation": "5.12.14", "systeminformation": "5.13.5",
"tinycolor2": "1.4.2", "tinycolor2": "1.4.2",
"tmp": "0.2.1", "tmp": "0.2.1",
"ts-loader": "9.4.1", "ts-loader": "9.4.1",
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
"xev": "3.0.2" "xev": "3.0.2"
}, },
"devDependencies": { "devDependencies": {
"@redocly/openapi-core": "1.0.0-beta.112", "@redocly/openapi-core": "1.0.0-beta.114",
"@swc/core": "1.3.15", "@swc/core": "1.3.18",
"@swc/jest": "0.2.23", "@swc/jest": "0.2.23",
"@types/archiver": "5.3.1", "@types/archiver": "5.3.1",
"@types/bcryptjs": "2.4.2", "@types/bcryptjs": "2.4.2",
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
"@types/cbor": "6.0.0", "@types/cbor": "6.0.0",
"@types/escape-regexp": "0.0.1", "@types/escape-regexp": "0.0.1",
"@types/fluent-ffmpeg": "2.1.20", "@types/fluent-ffmpeg": "2.1.20",
"@types/jest": "29.2.2", "@types/jest": "29.2.3",
"@types/js-yaml": "4.0.5", "@types/js-yaml": "4.0.5",
"@types/jsdom": "20.0.1", "@types/jsdom": "20.0.1",
"@types/jsonld": "1.5.7", "@types/jsonld": "1.5.7",
...@@ -178,13 +178,13 @@ ...@@ -178,13 +178,13 @@
"@types/web-push": "3.3.2", "@types/web-push": "3.3.2",
"@types/websocket": "1.0.5", "@types/websocket": "1.0.5",
"@types/ws": "8.5.3", "@types/ws": "8.5.3",
"@typescript-eslint/eslint-plugin": "5.42.1", "@typescript-eslint/eslint-plugin": "5.43.0",
"@typescript-eslint/parser": "5.42.1", "@typescript-eslint/parser": "5.43.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"eslint": "8.27.0", "eslint": "8.28.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.26.0",
"execa": "6.1.0", "execa": "6.1.0",
"jest": "29.3.1", "jest": "29.3.1",
"typescript": "4.8.4" "typescript": "4.9.3"
} }
} }
packages/backend/yarn.lock
+ 168
− 158
View file @ e5c50eb8
This diff is collapsed.
packages/client/package.json
+ 10
− 10
View file @ e5c50eb8
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
"@vue/compiler-sfc": "3.2.45", "@vue/compiler-sfc": "3.2.45",
"autobind-decorator": "2.4.0", "autobind-decorator": "2.4.0",
"autosize": "5.0.1", "autosize": "5.0.1",
"blurhash": "1.1.5", "blurhash": "2.0.4",
"broadcast-channel": "4.18.1", "broadcast-channel": "4.18.1",
"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2", "browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2",
"chart.js": "3.9.1", "chart.js": "4.0.1",
"chartjs-adapter-date-fns": "2.0.0", "chartjs-adapter-date-fns": "2.0.1",
"chartjs-plugin-gradient": "0.5.1", "chartjs-plugin-gradient": "0.5.1",
"chartjs-plugin-zoom": "1.2.1", "chartjs-plugin-zoom": "1.2.1",
"compare-versions": "5.0.1", "compare-versions": "5.0.1",
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
"tsc-alias": "1.7.1", "tsc-alias": "1.7.1",
"tsconfig-paths": "4.1.0", "tsconfig-paths": "4.1.0",
"twemoji-parser": "14.0.0", "twemoji-parser": "14.0.0",
"typescript": "4.8.4", "typescript": "4.9.3",
"uuid": "9.0.0", "uuid": "9.0.0",
"vanilla-tilt": "1.7.3", "vanilla-tilt": "1.7.3",
"vite": "3.2.3", "vite": "3.2.4",
"vue": "3.2.45", "vue": "3.2.45",
"vue-prism-editor": "2.0.0-alpha.2", "vue-prism-editor": "2.0.0-alpha.2",
"vuedraggable": "4.0.1" "vuedraggable": "4.0.1"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"devDependencies": { "devDependencies": {
"@types/escape-regexp": "0.0.1", "@types/escape-regexp": "0.0.1",
"@types/glob": "8.0.0", "@types/glob": "8.0.0",
"@types/gulp": "4.0.9", "@types/gulp": "4.0.10",
"@types/gulp-rename": "2.0.1", "@types/gulp-rename": "2.0.1",
"@types/katex": "0.14.0", "@types/katex": "0.14.0",
"@types/matter-js": "0.18.2", "@types/matter-js": "0.18.2",
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
"@types/throttle-debounce": "5.0.0", "@types/throttle-debounce": "5.0.0",
"@types/tinycolor2": "1.4.3", "@types/tinycolor2": "1.4.3",
"@types/uuid": "8.3.4", "@types/uuid": "8.3.4",
"@typescript-eslint/eslint-plugin": "5.42.1", "@typescript-eslint/eslint-plugin": "5.43.0",
"@typescript-eslint/parser": "5.42.1", "@typescript-eslint/parser": "5.43.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "11.0.1", "cypress": "11.1.0",
"eslint": "8.27.0", "eslint": "8.28.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.26.0",
"eslint-plugin-vue": "9.7.0", "eslint-plugin-vue": "9.7.0",
"rollup": "3.3.0", "rollup": "3.3.0",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment