Skip to content

Commit d5074ac

Browse files
authored
Merge branch 'main' into renovate/electron-39.x
2 parents e3ec363 + 35efd2a commit d5074ac

File tree

427 files changed

+7556
-4306
lines changed

Some content is hidden

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

427 files changed

+7556
-4306
lines changed

.github/actions/build-server/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
- name: Set up node & dependencies
1313
uses: actions/setup-node@v6
1414
with:
15-
node-version: 22
15+
node-version: 24
1616
cache: "pnpm"
1717
- name: Install dependencies
1818
shell: bash

.github/workflows/deploy-docs.yml

Lines changed: 10 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# GitHub Actions workflow for deploying MkDocs documentation to Cloudflare Pages
2-
# This workflow builds and deploys your MkDocs site when changes are pushed to main
3-
name: Deploy MkDocs Documentation
1+
name: Deploy Documentation
42

53
on:
64
# Trigger on push to main branch
@@ -11,11 +9,8 @@ on:
119
# Only run when docs files change
1210
paths:
1311
- 'docs/**'
14-
- 'README.md' # README is synced to docs/index.md
15-
- 'mkdocs.yml'
16-
- 'requirements-docs.txt'
17-
- '.github/workflows/deploy-docs.yml'
18-
- 'scripts/fix-mkdocs-structure.ts'
12+
- 'apps/edit-docs/**'
13+
- 'packages/share-theme/**'
1914

2015
# Allow manual triggering from Actions tab
2116
workflow_dispatch:
@@ -27,15 +22,12 @@ on:
2722
- master
2823
paths:
2924
- 'docs/**'
30-
- 'README.md' # README is synced to docs/index.md
31-
- 'mkdocs.yml'
32-
- 'requirements-docs.txt'
33-
- '.github/workflows/deploy-docs.yml'
34-
- 'scripts/fix-mkdocs-structure.ts'
25+
- 'apps/edit-docs/**'
26+
- 'packages/share-theme/**'
3527

3628
jobs:
3729
build-and-deploy:
38-
name: Build and Deploy MkDocs
30+
name: Build and Deploy Documentation
3931
runs-on: ubuntu-latest
4032
timeout-minutes: 10
4133

@@ -49,72 +41,25 @@ jobs:
4941
steps:
5042
- name: Checkout Repository
5143
uses: actions/checkout@v5
52-
with:
53-
fetch-depth: 0 # Fetch all history for git info and mkdocs-git-revision-date plugin
54-
55-
- name: Setup Python
56-
uses: actions/setup-python@v6
57-
with:
58-
python-version: '3.14'
59-
cache: 'pip'
60-
cache-dependency-path: 'requirements-docs.txt'
6144

62-
- name: Install MkDocs and Dependencies
63-
run: |
64-
pip install --upgrade pip
65-
pip install -r requirements-docs.txt
66-
env:
67-
PIP_DISABLE_PIP_VERSION_CHECK: 1
68-
69-
# Setup pnpm before fixing docs structure
7045
- name: Setup pnpm
7146
uses: pnpm/action-setup@v4
7247

73-
# Setup Node.js with pnpm
7448
- name: Setup Node.js
7549
uses: actions/setup-node@v6
7650
with:
77-
node-version: '22'
51+
node-version: '24'
7852
cache: 'pnpm'
7953

80-
# Install Node.js dependencies for the TypeScript script
8154
- name: Install Dependencies
82-
run: |
83-
pnpm install --frozen-lockfile
55+
run: pnpm install --frozen-lockfile
8456

85-
- name: Fix Documentation Structure
86-
run: |
87-
# Fix duplicate navigation entries by moving overview pages to index.md
88-
pnpm run chore:fix-mkdocs-structure
89-
90-
- name: Build MkDocs Site
91-
run: |
92-
# Build with strict mode but allow expected warnings
93-
mkdocs build --verbose || {
94-
EXIT_CODE=$?
95-
# Check if the only issue is expected warnings
96-
if mkdocs build 2>&1 | grep -E "WARNING.*(README|not found)" && \
97-
[ $(mkdocs build 2>&1 | grep -c "ERROR") -eq 0 ]; then
98-
echo "✅ Build succeeded with expected warnings"
99-
mkdocs build --verbose
100-
else
101-
echo "❌ Build failed with unexpected errors"
102-
exit $EXIT_CODE
103-
fi
104-
}
105-
106-
- name: Fix HTML Links
107-
run: |
108-
# Remove .md extensions from links in generated HTML
109-
pnpm tsx ./scripts/fix-html-links.ts site
57+
- name: Trigger build of documentation
58+
run: pnpm docs:build
11059

