enhance(backend): pugをやめ、JSXベースのテンプレートに変更 (#16908)

* enhance(backend): pugをやめ、JSXベースのテンプレートに変更 (to misskey-dev dev branch) (#16889) * wip * wip * wip * wip * fix lint * attempt to fix test * fix * fix * fix: oauthページの描画がおかしい問題を修正 * typo [ci skip] * fix * fix * fix * fix * fix * refactor * fix * fix * fix broken lockfile * fix: expose supported languages as global variable * remove i18n package from root as it is no longer required [ci skip] * fix * fix: add i18n package.json to Docker target-builder stage for federation tests (#16909) * Initial plan * fix: add i18n package.json to Docker target-builder stage for federation tests Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> * fix: followup-test-federation for enh-remove-pug (#16910) * fix: followup-test-federation for enh-remove-pug * Revert "fix: add i18n package.json to Docker target-builder stage for federation tests (#16909)" This reverts commit 14313468d3. * fix: CSSが読み込まれない場合がある問題を修正 * fix [ci skip] * fix: propsのデフォルト値をnull合体演算子から論理和演算子に変更（空文字に対処するため） * remove @types/pug * enhance: bootloaderを埋め込むように * fix possible race condition * remove esbuild --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
2026-03-21 03:30:42 +00:00 · 2025-12-01 18:36:55 +09:00
parent e1b6e9d4b6
commit f222d7e24d
70 changed files with 1507 additions and 948 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,9 +77,6 @@ importers:
      globals:
        specifier: 16.5.0
        version: 16.5.0
-      i18n:
-        specifier: workspace:*
-        version: link:packages/i18n
      ncp:
        specifier: 2.0.0
        version: 2.0.0
@@ -126,9 +123,9 @@ importers:
      '@fastify/static':
        specifier: 8.3.0
        version: 8.3.0
-      '@fastify/view':
-        specifier: 11.1.1
-        version: 11.1.1
+      '@kitajs/html':
+        specifier: 4.2.11
+        version: 4.2.11
      '@misskey-dev/sharp-read-bmp':
        specifier: 1.2.0
        version: 1.2.0
@@ -255,6 +252,9 @@ importers:
      http-link-header:
        specifier: 1.1.3
        version: 1.1.3
+      i18n:
+        specifier: workspace:*
+        version: link:../i18n
      ioredis:
        specifier: 5.8.2
        version: 5.8.2
@@ -345,9 +345,6 @@ importers:
      promise-limit:
        specifier: 2.7.0
        version: 2.7.0
-      pug:
-        specifier: 3.0.3
-        version: 3.0.3
      qrcode:
        specifier: 1.5.4
        version: 1.5.4
@@ -436,6 +433,9 @@ importers:
      '@jest/globals':
        specifier: 29.7.0
        version: 29.7.0
+      '@kitajs/ts-html-plugin':
+        specifier: 4.1.3
+        version: 4.1.3(@kitajs/html@4.2.11)(typescript@5.9.3)
      '@nestjs/platform-express':
        specifier: 11.1.9
        version: 11.1.9(@nestjs/common@11.1.9(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)
@@ -505,9 +505,6 @@ importers:
      '@types/pg':
        specifier: 8.15.6
        version: 8.15.6
-      '@types/pug':
-        specifier: 2.0.10
-        version: 2.0.10
      '@types/qrcode':
        specifier: 1.5.6
        version: 1.5.6
@@ -592,6 +589,9 @@ importers:
      supertest:
        specifier: 7.1.4
        version: 7.1.4
+      vite:
+        specifier: 7.2.4
+        version: 7.2.4(@types/node@24.10.1)(sass@1.94.2)(terser@5.44.1)(tsx@4.20.6)
    optionalDependencies:
      '@swc/core-android-arm64':
        specifier: 1.3.11
@@ -2503,9 +2503,6 @@ packages:
  '@fastify/static@8.3.0':
    resolution: {integrity: sha512-yKxviR5PH1OKNnisIzZKmgZSus0r2OZb8qCSbqmw34aolT4g3UlzYfeBRym+HJ1J471CR8e2ldNub4PubD1coA==}

-  '@fastify/view@11.1.1':
-    resolution: {integrity: sha512-GiHqT3R2eKJgWmy0s45eELTC447a4+lTM2o+8fSWeKwBe9VToeePuHJcKtOEXPrKGSddGO0RsNayULiS3aeHeQ==}
-
  '@file-type/xml@0.4.4':
    resolution: {integrity: sha512-NhCyXoHlVZ8TqM476hyzwGJ24+D5IPSaZhmrPj7qXnEVb3q6jrFzA3mM9TBpknKSI9EuQeGTKRg2DXGUwvBBoQ==}

@@ -2864,6 +2861,17 @@ packages:
  '@keyv/serialize@1.1.1':
    resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}

+  '@kitajs/html@4.2.11':
+    resolution: {integrity: sha512-gOe+zzCZKN2fPT1FUK32mHsr21ILcAOUUux/yDqQthInW8egN8RuxVp+zP3KhwWETVACkurBiKV9RWuNw+ceiw==}
+    engines: {node: '>=12'}
+
+  '@kitajs/ts-html-plugin@4.1.3':
+    resolution: {integrity: sha512-NlYrID5yMxfRKiO1eiiSC4MWveKe0ffoCJOZm4idNOqwimmLXr0g1NmvCcquOU2XLRrgzynxZqw6rhwR5CY5Nw==}
+    hasBin: true
+    peerDependencies:
+      '@kitajs/html': ^4.2.10
+      typescript: ^5.6.2
+
  '@kurkle/color@0.3.4':
    resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==}

@@ -4812,9 +4820,6 @@ packages:
  '@types/pg@8.15.6':
    resolution: {integrity: sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==}

-  '@types/pug@2.0.10':
-    resolution: {integrity: sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==}
-
  '@types/punycode@2.1.4':
    resolution: {integrity: sha512-trzh6NzBnq8yw5e35f8xe8VTYjqM3NE7bohBtvDVf/dtUer3zYTLK1Ka3DG3p7bdtoaOHZucma6FfVKlQ134pQ==}

@@ -5915,6 +5920,10 @@ packages:
    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
    engines: {node: '>=12'}

+  cliui@9.0.1:
+    resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==}
+    engines: {node: '>=20'}
+
  cluster-key-slot@1.1.2:
    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
    engines: {node: '>=0.10.0'}
