Fix problem that showed up in CI tests

Fixes #7896

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.2
+    TW5_BUILD_VERSION=v5.3.3
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

core/templates/html-json-skinny-tiddler.tid

@@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-skinny-tiddler
 
-<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
+<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>

core/templates/store.area.template.html.tid

@@ -9,9 +9,7 @@ title: $:/core/templates/store.area.template.html
             <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
                 <$text text=<<newline>>/>
                 <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
-                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
-                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} join=<<join>> template="$:/core/templates/html-json-skinny-tiddler"/>
-                </$vars>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]"  template="$:/core/templates/html-json-skinny-tiddler"/>
                 <$text text=<<newline>>/>
             </$let>
         `]</script>`
@@ -22,8 +20,8 @@ title: $:/core/templates/store.area.template.html
         <!-- Old-style DIV/PRE-based store area -->
         <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
             `<div id="storeArea" style="display:none;">`
-                <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
-                <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
+                <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
             `</div>`
         </$reveal>
     </$list>

core/wiki/config/OfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.2/index.html
+url: https://tiddlywiki.com/library/v5.3.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
 
 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid

@@ -11,4 +11,6 @@ The `tm-delete-tiddler` message deletes the specified tiddler and removes it fro
 |param |Title of the tiddler that is to be deleted |
 |tiddlerTitle |Fallback title that is used if ''param'' isn't specified (automatically set by the ButtonWidget)  |
 
-The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
+The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
+
+Use the [[ActionDeleteTiddlerWidget]] to delete a named tiddler without getting the "Do you wish to delete the tiddler" prompt.

editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid

@@ -1,5 +1,5 @@
 created: 20220917112233317
-modified: 20230419103154328
+modified: 20231217185535715
 tags: Pragmas
 title: Pragma: \define
 type: text/vnd.tiddlywiki
@@ -48,4 +48,6 @@ $caption$
 <<special-button>>
 """>>
 
+<<.warning """If macros are nested, textual substitution will only occur for the outermost macro. Thi is because by the time the inner macros are processed all the substitutions will have already occurred""">>
+
 A more formal [[presentation|Macro Definition Syntax]] of this syntax is also available.

editions/tw5.com/tiddlers/widgets/GenesisWidget.tid

@@ -1,6 +1,6 @@
 caption: genesis
 created: 20221101100729587
-modified: 20230115101800345
+modified: 20231214093716044
 tags: Widgets
 title: GenesisWidget
 type: text/vnd.tiddlywiki
@@ -15,6 +15,7 @@ The content of the <<.wid genesis>> widget is used as the content of the dynamic
 
 |!Attribute |!Description |
 |$type |The type of widget or element to create (an initial `$` indicates a widget, otherwise an HTML element will be created) |
+|$remappable |Set to "no" to prevent the generated widget from being affected by any custom widget overrides. Needed when invoking the original widget within a custom widget definition |
 |$names |An optional filter evaluating to the names of a list of attributes to be applied to the widget |
 |$values |An optional filter evaluating to the values corresponding to the list of names specified in <<.attr $names>> |
 |$mode |An optional override of the parsing mode. May be "inline" or "block" |

licenses/cla-individual.md

@@ -557,3 +557,5 @@ Wang Ke, @Gk0Wk, 2023/10/17
 @frittro, 2023/10/27
 
 @etardiff, 2023/12/10
+
+John Long, @drevarr, 2023/12/12

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.3.2",
+  "version": "5.3.3-prerelease",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [

plugins/tiddlywiki/tiddlyweb/html-json-skinny-tiddler.tid

@@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-skinny-tiddler
 
-<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>
+<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>