11160
- name: Validate Built Site
11261
run: |
113-
# Basic validation that important files exist
11462
test -f site/index.html || (echo "ERROR: site/index.html not found" && exit 1)
115-
test -f site/sitemap.xml || (echo "ERROR: site/sitemap.xml not found" && exit 1)
116-
test -d site/assets || (echo "ERROR: site/assets directory not found" && exit 1)
117-
echo "✅ Site validation passed"
11863
11964
- name: Deploy
12065
uses: ./.github/actions/deploy-to-cloudflare-pages

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up node & dependencies
3131
uses: actions/setup-node@v6
3232
with:
33-
node-version: 22
33+
node-version: 24
3434
cache: "pnpm"
3535
- run: pnpm install --frozen-lockfile
3636

.github/workflows/main-docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up node & dependencies
4747
uses: actions/setup-node@v6
4848
with:
49-
node-version: 22
49+
node-version: 24
5050
cache: "pnpm"
5151

5252
- name: Install npm dependencies
@@ -116,10 +116,10 @@ jobs:
116116
- dockerfile: Dockerfile
117117
platform: linux/arm64
118118
image: ubuntu-24.04-arm
119-
- dockerfile: Dockerfile
119+
- dockerfile: Dockerfile.legacy
120120
platform: linux/arm/v7
121121
image: ubuntu-24.04-arm
122-
- dockerfile: Dockerfile
122+
- dockerfile: Dockerfile.legacy
123123
platform: linux/arm/v8
124124
image: ubuntu-24.04-arm
125125
runs-on: ${{ matrix.image }}
@@ -146,7 +146,7 @@ jobs:
146146
- name: Set up node & dependencies
147147
uses: actions/setup-node@v6
148148
with:
149-
node-version: 22
149+
node-version: 24
150150
cache: 'pnpm'
151151

152152
- name: Install dependencies

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Set up node & dependencies
5353
uses: actions/setup-node@v6
5454
with:
55-
node-version: 22
55+
node-version: 24
5656
cache: 'pnpm'
5757
- name: Install dependencies
5858
run: pnpm install --frozen-lockfile

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: pnpm/action-setup@v4
2525
- uses: actions/setup-node@v6
2626
with:
27-
node-version: 22
27+
node-version: 24
2828
cache: 'pnpm'
2929

3030
- name: Install dependencies

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up node & dependencies
5151
uses: actions/setup-node@v6
5252
with:
53-
node-version: 22
53+
node-version: 24
5454
cache: 'pnpm'
5555
- name: Install dependencies
5656
run: pnpm install --frozen-lockfile

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up node & dependencies
3131
uses: actions/setup-node@v6
3232
with:
33-
node-version: 22
33+
node-version: 24
3434
cache: "pnpm"
3535

3636
- name: Install dependencies

_regroup/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"devDependencies": {
3838
"@playwright/test": "1.56.1",
3939
"@stylistic/eslint-plugin": "5.5.0",
40-
"@types/express": "5.0.4",
41-
"@types/node": "22.18.12",
40+
"@types/express": "5.0.5",
41+
"@types/node": "24.9.1",
4242
"@types/yargs": "17.0.34",
4343
"@vitest/coverage-v8": "3.2.4",
4444
"eslint": "9.38.0",

apps/client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
"leaflet-gpx": "2.2.0",
5555
"mark.js": "8.11.1",
5656
"marked": "16.4.1",
57-
"mermaid": "11.12.0",
57+
"mermaid": "11.12.1",
5858
"mind-elixir": "5.3.4",
5959
"normalize.css": "8.0.1",
6060
"panzoom": "9.4.3",
6161
"preact": "10.27.2",
62-
"react-i18next": "16.2.0",
62+
"react-i18next": "16.2.1",
6363
"reveal.js": "5.2.1",
6464
"svg-pan-zoom": "3.6.2",
6565
"tabulator-tables": "6.3.1",

0 commit comments

Comments
 (0)