Merge branch 'main' into redis-cluster-support (2f1a39f5) · Commits · sc07 / Fedify Patched

AGENTS.md

+9 −6

Original line number	Diff line number	Diff line
		@@ -196,13 +196,15 @@ maintenance:

		### Branch Types

		1. main: Contains unreleased development for the next major/minor version
		2. x.y-maintenance: Maintenance branches for released major/minor versions
		1. next: Contains unreleased development for the next major version
		2. main: Contains unreleased development for the next minor version
		3. x.y-maintenance: Maintenance branches for released major/minor versions
		(e.g., `1.5-maintenance`, `1.6-maintenance`)

		### Development Workflow

		- New features: Always target the `main` branch
		- Breaking changes: Target the `next` branch
		- New features: Target the `main` branch
		- Bug fixes: Target the oldest applicable maintenance branch that contains
		the bug

		@@ -215,9 +217,10 @@ When a bug is fixed in a maintenance branch:
		3. Merge the fix into the next maintenance branch (e.g., `1.6-maintenance`)
		4. Create a new patch release tag for that branch (e.g., `1.6.1`)
		5. Continue merging forward through all subsequent maintenance branches
		6. Finally merge into `main`
		6. Merge into `main`
		7. Finally merge into `next`

		This ensures that all maintenance branches and the main development branch
		This ensures that all maintenance branches and the development branches
		include the fix.


		@@ -242,7 +245,7 @@ When adding features:
		3. Update documentation for API changes
		4. Verify examples work with the change
		5. Update CHANGES.md with details
		6. Target the main branch
		6. Target the main branch for non-breaking changes, or the next branch for breaking changes


		Build and Distribution

CHANGES.md

+45 −4

