fix: webpack 4 compatibility

 Fixes #97

Author: SimenB

CHANGELOG.md

@@ -8,6 +8,12 @@ https://github.com/SimenB/add-asset-html-webpack-plugin/releases
 
 ## [Unreleased]
 
+## [2.1.3] - 2018-03-03
+
+### Fixes
+
+* Webpack 4 compatibility
+
 ### Changed
 
 * Replace Bluebird with `p-each-series`
@@ -143,7 +149,8 @@ https://github.com/SimenB/add-asset-html-webpack-plugin/releases
 
 Initial release
 
-[unreleased]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.1.2...HEAD
+[unreleased]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.1.3...HEAD
+[2.1.3]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.1.2...v2.1.3
 [2.1.2]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/SimenB/add-asset-html-webpack-plugin/compare/v2.0.1...v2.1.0

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Simen Bekkhus
+Copyright (c) 2018 Simen Bekkhus
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the

__snapshots__/test.js.snap

@@ -76,6 +76,12 @@ Array [
 ]
 `;
 
+exports[`should reject on error 1`] = `
+Array [
+  [Error: No filepath defined],
+]
+`;
+
 exports[`should replace compilation assets key if \`outputPath\` is set 1`] = `
 Object {
   "css": Array [],

package.json

@@ -57,7 +57,7 @@
     "webpack": "^3.5.6"
   },
   "peerDependencies": {
-    "html-webpack-plugin": "^2.10.0"
+    "html-webpack-plugin": "^2.10.0 || ^3.0.4"
   },
   "engines": {
     "node": ">=4"

src/addAllAssetsToCompilation.js

@@ -104,9 +104,14 @@ export default async function(assets, compilation, htmlPluginData, callback) {
     await pEachSeries(handledAssets, asset =>
       addFileToAssets(compilation, htmlPluginData, asset),
     );
-
-    callback(null, htmlPluginData);
+    if (callback) {
+      return callback(null, htmlPluginData);
+    }
+    return htmlPluginData;
   } catch (e) {
-    callback(e, htmlPluginData);
+    if (callback) {
+      return callback(e, htmlPluginData);
+    }
+    throw e;
   }
 }

src/index.js

@@ -10,14 +10,13 @@ export default class AddAssetHtmlPlugin {
     compiler.plugin('compilation', compilation => {
       compilation.plugin(
         'html-webpack-plugin-before-html-generation',
-        (htmlPluginData, callback) => {
+        (htmlPluginData, callback) =>
           addAllAssetsToCompilation(
             this.assets,
             compilation,
             htmlPluginData,
             callback,
-          );
-        },
+          ),
       );
     });
   }

test.js

@@ -29,6 +29,12 @@ test('should invoke callback on success', async () => {
   expect(callback).toHaveBeenCalledWith(null, pluginMock);
 });
 
+test('should not reject success', async () => {
+  expect(await addAllAssetsToCompilation([], {}, pluginMock)).toEqual(
+    pluginMock,
+  );
+});
+
 test('should invoke callback on error', async () => {
   const callback = jest.fn();
   const compilation = { errors: [] };
@@ -41,6 +47,18 @@ test('should invoke callback on error', async () => {
   expect(callback).toHaveBeenCalledWith(compilation.errors[0], pluginMock);
 });
 
+test('should reject on error', async () => {
+  expect.hasAssertions();
+  const compilation = { errors: [] };
+
+  try {
+    await addAllAssetsToCompilation([{}], compilation, pluginMock);
+  } catch (e) {
+    expect(compilation.errors).toMatchSnapshot();
+    expect(compilation.errors[0]).toBe(e);
+  }
+});
+
 test("should add file using compilation's publicPath", async () => {
   const callback = jest.fn();
   const compilation = { options: { output: { publicPath: 'vendor/' } } };