summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorおさむのひと <46447427+samunohito@users.noreply.github.com>2023-12-14 20:16:02 +0900
committerGitHub <noreply@github.com>2023-12-14 20:16:02 +0900
commit386fcedf3525eb18ed2297bd93d45d1d78a36f84 (patch)
tree98283bc709a08f23c84f539ac787e8923baa748f /packages
parentupdate deps (diff)
downloadmisskey-386fcedf3525eb18ed2297bd93d45d1d78a36f84.tar.gz
misskey-386fcedf3525eb18ed2297bd93d45d1d78a36f84.tar.bz2
misskey-386fcedf3525eb18ed2297bd93d45d1d78a36f84.zip
(dev-mode) devモードの改善 (#12639)
* fix dev-mode * fix dev-mode * fix dev-mode * fix dev-mode --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages')
-rw-r--r--packages/backend/package.json4
-rw-r--r--packages/frontend/@types/global.d.ts3
-rw-r--r--packages/frontend/src/_dev_boot_.ts84
-rw-r--r--packages/frontend/vite.config.local-dev.ts6
-rw-r--r--packages/misskey-js/package.json6
-rw-r--r--packages/sw/package.json3
6 files changed, 102 insertions, 4 deletions
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 17113a5e0d..504cc882ff 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -16,7 +16,8 @@
"watch:swc": "swc src -d built -D -w",
"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
"watch": "node watch.mjs",
- "dev": "node ./built/boot/entry.js",
+ "restart": "pnpm build && pnpm start",
+ "dev": "nodemon -w src -e ts,js,mjs,cjs,json --exec \"cross-env NODE_ENV=development pnpm run restart\"",
"typecheck": "tsc --noEmit",
"eslint": "eslint --quiet \"src/**/*.ts\"",
"lint": "pnpm typecheck && pnpm eslint",
@@ -226,6 +227,7 @@
"execa": "8.0.1",
"jest": "29.7.0",
"jest-mock": "29.7.0",
+ "nodemon": "3.0.2",
"simple-oauth2": "5.0.0"
}
}
diff --git a/packages/frontend/@types/global.d.ts b/packages/frontend/@types/global.d.ts
index 390f63990b..7d9335cc52 100644
--- a/packages/frontend/@types/global.d.ts
+++ b/packages/frontend/@types/global.d.ts
@@ -13,3 +13,6 @@ declare const _PERF_PREFIX_: string;
declare const _DATA_TRANSFER_DRIVE_FILE_: string;
declare const _DATA_TRANSFER_DRIVE_FOLDER_: string;
declare const _DATA_TRANSFER_DECK_COLUMN_: string;
+
+// for dev-mode
+declare const _LANGS_FULL_: string[][];
diff --git a/packages/frontend/src/_dev_boot_.ts b/packages/frontend/src/_dev_boot_.ts
index 2e95a03576..d01a957048 100644
--- a/packages/frontend/src/_dev_boot_.ts
+++ b/packages/frontend/src/_dev_boot_.ts
@@ -8,4 +8,88 @@
// (pnpm start時はpugファイルの中で静的リソースとして読み込むようになっており、この問題は起こっていない)
import '@tabler/icons-webfont/tabler-icons.scss';
+await main();
+
import('@/_boot_.js');
+
+/**
+ * backend/src/server/web/boot.jsで差し込まれている起動処理のうち、最低限必要なものを模倣するための処理
+ */
+async function main() {
+ const forceError = localStorage.getItem('forceError');
+ if (forceError != null) {
+ renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
+ }
+
+ //#region Detect language & fetch translations
+
+ // dev-modeの場合は常に取り直す
+ const supportedLangs = _LANGS_.map(it => it[0]);
+ let lang: string | null | undefined = localStorage.getItem('lang');
+ if (lang == null || !supportedLangs.includes(lang)) {
+ if (supportedLangs.includes(navigator.language)) {
+ lang = navigator.language;
+ } else {
+ lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+
+ // Fallback
+ if (lang == null) lang = 'en-US';
+ }
+ }
+
+ // TODO:今のままだと言語ファイル変更後はpnpm devをリスタートする必要があるので、chokidarを使ったり等で対応できるようにする
+ const locale = _LANGS_FULL_.find(it => it[0] === lang);
+ localStorage.setItem('lang', lang);
+ localStorage.setItem('locale', JSON.stringify(locale[1]));
+ localStorage.setItem('localeVersion', _VERSION_);
+ //#endregion
+
+ //#region Theme
+ const theme = localStorage.getItem('theme');
+ if (theme) {
+ for (const [k, v] of Object.entries(JSON.parse(theme))) {
+ document.documentElement.style.setProperty(`--${k}`, v.toString());
+
+ // HTMLの theme-color 適用
+ if (k === 'htmlThemeColor') {
+ for (const tag of document.head.children) {
+ if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') {
+ tag.setAttribute('content', v);
+ break;
+ }
+ }
+ }
+ }
+ }
+ const colorScheme = localStorage.getItem('colorScheme');
+ if (colorScheme) {
+ document.documentElement.style.setProperty('color-scheme', colorScheme);
+ }
+ //#endregion
+
+ const fontSize = localStorage.getItem('fontSize');
+ if (fontSize) {
+ document.documentElement.classList.add('f-' + fontSize);
+ }
+
+ const useSystemFont = localStorage.getItem('useSystemFont');
+ if (useSystemFont) {
+ document.documentElement.classList.add('useSystemFont');
+ }
+
+ const wallpaper = localStorage.getItem('wallpaper');
+ if (wallpaper) {
+ document.documentElement.style.backgroundImage = `url(${wallpaper})`;
+ }
+
+ const customCss = localStorage.getItem('customCss');
+ if (customCss && customCss.length > 0) {
+ const style = document.createElement('style');
+ style.innerHTML = customCss;
+ document.head.appendChild(style);
+ }
+}
+
+function renderError(code: string, details?: string) {
+ console.log(code, details);
+}
diff --git a/packages/frontend/vite.config.local-dev.ts b/packages/frontend/vite.config.local-dev.ts
index 6b6394a722..aea46f4231 100644
--- a/packages/frontend/vite.config.local-dev.ts
+++ b/packages/frontend/vite.config.local-dev.ts
@@ -1,5 +1,6 @@
import dns from 'dns';
import { defineConfig } from 'vite';
+import locales from '../../locales';
import { getConfig } from './vite.config.js';
dns.setDefaultResultOrder('ipv4first');
@@ -49,6 +50,11 @@ const devConfig = {
input: 'index.html',
},
},
+
+ define: {
+ ...defaultConfig.define,
+ _LANGS_FULL_: JSON.stringify(Object.entries(locales)),
+ },
};
export default defineConfig(({ command, mode }) => devConfig);
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 6a7712af90..0b54c6a59c 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -6,6 +6,7 @@
"types": "./built/index.d.ts",
"scripts": {
"build": "tsc",
+ "watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
"tsd": "tsd",
"api": "pnpm api-extractor run --local --verbose",
"api-prod": "pnpm api-extractor run --verbose",
@@ -32,9 +33,10 @@
"jest-fetch-mock": "3.0.3",
"jest-websocket-mock": "2.5.0",
"mock-socket": "9.3.1",
+ "ncp": "2.0.0",
+ "nodemon": "3.0.2",
"tsd": "0.29.0",
- "typescript": "5.3.3",
- "ncp": "2.0.0"
+ "typescript": "5.3.3"
},
"files": [
"built"
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 039a6887aa..990e991966 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -2,7 +2,7 @@
"name": "sw",
"private": true,
"scripts": {
- "watch": "node build.js watch",
+ "watch": "nodemon -w ../../package.json -e json --exec \"node build.js watch\"",
"build": "node build.js",
"typecheck": "tsc --noEmit",
"eslint": "eslint --quiet src/**/*.ts",
@@ -18,6 +18,7 @@
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
"eslint": "8.55.0",
"eslint-plugin-import": "2.29.0",
+ "nodemon": "3.0.2",
"typescript": "5.3.3"
},
"type": "module"