Hazelnoot
9c301fa5aa
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# .github/workflows/api-misskey-js.yml
# .github/workflows/changelog-check.yml
# .github/workflows/check-misskey-js-autogen.yml
# .github/workflows/get-api-diff.yml
# .github/workflows/lint.yml
# .github/workflows/locale.yml
# .github/workflows/on-release-created.yml
# .github/workflows/storybook.yml
# .github/workflows/test-backend.yml
# .github/workflows/test-federation.yml
# .github/workflows/test-frontend.yml
# .github/workflows/test-misskey-js.yml
# .github/workflows/test-production.yml
# .github/workflows/validate-api-json.yml
# package.json
# packages/backend/package.json
# packages/backend/src/server/api/ApiCallService.ts
# packages/backend/src/server/api/endpoints/drive/files/create.ts
# packages/frontend-shared/js/url.ts
# packages/frontend/package.json
# packages/frontend/src/components/MkFileCaptionEditWindow.vue
# packages/frontend/src/components/MkInfo.vue
# packages/frontend/src/components/MkLink.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNotes.vue
# packages/frontend/src/components/MkPageWindow.vue
# packages/frontend/src/components/MkReactionsViewer.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/MkUrlPreview.vue
# packages/frontend/src/components/MkUserPopup.vue
# packages/frontend/src/components/global/MkPageHeader.vue
# packages/frontend/src/components/global/MkUrl.vue
# packages/frontend/src/components/global/PageWithHeader.vue
# packages/frontend/src/pages/about-misskey.vue
# packages/frontend/src/pages/announcements.vue
# packages/frontend/src/pages/antenna-timeline.vue
# packages/frontend/src/pages/channel.vue
# packages/frontend/src/pages/instance-info.vue
# packages/frontend/src/pages/note.vue
# packages/frontend/src/pages/page.vue
# packages/frontend/src/pages/role.vue
# packages/frontend/src/pages/tag.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user-list-timeline.vue
# packages/frontend/src/pages/user/followers.vue
# packages/frontend/src/pages/user/following.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/pages/user/index.vue
# packages/frontend/src/ui/deck.vue
# packages/misskey-js/generator/package.json
# pnpm-lock.yaml
# scripts/changelog-checker/package-lock.json
# scripts/changelog-checker/package.json
2025-04-29 15:54:11 -04:00
かっこかり
6acb743e5e
deps: update pnpm to v10.10.0 ( #15899 )
...
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-28 10:12:04 +09:00
renovate[bot]
d9ff6011e3
chore(deps): update [tools] update dependencies ( #15810 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-28 09:31:34 +09:00
Hazelnoot
a4dd19fdd4
merge upstream again
2025-04-24 14:23:45 -04:00
かっこかり
96de18b096
fix(deps): update vite to v6.3.1 ( #15857 )
2025-04-17 02:57:53 +00:00
Hazelnoot
7e7350eab5
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# .github/workflows/storybook.yml
# package.json
# packages/frontend/src/utility/autogen/settings-search-index.ts
# pnpm-lock.yaml
2025-04-05 12:24:00 -04:00
anatawa12
5949bb6c7f
fix: unnecesary HMR when we opened setting page ( #15756 )
...
* refactor: add MarkerIdAssigner instead of processVueFile and remove transformedCodeCache object
* chore: add minimatch, a glob matcher
* chore: expose MarkerIdAssigner from plugin
* Revert "chore: expose MarkerIdAssigner from plugin"
This reverts commit 88c6d820f8635c35f1c15b4aac0987075d7cf8aa.
* chore: add plugin to generate virtual module
* chore: parse inlining earlier
* chore: use virtual module in search
* chore: use remove old generation
* chore: fix type errors
* chore: add patch to workaround vitejs/vite#19792
* chore: improve filtering files to process
* chore: rename plugin
* docs: add comment for plugin ordering
* fix: unnecessary log
* fix: spdx license header
2025-04-05 08:46:17 +09:00
renovate[bot]
1d9810627e
chore(deps): update [tools] update dependencies ( #15689 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-01 15:51:46 +09:00
renovate[bot]
b0c3ec3267
fix(deps): update dependency vite to v6.2.4 [security] ( #15733 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-01 15:48:48 +09:00
renovate[bot]
2618585a25
fix(deps): update dependency vite to v6.2.3 [security] ( #15710 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-30 08:39:40 +09:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
かっこかり
e16a14dcef
fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正 ( #15627 )
...
* fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正
* fix
* fix docker build
* fix build failure on Windows
2025-03-08 18:56:53 +09:00
renovate[bot]
d7706ef1b5
fix(deps): update [root] update dependencies (major) ( #15620 )
...
* fix(deps): update [root] update dependencies
* fix: migrate tar library
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
2025-03-07 19:42:39 +09:00
renovate[bot]
56459bbe68
chore(deps): update [tools] update dependencies ( #15616 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-07 11:44:20 +09:00
renovate[bot]
734c78ddd1
chore(deps): update [tools] update dependencies ( #15563 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-01 13:07:36 +09:00
かっこかり
1b44954dcb
enhance(frontend): サーバーエラー画面の多言語対応 ( #15549 )
...
* enhance(frontend): サーバーエラー画面の多言語対応
* indent
2025-02-24 05:23:20 +00:00
renovate[bot]
0456c0f3c2
chore(deps): update [tools] update dependencies ( #15540 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-24 14:06:30 +09:00
renovate[bot]
05d41f2a7a
chore(deps): update [tools] update dependencies ( #15498 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-16 11:57:41 +09:00
renovate[bot]
c9ab7eab92
chore(deps): update [tools] update dependencies ( #15493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-15 15:46:12 +09:00
renovate[bot]
4de33aca8c
chore(deps): update dependency vitest to v1.6.1 [security] ( #15473 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-15 11:01:32 +09:00
renovate[bot]
6bb4669242
fix(deps): update dependency vite [security] ( #15472 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-15 10:55:51 +09:00
Hazelnoot
eaed8f2cec
fix local dev errors caused by missing reversi / bubble game builds
2025-02-06 12:57:10 -05:00
Hazelnoot
a4e86758c1
merge upstream 2025-02-03
2025-02-03 14:36:09 -05:00
かっこかり
6250af2a2c
wip ( #15348 )
...
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-01-28 01:45:13 +00:00
かっこかり
35104d87d5
revert(dev): フロントエンド・バックエンドを分離する開発モードを廃止 ( #15284 )
...
* Revert "chore: 開発モードでフロントエンドとバックエンドを独立して起動するようにする（再） (#12593 )"
This reverts commit b0039f0946
2025-01-25 20:58:39 +09:00
syuilo
e26e24b610
update deps ( #14950 )
...
* update deps
* wip
* Revert "wip"
This reverts commit 393de249fe248ae181221266e0b7828a3ac53152.
* wip
* wip
* wip
* wip
2024-11-15 17:22:00 +09:00
Hazelnoot
8a34d8e9d2
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# locales/en-US.yml
# locales/ja-JP.yml
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/NoteDeleteService.ts
# packages/backend/src/core/NoteEditService.ts
# packages/frontend-shared/js/config.ts
# packages/frontend/src/boot/common.ts
# packages/frontend/src/pages/following-feed.vue
# packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:09:11 -04:00
Hazelnoot
8897b191d9
fix indentation in build-assets.mjs
2024-10-15 12:28:22 -04:00
Hazelnoot
652cc8602c
refresh locales after any change, not just a version update
2024-10-15 12:23:18 -04:00
dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
dependabot[bot]
2ee19ee22e
chore(deps-dev): bump vite in /scripts/changelog-checker ( #14569 )
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 5.0.12 to 5.4.6.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.6/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v5.4.6/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-20 21:10:21 +09:00
かっこかり
2cbe1d1210
feat(frontend): ノート・ユーザータイムライン埋め込み ( #13929 )
...
* 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 05ca36f400889456981e89489ae0ae242fa09b67.
* 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 937ae44521cdb0f250796943b20142b65f8ed944.
* 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
* うぃｐ
* 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 12bab1c6fbd3baf753515df760ff19d027b85155.
* Revert "Update preview.ts"
This reverts commit 5c0ce01dbdf2194ffe94aba950f747a9968f29c4.
* Revert "Update preview.ts"
This reverts commit f4863524d7e5ca0f25470808849c24a72bea000a.
* Revert "fix storybook instance imports"
This reverts commit ed8eabb246edf731d31adffbe3c77c539e53ae9e.
* Revert "wip"
This reverts commit d3c1926519878155193a1654f49141e515d49683.
* Revert "Update page.vue"
This reverts commit 27c7900b0c1ae296b56075e8a9c22585d9cd744b.
* Revert "Update branding.vue"
This reverts commit c08ccb65ba66774c3e2b3dcfc6153004b5c0aa16.
* Revert "Update roles.vue"
This reverts commit 1488b670660cb1803d17d8f5c78f2d79e59fa52d.
* Revert "wip"
This reverts commit aab1c769814b08c257cad3025422a0eea3bfba4f.
* 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 <4439005+syuilo@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2024-09-09 20:57:36 +09:00
dakkar
cfa9b852df
Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07
2024-08-02 12:25:58 +01:00
syuilo
427648c4b8
update deps ( #14057 )
...
* wip
* locales/index.jsのymlファイル取得ロジックを調節
* regenerate pnpm-lock.yaml
* fix(backend): typecheck fails
* chore(deps): bump ip-cidr from 4.0.0 to 4.0.1 in /packages/backend
* chore: migrate ESLint configs to flat config (#14094 )
* chore: migrate ESLint configs to flat config
* fix: update paths
* fix: frontend lint fails
* refactor(misskey-js): lint build.js
* update deps
---------
Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <root@zyoshoka.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2024-07-02 11:38:34 +09:00
dakkar
6d1b1df1aa
cache-bursting for stylesheets and fonts
...
adding `?version=…` makes sure browsers get the latest files, and it
looks like they honour the caching headers we send back
2024-06-19 17:04:49 +01:00
dakkar
b525c5887f
add copyright text to all our files
2024-06-15 11:36:55 +01:00
sirsegv
1616cb533e
Fix json module imports for node 22 ( #13875 )
2024-06-13 10:18:01 +09:00
syuilo
2b21c19362
update deps ( #13624 )
...
* update deps
* Update package.json
* update deps
* build: pass --strip-leading-paths to restore 0.2.x behavior (#13684 )
* ✌️
* ✌️
* pureimageの代わりに@napi-rs/canvasを使う (#13748 )
* pureimageの代わりに@napi-rs/canvasを使う
* remove writestream
* remove createtemp
* wip
* Update ClientServerService.ts
* update pnpm to 9.x
* update deps
* re: update pnpm to 9.x
* update node
* ✌️
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-05-04 20:56:14 +09:00
dakkar
a3b4ca782a
Merge remote-tracking branch 'misskey/develop' into future-2024-04-10
2024-04-11 13:39:55 +01:00
おさむのひと
2a851437ff
fix: misskey-js、bubble-game、reversiのビルドをesbuildに統合する ( #13600 )
...
* fix: ビルドが遅いパッケージのビルド速度を改善
* dependenciesの整理
* fix ci
* ビルド開始時に古いファイルを消す
* fix ci
* fix ci
2024-03-30 15:28:19 +09:00
dakkar
9478fc0095
Merge remote-tracking branch 'misskey/develop' into future-2024-03-14
2024-03-14 16:28:56 +00:00
zyoshoka
29f6ba6310
chore: add missing SPDX ID and workflow check ( #13570 )
...
* chore: add workflow which checks if SPDX ID exists
* chore: add missing SPDX ID in some files
* chore: change trigger condition
* chore: trigger on push
* lint
2024-03-13 22:37:18 +09:00
Marie
10bfc61670
merge: upstream
2024-02-19 10:47:42 +01:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection ( #13285 )
...
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる
Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438
* feat: license violation protection
* build: fix typo
* build: fix typo
* fix: farewell to the static type land
* fix: key typo
* fix: import typo
* fix: properly interpret `prominently`
* docs: add disclaimer
* docs: update CHANGELOG
* chore: add gap
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 13:34:50 +09:00
かっこかり
a49e8a1a3c
fix(dev): devコマンドの実装を修正 ( #13336 )
2024-02-16 19:17:16 +09:00
tamaina
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
tamaina
4f80b6fa5d
chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように ( #13220 )
...
* chore: 以前の開発環境（backendにアクセスする方式）を立ち上げられるように
* Update scripts/dev.mjs
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-02-13 00:54:34 +09:00
syuilo
a1e12c0ec3
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
2024-02-12 11:37:55 +09:00
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
