From 98dc0945932581ad67df39152d7fc3008165405c Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Fri, 25 Jul 2025 09:15:34 +0100
Subject: [PATCH] Package server files as new $:/core-server plugin

---
 boot/boot.js                                           |  4 +++-
 core-server/commands/savewikifolder.js                 |  1 +
 core-server/plugin.info                                | 10 ++++++++++
 core-server/readme.tid                                 |  6 ++++++
 core/templates/external-js/save-all-external-js.tid    |  2 +-
 .../templates/external-js/save-offline-external-js.tid |  2 +-
 core/templates/save-all.tid                            |  2 +-
 core/templates/save-empty.tid                          |  2 +-
 core/templates/save-lazy-all.tid                       |  2 +-
 core/templates/save-lazy-images.tid                    |  2 +-
 .../system/$__editions_de-AT-DE_download-empty.tid     |  2 +-
 editions/es-ES/tiddlers/system/download-empty.tid      |  2 +-
 editions/fr-FR/tiddlers/system/download-empty.tid      |  2 +-
 editions/ja-JP/tiddlers/system/download-empty.tid      |  2 +-
 editions/ko-KR/tiddlers/system/download-empty.tid      |  2 +-
 editions/prerelease/tiddlers/system/download-empty.tid |  2 +-
 editions/tw5.com/tiddlers/system/download-empty.tid    |  2 +-
 .../webserver/WebServer API_ Get All Tiddlers.tid      |  2 +-
 .../zh-Hans/tiddlers/system/download-empty-zh-Hans.tid |  2 +-
 .../zh-Hant/tiddlers/system/download-empty-zh-Hant.tid |  2 +-
 .../tiddlywiki/tiddlyweb/config-tiddlers-filter.tid    |  2 +-
 plugins/tiddlywiki/tiddlyweb/save-offline.tid          |  2 +-
 plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js       |  2 +-
 plugins/tiddlywiki/upgrade/save-tiddler-filter.tid     |  2 +-
 24 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 core-server/plugin.info
 create mode 100644 core-server/readme.tid

diff --git a/boot/boot.js b/boot/boot.js
index 20a639731c..9b88b98b14 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1433,7 +1433,7 @@ $tw.Wiki = function(options) {
 			checkTiddler = function(tiddler,title) {
 				if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) {
 					var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title);
-					if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
+					if(title === "$:/core" || title === "$:/core-server" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
 						self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered
 						pluginTiddlers.push(tiddler);
 						registeredTitles.push(tiddler.fields.title);
@@ -2350,6 +2350,7 @@ $tw.loadTiddlersNode = function() {
 	});
 	// Load the core tiddlers
 	$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.corePath));
