changed hash creation to something more reproducable

added context and hashPrefix option fixes webpack#157

Author: sokra

lib/getLocalIdent.js

@@ -3,12 +3,13 @@
 Author Tobias Koppers @sokra
 */
 var loaderUtils = require("loader-utils");
+var path = require("path");
+
 module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) {
-var request = loaderContext.options && typeof loaderContext.options.context === "string" ?
-loaderUtils.stringifyRequest({ context: loaderContext.options.context }, loaderUtils.getRemainingRequest(loaderContext)) :
-loaderContext.request;
-options.content = localName + " " + request;
-options.context = loaderContext.options && typeof loaderContext.options.context === "string" ? loaderContext.options.context : loaderContext.context;
+if(!options.context)
+options.context = loaderContext.options && typeof loaderContext.options.context === "string" ? loaderContext.options.context : loaderContext.context;
+var request = path.relative(options.context, loaderContext.resourcePath);
+options.content = options.hashPrefix + request + "+" + localName;
 localIdentName = localIdentName.replace(/\[local\]/gi, localName);
 var hash = loaderUtils.interpolateName(loaderContext, localIdentName, options);
 return hash.replace(new RegExp("[^a-zA-Z0-9\\-_\u00A0-\uFFFF]", "g"), "-").replace(/^([^a-zA-Z_])/, "_$1");

lib/processCss.js

@@ -121,6 +121,7 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 
 var query = options.query;
 var root = query.root;
+var context = query.context;
 var localIdentName = query.localIdentName || "[hash:base64]";
 var localIdentRegExp = query.localIdentRegExp;
 var forceMinimize = query.minimize;
@@ -149,7 +150,9 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 modulesScope({
 generateScopedName: function(exportName) {
 return getLocalIdent(options.loaderContext, localIdentName, exportName, {
-regExp: localIdentRegExp
+regExp: localIdentRegExp,
+hashPrefix: query.hashPrefix || "",
+context: context
 });
 }
 }),

test/camelCaseTest.js

@@ -6,14 +6,14 @@ describe("camelCase", function() {
 var css = ".btn-info { color: blue; }";
 var exports = {
 with: [
-[1, "._38r5hlPyrqKLodJwWOdM1k { color: blue; }", ""]
+[1, ".Vh87YsUQA8A0EbntSqs6 { color: blue; }", ""]
 ],
 without: [
-[1, "._38r5hlPyrqKLodJwWOdM1k { color: blue; }", ""]
+[1, ".Vh87YsUQA8A0EbntSqs6 { color: blue; }", ""]
 ]
 };
-exports.with.locals = {'btn-info': '_38r5hlPyrqKLodJwWOdM1k'};
-exports.without.locals = {btnInfo: '_38r5hlPyrqKLodJwWOdM1k', 'btn-info': '_38r5hlPyrqKLodJwWOdM1k'};
+exports.with.locals = {'btn-info': 'Vh87YsUQA8A0EbntSqs6'};
+exports.without.locals = {btnInfo: 'Vh87YsUQA8A0EbntSqs6', 'btn-info': 'Vh87YsUQA8A0EbntSqs6'};
 test("with", css, exports.with, "?modules");
 test("without", css, exports.without, "?modules&camelCase");
 });

test/helpers.js

@@ -45,6 +45,7 @@ function runLoader(loader, input, map, addOptions, callback) {
 loaderIndex: 0,
 context: "",
 resource: "test.css",
+resourcePath: "test.css",
 request: "css-loader!test.css",
 emitError: function(message) {
 throw new Error(message);
@@ -58,9 +59,9 @@ function runLoader(loader, input, map, addOptions, callback) {
 
 exports.test = function test(name, input, result, query, modules) {
 it(name, function(done) {
-runLoader(cssLoader, input, undefined, {
+runLoader(cssLoader, input, undefined, !query || typeof query === "string" ? {
 query: query
-}, function(err, output) {
+} : query, function(err, output) {
 if(err) return done(err);
 assetEvaluated(output, result, modules);
 done();

test/localTest.js

@@ -15,18 +15,18 @@ function testLocalMinimize(name, input, result, localsResult, query, modules) {
 
 describe("local", function() {
 testLocal("locals-format", ":local(.test) { background: red; }", [
-[1, ".test-3tNsp { background: red; }", ""]
+[1, ".test-2_pBx { background: red; }", ""]
 ], {
-test: "test-3tNsp"
+test: "test-2_pBx"
 }, "?localIdentName=[local]-[hash:base64:5]");
 testLocal("locals", ":local(.className) { background: red; }\n:local(#someId) { background: green; }\n" +
 ":local(.className .subClass) { color: green; }\n:local(#someId .subClass) { color: blue; }", [
-[1, "._23_aKvs-b8bW2Vg3fwHozO { background: red; }\n#_1j3LM6lKkKzRIt19ImYVnD { background: green; }\n" +
-"._23_aKvs-b8bW2Vg3fwHozO ._13LGdX8RMStbBE9w-t0gZ1 { color: green; }\n#_1j3LM6lKkKzRIt19ImYVnD ._13LGdX8RMStbBE9w-t0gZ1 { color: blue; }", ""]
+[1, "._23J0282swY7bwvI2X4fHiV { background: red; }\n#_3vpqN0v_IxlO3TzQjbpB33 { background: green; }\n" +
+"._23J0282swY7bwvI2X4fHiV ._1s1VsToXFz17cPAltMg7jz { color: green; }\n#_3vpqN0v_IxlO3TzQjbpB33 ._1s1VsToXFz17cPAltMg7jz { color: blue; }", ""]
 ], {
-className: "_23_aKvs-b8bW2Vg3fwHozO",
-someId: "_1j3LM6lKkKzRIt19ImYVnD",
-subClass: "_13LGdX8RMStbBE9w-t0gZ1"
+className: "_23J0282swY7bwvI2X4fHiV",
+someId: "_3vpqN0v_IxlO3TzQjbpB33",
+subClass: "_1s1VsToXFz17cPAltMg7jz"
 });
 testLocalMinimize("minimized plus local", ":local(.localClass) { background: red; }\n:local .otherClass { background: red; }\n:local(.empty) { }", [
 [1, "._localClass,._otherClass{background:red}", ""]
@@ -146,17 +146,17 @@ describe("local", function() {
 });
 testLocal("module mode", ".className { background: url(./file.png); }\n#someId { background: url('module/file.jpg'); }\n" +
 ".className .subClass { font-size: 5.5pt; }\n#someId .subClass { color: blue; }", [
-[1, "._23_aKvs-b8bW2Vg3fwHozO { background: url({./file.png}); }\n#_1j3LM6lKkKzRIt19ImYVnD { background: url({module/file.jpg}); }\n" +
-"._23_aKvs-b8bW2Vg3fwHozO ._13LGdX8RMStbBE9w-t0gZ1 { font-size: 5.5pt; }\n#_1j3LM6lKkKzRIt19ImYVnD ._13LGdX8RMStbBE9w-t0gZ1 { color: blue; }", ""]
+[1, "._23J0282swY7bwvI2X4fHiV { background: url({./file.png}); }\n#_3vpqN0v_IxlO3TzQjbpB33 { background: url({module/file.jpg}); }\n" +
+"._23J0282swY7bwvI2X4fHiV ._1s1VsToXFz17cPAltMg7jz { font-size: 5.5pt; }\n#_3vpqN0v_IxlO3TzQjbpB33 ._1s1VsToXFz17cPAltMg7jz { color: blue; }", ""]
 ], {
-className: "_23_aKvs-b8bW2Vg3fwHozO",
-someId: "_1j3LM6lKkKzRIt19ImYVnD",
-subClass: "_13LGdX8RMStbBE9w-t0gZ1"
+className: "_23J0282swY7bwvI2X4fHiV",
+someId: "_3vpqN0v_IxlO3TzQjbpB33",
+subClass: "_1s1VsToXFz17cPAltMg7jz"
 }, "?module");
 testLocal("class name parsing", ".-a0-34a___f { color: red; }", [
-[1, "._1YJOcrkc6cyZmBAAvyPFOn { color: red; }", ""]
+[1, "._3ZMCqVa1XidxdqbX65hZ5D { color: red; }", ""]
 ], {
-"-a0-34a___f": "_1YJOcrkc6cyZmBAAvyPFOn"
+"-a0-34a___f": "_3ZMCqVa1XidxdqbX65hZ5D"
 }, "?module");
 testLocal("imported values in decl", ".className { color: IMPORTED_NAME; }\n" +
 ":import(\"./vars.css\") { IMPORTED_NAME: primary-color; }", [
@@ -171,8 +171,35 @@ describe("local", function() {
 }
 });
 testLocal("issue-109", ".bar-1 { color: red; }", [
-[1, ".file--bar-1--2ESB7 { color: red; }", ""]
+[1, ".file--bar-1--2JvfJ { color: red; }", ""]
 ], {
-"bar-1": "file--bar-1--2ESB7"
+"bar-1": "file--bar-1--2JvfJ"
 }, "?modules&importLoaders=1&localIdentName=[name]--[local]--[hash:base64:5]");
+testLocal("path naming", ".bar { color: red; }", [
+[1, ".path-to--file--bar { color: red; }", ""]
+], {
+"bar": "path-to--file--bar"
+}, {
+query: "?modules&localIdentName=[path]-[name]--[local]",
+resourcePath: "/root/path/to/file.css",
+options: {
+context: "/root/"
+}
+});
+testLocal("path naming with context", ".bar { color: red; }", [
+[1, ".to--file--bar { color: red; }", ""]
+], {
+"bar": "to--file--bar"
+}, {
+query: "?modules&localIdentName=[path]-[name]--[local]&context=/root/path",
+resourcePath: "/root/path/to/file.css",
+options: {
+context: "/root/"
+}
+});
+testLocal("hash prefix", ".bar { color: red; }", [
+[1, ".bar--58a3b08b9195a6af0de7431eaf3427c7 { color: red; }", ""]
+], {
+"bar": "bar--58a3b08b9195a6af0de7431eaf3427c7"
+}, "?modules&localIdentName=[local]--[hash]&hashPrefix=x");
 });