Merge branch 'master' into filtered-actions

.eslintrc.yml

@@ -231,7 +231,10 @@ rules:
   prefer-spread: 'off'
   prefer-template: 'off'
   quote-props: 'off'
-  quotes: 'off'
+  quotes:
+    - error
+    - double
+    - avoidEscape: true
   radix: 'off'
   require-atomic-updates: error
   require-await: error

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       label: To Reproduce
       description: "Steps to reproduce the behavior:"
-      value: |
+      placeholder: |
         1. Go to '...'
         2. Click on '....'
         3. Scroll down to '....'
@@ -41,7 +41,7 @@ body:
     attributes:
       label: TiddlyWiki Configuration
       description: please complete the following information
-      value: |
+      placeholder: |
         - Version [e.g. v5.1.24]
         - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
         - Plugins installed [e.g. Freelinks, TiddlyMap]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discuss feature request
-    url: https://github.com/Jermolene/TiddlyWiki5/discussions
+    url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions
     about: Open new discussion about new feature
   - name: Talk.Tiddlywiki Forum
     url: https://talk.tiddlywiki.org

.github/workflows/cla-check.yml

@@ -0,0 +1,30 @@
+name: Check CLA Signature
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+    paths-ignore:
+      - 'licenses/cla-individual.md'
+jobs:
+  check_cla:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    if: ${{ (github.event.pull_request.user.login != github.repository_owner) }}
+    steps:
+    - run: |
+        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -o "@$USER,"; then
+          echo "CLA not signed"
+          gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
+          
+          With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))."
+        else
+          echo "CLA already signed"
+          gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
+        fi
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_REPO: ${{ github.repository }}
+        NUMBER: ${{ github.event.pull_request.number }}
+        USER: ${{ github.actor }}

.github/workflows/cla-signed.yml

@@ -0,0 +1,70 @@
+name: CLA Signed
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - closed
+    paths:
+      - 'licenses/cla-individual.md'
+
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GH_REPO: ${{ github.repository }}
+  NUMBER: ${{ github.event.pull_request.number }}
+  AUTHOR: ${{ github.event.pull_request.user.login }}
+
+jobs:
+  # check if PRs updating the CLA are targetting the tiddlywiki-com branch
+  check-signature-branch:
+    if: (github.event.pull_request.merged != true) && (github.event.pull_request.user.login != github.repository_owner)
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - run: |
+        if ! $BRANCH == "tiddlywiki-com"; then
+          echo "This CLA signature targets the wrong branch"
+          gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
+        fi
+      env:
+        BRANCH: ${{ github.event.pull_request.base.ref }}
+
+  # leave a comment on each open PR by a given author when their signature is added to the CLA
+  cla-signed:
+    if: (github.event.pull_request.merged == true) && (github.event.pull_request.user.login != github.repository_owner)
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - name: List open PRs by user
+      id: list-prs
+      uses: actions/github-script@v6
+      with:
+        result-encoding: string
+        script: |
+          const owner = context.repo.owner,
+            repo = context.repo.repo,
+            author = context.payload.pull_request.user.login;
+
+          const { data: pullRequests } = await github.rest.pulls.list({
+            owner: owner,
+            repo: repo,
+            state: 'open',
+            sort: 'created',
+            direction: 'desc',
+            per_page: 100
+          });
+          const userPullRequests = pullRequests.filter(pr => pr.user.login === author),
+            prNumbers = userPullRequests.map(pr => pr.number).join(',');
+          console.log(`Open pull requests by ${author}:${prNumbers}`);
+          return prNumbers;
+          
+    - name: Comment open PRs by the same author
+      run: |
+        prs=($(echo ${{ steps.list-prs.outputs.result }} | tr "," "\n"))  
+  
+        for number in "${prs[@]}"  
+        do  
+          gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
+        done     

.gitignore

@@ -8,3 +8,4 @@ node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+$__StoryList.tid

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.3
+    TW5_BUILD_VERSION=v5.3.6
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -393,6 +393,17 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
+# /plugins/tiddlywiki/geospatial/index.html		Demo wiki with geospatial plugin
+# /plugins/tiddlywiki/geospatial/empty.html		Empty wiki with geospatial plugin
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/geospatialdemo \
+	--verbose \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
+	|| exit 1
+
 ######################################################
 #
 # Language editions

bin/ci-pre-build.sh

@@ -7,4 +7,4 @@ npm --force install tiddlywiki || exit 1
 
 # Pull existing GitHub pages content
 
-git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output
+git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output

bin/ci-push.sh

@@ -10,6 +10,6 @@ git config --global user.email "[email protected]"
 git config --global user.name "GitHub Actions"
 git add -A .
 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
-git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
+git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null
 git push deploy master &>/dev/null
 cd ..

bin/readme-bld.sh

@@ -15,3 +15,11 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--output . \
 	--build readmes \
 	|| exit 1
+
+# tw.org readmes
+node $TW5_BUILD_TIDDLYWIKI \
+	editions/tw.org \
+	--verbose \
+	--output . \
+	--build readmes \
+	|| exit 1