+	$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.coreServerPath));
 	// Load any extra plugins
 	$tw.utils.each($tw.boot.extraPlugins,function(name) {
 		if(name.charAt(0) === "+") { // Relative path to plugin
@@ -2423,6 +2424,7 @@ $tw.boot.initStartup = function(options) {
 		// System paths and filenames
 		$tw.boot.bootPath = options.bootPath || path.dirname(module.filename);
 		$tw.boot.corePath = path.resolve($tw.boot.bootPath,"../core");
+		$tw.boot.coreServerPath = path.resolve($tw.boot.bootPath,"../core-server");
 		// If there's no arguments then default to `--help`
 		if($tw.boot.argv.length === 0) {
 			$tw.boot.argv = ["--help"];
diff --git a/core-server/commands/savewikifolder.js b/core-server/commands/savewikifolder.js
index 751e0e54ea..b17246e866 100644
--- a/core-server/commands/savewikifolder.js
+++ b/core-server/commands/savewikifolder.js
@@ -76,6 +76,7 @@ WikiFolderMaker.prototype.tiddlersToIgnore = [
 	"$:/boot/boot.js",
 	"$:/boot/bootprefix.js",
 	"$:/core",
+	"$:/core-server",
 	"$:/library/sjcl.js",
 	"$:/temp/info-plugin"
 ];
diff --git a/core-server/plugin.info b/core-server/plugin.info
new file mode 100644
index 0000000000..747945521e
--- /dev/null
+++ b/core-server/plugin.info
@@ -0,0 +1,10 @@
+{
+	"title": "$:/core-server",
+	"name": "Core Server Components",
+	"description": "TiddlyWiki5 core server components",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"plugin-priority": "0",
+	"list": "readme",
+	"stability": "STABILITY_2_STABLE"
+}
diff --git a/core-server/readme.tid b/core-server/readme.tid
new file mode 100644
index 0000000000..3960fe76a7
--- /dev/null
+++ b/core-server/readme.tid
@@ -0,0 +1,6 @@
+title: $:/core-server/readme
+
+This plugin contains TiddlyWiki's core components that are only needed on the server, comprising:
+
+* Commands
+* HTTP server code
diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 1f49088781..5b96d23014 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/all-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]] $(publishFilter)$
 \end
 
 <!-- Important: core library is provided by serving URI encoded $:/core/templates/tiddlywiki5.js -->
diff --git a/core/templates/external-js/save-offline-external-js.tid b/core/templates/external-js/save-offline-external-js.tid
index 70cb8bbc0d..9418a4af04 100644
--- a/core/templates/external-js/save-offline-external-js.tid
+++ b/core/templates/external-js/save-offline-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/offline-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]] $(publishFilter)$
 \end
 \define defaultCoreURL() tiddlywikicore-$(version)$.js
 <$let coreURL={{{ [[coreURL]is[variable]then<coreURL>else<defaultCoreURL>] }}}>
diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
index a316d1954c..059775d5a2 100644
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -2,6 +2,6 @@ title: $:/core/save/all
 
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-empty.tid b/core/templates/save-empty.tid
index 0b1c33b595..1d8776c2bc 100644
--- a/core/templates/save-empty.tid
+++ b/core/templates/save-empty.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/empty
 
 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-lazy-all.tid b/core/templates/save-lazy-all.tid
index da4353fba6..96573b3ffb 100644
--- a/core/templates/save-lazy-all.tid
+++ b/core/templates/save-lazy-all.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-all
 
 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] [is[tiddler]type[application/javascript]] +[sort[title]]
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]] -[type[application/javascript]]
diff --git a/core/templates/save-lazy-images.tid b/core/templates/save-lazy-images.tid
index b23b348f0a..f144f34f96 100644
--- a/core/templates/save-lazy-images.tid
+++ b/core/templates/save-lazy-images.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-images
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] -[!is[system]is[image]] +[sort[title]] 
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]is[image]]
diff --git a/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
index d14f6c4c99..c8a96a1931 100755
--- a/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
+++ b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
@@ -4,7 +4,7 @@ title: $:/editions/de-AT-DE/download-empty
 type: text/vnd.tiddlywiki
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/de-DE]] [[$:/languages/de-AT]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/de-DE]] [[$:/languages/de-AT]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/es-ES/tiddlers/system/download-empty.tid b/editions/es-ES/tiddlers/system/download-empty.tid
index 64928eb2f4..5600331878 100755
--- a/editions/es-ES/tiddlers/system/download-empty.tid
+++ b/editions/es-ES/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/es-ES/download-empty
 type: text/vnd.tiddlywiki
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/es-ES]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/es-ES]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/fr-FR/tiddlers/system/download-empty.tid b/editions/fr-FR/tiddlers/system/download-empty.tid
index d07088b63c..a91f73e9e4 100755
--- a/editions/fr-FR/tiddlers/system/download-empty.tid
+++ b/editions/fr-FR/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/fr-FR/download-empty
 type: text/vnd.tiddlywiki
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/fr-FR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/fr-FR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/ja-JP/tiddlers/system/download-empty.tid b/editions/ja-JP/tiddlers/system/download-empty.tid
index 79b98e462f..b3c2c00a5e 100644
--- a/editions/ja-JP/tiddlers/system/download-empty.tid
+++ b/editions/ja-JP/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/ja-JP/download-empty
 type: text/vnd.tiddlywiki
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/ko-KR/tiddlers/system/download-empty.tid b/editions/ko-KR/tiddlers/system/download-empty.tid
index 75f80307ff..e1e8ea2540 100644
--- a/editions/ko-KR/tiddlers/system/download-empty.tid
+++ b/editions/ko-KR/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/ko-KR/download-empty
 type: text/vnd.tiddlywiki
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ko-KR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ko-KR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/prerelease/tiddlers/system/download-empty.tid b/editions/prerelease/tiddlers/system/download-empty.tid
index 2c0eaa259a..42e4e4cdff 100644
--- a/editions/prerelease/tiddlers/system/download-empty.tid
+++ b/editions/prerelease/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/tw5.com/download-empty
 code-body: yes
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [[$:/config/OfficialPluginLibrary]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] [[$:/config/OfficialPluginLibrary]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/tw5.com/tiddlers/system/download-empty.tid b/editions/tw5.com/tiddlers/system/download-empty.tid
index f49b9b7940..90ce378564 100644
--- a/editions/tw5.com/tiddlers/system/download-empty.tid
+++ b/editions/tw5.com/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/tw5.com/download-empty
 code-body: yes
 
 \procedure saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 
 \procedure savingEmpty() yes
diff --git a/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid b/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid
index 9c38f61573..c77a623fa4 100644
--- a/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid	
@@ -22,7 +22,7 @@ In order to avoid denial of service attacks with malformed filters in the defaul
 To enable a particular filter, create a tiddler with the title "$:/config/Server/ExternalFilters/" concatenated with the filter text, and the text field set to "yes". For example, the TiddlyWeb plugin includes the following shadow tiddler to enable the filter that it requires:
 
 ```
-title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/library/sjcl.js]] -[[$:/core]]
+title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] -[[$:/library/sjcl.js]] -[[$:/core]]
 text: yes
 ```
 
diff --git a/editions/zh-Hans/tiddlers/system/download-empty-zh-Hans.tid b/editions/zh-Hans/tiddlers/system/download-empty-zh-Hans.tid
index 861a1d410c..8b67ab4555 100644
--- a/editions/zh-Hans/tiddlers/system/download-empty-zh-Hans.tid
+++ b/editions/zh-Hans/tiddlers/system/download-empty-zh-Hans.tid
@@ -1,7 +1,7 @@
 title: $:/editions/zh-Hans/download-empty
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/language]] [[$:/languages/zh-Hans]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/language]] [[$:/languages/zh-Hans]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/editions/zh-Hant/tiddlers/system/download-empty-zh-Hant.tid b/editions/zh-Hant/tiddlers/system/download-empty-zh-Hant.tid
index c061d95380..c9bec8e57a 100644
--- a/editions/zh-Hant/tiddlers/system/download-empty-zh-Hant.tid
+++ b/editions/zh-Hant/tiddlers/system/download-empty-zh-Hant.tid
@@ -1,7 +1,7 @@
 title: $:/editions/zh-Hant/download-empty
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/language]] [[$:/languages/zh-Hant]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/language]] [[$:/languages/zh-Hant]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/plugins/tiddlywiki/tiddlyweb/config-tiddlers-filter.tid b/plugins/tiddlywiki/tiddlyweb/config-tiddlers-filter.tid
index 4e5c951dbb..b4e041779e 100644
--- a/plugins/tiddlywiki/tiddlyweb/config-tiddlers-filter.tid
+++ b/plugins/tiddlywiki/tiddlyweb/config-tiddlers-filter.tid
@@ -1,2 +1,2 @@
-title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/library/sjcl.js]] -[[$:/core]]
+title: $:/config/Server/ExternalFilters/[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] -[[$:/library/sjcl.js]] -[[$:/core]]
 text: yes
