From c5b465ec99dc24d67d73f9e9a0802976b7521e25 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 11 Mar 2025 01:28:55 +0800 Subject: [PATCH] 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" + ] } }