Skip to content

Commit 483673f

Browse files
committed
Merge branch 'main' into feat/minimessage-format-specs
2 parents 7e8513e + 4de4a40 commit 483673f

File tree

65 files changed

+1431
-1126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1431
-1126
lines changed

.github/workflows/build-preview.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ jobs:
2525
run: "pnpm build"
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
- name: "copy cloudflare configuration files to build directory"
29-
run: |
30-
cp _headers dist/
31-
cp _redirects dist/
3228
- name: "upload build artifact"
3329
uses: "actions/upload-artifact@v4"
3430
with:

.github/workflows/deploy.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ jobs:
2828
run: "pnpm build"
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
- name: "copy cloudflare configuration files to build directory"
32-
run: |
33-
cp _headers dist/
34-
cp _redirects dist/
3531
- name: "publish (push)"
3632
id: "cloudflare-publish"
3733
uses: "AdrianGonz97/refined-cf-pages-action@v1"

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ For that, you can use the `jd:project_name[:module_name][:class_or_member_refere
180180
[`repeat(long, TimeUnit)`](jd:velocity:com.velocitypowered.api.scheduler.Scheduler$TaskBuilder#repeat(long,java.util.concurrent.TimeUnit))
181181
[java.base's List](jd:java:java.util.List)
182182
[java.sql's Connection](jd:java:java.sql:java.sql.Connection)
183+
184+
We don't even need to specify the link text, it can be generated automatically:
185+
[](jd:paper:org.bukkit.event.Event) looks like `Event`
186+
[](jd:velocity:com.velocitypowered.api.scheduler.Scheduler$TaskBuilder#repeat(long,java.util.concurrent.TimeUnit)) looks like `Scheduler.TaskBuilder#repeat(long, TimeUnit)`
183187
```
184188

185189
## Referencing a build system dependency

astro.config.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ export default defineConfig({
4141
title: "PaperMC Docs",
4242
social: [
4343
{ icon: "github", label: "paper:GitHub", href: "https://github.com/PaperMC/Paper" },
44-
{ icon: "seti:java", label: "paper:Javadoc", href: `https://jd.papermc.io/paper/${LATEST_PAPER_RELEASE}` },
44+
{ icon: "seti:java", label: "paper:Javadoc", href: `https://jd.papermc.io/paper` },
4545

4646
{ icon: "github", label: "velocity:GitHub", href: "https://github.com/PaperMC/Velocity" },
4747
{
4848
icon: "seti:java",
4949
label: "velocity:Javadoc",
50-
href: `https://jd.papermc.io/velocity/${LATEST_VELOCITY_RELEASE.substring(0, LATEST_VELOCITY_RELEASE.lastIndexOf("."))}.0`,
50+
href: `https://jd.papermc.io/velocity`,
5151
},
5252

5353
{ icon: "github", label: "folia:GitHub", href: "https://github.com/PaperMC/Folia" },
5454
{
5555
icon: "seti:java",
5656
label: "folia:Javadoc",
57-
href: `https://jd.papermc.io/folia/${LATEST_FOLIA_RELEASE.split(".").slice(0, 2).join(".")}`,
57+
href: `https://jd.papermc.io/folia`,
5858
},
5959

