Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow upstream/2024.9.0 #131

Closed
wants to merge 44 commits into from
Closed

Conversation

adzukimame
Copy link
Owner

What

  • upstreamの変更を取り込み(2024.9.0まで)

Why

Additional info (optional)

Checklist

  • コントリビューションガイド を確認した
  • ローカル環境でテストが動作している
  • (必要なら)Storybookのストーリーを追加する
  • (必要なら)CHANGELOGを更新する
  • (可能なら)テストを追加する

github-actions bot and others added 30 commits August 18, 2024 08:08
that Japanese string exactly matches that i18n key

(cherry picked from commit a408d32)

Co-authored-by: dakkar <[email protected]>
* refactor(sw): use fully typed locales

* fix(backend): enumerate achievement notification type
…chema (misskey-dev#14468)

* fix(backend): represent tuples with `prefixItems`

* refactor(frontend): fix type errors

* fix(backend): add `prefixItems` in `SchemaType`

* fix(backend): add `unevaluatedItems: false` to disallow extra items

* refactor(frontend): consolidate `'deliver' | 'queue'` type def into `queue.vue`

* fix(backend): add `unevaluatedItems` in `SchemaType`
* style(sw): lint fixes

* refactor(sw): fix type errors

* chore(sw): disable `noImplicitAny`

* ci(sw): enable typecheck ci

* ci(sw): build `misskey-js` before typecheck
* enhance(frontend): アイコンデコレーション管理画面にプレビューを追加

* Update Changelog

* tweak
* fix(frontend): instance infoページで不必要なapiリクエストが飛ぶのを抑止

* fix
* fix

* navhookをbootに移動

* サーバーサイドのbootも分けるように

* 埋め込みページかどうかの判定は最初の一回だけに

* tooltipは出せるように

* fix design

* 埋め込み独自のtooltipを削除

* ロジックの分岐が多かったMkNoteDetailedを分離

* fix indent

* プレビュー用iframeにフォーカスが当たるのを修正

* popupの制御を出す側で行うように

* パラメータが逆になっていたのを修正

* Update MkEmbedCodeGenDialog.vue

* fix

* eliminate misskey-js lint warns

* fix

* add appropriate attributes to embed html

* enhance: サーバーサイドのembed系をさらに分離

* enhance: embed routerを分離(route定義をboot時に変更できるようにする改修を含む)

* type

* lint

* fix indent

* server-side styleを完全に分離

* Revert "refactor: 画面サイズのしきい値をconstにまとめる"

This reverts commit 05ca36f.

* fix

* revert all changes in base.pug

* embedドメインをまとめた

* embedドメインをまとめた

* prevent calling contextmenu in embed page by stopping at the caller

* fix import

* fix import

* improve directory structure

* fix import

* register timeline ui as a container

* wa-

* rename

* wa-

* Update EmMediaList.vue

* Update EmMediaList.vue

* Update EmMediaList.vue

* Update EmMediaImage.vue

* Update EmNote.vue

* revert mkmedialist changes

* 戻し漏れ

* wip

* tweak embed media ui

* revert original media components

* Update boot.embed.js

* rename

* wip

* Update MkNote.vue

* wip

* Update MkSubNoteContent.vue

* Update EmNote.vue

* Update packages/frontend/src/router/definition.ts

* Revert "Update packages/frontend/src/router/definition.ts"

This reverts commit 937ae44.

* refactor EmMediaImage

* fix import

* remove unused imports

* Update router.ts

* wip

* Update boot.ts

* wip

* wip

* wip

* wip

* Update EmNote.vue

* Update EmNote.vue

* Create EmA.vue

* Create EmAvatar.vue

* Update EmAvatar.vue

* wip

* wip

* wip

* Create EmImgWithBlurhash.vue

* Update EmImgWithBlurhash.vue

* Create EmPagination.vue

* wip

* Update boot.ts

* wip

* wip

* wi@p

* wip

* wip

* wiop

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update boot.ts

* wip

* Update MkMisskeyFlavoredMarkdown.ts

* wip

* wip

* wip

* wip

* wip

* Update post-message.ts

* wip

* Update EmNoteDetailed.vue

* Update EmNoteDetailed.vue

* Create instance.ts

* Update EmNoteDetailed.vue

* wip

* Update EmNoteDetailed.vue

* wip

* wip

* wip

* Update pnpm-lock.yaml

* wip

* wip

* wp

* wip

* Update ClientServerService.ts

* wip

* Update boot.ts

* Update vite.config.local-dev.ts

* Update vite.config.ts

* Create index.html

* wa-

* wip

* Update boot.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Create EmLink.vue

* Create EmMention.vue

* Update EmMfm.ts

* wip

* wip

* wip

* wip

* Update vite.config.ts

* Update boot.ts

* Update EmA.vue

* うぃp

* wip

* wip

* Create EmError.vue

* wip

* Update MkEmbedCodeGenDialog.vue

* Update EmNote.vue

* wip

* wip

* Update user-timeline.vue

* Update check-spdx-license-id.yml

* wip

* wip

* style(frontend-shared): lint fixes on build.js

* fix(frontend-shared): include `*.{js,json}` files in js-built

* wip

* use alias

* refactor

* refactor

* Update scroll.ts

* refactor

* refactor

* refactor

* wip

* wip

* wip

* wip

* Update roles.vue

* Update branding.vue

* wip

* wip

* wip

* Update page.vue

* wip

* fix import

* add missing css variables

* 絵文字をtwemojiに変更

クライアントデフォルトにあわせるため

* force empoll readonly

* fix compiler error

* fix broken imports

* tweak button style

* run api extractor

* fix storybook theme preloads

* fix storybook instance imports

* Update preview.ts

* Update preview.ts

* Update preview.ts

* Revert "Update preview.ts"

This reverts commit 12bab1c.

* Revert "Update preview.ts"

This reverts commit 5c0ce01.

* Revert "Update preview.ts"

This reverts commit f486352.

* Revert "fix storybook instance imports"

This reverts commit ed8eabb.

* Revert "wip"

This reverts commit d3c1926.

* Revert "Update page.vue"

This reverts commit 27c7900.

* Revert "Update branding.vue"

This reverts commit c08ccb6.

* Revert "Update roles.vue"

This reverts commit 1488b67.

* Revert "wip"

This reverts commit aab1c76.

* refactor: use common media proxy

* fix imports

* fix

* fix: MediaProxyの初期化を保証する(storybook対策?)

* enhance(frontend-embed): improve embedParams provide

* fix(backend): MK_DEV_PREFER=backendのときにembed viteが読み込めないのを修正

* fix

* embed-pageを共通化

* fix import

* fix import

* fix import

* const.jsを共通化

(たぶんrevertしすぎた)

* fix type error

* fix duplicated import

* fix lint

* fix

* コメントとして残す

* sharedとembedをlint対象にする

* lint

* attempt to fix eslint (frontend-shared)

* lint fixes

---------

Co-authored-by: syuilo <[email protected]>
Co-authored-by: zyoshoka <[email protected]>
* fix(frontend-embed): add missing imports

* fix(frontend-embed): add missing styles
* fix(frontend/frontend-embed): wrong imports

* enhance(frontend-embed): サーバーデフォルトのテーマがある場合はそちらを利用するように

* 🎨

* 🎨

* 🎨
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

Attention: Patch coverage is 28.06452% with 223 lines in your changes missing coverage. Please review.

Project coverage is 42.11%. Comparing base (b5cf779) to head (23c0704).

Files with missing lines Patch % Lines
packages/frontend/src/pages/avatar-decorations.vue 0.00% 80 Missing ⚠️
packages/frontend/src/components/MkChart.vue 0.00% 26 Missing ⚠️
packages/frontend/src/pages/instance-info.vue 0.00% 17 Missing ⚠️
packages/frontend/src/pages/admin/queue.chart.vue 0.00% 15 Missing ⚠️
...ckages/frontend/src/pages/admin/overview.queue.vue 0.00% 11 Missing ⚠️
packages/backend/src/server/api/ApiCallService.ts 0.00% 10 Missing ⚠️
packages/frontend/src/scripts/upload.ts 10.00% 9 Missing ⚠️
packages/frontend/src/ui/_common_/statusbars.vue 0.00% 8 Missing ⚠️
packages/frontend/src/scripts/get-note-menu.ts 0.00% 5 Missing ⚠️
packages/frontend/src/ui/_common_/navbar.vue 0.00% 5 Missing ⚠️
... and 20 more
Additional details and impacted files
@@                Coverage Diff                @@
##           develop-mame     #131       +/-   ##
=================================================
+ Coverage         20.73%   42.11%   +21.37%     
=================================================
  Files               713     1520      +807     
  Lines             95143   189460    +94317     
  Branches           1038     3559     +2521     
=================================================
+ Hits              19728    79782    +60054     
- Misses            74883   109096    +34213     
- Partials            532      582       +50     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

github-actions bot commented Oct 18, 2024

このPRによるapi.jsonの差分

差分はこちら
--- base
+++ head
@@ -9912,16 +9912,15 @@
                   "type": "array",
                   "items": {
                     "type": "array",
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    }
+                    "prefixItems": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      }
+                    ],
+                    "unevaluatedItems": false
                   },
                   "example": [
                     [
@@ -10067,16 +10066,15 @@
                   "type": "array",
                   "items": {
                     "type": "array",
-                    "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "type": "number"
-                        }
-                      ]
-                    }
+                    "prefixItems": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      }
+                    ],
+                    "unevaluatedItems": false
                   },
                   "example": [
                     [
@@ -72580,10 +72578,16 @@
                 "type": "string"
               },
               "header": {
-                "type": "string"
+                "type": [
+                  "string",
+                  "null"
+                ]
               },
               "icon": {
-                "type": "string"
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "required": [
@@ -74816,6 +74820,9 @@
               "global"
             ],
             "default": "local"
+          },
+          "maxFileSize": {
+            "type": "number"
           }
         },
         "required": [
@@ -74867,7 +74874,8 @@
           "serverRules",
           "themeColor",
           "policies",
-          "noteSearchableScope"
+          "noteSearchableScope",
+          "maxFileSize"
         ]
       },
       "MetaDetailedOnly": {

Get diff files from Workflow Page

@adzukimame
Copy link
Owner Author

ours戦略を使いながらマージするより、必要なものだけcherry-pickしていくほうがいいかも

@adzukimame
Copy link
Owner Author

#132 が先に進んだので閉じる

@adzukimame adzukimame closed this Oct 19, 2024
@adzukimame adzukimame deleted the follow-upstream/2024.9.0 branch October 19, 2024 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants