updating yarn.lock fixing line endings in test

jaydiablo · jaydiablo · commit dae8030a473c · 2020-06-09T09:39:30.000-06:00
diff --git a/loader.js b/loader.js
@@ -70,7 +70,11 @@ function mergeSourceMaps(inputSourceMap, annotateMap) {
     }
   }
 
-  return JSON.parse(outputSourceMap);
+  if (typeof outputSourceMap == String) {
+    return JSON.parse(outputSourceMap);
+  } else {
+    return outputSourceMap;
+  }
 }
 
 module.exports = function(source, inputSourceMap) {
diff --git a/run-tests.js b/run-tests.js
@@ -30,7 +30,7 @@ for (let testCase of cases) {
         }));
       }
 
-      const actualSource = fs.readFileSync(folder + '/dist/build.js', 'utf8');
+      const actualSource = fs.readFileSync(folder + '/dist/build.js', 'utf8').replace(/\r\n/g, "\n");
       const expectedSource = fs.readFileSync(folder + '/reference/build.js', 'utf8');
 
       t.equal(actualSource, expectedSource, 'Test annotated source');
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,11 @@ function mergeSourceMaps(inputSourceMap, annotateMap) {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- return JSON.parse(outputSourceMap);`
	`73`	`+ if (typeof outputSourceMap == String) {`
	`74`	`+ return JSON.parse(outputSourceMap);`
	`75`	`+ } else {`
	`76`	`+ return outputSourceMap;`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`module.exports = function(source, inputSourceMap) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ for (let testCase of cases) {`
`30`	`30`	`}));`
`31`	`31`	`}`
`32`	`32`
`33`		`- const actualSource = fs.readFileSync(folder + '/dist/build.js', 'utf8');`
	`33`	`+ const actualSource = fs.readFileSync(folder + '/dist/build.js', 'utf8').replace(/\r\n/g, "\n");`
`34`	`34`	`const expectedSource = fs.readFileSync(folder + '/reference/build.js', 'utf8');`
`35`	`35`
`36`	`36`	`t.equal(actualSource, expectedSource, 'Test annotated source');`