Merge pull request #134 from webpack/bugfix/concat-buffer

add support for concatenating Buffer RawSources

Author: sokra

lib/RawSource.js

@@ -18,6 +18,7 @@ class RawSource extends Source {
 		this._valueIsBuffer = !convertToString && isBuffer;
 		this._value = convertToString && isBuffer ? undefined : value;
 		this._valueAsBuffer = isBuffer ? value : undefined;
+		this._valueAsString = isBuffer ? undefined : value;
 	}
 
 	isBuffer() {
@@ -51,10 +52,16 @@ class RawSource extends Source {
 	 */
 	streamChunks(options, onChunk, onSource, onName) {
 		if (this._value === undefined) {
-			this._value = this._valueAsBuffer.toString("utf-8");
+			this._value = Buffer.from(this._valueAsBuffer, "utf-8");
+		}
+		if (this._valueAsString === undefined) {
+			this._valueAsString =
+				typeof this._value === "string"
+					? this._value
+					: this._value.toString("utf-8");
 		}
 		return streamChunksOfRawSource(
-			this._value,
+			this._valueAsString,
 			onChunk,
 			onSource,
 			onName,

test/ConcatSource.js

@@ -194,4 +194,14 @@ describe("ConcatSource", () => {
 		}
 	`);
 	});
+
+	it("should allow to concat buffer sources", () => {
+		const source = new ConcatSource("a", new RawSource(Buffer.from("b")), "c");
+		expect(source.sourceAndMap()).toMatchInlineSnapshot(`
+		Object {
+		  "map": null,
+		  "source": "abc",
+		}
+	`);
+	});
 });