mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-27 22:38:34 +09:00
Code
28,387 Commits 30 Branches 125 Tags 135 MiB
0dc322b61d
Commit Graph

109 Commits

Author SHA1 Message Date
NoriDev
8a4a895231 Merge remote-branch 'misskey/develop' 2024-09-12 09:51:05 +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
NoriDev
58c022d241 Merge remote-branch 'misskey/develop' 2024-07-31 03:06:03 +09:00
syuilo
1991a02aa9 update node version 2024-07-30 09:17:06 +09:00
NoriDev
444fc93d8b Merge remote-branch 'misskey/develop' 2024-07-27 23:24:38 +09:00
anatawa12
b8b4dc5038
build: install pnpm with corepack on docker build (#13926) 
* build: install pnpm with corepack on build

* docs(changelog): Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 2024-06-22 19:45:08 +09:00
NoriDev
b0cc04e87b Merge remote-branch 'misskey/develop' 2024-05-20 04:29:35 +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
NoriDev
5e2168dbdd Merge remote-branch 'misskey/develop' 2024-02-21 15:34:24 +09:00
anatawa12
40c201407d
fix of #13330 (#13330) 
* build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする

* build: 消す行間違ってたのを修正
 2024-02-16 16:49:12 +09:00
anatawa12
f41c78a6e3
build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする (#13329) 2024-02-16 16:44:37 +09:00
NoriDev
98369400bc Merge remote-branch 'misskey/develop' 2024-01-22 20:15:41 +09:00
syuilo
7d57487026 Update Dockerfile 2024-01-20 18:14:20 +09:00
NoriDev
de48b0149f Merge remote-branch 'misskey/master' 2024-01-02 17:08:49 +09:00
anatawa12
8753f9ef06
fix: running from docker is broken (#12824) 
* fix: running from docker is broken

* fix: dependencies of misskey-js not found from backend

* docs(changelog): Dockerでサーバーを起動できない問題を修正

* Update CHANGELOG.md

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2023-12-28 07:52:08 +09:00
NoriDev
feef0d6ffd Merge remote-branch 'misskey/develop' 2023-11-30 19:58:23 +09:00
Cocoa Hoto
4f6e098542
fix(docker): cannot build docker image on some environments (#12494) 2023-11-30 14:47:08 +09:00
NoriDev
24b1b52b3b Merge remote-branch 'misskey/develop' 2023-11-24 13:31:26 +09:00
syuilo
06ed64f26f update node to 20.10.0 2023-11-24 09:20:41 +09:00
typeling1578
cb026a7512
Update Dockerfile (#11848) 2023-09-20 13:28:42 +09:00
NoriDev
e73976f7d2 Merge pull request #11848 from misskey-dev/misskey 2023-09-19 16:44:38 +09:00
typeling1578
9a60de4e29
Update Dockerfile 2023-09-19 15:11:21 +09:00
NoriDev
b446cd1838 Merge remote-branch 'misskey/develop' 2023-09-13 16:03:51 +09:00
syuilo
0d505f8131 enhance(docker): Dockerイメージにjemallocを含むように 
#10984
 2023-09-13 13:47:15 +09:00
NoriDev
b1d6e350e1 Merge remote-branch 'misskey/develop' 2023-09-05 18:24:34 +09:00
syuilo
1f7a81aae7
update deps (#11764) 
* update deps

* node16

* wip

* wip

* wip

* Update test-utils.ts

* wip

* Update tsconfig.json

* wip

* Update package.json

* wip

* Update following.vue

* Update followers.vue

* Update index.vue

* Update share.vue

* Update MkUserPopup.vue

* Update MkPostForm.vue

* wip

* Update MkTokenGenerateWindow.vue

* Update MkPagination.vue

* refactor

* update deps

* update deps

* Update sw.ts

* wip

* wip

* wip

* Update FetchInstanceMetadataService.ts

* Update FetchInstanceMetadataService.ts

* update node

* update deps

* 🎨
 2023-09-04 13:33:38 +09:00
まっちゃとーにゅ
8762f0d573 メモリアロケーターをjemallocにする (MisskeyIO#152) 2023-09-01 17:22:59 +09:00
riku6460
1217790667 Graceful Shutdown (MisskeyIO#156) 
---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2023-09-01 17:13:54 +09:00
NoriDev
a1b11850ee Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-08-09 16:00:30 +09:00
HAL9000COM
41ba242c9c
Update node to 20.5.0 (#11463) 2023-08-09 09:52:01 +09:00
NoriDev
0f3be8fcde Merge remote-branch 'misskey/develop' 2023-07-14 17:36:02 +09:00
syuilo
b056e8f5eb use node 20.3.1 
Fix #11179
 2023-07-08 15:48:46 +09:00
NoriDev
5a92456a83 Merge remote-branch 'misskey/develop' 2023-07-07 17:34:23 +09:00
syuilo
f76b3edbdd update node to 20.4.0 2023-07-07 13:58:43 +09:00
NoriDev
53a4e4054d misskey-js -> cherrypick-js 2023-06-12 16:35:30 +09:00
NoriDev
d0339758af CherryPick🍒 2023-05-28 18:35:56 +09:00
Kohei Ota (inductor)
5a8748b2b0
Update node version (#10639) 2023-04-15 10:20:39 +09:00
Kagami Sascha Rosylight
cee1d5e2d0
chore: integrate misskey-js as a workspace item (git subtree) (#10409) 
* Additional changes for the merge

* api-misskey-js
 2023-03-30 09:33:19 +09:00
Kagami Sascha Rosylight
abdb43c440 Revert "Additional changes for the merge" 
This reverts commit efb5e1d1cc.
 2023-03-25 08:20:34 +01:00
Kagami Sascha Rosylight
efb5e1d1cc Additional changes for the merge 2023-03-25 08:13:30 +01:00
Acid Chicken (硫酸鶏)
b1c173ec4f
fix(docker): cannot build docker image on some environments (#10220) 2023-03-05 22:00:17 +09:00
rinsuki
ccdac0ca96
docker: build assets on native arch (#10080) 
* docker: build assets on native arch

* 消しすぎた
 2023-03-04 21:36:52 +09:00
Kohei Ota (inductor)
1c8419cea0
Update Docker GHA (#9920) 
* Update Docker GHA

* add id
 2023-02-14 09:59:50 +09:00
파링
dee662705e
fix docker health check (#9810) 
* fix(healthcheck): use default commands instead of yq

this removes yq command and uses grep and awk to get port

* fix: use correct config file

* fix: install curl in runner instead of builder

* fix: remove unused packages
 2023-02-08 17:59:10 +09:00
Masaya Suzuki
eea33d07fd
fix: aptのキャッシュを削除しないようにする (#9803) 2023-02-05 14:15:59 +09:00
Masaya Suzuki
f599337320
DockleのCI追加 (#9568) 
* Dockerイメージ検査のCI追加

* Add cp

* step分離

* step分離

* rm depends_on

* Dockle実行時に必要なイメージタグ付与処理をCI内で行う

* 末尾に移動

* Add comment

* .git削除処理をビルドステージに移動

* docker-compose.yml作成処理追加

* aptのキャッシュ削除処理追加

* ヘルスチェック用スクリプト追加

* yqインストール処理修正

* Add ca-certificates

* yqインストール処理をビルドステージに移動

* インデントを揃える

* インデントをタブに変更
 2023-02-05 14:04:02 +09:00
Takuya Yoshida
7af0e38dd3
Use cache on build (#9639) 2023-01-27 11:30:22 +09:00
Takuya Yoshida
a69c78e709
Use corepack (#9620) 2023-01-17 05:34:14 +09:00
CyberRex
6e2d7e9792
Use pnpm for package manager (#9531) 
* Use pnpm for package manager

* Fix

* Change github workflow

* use pnpm in workflow

* fix

* Fix test (e2e/jest)

* Update Dockerfile for pnpm

* Exclude node_modules from file search on VSCode

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* Move typescript from devDependencies to dependencies

* Fix Dockerfile

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-01-16 06:08:42 +09:00
CyberRex
91a3c3943d
Dockerfile: copy fluent-emoji assets (#9605) 2023-01-16 02:24:37 +09:00