6060
{ icon: "github", label: "adventure:GitHub", href: "https://github.com/PaperMC/adventure" },
@@ -64,7 +64,7 @@ export default defineConfig({
6464
{
6565
icon: "seti:java",
6666
label: "waterfall:Javadoc",
67-
href: `https://jd.papermc.io/waterfall/${LATEST_WATERFALL_RELEASE}`,
67+
href: `https://jd.papermc.io/waterfall`,
6868
},
6969

7070
{ icon: "github", label: "GitHub", href: "https://github.com/PaperMC" },
@@ -156,7 +156,7 @@ export default defineConfig({
156156
},
157157
{
158158
label: "Miscellaneous",
159-
items: ["paper/misc/paper-bug-fixes", "paper/faq"],
159+
items: ["paper/misc/update-checker", "paper/misc/paper-bug-fixes", "paper/faq"],
160160
},
161161
],
162162
},
@@ -548,9 +548,9 @@ export default defineConfig({
548548
javadocPlugin,
549549
{
550550
targets: {
551-
paper: `https://jd.papermc.io/paper/${LATEST_PAPER_RELEASE}`,
552-
velocity: `https://jd.papermc.io/velocity/${LATEST_VELOCITY_RELEASE.substring(0, LATEST_VELOCITY_RELEASE.lastIndexOf("."))}.0`,
553-
java: { url: "https://docs.oracle.com/en/java/javase/21/docs/api", module: "java.base" },
551+
paper: "https://jd.papermc.io/paper",
552+
velocity: "https://jd.papermc.io/velocity",
553+
java: { url: "https://docs.oracle.com/en/java/javase/25/docs/api", module: "java.base" },
554554
},
555555
},
556556
],

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,36 @@
1313
},
1414
"dependencies": {
1515
"@ascorbic/feed-loader": "^2.0.1",
16-
"@astrojs/markdown-remark": "^6.3.8",
17-
"@astrojs/starlight": "^0.36.1",
18-
"@astrojs/svelte": "^7.2.0",
19-
"@expressive-code/plugin-collapsible-sections": "^0.41.3",
20-
"@expressive-code/plugin-line-numbers": "^0.41.3",
16+
"@astrojs/markdown-remark": "^6.3.10",
17+
"@astrojs/starlight": "^0.37.1",
18+
"@astrojs/svelte": "^7.2.4",
19+
"@expressive-code/plugin-collapsible-sections": "^0.41.5",
20+
"@expressive-code/plugin-line-numbers": "^0.41.5",
2121
"@fontsource/jetbrains-mono": "^5.2.8",
2222
"@fontsource/poppins": "^5.2.7",
23-
"astro": "^5.14.7",
23+
"astro": "^5.16.6",
2424
"astro-d2": "^0.8.1",
25-
"sharp": "^0.34.4",
26-
"starlight-contributor-list": "^0.3.0",
27-
"starlight-links-validator": "^0.19.0",
25+
"sharp": "^0.34.5",
26+
"starlight-contributor-list": "^0.3.1",
27+
"starlight-links-validator": "^0.19.2",
2828
"starlight-sidebar-topics": "^0.6.2",
29-
"starlight-sidebar-topics-dropdown": "^0.5.1",
30-
"svelte": "^5.41.1",
29+
"starlight-sidebar-topics-dropdown": "^0.5.2",
30+
"svelte": "^5.46.0",
3131
"typescript": "^5.9.3",
3232
"unist-util-visit": "^5.0.0",
33-
"yaml": "^2.8.1"
33+
"yaml": "^2.8.2"
3434
},
3535
"devDependencies": {
3636
"@types/mdast": "^4.0.4",
37-
"@types/node": "^24.9.0",
37+
"@types/node": "^25.0.3",
3838
"dead-or-alive": "^1.0.4",
39-
"prettier": "3.6.2",
39+
"prettier": "3.7.4",
4040
"prettier-plugin-astro": "0.14.1",
4141
"prettier-plugin-organize-imports": "^4.3.0",
42-
"prettier-plugin-svelte": "^3.4.0"
42+
"prettier-plugin-svelte": "^3.4.1"
4343
},
4444
"engines": {
4545
"node": ">=22.x"
4646
},
47-
"packageManager": "pnpm@10.18.3+sha512.bbd16e6d7286fd7e01f6b3c0b3c932cda2965c06a908328f74663f10a9aea51f1129eea615134bf992831b009eabe167ecb7008b597f40ff9bc75946aadfb08d"
47+
"packageManager": "pnpm@10.26.1+sha512.664074abc367d2c9324fdc18037097ce0a8f126034160f709928e9e9f95d98714347044e5c3164d65bd5da6c59c6be362b107546292a8eecb7999196e5ce58fa"
4848
}

0 commit comments

Comments
 (0)