Skip to content

Commit 779e1b3

Browse files
committed
Merge branch 'master' into dynamic-macro-calls
2 parents 5136e33 + 6cb333b commit 779e1b3

File tree

1,283 files changed

+20258
-6875
lines changed

Some content is hidden

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

1,283 files changed

+20258
-6875
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- uses: actions/setup-node@v4
1515
with:
1616
node-version: "${{ env.NODE_VERSION }}"
@@ -30,7 +30,7 @@ jobs:
3030
TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
3131
TW5_BUILD_OUTPUT: "./output/prerelease"
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434
- uses: actions/setup-node@v4
3535
with:
3636
node-version: "${{ env.NODE_VERSION }}"
@@ -62,7 +62,7 @@ jobs:
6262
TW5_BUILD_OUTPUT: "./output"
6363
TW5_BUILD_ARCHIVE: "./output"
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6666
- uses: actions/setup-node@v4
6767
with:
6868
node-version: "${{ env.NODE_VERSION }}"

.github/workflows/eslint.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: ESLint
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
workflow_dispatch:
7+
8+
concurrency:
9+
group: lint-${{ github.event.pull_request.number || github.ref_name }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
# Needed for GitHub Checks API
15+
checks: write
16+
17+
jobs:
18+
eslint:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@v5
24+
25+
- name: Setup Node.js
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: 20
29+
30+
- name: Install dependencies
31+
run: npm install --include=dev
32+
33+
- name: Run ESLint with reviewdog (GitHub Checks)
34+
uses: reviewdog/action-eslint@v1
35+
with:
36+
eslint_flags: '.'
37+
reporter: github-pr-check
38+
fail_level: error
39+
level: error
40+
tool_name: ESLint PR code

.github/workflows/pr-check-build-size.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Calculate PR build size
22
on:
33
pull_request_target:
44
types: [opened, reopened, synchronize]
5+
paths:
6+
- 'boot/**'
7+
- 'core/**'
8+
- 'themes/tiddlywiki/snowwhite/**'
9+
- 'themes/tiddlywiki/vanilla/**'
510

611
jobs:
712
calculate-build-size:
@@ -15,11 +20,11 @@ jobs:
1520
steps:
1621
- name: build-size-check
1722
id: get_sizes
18-
uses: TiddlyWiki/cerebrus@v4
23+
uses: TiddlyWiki/cerebrus@v6
1924
with:
2025
pr_number: ${{ github.event.pull_request.number }}
2126
repo: ${{ github.repository }}
22-
base_ref: ${{ github.base_ref }}
27+
base_ref: ${{ github.event.pull_request.base.ref }}
2328
github_token: ${{ secrets.GITHUB_TOKEN }}
2429
mode: size:calc
2530

.github/workflows/pr-comment-build-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Build and check size
28-
uses: TiddlyWiki/cerebrus@v4
28+
uses: TiddlyWiki/cerebrus@v6
2929
with:
3030
pr_number: ${{ inputs.pr_number }}
3131
repo: ${{ github.repository }}

.github/workflows/pr-path-validation.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: PR Validation
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, synchronize]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
issues: write
11+
jobs:
12+
validate-pr:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
# Step 1: Validate PR paths
17+
- name: Validate PR Paths
18+
uses: TiddlyWiki/cerebrus@v6
19+
with:
20+
pr_number: ${{ github.event.pull_request.number }}
21+
repo: ${{ github.repository }}
22+
base_ref: ${{ github.event.pull_request.base.ref }}
23+
github_token: ${{ secrets.GITHUB_TOKEN }}
24+
mode: rules
25+
continue-on-error: true
26+
27+
# Step 2: Validate change notes
28+
- name: Validate Change Notes
29+
uses: TiddlyWiki/cerebrus@v6
30+
with:
31+
pr_number: ${{ github.event.pull_request.number }}
32+
repo: ${{ github.repository }}
33+
base_ref: ${{ github.event.pull_request.base.ref }}
34+
github_token: ${{ secrets.GITHUB_TOKEN }}
35+
mode: changenotes
36+
continue-on-error: false
37+

bin/build-site.sh

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Default to the current version number for building the plugin library
66

77
if [ -z "$TW5_BUILD_VERSION" ]; then
8-
TW5_BUILD_VERSION=v5.3.7
8+
TW5_BUILD_VERSION=v5.4.0
99
fi
1010

1111
echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -73,10 +73,8 @@ rm $TW5_BUILD_OUTPUT/dev/static/*
7373

7474
echo "<a href='./plugins/tiddlywiki/tw2parser/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html</a>" > $TW5_BUILD_OUTPUT/classicparserdemo.html
7575
echo "<a href='./plugins/tiddlywiki/codemirror/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html</a>" > $TW5_BUILD_OUTPUT/codemirrordemo.html
76-
echo "<a href='./plugins/tiddlywiki/d3/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html</a>" > $TW5_BUILD_OUTPUT/d3demo.html
7776
echo "<a href='./plugins/tiddlywiki/highlight/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html</a>" > $TW5_BUILD_OUTPUT/highlightdemo.html
7877
echo "<a href='./plugins/tiddlywiki/markdown/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html</a>" > $TW5_BUILD_OUTPUT/markdowndemo.html
79-
echo "<a href='./plugins/tiddlywiki/tahoelafs/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html</a>" > $TW5_BUILD_OUTPUT/tahoelafs.html
8078

8179
# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
8280

@@ -159,6 +157,13 @@ node $TW5_BUILD_TIDDLYWIKI \
159157
--rendertiddler $:/core/save/all-external-js tour.html text/plain \
160158
|| exit 1
161159

160+
# /surveys.html surveys edition
161+
node $TW5_BUILD_TIDDLYWIKI \
162+
./editions/tiddlywiki-surveys \
163+
--output $TW5_BUILD_OUTPUT \
164+
--build index \
165+
|| exit 1
166+
162167
# /share.html Custom edition for sharing via the URL
163168
node $TW5_BUILD_TIDDLYWIKI \
164169
./editions/share \
@@ -294,26 +299,6 @@ node $TW5_BUILD_TIDDLYWIKI \
294299
--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
295300
|| exit 1
296301

297-
# /plugins/tiddlywiki/tahoelafs/index.html Demo wiki with Tahoe-LAFS plugin
298-
# /plugins/tiddlywiki/tahoelafs/empty.html Empty wiki with Tahoe-LAFS plugin
299-
node $TW5_BUILD_TIDDLYWIKI \
300-
./editions/tahoelafs \
301-
--load $TW5_BUILD_OUTPUT/build.tid \
302-
--output $TW5_BUILD_OUTPUT \
303-
--rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
304-
--rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \
305-
|| exit 1
306-
307-
# /plugins/tiddlywiki/d3/index.html Demo wiki with D3 plugin
308-
# /plugins/tiddlywiki/d3/empty.html Empty wiki with D3 plugin
309-
node $TW5_BUILD_TIDDLYWIKI \
310-
./editions/d3demo \
311-
--load $TW5_BUILD_OUTPUT/build.tid \
312-
--output $TW5_BUILD_OUTPUT \
313-
--rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
314-
--rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \
315-
|| exit 1
316-
317302
# /plugins/tiddlywiki/codemirror/index.html Demo wiki with codemirror plugin
318303
# /plugins/tiddlywiki/codemirror/empty.html Empty wiki with codemirror plugin
319304
node $TW5_BUILD_TIDDLYWIKI \

0 commit comments

Comments
 (0)