@@ -6451,6 +6460,9 @@ packages:
    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
    engines: {node: '>=12'}

+  emoji-regex@10.6.0:
+    resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
+
  emoji-regex@8.0.0:
    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}

@@ -7060,6 +7072,10 @@ packages:
    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
    engines: {node: 6.* || 8.* || >= 10.*}

+  get-east-asian-width@1.4.0:
+    resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==}
+    engines: {node: '>=18'}
+
  get-intrinsic@1.3.0:
    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
    engines: {node: '>= 0.4'}
@@ -10151,6 +10167,10 @@ packages:
    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
    engines: {node: '>=12'}

+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
+    engines: {node: '>=18'}
+
  string.prototype.trim@1.2.10:
    resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
    engines: {node: '>= 0.4'}
@@ -11108,6 +11128,10 @@ packages:
    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
    engines: {node: '>=12'}

+  wrap-ansi@9.0.2:
+    resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==}
+    engines: {node: '>=18'}
+
  wrappy@1.0.2:
    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}

@@ -11189,6 +11213,10 @@ packages:
    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
    engines: {node: '>=12'}

+  yargs-parser@22.0.0:
+    resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
  yargs@15.4.1:
    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
    engines: {node: '>=8'}
@@ -11201,6 +11229,10 @@ packages:
    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
    engines: {node: '>=12'}

+  yargs@18.0.0:
+    resolution: {integrity: sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
  yauzl@2.10.0:
    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}

@@ -12489,11 +12521,6 @@ snapshots:
      fastq: 1.19.1
      glob: 11.1.0

-  '@fastify/view@11.1.1':
-    dependencies:
-      fastify-plugin: 5.1.0
-      toad-cache: 3.7.0
-
  '@file-type/xml@0.4.4':
    dependencies:
      sax: 1.4.3
@@ -12904,6 +12931,18 @@ snapshots:

  '@keyv/serialize@1.1.1': {}

+  '@kitajs/html@4.2.11':
+    dependencies:
+      csstype: 3.2.3
+
+  '@kitajs/ts-html-plugin@4.1.3(@kitajs/html@4.2.11)(typescript@5.9.3)':
+    dependencies:
+      '@kitajs/html': 4.2.11
+      chalk: 5.6.2
+      tslib: 2.8.1
+      typescript: 5.9.3
+      yargs: 18.0.0
+
  '@kurkle/color@0.3.4': {}

  '@levischuck/tiny-cbor@0.2.11': {}
@@ -15177,8 +15216,6 @@ snapshots:
      pg-protocol: 1.10.3
      pg-types: 2.2.0

-  '@types/pug@2.0.10': {}
-
  '@types/punycode@2.1.4': {}

  '@types/qrcode@1.5.6':
@@ -16555,6 +16592,12 @@ snapshots:
      strip-ansi: 6.0.1
      wrap-ansi: 7.0.0

+  cliui@9.0.1:
+    dependencies:
+      string-width: 7.2.0
+      strip-ansi: 7.1.2
+      wrap-ansi: 9.0.2
+
  cluster-key-slot@1.1.2: {}

  co@4.6.0: {}
@@ -17140,6 +17183,8 @@ snapshots:

  emittery@0.13.1: {}

+  emoji-regex@10.6.0: {}
+
  emoji-regex@8.0.0: {}

  emoji-regex@9.2.2: {}
@@ -18025,6 +18070,8 @@ snapshots:

  get-caller-file@2.0.5: {}

+  get-east-asian-width@1.4.0: {}
+
  get-intrinsic@1.3.0:
    dependencies:
      call-bind-apply-helpers: 1.0.2
@@ -21684,6 +21731,12 @@ snapshots:
      emoji-regex: 9.2.2
      strip-ansi: 7.1.2

+  string-width@7.2.0:
+    dependencies:
+      emoji-regex: 10.6.0
+      get-east-asian-width: 1.4.0
+      strip-ansi: 7.1.2
+
  string.prototype.trim@1.2.10:
    dependencies:
      call-bind: 1.0.8
@@ -22634,6 +22687,12 @@ snapshots:
      string-width: 5.1.2
      strip-ansi: 7.1.2

+  wrap-ansi@9.0.2:
+    dependencies:
+      ansi-styles: 6.2.3
+      string-width: 7.2.0
+      strip-ansi: 7.1.2
+
  wrappy@1.0.2: {}

  write-file-atomic@4.0.2:
@@ -22690,6 +22749,8 @@ snapshots:

  yargs-parser@21.1.1: {}

+  yargs-parser@22.0.0: {}
+
  yargs@15.4.1:
    dependencies:
      cliui: 6.0.0
@@ -22724,6 +22785,15 @@ snapshots:
      y18n: 5.0.8
      yargs-parser: 21.1.1

+  yargs@18.0.0:
+    dependencies:
+      cliui: 9.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      string-width: 7.2.0
+      y18n: 5.0.8
+      yargs-parser: 22.0.0
+
  yauzl@2.10.0:
    dependencies:
      buffer-crc32: 0.2.13