Merge 621114e into 57452fd

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 233
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[test/cases/parsing/bom/bomfile.{css,js}]
+charset = utf-8-bom
+
+[*.md]
+trim_trailing_whitespace = false

.eslintrc.json

@@ -50,6 +50,7 @@
 		"valid-jsdoc": "error",
 		"no-var": "error",
 		"prefer-const": "error",
-		"prefer-arrow-callback": "error"
+		"prefer-arrow-callback": "error",
+    "object-shorthand": "error"
 	}
-}
+}

lib/getCurrentRequest.js

@@ -0,0 +1,13 @@
+"use strict";
+
+function getCurrentRequest(loaderContext) {
+	if(loaderContext.currentRequest)
+		return loaderContext.currentRequest;
+	const request = loaderContext.loaders
+		.slice(loaderContext.loaderIndex)
+		.map(obj => obj.request)
+		.concat([loaderContext.resource]);
+	return request.join("!");
+}
+
+module.exports = getCurrentRequest;