From cd36f594c54859d8d8eacad0eca55e1ef3bb4e72 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 28 Mar 2013 17:07:30 +0000
Subject: [PATCH] Make the core into a plugin

---
 {core/styles => boot}/boot.css.tid |  0
 {core => boot}/boot.js             | 11 +++++++----
 {core => boot}/bootprefix.js       |  0
 {core => boot}/sjcl.js             |  0
 {core => boot}/sjcl.js.meta        |  0
 core/modules/startup.js            |  3 +--
 core/modules/wiki.js               |  2 +-
 core/plugin.info                   |  7 +++++++
 core/styles/base.tid               |  2 +-
 tiddlywiki.js                      |  2 +-
 10 files changed, 18 insertions(+), 9 deletions(-)
 rename {core/styles => boot}/boot.css.tid (100%)
 rename {core => boot}/boot.js (99%)
 rename {core => boot}/bootprefix.js (100%)
 rename {core => boot}/sjcl.js (100%)
 rename {core => boot}/sjcl.js.meta (100%)
 create mode 100644 core/plugin.info

diff --git a/core/styles/boot.css.tid b/boot/boot.css.tid
similarity index 100%
rename from core/styles/boot.css.tid
rename to boot/boot.css.tid
diff --git a/core/boot.js b/boot/boot.js
similarity index 99%
rename from core/boot.js
rename to boot/boot.js
index 1ac7a4f62..5325d0a37 100644
--- a/core/boot.js
+++ b/boot/boot.js
@@ -599,7 +599,7 @@ $tw.Wiki.prototype.definePluginModules = function() {
 	$tw.utils.each(this.shadowTiddlers,function(element,title,object) {
 		var tiddler = self.getTiddler(title);
 		if(!$tw.utils.hop(self.tiddlers,title)) { // Don't define the module if it is overidden by an ordinary tiddler
-			if(tiddler.fields.type === "application/javascript" && tiddler.hasField("module-type")) {
+			if(tiddler.hasField("module-type")) {
 				// Define the module
 				$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
 			}
@@ -1035,7 +1035,7 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
 	}
 	// Load any plugins listed in the wiki info file
 	if(wikiInfo.plugins) {
-		var pluginBasePath = path.resolve($tw.boot.bootPath,$tw.config.pluginsPath);
+		var pluginBasePath = path.resolve($tw.boot.corePath,$tw.config.pluginsPath);
 		for(var t=0; t<wikiInfo.plugins.length; t++) {
 			pluginFields = $tw.loadPluginFolder(path.resolve(pluginBasePath,"./" + wikiInfo.plugins[t]));
 			if(pluginFields) {
@@ -1072,10 +1072,12 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
 };
 
 $tw.loadTiddlers = function() {
-	// Load the core tiddlers
+	// Load the boot tiddlers
 	$tw.utils.each($tw.loadTiddlersFromPath($tw.boot.bootPath),function(tiddlerFile) {
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
+	// Load the core tiddlers
+	$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.corePath));
 	// Load the tiddlers from the wiki directory
 	$tw.boot.wikiInfo = $tw.loadWikiTiddlers($tw.boot.wikiPath);
 };
@@ -1107,6 +1109,7 @@ $tw.boot.startup = function() {
 		$tw.boot.files = {};
 		// System paths and filenames
 		$tw.boot.bootPath = path.dirname(module.filename);
+		$tw.boot.corePath = path.resolve($tw.boot.bootPath,"../core");
 		// If the first command line argument doesn't start with `--` then we
 		// interpret it as the path to the wiki folder, which will otherwise default
 		// to the current folder
@@ -1119,7 +1122,7 @@ $tw.boot.startup = function() {
 		}
 		$tw.boot.wikiTiddlersPath = path.resolve($tw.boot.wikiPath,$tw.config.wikiTiddlersSubDir);
 		// Read package info
-		$tw.packageInfo = JSON.parse(fs.readFileSync($tw.boot.bootPath + "/../package.json"));
+		$tw.packageInfo = JSON.parse(fs.readFileSync($tw.boot.corePath + "/../package.json"));
 		// Check node version number
 		if($tw.utils.checkVersions($tw.packageInfo.engines.node.substr(2),process.version.substr(1))) {
 			$tw.utils.error("TiddlyWiki5 requires node.js version " + $tw.packageInfo.engine.node);
diff --git a/core/bootprefix.js b/boot/bootprefix.js
similarity index 100%
rename from core/bootprefix.js
rename to boot/bootprefix.js
diff --git a/core/sjcl.js b/boot/sjcl.js
similarity index 100%
rename from core/sjcl.js
rename to boot/sjcl.js
diff --git a/core/sjcl.js.meta b/boot/sjcl.js.meta
similarity index 100%
rename from core/sjcl.js.meta
rename to boot/sjcl.js.meta
diff --git a/core/modules/startup.js b/core/modules/startup.js
index f9ed4a111..f401765cf 100644
--- a/core/modules/startup.js
+++ b/core/modules/startup.js
@@ -90,8 +90,7 @@ exports.startup = function() {
 			$tw.crypto.setPassword(null);
 		});
 		// Apply stylesheets
-		var styleTiddlers = $tw.wiki.getTiddlersWithTag("$:/core/styles");
-		$tw.utils.each(styleTiddlers,function(title) {
+		$tw.utils.each($tw.modules.types.stylesheet,function(moduleInfo,title) {
 			// Stylesheets don't refresh, yet
 			var parser = $tw.wiki.parseTiddler(title),
 				renderTree = new $tw.WikiRenderTree(parser,{wiki: $tw.wiki});
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index f7e648bed..293cd2f74 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -375,7 +375,7 @@ application/x-tiddler-dictionary: the tiddler is parsed as sequence of name:valu
 Other types currently just return null.
 */
 exports.getTiddlerData = function(title,defaultData) {
-	var tiddler = this.tiddlers[title],
+	var tiddler = this.getTiddler(title),
 		data;
 	if(tiddler && tiddler.fields.text) {
 		switch(tiddler.fields.type) {
diff --git a/core/plugin.info b/core/plugin.info
new file mode 100644
index 000000000..5976346f0
--- /dev/null
+++ b/core/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:",
+	"description": "TiddlyWiki5 core plugin",
+	"author": "JeremyRuston",
+	"version": "0.0.0",
+	"coreVersion": ">=5.0.0"
+}
diff --git a/core/styles/base.tid b/core/styles/base.tid
index 7cc650250..918589489 100644
--- a/core/styles/base.tid
+++ b/core/styles/base.tid
@@ -1,5 +1,5 @@
 title: $:/core/styles/base
-tags: $:/core/styles
+module-type: stylesheet
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 \define border-radius(radius)
diff --git a/tiddlywiki.js b/tiddlywiki.js
index 422d238a7..b53581984 100755
--- a/tiddlywiki.js
+++ b/tiddlywiki.js
@@ -4,4 +4,4 @@
 This is invoked as a shell script by NPM when the `tiddlywiki` command is typed
 */
 
-var tiddlywiki = require("./core/boot.js");
+var tiddlywiki = require("./boot/boot.js");