Commit Graph

3881 Commits

Author SHA1 Message Date
mattyatea aa633a12d8 aaa 2024-04-24 03:51:52 +09:00
mattyatea fa4983f8c7 are 2024-04-14 21:58:15 +09:00
mattyatea 7265431a16 are 2024-04-01 22:34:20 +09:00
mattyatea 04fae906c9 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/pages/settings/general.vue
2024-04-01 15:32:52 +09: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
Gianni Ceccarelli d7bb6c88d3
Cypress typescript (#13591)
* convert Cypress tests to TypeScript

this work was done by @lunaisnotaboy https://github.com/lunaisnotaboy
for their fork https://github.com/cutiekey/cutiekey/pull/7

I just repacked their changes into a minimal set

* fix call to `window` in cypress tests

this error was spotted thanks to the TypeScript compiler:

```
support/commands.ts:33:12 - error TS2559: Type '(win: any) => void'
has no properties in common with type 'Partial<Loggable &
Timeoutable>'.

33  cy.window(win => {
              ~~~~~~~~

Found 1 error in support/commands.ts:33
```

(again, @lunaisnotaboy did the actual work)
2024-03-20 11:25:49 +09:00
mattyatea 1947a53af6 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	README.md
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/core/NoteCreateService.ts
#	packages/backend/src/core/RoleService.ts
#	packages/backend/src/core/activitypub/models/ApNoteService.ts
#	packages/backend/src/core/activitypub/models/ApPersonService.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/MkDialog.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/admin/security.vue
#	pnpm-lock.yaml
2024-03-05 16:38:19 +09:00
syuilo 3afdafed61 2024.3.1 2024-03-02 17:06:01 +09:00
syuilo ba9d47fb69 2024.3.0 2024-03-01 20:22:06 +09:00
syuilo b55b77c8ae update pnpm 2024-03-01 13:52:23 +09:00
syuilo 920c3be750 update deps 2024-02-29 11:10:03 +09:00
mattyatea 69c16f036c Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/scripts/get-note-menu.ts
2024-02-17 13:45:01 +09:00
syuilo 0b5d3315bc 2024.2.0 2024-02-17 13:41:24 +09:00
tamaina 8c1a582348 2024.2.0-beta.13 2024-02-16 15:04:12 +00:00
mattyatea 2b52a215e5 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
2024-02-16 19:40:51 +09:00
syuilo b7a12fbc2b 2024.2.0-beta.12 2024-02-16 15:40:10 +09:00
mattyatea 5812b15cbd Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkFooterSpacer.vue
2024-02-13 05:48:07 +09:00
Acid Chicken (硫酸鶏) 3dc095d1c9
feat: provide tarball (#13260)
* feat: provide tarball

* build: pack on build-assets

* chore: use ignore-walk

* chore: debug

* build: dependencies
2024-02-12 10:02:27 +09:00
mattyatea 0cf3082902 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-02-11 14:46:59 +09:00
かっこかり 0736eea3fd
fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように (#13249)
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように

* Revert "type"

This reverts commit bac0951bd1.

* Revert "fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正"

This reverts commit 92b2165828.
2024-02-11 13:24:25 +09:00
syuilo 639f14f713 2024.2.0-beta.11 2024-02-09 17:10:31 +09:00
mattyatea dfd491ff85 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
tamaina c0cb76f0ec chore: use vite@5.1.0 / pnpm@8.15.1 2024-02-08 17:24:51 +00:00
syuilo 2f54a53062 2024.2.0-beta.10 2024-02-05 21:08:05 +09:00
mattyatea a23e9a71bf ui:fix 2024-02-05 14:31:48 +09:00
mattyatea ed7cf7828f 2024.2.0-beta.9-PrisMisskey.2 2024-02-05 13:57:34 +09:00
mattyatea 7579df2da0 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkPostForm.vue
2024-02-03 21:13:22 +09:00
syuilo 66714d94fc
2024.2.0-beta.9 2024-02-02 21:38:15 +09:00
mattyatea 8a4f29d998 fix: expanded 2024-02-01 00:28:17 +09:00
mattyatea 942b7f1b3c Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkInput.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/components/MkTab.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/universal.vue
2024-01-31 19:51:51 +09:00
syuilo eef46ed3c9 2024.2.0-beta.8 2024-01-30 21:00:17 +09:00
mattyatea 89b4cc3822 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-01-25 20:16:33 +09:00
syuilo 5342692b1e 2024.2.0-beta.7 2024-01-24 20:31:05 +09:00
mattyatea 79d2b6fe9e Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-01-24 16:40:37 +09:00
syuilo 2b6bf074c6 2024.2.0-beta.6 2024-01-24 15:20:12 +09:00
syuilo ca9be872a8 2024.2.0-beta.5 2024-01-24 13:55:57 +09:00
mattyatea 78a34d3de3 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/pages/timeline.vue
2024-01-23 12:38:56 +09:00
syuilo 298bc34eaf 2024.2.0-beta.4 2024-01-23 10:54:04 +09:00
syuilo 5e307e472d 2024.2.0-beta.3 2024-01-22 18:33:40 +09:00
おさむのひと 850d38414e
fix: 2024-01-22 10:50時点のdevelopにてCIがコケている (#13060)
* fix: バブルゲームのビルド失敗修正

* fix: api.jsonの定義誤りを修正

* fix: lint.yml(typecheck)

* fix: fix eslint error

* fix: frontend vitest version

* fix: frontend vitest version

* fix:

* fix: cypress

* fix: misskey-js test

* fix: misskey-js tsd(tsdはpakcage.jsonのexportsをサポートしない?)

* fix: conflict

* fix: 間違えて上書きしたところを修正

* fix: 再

* fix: api.json

* fix: api.json

* fix: タイムアウト延長

* Update packages/misskey-js/jest.config.cjs

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2024-01-22 18:01:54 +09:00
syuilo 67f6157d42 2024.2.0-beta.2 2024-01-22 09:30:00 +09:00
syuilo 9eb0468cd2 2024.2.0-beta.1 2024-01-22 09:14:45 +09:00
syuilo f4657eb16f update deps 2024-01-21 18:43:01 +09:00
mattyatea 7c50a574f8 2023.12.2-PrisMisskey.6 2024-01-21 13:43:42 +09:00
mattyatea f6d3fde92d Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/models/_.ts
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/index.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/avatar-decorations.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
syuilo 44b8ac135f fix(dev): fix workspace settings 2024-01-20 11:11:20 +09:00
mattyatea 6fa319afc6 Feat: emoji picker profile 2024-01-14 13:54:37 +09:00
mattyatea 158ece67f5 2023.12.2-PrisMisskey.4 2024-01-11 21:52:04 +09:00
mattyatea 56066ae836 fix 2024-01-08 00:53:52 +09:00
mattyatea 4d052272e9 2023.12.2-PrisMisskey.2 2024-01-03 01:28:09 +09:00