From 378b9b3627cab368ed216cf5eb856370cfb4b9b0 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Thu, 27 Feb 2025 19:00:58 +0800 Subject: [PATCH 01/12] Allow building external core version of main site (#8953) --- bin/build-site.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/build-site.sh b/bin/build-site.sh index f1fe649e7..066d13d1f 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -105,6 +105,7 @@ node $TW5_BUILD_TIDDLYWIKI \ fi # /index.html Main site +# /external-(version).html External core version of main site # /favicon.ico Favicon for main site # /static.html Static rendering of default tiddlers # /alltiddlers.html Static rendering of all tiddlers @@ -117,7 +118,7 @@ node $TW5_BUILD_TIDDLYWIKI \ --version \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --build favicon static index \ + --build favicon static index external-js \ || exit 1 # /empty.html Empty From 81d8d678002c37f4ed3aa97948f21d2fcfa45e7d Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 4 Mar 2025 01:59:23 +0800 Subject: [PATCH 02/12] Update docs for plugin versions (#8968) * Update docs for plugin versions Update docs for share plugin. Add docs for Tour and Geospatial plugin. * Do not change modified field for some tiddlers --- .../tiddlers/plugins/Dynaview Plugin.tid | 2 +- .../tiddlers/plugins/Geospatial Plugin.tid | 17 +++++++++++++++++ .../tiddlers/plugins/Innerwiki Plugin.tid | 2 +- .../tw5.com/tiddlers/plugins/Share Plugin.tid | 6 ++++-- .../tw5.com/tiddlers/plugins/Tour Plugin.tid | 9 +++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 editions/tw5.com/tiddlers/plugins/Geospatial Plugin.tid create mode 100644 editions/tw5.com/tiddlers/plugins/Tour Plugin.tid diff --git a/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid b/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid index a37dd0d0e..0ab6bd536 100644 --- a/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid @@ -1,6 +1,6 @@ created: 20180111122953142 modified: 20181113084151268 -tags: OfficialPlugins +tags: OfficialPlugins [[Plugin Editions]] title: Dynaview Plugin type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/plugins/Geospatial Plugin.tid b/editions/tw5.com/tiddlers/plugins/Geospatial Plugin.tid new file mode 100644 index 000000000..a9df92a7e --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Geospatial Plugin.tid @@ -0,0 +1,17 @@ +created: 20250302053159467 +modified: 20250302053316068 +tags: OfficialPlugins [[Plugin Editions]] +title: Geospatial Plugin +type: text/vnd.tiddlywiki + +The Geospatial Plugin adds new primitives to the TiddlyWiki platform to enable non-developers to build sophisticated interactive geospatial applications. + +It incorporates a number of third party libraries and online services: + +* [[Leaflet.js|https://leafletjs.com/]], an open source library to display interactive maps +* [[Turf.js|https://turfjs.org/]], an open source library to perform geospatial calculations with [[GeoJSON|https://en.wikipedia.org/wiki/GeoJSON]] objects +* [[TravelTime|https://traveltime.com/]], a commercial API for [[geocoding|https://traveltime.com/features/geocoding]], [[routing|https://traveltime.com/features/multi-modal-routing]] and [[isochrones|https://traveltime.com/features/isochrones]] +* [[Flickr|https://www.flickr.com/services/api/]], a free API for retrieving geotagged photographs +* [[OpenLocationCode|https://github.com/google/open-location-code]], Google's open source library for converting to and from Open Location Codes (also known as [[PlusCodes|https://maps.google.com/pluscodes/]]) + +Try it out at https://tiddlywiki.com/plugins/tiddlywiki/geospatial/ \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Innerwiki Plugin.tid b/editions/tw5.com/tiddlers/plugins/Innerwiki Plugin.tid index 11779f535..39ce68c25 100644 --- a/editions/tw5.com/tiddlers/plugins/Innerwiki Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Innerwiki Plugin.tid @@ -1,6 +1,6 @@ created: 20190127104143725 modified: 20190127104143725 -tags: OfficialPlugins +tags: OfficialPlugins [[Plugin Editions]] title: Innerwiki Plugin type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/plugins/Share Plugin.tid b/editions/tw5.com/tiddlers/plugins/Share Plugin.tid index f90506548..0bf35b8f3 100644 --- a/editions/tw5.com/tiddlers/plugins/Share Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Share Plugin.tid @@ -1,6 +1,6 @@ created: 20201228143125000 -modified: 20201228143125000 -tags: OfficialPlugins +modified: 20250302051857380 +tags: OfficialPlugins [[Plugin Editions]] title: Share Plugin type: text/vnd.tiddlywiki @@ -10,3 +10,5 @@ This experimental plugin provides tools to share tiddlers via URLs, comprising: * The ability to load a group of tiddlers from the browser location hash at startup * Wizard and templates to create URLs from group of tiddlers + +See the demo at [ext[https://tiddlywiki.com/share|share]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Tour Plugin.tid b/editions/tw5.com/tiddlers/plugins/Tour Plugin.tid new file mode 100644 index 000000000..84f8fa9bd --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Tour Plugin.tid @@ -0,0 +1,9 @@ +created: 20250302052635425 +modified: 20250302052905312 +tags: OfficialPlugins [[Plugin Editions]] +title: Tour Plugin +type: text/vnd.tiddlywiki + +The tour plugin allows interactive learning tours to be created and presented in TiddlyWiki. + +The demo TiddlyWiki interactive tour can be seen at https://tiddlywiki.com/tour \ No newline at end of file From 9c0fff268c059112d1bafbaacd94aeb8feda45d0 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 3 Mar 2025 19:00:39 +0100 Subject: [PATCH 03/12] [DOCS] make Filter Operators initial filter run assumption more visible (#8969) --- editions/tw5.com/tiddlers/filters/Filter Operators.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/filters/Filter Operators.tid b/editions/tw5.com/tiddlers/filters/Filter Operators.tid index 35d80607f..63d0e318b 100644 --- a/editions/tw5.com/tiddlers/filters/Filter Operators.tid +++ b/editions/tw5.com/tiddlers/filters/Filter Operators.tid @@ -1,6 +1,6 @@ breadcrumbs: [[Filter Step]] created: 20140410103123179 -modified: 20230410114132501 +modified: 20250302200615061 tags: Filters title: Filter Operators type: text/vnd.tiddlywiki @@ -21,7 +21,7 @@ type: text/vnd.tiddlywiki A <<.def "filter operator">> is a predefined keyword attached to an individual step of a [[filter|Filters]]. It defines the particular action of that step. -''Important:'' In general, each first [[filter step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">[all[tiddlers]] as its input. +<<.tip """In general, each first [[filter step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">''[all[tiddlers]]'' as its input.""" title:"Important">> ''Table legend:'' From c5b465ec99dc24d67d73f9e9a0802976b7521e25 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 11 Mar 2025 01:28:55 +0800 Subject: [PATCH 04/12] Make plugin editions use external core (#8952) * Make some editions use external core * Revert tw5.com-docs use external js * Revert "Revert tw5.com-docs use external js" This reverts commit 93f36cb0af735b2d0c906c7422648beb37e2a9bf. --- bin/build-site.sh | 24 +++++++++---------- .../classicparserdemo/tiddlers/$__coreURL.tid | 4 ++++ editions/classicparserdemo/tiddlywiki.info | 5 +++- .../codemirrordemo/tiddlers/$__coreURL.tid | 4 ++++ editions/codemirrordemo/tiddlywiki.info | 5 +++- editions/dynaviewdemo/tiddlers/$__coreURL.tid | 4 ++++ editions/dynaviewdemo/tiddlywiki.info | 5 +++- .../geospatialdemo/tiddlers/$__coreURL.tid | 4 ++++ editions/geospatialdemo/tiddlywiki.info | 5 +++- .../highlightdemo/tiddlers/$__coreURL.tid | 4 ++++ editions/highlightdemo/tiddlywiki.info | 5 +++- .../tiddlers/system/$__coreURL.tid | 4 ++++ editions/innerwikidemo/tiddlywiki.info | 3 +++ editions/katexdemo/tiddlers/$__coreURL.tid | 4 ++++ editions/katexdemo/tiddlywiki.info | 5 +++- editions/markdowndemo/tiddlers/$__coreURL.tid | 4 ++++ editions/markdowndemo/tiddlywiki.info | 5 +++- .../tiddlers/system/$__coreURL.tid | 4 ++++ editions/text-slicer/tiddlywiki.info | 3 +++ editions/tour/tiddlers/System/$__coreURL.tid | 4 ++++ editions/tw5.com-docs/tiddlers/$__coreURL.tid | 4 ++++ editions/tw5.com-docs/tiddlywiki.info | 5 +++- editions/xlsx-utils/tiddlers/$__coreURL.tid | 4 ++++ editions/xlsx-utils/tiddlywiki.info | 5 +++- 24 files changed, 102 insertions(+), 21 deletions(-) create mode 100644 editions/classicparserdemo/tiddlers/$__coreURL.tid create mode 100644 editions/codemirrordemo/tiddlers/$__coreURL.tid create mode 100644 editions/dynaviewdemo/tiddlers/$__coreURL.tid create mode 100644 editions/geospatialdemo/tiddlers/$__coreURL.tid create mode 100644 editions/highlightdemo/tiddlers/$__coreURL.tid create mode 100644 editions/innerwikidemo/tiddlers/system/$__coreURL.tid create mode 100644 editions/katexdemo/tiddlers/$__coreURL.tid create mode 100644 editions/markdowndemo/tiddlers/$__coreURL.tid create mode 100644 editions/text-slicer/tiddlers/system/$__coreURL.tid create mode 100644 editions/tour/tiddlers/System/$__coreURL.tid create mode 100644 editions/tw5.com-docs/tiddlers/$__coreURL.tid create mode 100644 editions/xlsx-utils/tiddlers/$__coreURL.tid diff --git a/bin/build-site.sh b/bin/build-site.sh index 066d13d1f..057f76b8d 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -156,7 +156,7 @@ node $TW5_BUILD_TIDDLYWIKI \ node $TW5_BUILD_TIDDLYWIKI \ ./editions/tour \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all tour.html text/plain \ + --rendertiddler $:/core/save/all-external-js tour.html text/plain \ || exit 1 # /share.html Custom edition for sharing via the URL @@ -195,7 +195,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/xlsx-utils \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \ - --build index \ + --build external \ || exit 1 # /editions/resumebuilder/index.html Resume builder edition @@ -211,7 +211,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/text-slicer \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT/editions/text-slicer/ \ - --build index \ + --build external \ || exit 1 # /editions/translators/index.html Translators edition @@ -243,7 +243,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/tw5.com-docs \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \ - --build index \ + --build external \ || exit 1 # /editions/twitter-archivist/index.html Twitter Archivist edition @@ -266,7 +266,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/innerwikidemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \ || exit 1 # /plugins/tiddlywiki/dynaview/index.html Demo wiki with DynaView plugin @@ -276,7 +276,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/dynaviewdemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \ || exit 1 @@ -290,7 +290,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/katexdemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \ || exit 1 @@ -320,7 +320,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/codemirrordemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \ || exit 1 @@ -330,7 +330,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/markdowndemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \ || exit 1 @@ -340,7 +340,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/classicparserdemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \ || exit 1 @@ -350,7 +350,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/highlightdemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \ || exit 1 @@ -360,7 +360,7 @@ node $TW5_BUILD_TIDDLYWIKI \ ./editions/geospatialdemo \ --load $TW5_BUILD_OUTPUT/build.tid \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \ + --rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/geospatial/index.html text/plain \ --rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \ || exit 1 diff --git a/editions/classicparserdemo/tiddlers/$__coreURL.tid b/editions/classicparserdemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/classicparserdemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/classicparserdemo/tiddlywiki.info b/editions/classicparserdemo/tiddlywiki.info index 44d5993c5..3a443c4ce 100644 --- a/editions/classicparserdemo/tiddlywiki.info +++ b/editions/classicparserdemo/tiddlywiki.info @@ -11,6 +11,9 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"] + "--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","classicparserdemo.html","text/plain" + ] } } diff --git a/editions/codemirrordemo/tiddlers/$__coreURL.tid b/editions/codemirrordemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/codemirrordemo/tiddlywiki.info b/editions/codemirrordemo/tiddlywiki.info index 7baa8f5a0..ef71f55c9 100644 --- a/editions/codemirrordemo/tiddlywiki.info +++ b/editions/codemirrordemo/tiddlywiki.info @@ -22,6 +22,9 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"] + "--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","codemirrordemo.html","text/plain" + ] } } diff --git a/editions/dynaviewdemo/tiddlers/$__coreURL.tid b/editions/dynaviewdemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/dynaviewdemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/dynaviewdemo/tiddlywiki.info b/editions/dynaviewdemo/tiddlywiki.info index 96b2ef2e5..d45ed738c 100644 --- a/editions/dynaviewdemo/tiddlywiki.info +++ b/editions/dynaviewdemo/tiddlywiki.info @@ -9,6 +9,9 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","index.html","text/plain"] + "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" + ] } } \ No newline at end of file diff --git a/editions/geospatialdemo/tiddlers/$__coreURL.tid b/editions/geospatialdemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/geospatialdemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/geospatialdemo/tiddlywiki.info b/editions/geospatialdemo/tiddlywiki.info index db988811d..527748f49 100644 --- a/editions/geospatialdemo/tiddlywiki.info +++ b/editions/geospatialdemo/tiddlywiki.info @@ -14,7 +14,10 @@ ], "build": { "index": [ - "--render","$:/core/save/all","index.html","text/plain"], + "--render","$:/core/save/all","index.html","text/plain"],, + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" + ], "favicon": [], "static": [], "empty": [], diff --git a/editions/highlightdemo/tiddlers/$__coreURL.tid b/editions/highlightdemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/highlightdemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/highlightdemo/tiddlywiki.info b/editions/highlightdemo/tiddlywiki.info index 075859c8c..74342d35b 100644 --- a/editions/highlightdemo/tiddlywiki.info +++ b/editions/highlightdemo/tiddlywiki.info @@ -16,6 +16,9 @@ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", - "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] + "--render","$:/core/templates/static.template.css","static/static.css","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","highlightdemo.html","text/plain" + ] } } diff --git a/editions/innerwikidemo/tiddlers/system/$__coreURL.tid b/editions/innerwikidemo/tiddlers/system/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/innerwikidemo/tiddlers/system/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/innerwikidemo/tiddlywiki.info b/editions/innerwikidemo/tiddlywiki.info index 2a55c68d0..676734982 100644 --- a/editions/innerwikidemo/tiddlywiki.info +++ b/editions/innerwikidemo/tiddlywiki.info @@ -19,6 +19,9 @@ "--screenshot", "[[$:/plugins/tiddlywiki/innerwiki/examples]]", "4" + ], + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" ] } } \ No newline at end of file diff --git a/editions/katexdemo/tiddlers/$__coreURL.tid b/editions/katexdemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/katexdemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/katexdemo/tiddlywiki.info b/editions/katexdemo/tiddlywiki.info index bd07b3e28..40c84dfc6 100644 --- a/editions/katexdemo/tiddlywiki.info +++ b/editions/katexdemo/tiddlywiki.info @@ -16,6 +16,9 @@ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", - "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] + "--render","$:/core/templates/static.template.css","static/static.css","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","katexdemo.html","text/plain" + ] } } diff --git a/editions/markdowndemo/tiddlers/$__coreURL.tid b/editions/markdowndemo/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..99eff5356 --- /dev/null +++ b/editions/markdowndemo/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/markdowndemo/tiddlywiki.info b/editions/markdowndemo/tiddlywiki.info index 575c1e416..bc025070d 100644 --- a/editions/markdowndemo/tiddlywiki.info +++ b/editions/markdowndemo/tiddlywiki.info @@ -13,6 +13,9 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","markdowndemo.html","text/plain"] + "--rendertiddler","$:/core/save/all","markdowndemo.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","markdowndemo.html","text/plain" + ] } } diff --git a/editions/text-slicer/tiddlers/system/$__coreURL.tid b/editions/text-slicer/tiddlers/system/$__coreURL.tid new file mode 100644 index 000000000..f3ab8b9c0 --- /dev/null +++ b/editions/text-slicer/tiddlers/system/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/text-slicer/tiddlywiki.info b/editions/text-slicer/tiddlywiki.info index 7906ba510..f3a0df3bf 100644 --- a/editions/text-slicer/tiddlywiki.info +++ b/editions/text-slicer/tiddlywiki.info @@ -13,6 +13,9 @@ "build": { "index": [ "--rendertiddler","$:/core/save/all","index.html","text/plain" + ], + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" ] } } \ No newline at end of file diff --git a/editions/tour/tiddlers/System/$__coreURL.tid b/editions/tour/tiddlers/System/$__coreURL.tid new file mode 100644 index 000000000..5876d6687 --- /dev/null +++ b/editions/tour/tiddlers/System/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/tw5.com-docs/tiddlers/$__coreURL.tid b/editions/tw5.com-docs/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..f3ab8b9c0 --- /dev/null +++ b/editions/tw5.com-docs/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/tw5.com-docs/tiddlywiki.info b/editions/tw5.com-docs/tiddlywiki.info index 4d486267b..b788116eb 100644 --- a/editions/tw5.com-docs/tiddlywiki.info +++ b/editions/tw5.com-docs/tiddlywiki.info @@ -10,6 +10,9 @@ ], "build": { "index": [ - "--render","$:/core/save/all","index.html","text/plain"] + "--render","$:/core/save/all","index.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" + ] } } diff --git a/editions/xlsx-utils/tiddlers/$__coreURL.tid b/editions/xlsx-utils/tiddlers/$__coreURL.tid new file mode 100644 index 000000000..f3ab8b9c0 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/$__coreURL.tid @@ -0,0 +1,4 @@ +title: $:/coreURL +tags: $:/tags/Global + +\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]] diff --git a/editions/xlsx-utils/tiddlywiki.info b/editions/xlsx-utils/tiddlywiki.info index 7adfc403b..5f1774f0b 100644 --- a/editions/xlsx-utils/tiddlywiki.info +++ b/editions/xlsx-utils/tiddlywiki.info @@ -12,6 +12,9 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","index.html","text/plain"] + "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "external": [ + "--render","$:/core/save/all-external-js","index.html","text/plain" + ] } } From 897b14a8d612294142aee4e8e6aac401eb1ab9b4 Mon Sep 17 00:00:00 2001 From: Abdullah Ibrahim <76573989+rumman157@users.noreply.github.com> Date: Mon, 17 Mar 2025 21:51:40 +0600 Subject: [PATCH 05/12] Signing CLA (#8983) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index f827a3f2b..ee46925ff 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -609,3 +609,5 @@ J. Ryan Stinnett, @jryans, 2025/01/04 Galen Huntington, @galenhuntington, 2025/01/19 @Rhys-T, 2025/01/23 + +@Rumman157, 2025/03/17 \ No newline at end of file From f6a60f51d279d4090623d401b34a59113f07d8d2 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 18 Mar 2025 00:15:28 +0800 Subject: [PATCH 06/12] Fix error in geospatial edition tiddlywiki.info file (#8977) --- editions/geospatialdemo/tiddlywiki.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/geospatialdemo/tiddlywiki.info b/editions/geospatialdemo/tiddlywiki.info index 527748f49..ed9700583 100644 --- a/editions/geospatialdemo/tiddlywiki.info +++ b/editions/geospatialdemo/tiddlywiki.info @@ -14,7 +14,7 @@ ], "build": { "index": [ - "--render","$:/core/save/all","index.html","text/plain"],, + "--render","$:/core/save/all","index.html","text/plain"], "external": [ "--render","$:/core/save/all-external-js","index.html","text/plain" ], From 4e6a2ffd60951f4c9aade44959d271c645878312 Mon Sep 17 00:00:00 2001 From: Abdullah Ibrahim <76573989+rumman157@users.noreply.github.com> Date: Tue, 18 Mar 2025 00:27:54 +0600 Subject: [PATCH 07/12] Signing CLA (#8982) From 40d53543dc943ff8689264df71cd2ed7b9c0b21c Mon Sep 17 00:00:00 2001 From: bobjtls <71995093+bobjtls@users.noreply.github.com> Date: Sat, 22 Mar 2025 22:35:15 +1100 Subject: [PATCH 08/12] Signing CLA (#8985) --- licenses/cla-individual.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index ee46925ff..4033e9fc1 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -610,4 +610,5 @@ Galen Huntington, @galenhuntington, 2025/01/19 @Rhys-T, 2025/01/23 -@Rumman157, 2025/03/17 \ No newline at end of file +@Rumman157, 2025/03/17 +@bob.jansen@cultconv.com, 2025/03/22 \ No newline at end of file From 1b605f0b876d77f70e24d26a24182eb4b9286d26 Mon Sep 17 00:00:00 2001 From: bobjtls <71995093+bobjtls@users.noreply.github.com> Date: Sat, 22 Mar 2025 22:35:56 +1100 Subject: [PATCH 09/12] Docs: Addition of example for ActionSetField widget (#8986) --- .../tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid index f278dae0b..92de54be9 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid @@ -1,6 +1,6 @@ caption: action-setfield created: 20141025120850184 -modified: 20150806171403798 +modified: 20250322010115457 tags: Widgets ActionWidgets title: ActionSetFieldWidget type: text/vnd.tiddlywiki @@ -66,3 +66,10 @@ src='<$button> <$action-navigate $to="$:/ControlPanel"/> Go to Control Panel "Appearance" tab '/> + +Here is an example of a button that will update the value of an existing field in a tiddler +<$macrocall $name='wikitext-example-without-html' +src='<$button> +<$action-setfield $tiddler="Test" existing_field_name="new field value"/> +Update Field existing_field_name in tiddler Test +'/> \ No newline at end of file From 48fa2be6acd635e4ee78b8e5c7405a66ade6bc52 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sat, 22 Mar 2025 21:37:15 +0100 Subject: [PATCH 10/12] [DOCS] Add HTML Tag info to reveal-widget (#8941) --- editions/tw5.com/tiddlers/HTML Tags.tid | 11 +++++++++++ editions/tw5.com/tiddlers/widgets/RevealWidget.tid | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 editions/tw5.com/tiddlers/HTML Tags.tid diff --git a/editions/tw5.com/tiddlers/HTML Tags.tid b/editions/tw5.com/tiddlers/HTML Tags.tid new file mode 100644 index 000000000..8df3b22d9 --- /dev/null +++ b/editions/tw5.com/tiddlers/HTML Tags.tid @@ -0,0 +1,11 @@ +created: 20250211092107689 +modified: 20250211092307574 +tags: Definitions +title: HTML Tags +type: text/vnd.tiddlywiki + +<<< +In HTML, a tag is used for creating an element. + +The name of an HTML element is the name that appears at the beginning of the element's start tag and at the end of the element's end tag (if the element has an end tag). For example, the p in the `

` start tag and `

` end tag is the name of the HTML paragraph element. Note that an element name in an end tag is preceded by a slash character: `

`, and that for void elements, the end tag is neither required nor allowed. +<<< https://developer.mozilla.org/en-US/docs/Glossary/Tag \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index 37df94c1e..0aff56e23 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -1,7 +1,7 @@ caption: reveal created: 20131024141900000 jeremy: tiddlywiki -modified: 20240721175716320 +modified: 20250211091937860 tags: Widgets title: RevealWidget type: text/vnd.tiddlywiki @@ -28,7 +28,7 @@ The content of the `<$reveal>` widget is displayed according to the rules given |stateTitle |A title containing the state, ''without'' TextReference. Gets preferred over the <<.attr state>> attribute | |stateField |A ''field name'' which is used to look for the state, if the attribute <<.attr stateTitle>> is present | |stateIndex |An ''index'' which is used to look for the state, if the attribute <<.attr stateTitle>> is present | -|tag |Overrides the default HTML element tag (`
` in block mode or `` in inline mode) | +|tag |Overrides the default [[HTML Tags]] (`
` in block mode or `` in inline mode) | |type |The type of matching performed: ''match'', ''nomatch'', ''popup'', ''lt'', ''gt'', ''lteq'' or ''gteq'' | |text |The text to match when the type is ''match'', ''nomatch'', ''lt'', ''gt'', ''lteq'' or ''gteq'' | |class |An optional CSS class name to be assigned to the HTML element
» Set to `tc-popup-keep` to make a popup "sticky", so it won't close when you click inside of it| From 8bda28afd5082bbf3f77482990f476ca6764df17 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 27 Mar 2025 18:22:56 +0100 Subject: [PATCH 11/12] Fix typo (#8994) --- editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid index 883f1e450..0ecac2400 100644 --- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid +++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid @@ -48,6 +48,6 @@ $caption$ <> """>> -<<.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""">> +<<.warning """If macros are nested, textual substitution will only occur for the outermost macro. This 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. From f315567924d6571293719f2447205ce1ad93c98b Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 6 Apr 2025 15:22:25 +0100 Subject: [PATCH 12/12] Update MultiWikiServer tiddler --- .../roadmap/multiwikiserver/MultiWikiServer.tid | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/editions/tw5.com/tiddlers/roadmap/multiwikiserver/MultiWikiServer.tid b/editions/tw5.com/tiddlers/roadmap/multiwikiserver/MultiWikiServer.tid index 891bdb378..d15f34679 100644 --- a/editions/tw5.com/tiddlers/roadmap/multiwikiserver/MultiWikiServer.tid +++ b/editions/tw5.com/tiddlers/roadmap/multiwikiserver/MultiWikiServer.tid @@ -14,13 +14,8 @@ Planned features include: * Instantaneous synchronisation of changes between the server and all connected clients * Workflow processing on the server, for example to automatically compress images, or to archive webpages -MWS does require basic knowledge of the command line and Node.js but is designed to be as simple as possible to setup and use. Once downloaded, just two commands are needed to complete the installation and start the server: +MWS does require basic knowledge of the command line and Node.js but is designed to be as simple as possible to setup and use. A few simple commands are all that is needed to complete the installation and start the server. -``` -npm install -npm start -``` +MWS is currently under development at ~GitHub but it is already functional and usable: -MWS is currently [[under development at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/pull/7915]] but it is already functional and usable. Visit the MWS website for more information: - -! https://mws.tiddlywiki.com/ \ No newline at end of file +https://github.com/TiddlyWiki/MultiWikiServer/