Merge pull request webpack-contrib#169 from nkt/camelcased-keys

Added missing camelCase option for locals loader

Author: sokra

lib/compile-exports.js

@@ -0,0 +1,19 @@
+var camelCase = require("lodash.camelcase");
+
+module.exports = function compileExports(result, importItemMatcher, camelCaseKeys) {
+  if (!Object.keys(result.exports).length) {
+    return "";
+  }
+
+  var exportJs = Object.keys(result.exports).reduce(function(res, key) {
+    var valueAsString = JSON.stringify(result.exports[key]);
+    valueAsString = valueAsString.replace(result.importItemRegExpG, importItemMatcher);
+    res.push("\t" + JSON.stringify(key) + ": " + valueAsString);
+    if (camelCaseKeys) {
+      res.push("\t" + JSON.stringify(camelCase(key)) + ": " + valueAsString);
+    }
+    return res;
+  }, []).join(",\n");
+
+  return "{\n" + exportJs + "\n}";
+};

lib/loader.js

@@ -4,9 +4,9 @@
 */
 var path = require("path");
 var loaderUtils = require("loader-utils");
-var camelCase = require("lodash.camelcase");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
 
 
 module.exports = function(content, map) {
@@ -82,21 +82,11 @@ module.exports = function(content, map) {
 			return "\" + require(" + loaderUtils.stringifyRequest(this, urlRequest) + ") + \"";
 		}.bind(this));
 
-		var exportJs = "";
-		if(Object.keys(result.exports).length > 0) {
-			var boundImportItemMatcher = importItemMatcher.bind(this);
-			exportJs = Object.keys(result.exports).reduce(function(res, key) {
-				var valueAsString = JSON.stringify(result.exports[key]);
-				valueAsString = valueAsString.replace(result.importItemRegExpG, boundImportItemMatcher);
-				res.push("\t" + JSON.stringify(key) + ": " + valueAsString);
-				if (camelCaseKeys) {
-					res.push("\t" + JSON.stringify(camelCase(key)) + ": " + valueAsString);
-				}
-				return res;
-			}, []).join(",\n");
-			exportJs = "exports.locals = {\n" + exportJs + "\n};";
-		}
 
+		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
+		if (exportJs) {
+			exportJs = "exports.locals = " + exportJs;
+		}
 
 		var moduleJs;
 		if(query.sourceMap && result.map) {

lib/localsLoader.js

@@ -5,13 +5,15 @@
 var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
 
 
 module.exports = function(content) {
 	if(this.cacheable) this.cacheable();
 	var callback = this.async();
 	var query = loaderUtils.parseQuery(this.query);
 	var moduleMode = query.modules || query.module;
+	var camelCaseKeys = query.camelCase || query.camelcase;
 
 	processCss(content, null, {
 		mode: moduleMode ? "local" : "global",
@@ -33,16 +35,12 @@ module.exports = function(content) {
 				"[" + JSON.stringify(importItem.export) + "] + \"";
 		}
 
-		var exportJs = "";
-		if(Object.keys(result.exports).length > 0) {
-			exportJs = Object.keys(result.exports).map(function(key) {
-				var valueAsString = JSON.stringify(result.exports[key]);
-				valueAsString = valueAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this));
-				return "\t" + JSON.stringify(key) + ": " + valueAsString;
-			}.bind(this)).join(",\n");
-			exportJs = "module.exports = {\n" + exportJs + "\n};";
+		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
+		if (exportJs) {
+			exportJs = "module.exports = " + exportJs;
 		}
 
+
 		callback(null, exportJs);
 	}.bind(this));
 };