Merge pull request #9318 from jamesgeorge007/hotfix/ease-access-of-em…

…itted-assets chore: Makes it easier to access contents of emitted assets
webpack · Aug 1, 2019 · ed7d815 · ed7d815
2 parents ba20513 + 53a7a34
commit ed7d815
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 2 deletions.
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -55,6 +55,8 @@ class Compiler extends Tapable {
 			run: new AsyncSeriesHook(["compiler"]),
 			/** @type {AsyncSeriesHook<Compilation>} */
 			emit: new AsyncSeriesHook(["compilation"]),
+			/** @type {AsyncSeriesHook<string, Buffer>} */
+			assetEmitted: new AsyncSeriesHook(["file", "content"]),
 			/** @type {AsyncSeriesHook<Compilation>} */
 			afterEmit: new AsyncSeriesHook(["compilation"]),
 
@@ -430,7 +432,7 @@ class Compiler extends Tapable {
 										: targetFileGeneration + 1;
 								cacheEntry.writtenTo.set(targetPath, newGeneration);
 								this._assetEmittingWrittenFiles.set(targetPath, newGeneration);
-								callback();
+								this.hooks.assetEmitted.callAsync(file, content, callback);
 							});
 						} else {
 							if (source.existsAt === targetPath) {
@@ -445,7 +447,10 @@ class Compiler extends Tapable {
 
 							source.existsAt = targetPath;
 							source.emitted = true;
-							this.outputFileSystem.writeFile(targetPath, content, callback);
+							this.outputFileSystem.writeFile(targetPath, content, err => {
+								if (err) return callback(err);
+								this.hooks.assetEmitted.callAsync(file, content, callback);
+							});
 						}
 					};
 

diff --git a/test/configCases/asset-emitted/futureEmitAssets/index.js b/test/configCases/asset-emitted/futureEmitAssets/index.js
@@ -0,0 +1,3 @@
+import("./module");
+
+it("should run", () => {});
diff --git a/test/configCases/asset-emitted/futureEmitAssets/module.js b/test/configCases/asset-emitted/futureEmitAssets/module.js
diff --git a/test/configCases/asset-emitted/futureEmitAssets/webpack.config.js b/test/configCases/asset-emitted/futureEmitAssets/webpack.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+	output: {
+		futureEmitAssets: true
+	},
+	plugins: [
+		compiler => {
+			const files = {};
+			compiler.hooks.assetEmitted.tap("Test", (file, buffer) => {
+				files[file] = Buffer.isBuffer(buffer);
+			});
+			compiler.hooks.afterEmit.tap("Test", () => {
+				expect(files).toMatchInlineSnapshot(`
+Object {
+  "1.bundle0.js": true,
+  "bundle0.js": true,
+}
+`);
+			});
+		}
+	]
+};
diff --git a/test/configCases/asset-emitted/normal/index.js b/test/configCases/asset-emitted/normal/index.js
@@ -0,0 +1,3 @@
+import("./module");
+
+it("should run", () => {});
diff --git a/test/configCases/asset-emitted/normal/module.js b/test/configCases/asset-emitted/normal/module.js
diff --git a/test/configCases/asset-emitted/normal/webpack.config.js b/test/configCases/asset-emitted/normal/webpack.config.js
@@ -0,0 +1,18 @@
+module.exports = {
+	plugins: [
+		compiler => {
+			const files = {};
+			compiler.hooks.assetEmitted.tap("Test", (file, buffer) => {
+				files[file] = Buffer.isBuffer(buffer);
+			});
+			compiler.hooks.afterEmit.tap("Test", () => {
+				expect(files).toMatchInlineSnapshot(`
+Object {
+  "1.bundle0.js": true,
+  "bundle0.js": true,
+}
+`);
+			});
+		}
+	]
+};