mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 12:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reformat upstream merge instructions

Browse source
This commit is contained in:
Hazelnoot 2025-04-01 10:56:08 -04:00
parent fffa6c97fe
commit 6ad0669a51
1 changed files with 23 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
CONTRIBUTING.md
View file

@ -659,57 +659,31 @@ seems to do a decent job)
*after that commit*, do all the extra work, on the same branch: *after that commit*, do all the extra work, on the same branch:
* copy all changes (commit after each step): * copy all changes (commit after each step):
* in * in `packages/backend/src/core/activitypub/models/ApNoteService.ts`, from `createNote` to `updateNote`
`packages/backend/src/core/activitypub/models/ApNoteService.ts`, * from `packages/backend/src/core/NoteCreateService.ts` to `packages/backend/src/core/NoteEditService.ts`
from `createNote` to `updateNote` * from `packages/backend/src/server/api/endpoints/notes/create.ts` to `packages/backend/src/server/api/endpoints/notes/edit.ts`
* from `packages/backend/src/core/NoteCreateService.ts` to * from `packages/frontend/src/components/MkNote*.vue` to `packages/frontend/src/components/SkNote*.vue` (if sensible)
`packages/backend/src/core/NoteEditService.ts`
* from `packages/backend/src/server/api/endpoints/notes/create.ts`
to `packages/backend/src/server/api/endpoints/notes/edit.ts`
* from `packages/frontend/src/components/MkNote*.vue` to
`packages/frontend/src/components/SkNote*.vue` (if sensible)
* from the global timeline to the bubble timeline * from the global timeline to the bubble timeline
(`packages/backend/src/server/api/stream/channels/global-timeline.ts`, * `packages/backend/src/server/api/stream/channels/global-timeline.ts`
`packages/backend/src/server/api/stream/channels/bubble-timeline.ts`, * `packages/backend/src/server/api/stream/channels/bubble-timeline.ts`
`packages/frontend/src/timelines.ts`, * `packages/frontend/src/timelines.ts`
`packages/frontend/src/components/MkTimeline.vue`, * `packages/frontend/src/components/MkTimeline.vue`
`packages/frontend/src/pages/timeline.vue`, * `packages/frontend/src/pages/timeline.vue`
`packages/frontend/src/ui/deck/tl-column.vue`, * `packages/frontend/src/ui/deck/tl-column.vue`
`packages/frontend/src/widgets/WidgetTimeline.vue`) * `packages/frontend/src/widgets/WidgetTimeline.vue`
* from `packages/backend/src/queue/processors/InboxProcessorService.ts` * from `packages/backend/src/queue/processors/InboxProcessorService.ts` to `packages/backend/src/core/UpdateInstanceQueue.ts`, where `updateInstanceQueue` is impacted
to `packages/backend/src/core/UpdateInstanceQueue.ts` * if there have been any changes to the federated user data (the `renderPerson` function in `packages/backend/src/core/activitypub/ApRendererService.ts`), make sure that the set of fields in `userNeedsPublishing` and `profileNeedsPublishing` in `packages/backend/src/server/api/endpoints/i/update.ts` are still correct.
where `updateInstanceQueue` is impacted * check the changes against our `develop` (`git diff develop`) and against Misskey (`git diff misskey/develop`)
* if there have been any changes to the federated user data (the
`renderPerson` function in
`packages/backend/src/core/activitypub/ApRendererService.ts`), make
sure that the set of fields in `userNeedsPublishing` and
`profileNeedsPublishing` in
`packages/backend/src/server/api/endpoints/i/update.ts` are still
correct
* check the changes against our `develop` (`git diff develop`) and
against Misskey (`git diff misskey/develop`)
* re-generate `misskey-js` (`pnpm build-misskey-js-with-types`) and commit * re-generate `misskey-js` (`pnpm build-misskey-js-with-types`) and commit
* build the frontend: `rm -rf built/; NODE_ENV=development pnpm * build the frontend: `rm -rf built/; NODE_ENV=development pnpm --filter=frontend --filter=frontend-embed --filter=frontend-shared build` (the `development` tells it to keep some of the original filenames in the built files)
--filter=frontend --filter=frontend-embed --filter=frontend-shared * make sure there aren't any new `ti-*` classes (Tabler Icons), and replace them with appropriate `ph-*` ones (Phosphor Icons) in [`vite.replaceicons.ts`](packages/frontend/vite.replaceIcons.ts).
build` (the `development` tells it to keep some of the original * This command should show you want to change: `grep -ohrP '(?<=["'\'']ti )(ti-(?!fw)[\w\-]+)' --exclude \*.map -- built/ | sort -u`.
filenames in the built files) * NOTE: `ti-fw` is a special class that's defined by Misskey, leave it alone.
* make sure there aren't any new `ti-*` classes (Tabler Icons), and * After every change, re-build the frontend and check again, until there are no more `ti-*` classes in the built files.
replace them with appropriate `ph-*` ones (Phosphor Icons) in * Commit!
[`vite.replaceicons.ts`](packages/frontend/vite.replaceIcons.ts). * double-check the new migration, that they won't conflict with our db changes: `git diff develop -- packages/backend/migration/`
This command should show you want to change: `grep -ohrP
'(?<=["'\'']ti )(ti-(?!fw)[\w\-]+)' --exclude \*.map -- built/ |
sort -u`.
* NOTE: `ti-fw` is a special class that's defined by Misskey, leave it alone.
* After every change, re-build the frontend and check again, until
there are no more `ti-*` classes in the built files.
* Commit!
* double-check the new migration, that they won't conflict with our db
changes: `git diff develop -- packages/backend/migration/`
* `pnpm clean; pnpm build` * `pnpm clean; pnpm build`
* run tests `pnpm test; pnpm --filter backend test:e2e` (requires a * run tests `pnpm test; pnpm --filter backend test:e2e` (requires a test database, [see above](#testing)) and fix as much as you can.
test database, [see above](#testing)) and fix as much as you can * run lint `pnpm --filter=backend --filter=frontend-shared lint` + `pnpm --filter=frontend --filter=frontend-embed eslint` and fix as much as you can.
* run lint `pnpm --filter=backend --filter=frontend-shared lint` +
`pnpm --filter=frontend --filter=frontend-embed eslint` and fix as
much as you can
Then push and open a Merge Request. Then push and open a Merge Request.