diff --git a/plugins/tiddlywiki/tiddlyweb/save-offline.tid b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
index 591a1e438a..e1e6a368b5 100644
--- a/plugins/tiddlywiki/tiddlyweb/save-offline.tid
+++ b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
@@ -2,6 +2,6 @@ title: $:/plugins/tiddlywiki/tiddlyweb/save/offline
 
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
index b33d3b5e6c..24decabc1d 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
@@ -175,7 +175,7 @@ TiddlyWebAdaptor.prototype.getSkinnyTiddlers = function(callback) {
 	$tw.utils.httpRequest({
 		url: this.host + "recipes/" + this.recipe + "/tiddlers.json",
 		data: {
-			filter: "[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/library/sjcl.js]] -[[$:/core]]"
+			filter: "[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] -[[$:/library/sjcl.js]] -[[$:/core]]"
 		},
 		callback: function(err,data) {
 			// Check for errors
diff --git a/plugins/tiddlywiki/upgrade/save-tiddler-filter.tid b/plugins/tiddlywiki/upgrade/save-tiddler-filter.tid
index 988cdae540..631f9a0473 100644
--- a/plugins/tiddlywiki/upgrade/save-tiddler-filter.tid
+++ b/plugins/tiddlywiki/upgrade/save-tiddler-filter.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/upgrade/save-tiddler-filter
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[[$:/UpgradeLibrary]] -[[$:/plugins/tiddlywiki/upgrade]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[tiddler]] -[[$:/UpgradeLibrary]] -[[$:/plugins/tiddlywiki/upgrade]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/core-server]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}