change loaders output structure, and remove props loader

Author: robhrt7

loaders/examples.loader.js

@@ -2,39 +2,25 @@ var _ = require('lodash');
 var marked = require('marked');
 
 var evalPlaceholder = '<%{#eval#}%>';
-var codePlaceholder = '<%{#code#}%>';
 
 var requireAnythingRegex = /require\s*\(([^)]+)\)/g;
 var simpleStringRegex = /^"([^"]+)"$|^'([^']+)'$/;
 
 function readExamples(markdown) {
 	var codeChunks = [];
-
 	var renderer = new marked.Renderer();
-	renderer.heading = function(text, level, raw) {
-		var tag = 'h' + (level + 2);
-		return '<' + tag + '>' + text + '</' + tag + '>\n';
-	};
-	renderer.code = function(code) {
-		codeChunks.push(code);
-		return codePlaceholder;
-	};
 
-	var html = marked(markdown, {renderer: renderer});
+	renderer.code = function(code, language) {
+		if (language && language === 'jsx') {
+			codeChunks.push({type: 'code', content: code, evalInContext: evalPlaceholder});
+        }
 
-	var chunks = [];
-	var textChunks = html.split(codePlaceholder);
-	textChunks.forEach(function(chunk) {
-		if (chunk) {
-			chunks.push({type: 'html', content: chunk});
-		}
-		var code = codeChunks.shift();
-		if (code) {
-			chunks.push({type: 'code', content: code, evalInContext: evalPlaceholder});
-		}
-	});
+		return code;
+	};
+
+	marked(markdown, {renderer: renderer});
 
-	return chunks;
+	return codeChunks;
 }
 
 // Returns a list of all strings used in require(...) calls in the given source code.

loaders/props.loader.js

@@ -12,7 +12,6 @@ function processComponent(filepath) {
 			'filepath: ' + JSON.stringify(filepath),
 			'relativePath: ' + JSON.stringify(path.relative(config.rootDir, filepath)),
 			'module: ' + requireIt(filepath),
-			'props: ' + requireIt('!!props!' + filepath),
 			'examples: ' + (hasExamples ? requireIt('examples!' + examplesFile) : null)
 		].join(',') + '}';
 }
@@ -40,7 +39,14 @@ module.exports.pitch = function() {
 		console.log();
 	}
 
-	var components = componentSources.map(processComponent);
+	var specPah;
+	var specId;
+	var components = componentSources.map(function(item){
+		specPah = config.getExampleFilename(item);
+		specId = path.dirname(specPah.replace(global.userPath, '')).replace(/^\//, '').toLowerCase();
+
+		return '"' + specId + '":' + processComponent(item);
+	});
 
 	var simplifiedConfig = _.pick(config, [
 		'title',
@@ -50,7 +56,7 @@ module.exports.pitch = function() {
 	return [
 		'module.exports = {',
 		'	config: ' + JSON.stringify(simplifiedConfig) + ',',
-		'	components: [' + components.join(',') + ']',
+		'	components: {' + components.join(',') + '}',
 		'};'
 	].join('\n');
 };