diff --git a/package.json b/package.json index 26af85ecd..d601b615e 100644 --- a/package.json +++ b/package.json @@ -57,11 +57,11 @@ "@swc/core": "^1.2.244", "@types/gulp": "4.0.9", "@types/gulp-rename": "2.0.1", - "@typescript-eslint/parser": "5.33.0", + "@typescript-eslint/parser": "5.35.1", "cross-env": "7.0.3", - "cypress": "10.4.0", + "cypress": "10.6.0", "start-server-and-test": "1.14.0", - "typescript": "4.7.4", + "typescript": "4.8.2", "unplugin-swc": "^1.3.2", "vue-eslint-parser": "^9.0.2" } diff --git a/packages/backend/package.json b/packages/backend/package.json index 8e9f42dac..e6fbf71ed 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -14,7 +14,7 @@ "test": "yarn mocha" }, "optionalDependencies": { - "@tensorflow/tfjs-node": "3.19.0" + "@tensorflow/tfjs-node": "3.20.0" }, "dependencies": { "@bull-board/koa": "4.2.2", @@ -30,7 +30,7 @@ "archiver": "5.3.1", "autobind-decorator": "2.4.0", "autwh": "0.1.0", - "aws-sdk": "2.1194.0", + "aws-sdk": "2.1204.0", "bcryptjs": "2.4.3", "blurhash": "1.1.5", "bull": "4.8.5", @@ -42,7 +42,7 @@ "cli-highlight": "2.1.11", "color-convert": "2.0.1", "content-disposition": "0.5.4", - "date-fns": "2.29.1", + "date-fns": "2.29.2", "deep-email-validator": "0.1.21", "escape-regexp": "0.0.1", "feed": "4.2.2", @@ -58,7 +58,7 @@ "json5": "2.2.1", "json5-loader": "4.0.1", "jsonld": "6.0.0", - "jsrsasign": "10.5.26", + "jsrsasign": "10.5.27", "koa": "2.13.4", "koa-bodyparser": "4.3.0", "koa-favicon": "2.1.0", @@ -80,7 +80,7 @@ "oauth": "^0.9.15", "os-utils": "0.0.14", "parse5": "7.0.0", - "pg": "8.7.3", + "pg": "8.8.0", "private-ip": "2.3.4", "probe-image-size": "7.2.3", "promise-limit": "2.7.0", @@ -105,7 +105,7 @@ "stringz": "2.1.0", "summaly": "2.7.0", "syslog-pro": "1.0.0", - "systeminformation": "5.12.5", + "systeminformation": "5.12.6", "tinycolor2": "1.4.2", "tmp": "0.2.1", "ts-loader": "9.3.1", @@ -113,7 +113,7 @@ "tsc-alias": "1.7.0", "tsconfig-paths": "4.1.0", "twemoji-parser": "14.0.0", - "typeorm": "0.3.7", + "typeorm": "0.3.8", "ulid": "2.3.0", "unzipper": "0.10.11", "uuid": "8.3.2", @@ -123,7 +123,7 @@ "xev": "3.0.2" }, "devDependencies": { - "@redocly/openapi-core": "1.0.0-beta.106", + "@redocly/openapi-core": "1.0.0-beta.108", "@types/bcryptjs": "2.4.2", "@types/bull": "3.15.9", "@types/cbor": "6.0.0", @@ -145,13 +145,13 @@ "@types/koa__multer": "2.0.4", "@types/koa__router": "8.0.11", "@types/mocha": "9.1.1", - "@types/node": "18.7.2", + "@types/node": "18.7.13", "@types/node-fetch": "3.0.3", "@types/nodemailer": "6.4.5", "@types/oauth": "0.9.1", "@types/pug": "2.0.6", "@types/punycode": "2.1.0", - "@types/qrcode": "1.4.2", + "@types/qrcode": "1.5.0", "@types/random-seed": "0.3.3", "@types/ratelimiter": "3.4.3", "@types/redis": "4.0.11", @@ -167,13 +167,13 @@ "@types/web-push": "3.3.2", "@types/websocket": "1.0.5", "@types/ws": "8.5.3", - "@typescript-eslint/eslint-plugin": "5.33.0", - "@typescript-eslint/parser": "5.33.0", + "@typescript-eslint/eslint-plugin": "5.35.1", + "@typescript-eslint/parser": "5.35.1", "cross-env": "7.0.3", - "eslint": "8.21.0", + "eslint": "8.23.0", "eslint-plugin-import": "2.26.0", "execa": "6.1.0", "form-data": "^4.0.0", - "typescript": "4.7.4" + "typescript": "4.8.2" } } diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index aeb13793e..29167f8df 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -92,6 +92,10 @@ } } } + const colorSchema = localStorage.getItem('colorSchema'); + if (colorSchema) { + document.documentElement.style.setProperty('color-schema', colorSchema); + } //#endregion const fontSize = localStorage.getItem('fontSize'); diff --git a/packages/client/package.json b/packages/client/package.json index 1b1b5c6c3..37aab9164 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -22,11 +22,11 @@ "browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer", "chart.js": "3.9.1", "chartjs-adapter-date-fns": "2.0.0", - "chartjs-plugin-gradient": "0.5.0", + "chartjs-plugin-gradient": "0.5.1", "chartjs-plugin-zoom": "1.2.1", - "compare-versions": "4.1.3", + "compare-versions": "5.0.1", "cropperjs": "2.0.0-beta", - "date-fns": "2.29.1", + "date-fns": "2.29.2", "escape-regexp": "0.0.1", "eventemitter3": "4.0.7", "idb-keyval": "6.2.0", @@ -37,12 +37,12 @@ "mfm-js": "0.23.0", "misskey-js": "0.0.14", "photoswipe": "5.3.0", - "prismjs": "1.28.0", + "prismjs": "1.29.0", "punycode": "2.1.1", "querystring": "0.2.1", "rndstr": "1.0.0", "s-age": "1.1.2", - "sass": "1.54.4", + "sass": "1.54.5", "seedrandom": "3.0.5", "strict-event-emitter-types": "2.0.0", "stringz": "2.1.0", @@ -56,10 +56,10 @@ "tsc-alias": "1.7.0", "tsconfig-paths": "4.1.0", "twemoji-parser": "14.0.0", - "typescript": "4.7.4", + "typescript": "4.8.2", "uuid": "8.3.2", "vanilla-tilt": "1.7.2", - "vite": "3.0.7", + "vite": "3.0.9", "vue": "3.2.37", "vue-plyr": "^7.0.0", "vue-prism-editor": "2.0.0-alpha.2", @@ -78,14 +78,14 @@ "@types/throttle-debounce": "5.0.0", "@types/tinycolor2": "1.4.3", "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.33.0", - "@typescript-eslint/parser": "5.33.0", + "@typescript-eslint/eslint-plugin": "5.35.1", + "@typescript-eslint/parser": "5.35.1", "cross-env": "7.0.3", - "cypress": "10.4.0", - "eslint": "8.21.0", + "cypress": "10.6.0", + "eslint": "8.23.0", "eslint-plugin-import": "2.26.0", - "eslint-plugin-vue": "9.3.0", - "rollup": "2.77.3", + "eslint-plugin-vue": "9.4.0", + "rollup": "2.78.1", "start-server-and-test": "1.14.0" } } diff --git a/packages/client/src/components/analog-clock.vue b/packages/client/src/components/analog-clock.vue index b138bfcb4..b709a2254 100644 --- a/packages/client/src/components/analog-clock.vue +++ b/packages/client/src/components/analog-clock.vue @@ -26,6 +26,7 @@ + + + - - diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index e977b4de5..1a7a81b7c 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -14,7 +14,7 @@ if (localStorage.getItem('accounts') != null) { //#endregion import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue'; -import compareVersions from 'compare-versions'; +import { compareVersions } from 'compare-versions'; import JSON5 from 'json5'; import widgets from '@/widgets'; diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index bdb507ce2..da312a345 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -60,6 +60,8 @@ export function applyTheme(theme: Theme, persist = true) { document.documentElement.classList.remove('_themeChanging_'); }, 1000); + const colorSchema = theme.base === 'dark' ? 'dark' : 'light'; + // Deep copy const _theme = JSON.parse(JSON.stringify(theme)); @@ -81,8 +83,11 @@ export function applyTheme(theme: Theme, persist = true) { document.documentElement.style.setProperty(`--${k}`, v.toString()); } + document.documentElement.style.setProperty('color-schema', colorSchema); + if (persist) { localStorage.setItem('theme', JSON.stringify(props)); + localStorage.setItem('colorSchema', colorSchema); } // 色計算など再度行えるようにクライアント全体に通知 diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index c0ed66d19..580b24b75 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -94,7 +94,6 @@ const widgetsShowing = $ref(false); provide('router', mainRouter); provideMetadataReceiver((info) => { - console.log(info); pageMetadata = info; if (pageMetadata.value) { document.title = `${pageMetadata.value.title} | ${instanceName}`; diff --git a/packages/client/src/widgets/unix-clock.vue b/packages/client/src/widgets/unix-clock.vue index c9e2b4b92..cf85ac782 100644 --- a/packages/client/src/widgets/unix-clock.vue +++ b/packages/client/src/widgets/unix-clock.vue @@ -1,6 +1,6 @@