only make absolute pathy things relative

timse · timse · commit ad5968ae2b8d · 2017-03-23T21:41:17.000+11:00
diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
@@ -4,20 +4,23 @@
 */
 "use strict";
 
+const path = require("path");
+
+const looksLikeAbsolutePath = (maybeAbsolutePath) => /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
+
 function makeRelative(compiler, identifier) {
 	const context = compiler.context;
 	return identifier.split("|")
 		.map(str => str.split("!")
 			.map(str => str.split(" ")
-				.map(str => path.relative(context, str))
+				.map(str => looksLikeAbsolutePath(str) ? path.relative(context, str) : str)
 				.join(" "))
 			.join("!"))
 		.join("|");
 }
 
-const path = require("path");
-
 class RecordIdsPlugin {
+
 	apply(compiler) {
 		compiler.plugin("compilation", compilation => {
 			compilation.plugin("record-modules", (modules, records) => {
diff --git a/test/RecordIdsPlugin.test.js b/test/RecordIdsPlugin.test.js
@@ -7,12 +7,14 @@ const webpack = require("../lib/webpack");
 
 const RecordIdsPlugin = require("../lib/RecordIdsPlugin");
 
+const looksLikeAbsolutePath = (maybeAbsolutePath) => /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
+
 function makeRelative(compiler, identifier) {
 	const context = compiler.context;
 	return identifier.split("|")
 		.map(str => str.split("!")
 			.map(str => str.split(" ")
-				.map(str => path.relative(context, str))
+				.map(str => looksLikeAbsolutePath(str) ? path.relative(context, str) : str)
 				.join(" "))
 			.join("!"))
 		.join("|");
diff --git a/test/configCases/records/issue-2991/test.js b/test/configCases/records/issue-2991/test.js
@@ -6,12 +6,12 @@ it("should write relative paths to records", function() {
 	var fs = require("fs");
 	var path = require("path");
 	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
-	content.replace(/\\\\/g, "/").should.eql(`{
+	content.should.eql(`{
   "modules": {
     "byIdentifier": {
-      "../../../../external \\"fs\\"": 0,
-      "../../../../external \\"path\\"": 1,
-      "../../../../ignored ../test/configCases/records/issue-2991 pkgs/somepackage/foo": 2,
+      "external \\"fs\\"": 0,
+      "external \\"path\\"": 1,
+      "ignored  pkgs/somepackage/foo": 2,
       "test.js": 3
     },
     "usedIds": {