Original line number	Diff line number	Diff line
		@@ -10,9 +10,43 @@ To be released.

		### @fedify/fedify

		- Added inverse properties for collections to Vocabulary API.
		[[FEP-5711], [#373], [#381] by Jiwon Kwon]

		- `new Collection()` constructor now accepts `likesOf` option.
		- Added `Collection.likesOfId` property.
		- Added `Collection.getLikesOf()` method.
		- `new Collection()` constructor now accepts `sharesOf` option.
		- Added `Collection.sharedOfId` property.
		- Added `Collection.getSharedOf()` method.
		- `new Collection()` constructor now accepts `repliesOf` option.
		- Added `Collection.repliesOfId` property.
		- Added `Collection.getRepliesOf()` method.
		- `new Collection()` constructor now accepts `inboxOf` option.
		- Added `Collection.inboxOfId` property.
		- Added `Collection.getInboxOf()` method.
		- `new Collection()` constructor now accepts `outboxOf` option.
		- Added `Collection.outboxOfId` property.
		- Added `Collection.getOutboxOf()` method.
		- `new Collection()` constructor now accepts `followersOf` option.
		- Added `Collection.followersOfId` property.
		- Added `Collection.getFollowersOf()` method.
		- `new Collection()` constructor now accepts `followingOf` option.
		- Added `Collection.followingOfId` property.
		- Added `Collection.getFollowingOf()` method.
		- `new Collection()` constructor now accepts `likedOf` option.
		- Added `Collection.likedOfId` property.
		- Added `Collection.getLikedOf()` method.

		- Changed how `parseSoftware()` function handles non-Semantic Versioning
		number strings on `tryBestEffort` mode. [[#353], [#365] by Hyeonseo Kim]]

		[FEP-5711]: https://w3id.org/fep/5711
		[#353]: https://github.com/fedify-dev/fedify/issues/353
		[#365]: https://github.com/fedify-dev/fedify/pull/365
		[#373]: https://github.com/fedify-dev/fedify/issues/373
		[#381]: https://github.com/fedify-dev/fedify/pull/381

		### @fedify/cli

		- Added `Next.js` option to `fedify init` command. This option allows users
		@@ -25,20 +59,27 @@ To be released.
		allows it to parse non-Semantic Versioning number strings more flexibly.
		[[#353], [#365] by Hyeonseo Kim]]

		- Added `-T`/`--timeout` option to `fedify lookup` command. This option allows
		users to specify timeout in seconds for network requests to prevent
		hanging on slow or unresponsive servers.
		[[#258] by Hyunchae Kim]

		[#353]: https://github.com/fedify-dev/fedify/issues/353
		[#365]: https://github.com/fedify-dev/fedify/pull/365

		### @fedify/next

		- Created [Next.js] integration as the @fedify/next package.
		[[#313] by Chanhaeng Lee]

		[Next.js]: https://nextjs.org/
		[#313]: https://github.com/fedify-dev/fedify/issues/313

		### @fedify/redis

		- Added support for Redis Cluster to the @fedify/redis package.
		[[#368] by Michael Barrett]

		[Next.js]: https://nextjs.org/
		[#313]: https://github.com/fedify-dev/fedify/issues/313
		[#353]: https://github.com/fedify-dev/fedify/issues/353
		[#365]: https://github.com/fedify-dev/fedify/pull/365
		[#368]: https://github.com/fedify-dev/fedify/pull/368

CONTRIBUTING.md

+9 −5

Original line number	Diff line number	Diff line
		@@ -94,13 +94,15 @@ maintenance:

		#### Branch types

		- main: Contains unreleased development for the next major/minor version.
		- next: Contains unreleased development for the next major version.
		- main: Contains unreleased development for the next minor version.
		- x.y-maintenance: Maintenance branches for released major/minor versions
		(e.g., 1.5-maintenance, 1.6-maintenance).

		#### Target branches

		- New features: Always target the main branch.
		- Breaking changes: Target the next branch.
		- New features: Target the main branch.
		- Bug fixes: Target the oldest applicable maintenance branch that contains
		the bug.

		@@ -114,9 +116,10 @@ When a bug is fixed in a maintenance branch:
		3. Merge the fix into the next maintenance branch (e.g., 1.6-maintenance).
		4. Create a new patch release tag for that branch (e.g., `1.6.1`).
		5. Continue merging forward through all subsequent maintenance branches.
		6. Finally merge into main.
		6. Merge into main.
		7. Finally merge into next.

		This ensures that all maintenance branches and the main development branch
		This ensures that all maintenance branches and the development branches
		include the fix.

		### Bug fix
		@@ -161,7 +164,8 @@ A patch set should include the following:
		- The CHANGES.md entry. The entry should include the issue number,
		the pull request number, and your name (unless you want to be anonymous).

		Feature pull requests should target the main branch.
		Feature pull requests should target the main branch for non-breaking changes,
		or the next branch for breaking changes.

		### Pull request builds

SPONSORS.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ Supporters
		Backers
		-------

		Robin Riley, yamanoku, taye, Encyclia, okin, box464, Evan Prodromou, Rafael Goulart, malte, Andy Piper
		Robin Riley, yamanoku, Encyclia, taye, okin, box464, Evan Prodromou, Rafael Goulart, malte, Andy Piper

		One-time donations
		------------------

docs/manual/integration.md

+24 −10

Original line number	Diff line number	Diff line
		@@ -531,16 +531,30 @@ export default fedifyWith(federation)(
		// More details: https://nextjs.org/docs/app/api-reference/file-conventions/middleware#config-object-optional
		export const config = {
		runtime: "nodejs",
		matcher: [{
		matcher: [
		{
		source: "/:path*",
		has: [
		{
		type: "header",
		key: "Accept",
		value: ".application\\\\/((jrd\|activity\|ld)\\\\+json\|xrd\\\\+xml).",
		value: ".application\\/((jrd\|activity\|ld)\\+json\|xrd\\+xml).",
		},
		],
		},
		{
		source: "/:path*",
		has: [
		{
		type: "header",
		key: "content-type",
		value: ".application\\/((jrd\|activity\|ld)\\+json\|xrd\\+xml).",
		},
		],
		},
		{ source: "/.well-known/nodeinfo" },
		{ source: "/.well-known/x-nodeinfo2" },
		],
		}],
		};
		~~~~