diff --git a/README.md b/README.md index 651e964..350e829 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## 本体 **要件** -- Node.js v22.15.0以上v23未満 +- Node.js v24.14以上v25未満 - pnpm v10.17.0以上 ```bash @@ -13,21 +13,17 @@ # config/config.yamlをコメントに従って変更してください。 cp config/example.yaml config/config.yaml -# フロントエンドのビルド -cd packages/frontend +# 依存関係のインストール pnpm i -pnpm run build -# バックエンドのビルド -cd ../backend -pnpm i +# ビルド pnpm run build # データベースのマイグレーション -pnpm mikro migration:up +pnpm -F backend mikro migration:up # 起動 -pnpm run start +pnpm -F backend start ``` ## PostgreSQL diff --git a/package.json b/package.json index 66f425a..e0bf9dc 100755 --- a/package.json +++ b/package.json @@ -7,6 +7,11 @@ "email": "info@last2014.com", "url": "https://about.last2014.com" }, + "scripts": { + "start": "pnpm -F backend start", + "dev": "pnpm -r --parallel --no-bail dev", + "build": "pnpm -r --parallel build" + }, "license": "AGPL-3.0-only", "packageManager": "pnpm@10.29.1" } diff --git a/packages/backend/package.json b/packages/backend/package.json index 3a4b7f8..a9bee63 100755 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -22,8 +22,8 @@ "@mikro-orm/migrations": "^6.6.7", "@mikro-orm/postgresql": "^6.6.7", "@mikro-orm/reflection": "^6.6.7", - "@types/node": "^25.2.2", "argon2": "^0.44.0", + "cross-env": "^10.1.0", "fastify": "^5.7.4", "fastify-plugin": "^5.1.0", "fs": "0.0.1-security", @@ -37,6 +37,6 @@ "zod": "^4.3.6" }, "devDependencies": { - "cross-env": "^10.1.0" + "@types/node": "^24.1.0" } } diff --git a/packages/backend/src/mikro-orm.config.ts b/packages/backend/src/mikro-orm.config.ts index 5006da6..e61e3ef 100644 --- a/packages/backend/src/mikro-orm.config.ts +++ b/packages/backend/src/mikro-orm.config.ts @@ -17,7 +17,7 @@ export default defineConfig({ extensions: [Migrator], metadataProvider: TsMorphMetadataProvider, debug: process.env.NODE_ENV !== "production", - logger: (message: string) => { + logger: (message) => { logger.log(`[MikroORM] ${message}`); }, diff --git a/packages/frontend/src/Layout.vue b/packages/frontend/src/Layout.vue index 6daf85c..85c50cd 100755 --- a/packages/frontend/src/Layout.vue +++ b/packages/frontend/src/Layout.vue @@ -24,10 +24,10 @@ import { RouterView } from "vue-router"; import routerStatus from "@/lib/router"; import Progress from "@/components/Progress.vue"; -import LynqChat from "lynqchat-js"; +/*import LynqChat from "lynqchat-js"; import type ApiMap from "lynqchat-js/1.0.0-alpha.0/map" const client = new LynqChat({ origin: window.origin, -}); +});*/ \ No newline at end of file diff --git a/packages/lynqchat-js/package.json b/packages/lynqchat-js/package.json index 5afc0ce..ee31e70 100644 --- a/packages/lynqchat-js/package.json +++ b/packages/lynqchat-js/package.json @@ -12,8 +12,7 @@ "url": "https://about.last2014.com" }, "scripts": { - "build": "tsc && tsc-alias && copyfiles -u 1 \"src/**/*.d.ts\" dist", - "prepare": "tsc && tsc-alias && copyfiles -u 1 \"src/**/*.d.ts\" dist" + "build": "tsc && tsc-alias && copyfiles -u 1 \"src/**/*.d.ts\" dist" }, "exports": { ".": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a40cda7..9870b36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,19 +18,19 @@ importers: version: 6.6.9 '@mikro-orm/migrations': specifier: ^6.6.7 - version: 6.6.9(@mikro-orm/core@6.6.9)(@types/node@25.5.0)(pg@8.19.0) + version: 6.6.9(@mikro-orm/core@6.6.9)(@types/node@24.1.0)(pg@8.19.0) '@mikro-orm/postgresql': specifier: ^6.6.7 version: 6.6.9(@mikro-orm/core@6.6.9) '@mikro-orm/reflection': specifier: ^6.6.7 version: 6.6.9(@mikro-orm/core@6.6.9) - '@types/node': - specifier: ^25.2.2 - version: 25.5.0 argon2: specifier: ^0.44.0 version: 0.44.0 + cross-env: + specifier: ^10.1.0 + version: 10.1.0 fastify: specifier: ^5.7.4 version: 5.8.2 @@ -63,9 +63,9 @@ importers: specifier: ^4.3.6 version: 4.3.6 devDependencies: - cross-env: - specifier: ^10.1.0 - version: 10.1.0 + '@types/node': + specifier: ^24.1.0 + version: 24.1.0 packages/frontend: dependencies: @@ -547,12 +547,12 @@ packages: '@types/argparse@1.0.38': resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==} + '@types/node@24.1.0': + resolution: {integrity: sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==} + '@types/node@24.12.0': resolution: {integrity: sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==} - '@types/node@25.5.0': - resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==} - '@vitejs/plugin-vue@6.0.4': resolution: {integrity: sha512-uM5iXipgYIn13UUQCZNdWkYk+sysBeA97d5mHsAoAt1u/wpN3+zxOmsVJWosuzX+IMGRzeYUNytztrYznboIkQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1742,8 +1742,8 @@ packages: undici-types@7.16.0: resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} - undici-types@7.18.2: - resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + undici-types@7.8.0: + resolution: {integrity: sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==} universalify@2.0.1: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} @@ -2102,12 +2102,12 @@ snapshots: - supports-color - tedious - '@mikro-orm/migrations@6.6.9(@mikro-orm/core@6.6.9)(@types/node@25.5.0)(pg@8.19.0)': + '@mikro-orm/migrations@6.6.9(@mikro-orm/core@6.6.9)(@types/node@24.1.0)(pg@8.19.0)': dependencies: '@mikro-orm/core': 6.6.9 '@mikro-orm/knex': 6.6.9(@mikro-orm/core@6.6.9)(pg@8.19.0) fs-extra: 11.3.3 - umzug: 3.8.2(@types/node@25.5.0) + umzug: 3.8.2(@types/node@24.1.0) transitivePeerDependencies: - '@types/node' - better-sqlite3 @@ -2224,7 +2224,7 @@ snapshots: '@rolldown/pluginutils@1.0.0-rc.9': {} - '@rushstack/node-core-library@5.13.0(@types/node@25.5.0)': + '@rushstack/node-core-library@5.13.0(@types/node@24.1.0)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -2235,18 +2235,18 @@ snapshots: resolve: 1.22.11 semver: 7.5.4 optionalDependencies: - '@types/node': 25.5.0 + '@types/node': 24.1.0 - '@rushstack/terminal@0.15.2(@types/node@25.5.0)': + '@rushstack/terminal@0.15.2(@types/node@24.1.0)': dependencies: - '@rushstack/node-core-library': 5.13.0(@types/node@25.5.0) + '@rushstack/node-core-library': 5.13.0(@types/node@24.1.0) supports-color: 8.1.1 optionalDependencies: - '@types/node': 25.5.0 + '@types/node': 24.1.0 - '@rushstack/ts-command-line@4.23.7(@types/node@25.5.0)': + '@rushstack/ts-command-line@4.23.7(@types/node@24.1.0)': dependencies: - '@rushstack/terminal': 0.15.2(@types/node@25.5.0) + '@rushstack/terminal': 0.15.2(@types/node@24.1.0) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -2266,14 +2266,14 @@ snapshots: '@types/argparse@1.0.38': {} + '@types/node@24.1.0': + dependencies: + undici-types: 7.8.0 + '@types/node@24.12.0': dependencies: undici-types: 7.16.0 - '@types/node@25.5.0': - dependencies: - undici-types: 7.18.2 - '@vitejs/plugin-vue@6.0.4(vite@8.0.0(@types/node@24.12.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 @@ -3425,9 +3425,9 @@ snapshots: ufo@1.6.3: {} - umzug@3.8.2(@types/node@25.5.0): + umzug@3.8.2(@types/node@24.1.0): dependencies: - '@rushstack/ts-command-line': 4.23.7(@types/node@25.5.0) + '@rushstack/ts-command-line': 4.23.7(@types/node@24.1.0) emittery: 0.13.1 fast-glob: 3.3.3 pony-cause: 2.1.11 @@ -3437,7 +3437,7 @@ snapshots: undici-types@7.16.0: {} - undici-types@7.18.2: {} + undici-types@7.8.0: {} universalify@2.0.1: {}