Improve webpack 4 support. Deprecate node 4 and level up scripts.

Author: andriijas

.travis.yml

@@ -3,12 +3,11 @@ node_js:
   - '9'
   - '8'
   - '6'
-  - '4'
 
 env:
   - WEBPACK_VERSION=2 EXTRACT_PLUGIN_VERSION=2
   - WEBPACK_VERSION=3 EXTRACT_PLUGIN_VERSION=3.0.2
-  - WEBPACK_VERSION=4 EXTRACT_PLUGIN_VERSION=3.0.2
+  - WEBPACK_VERSION=4 EXTRACT_PLUGIN_VERSION=4.0.0-alpha.0
 
 install:
   - npm install

lib/plugin.js

@@ -1,9 +1,9 @@
-var path = require('path');
-var fse = require('fs-extra');
-var _ = require('lodash');
-var mutexify = require('mutexify');
+const path = require('path');
+const fse = require('fs-extra');
+const _ = require('lodash');
+const mutexify = require('mutexify');
 
-var lock = mutexify();
+const lock = mutexify();
 
 function ManifestPlugin(opts) {
   this.opts = _.assign({
@@ -16,40 +16,38 @@ function ManifestPlugin(opts) {
     map: null,
     generate: null,
     sort: null,
-    serialize: function(manifest) {
-      return JSON.stringify(manifest, null, 2);
-    },
+    serialize: manifest => JSON.stringify(manifest, null, 2),
   }, opts || {});
 }
 
 ManifestPlugin.prototype.getFileType = function(str) {
   str = str.replace(/\?.*/, '');
-  var split = str.split('.');
-  var ext = split.pop();
+  const split = str.split('.');
+  let ext = split.pop();
   if (this.opts.transformExtensions.test(ext)) {
     ext = split.pop() + '.' + ext;
   }
   return ext;
 };
 
 ManifestPlugin.prototype.apply = function(compiler) {
-  var seed = this.opts.seed || {};
-  var moduleAssets = {};
+  const seed = this.opts.seed || {};
+  const moduleAssets = {};
 
-  var moduleAsset = function (module, file) {
+  const moduleAsset = (module, file) => {
     moduleAssets[file] = path.join(
       path.dirname(file),
       path.basename(module.userRequest)
     );
   };
 
-  var emit = function(compilation, compileCallback) {
-    var publicPath = compilation.options.output.publicPath;
-    var stats = compilation.getStats().toJson();
+  const emit = (compilation, compileCallback) => {
+    const publicPath = compilation.options.output.publicPath;
+    const stats = compilation.getStats().toJson();
 
-    var files = compilation.chunks.reduce(function(files, chunk) {
-      return chunk.files.reduce(function (files, path) {
-        var name = chunk.name ? chunk.name : null;
+    let files = compilation.chunks.reduce((files, chunk) => {
+      return chunk.files.reduce((files, path) => {
+        let name = chunk.name ? chunk.name : null;
 
         if (name) {
           name = name + '.' + this.getFileType(path);
@@ -70,13 +68,13 @@ ManifestPlugin.prototype.apply = function(compiler) {
           isAsset: false,
           isModuleAsset: false
         });
-      }.bind(this), files);
-    }.bind(this), []);
+      }, files);
+    }, []);
 
     // module assets don't show up in assetsByChunkName.
     // we're getting them this way;
-    files = stats.assets.reduce(function (files, asset) {
-      var name = moduleAssets[asset.name];
+    files = stats.assets.reduce((files, asset) => {
+      const name = moduleAssets[asset.name];
       if (name) {
         return files.concat({
           path: asset.name,
@@ -88,7 +86,7 @@ ManifestPlugin.prototype.apply = function(compiler) {
         });
       }
 
-      var isEntryAsset = asset.chunks.length > 0;
+      const isEntryAsset = asset.chunks.length > 0;
       if (isEntryAsset) {
         return files;
       }
@@ -103,28 +101,26 @@ ManifestPlugin.prototype.apply = function(compiler) {
       });
     }, files);
 
-    files = files.filter(function (file) {
-      // Don't add hot updates to manifest
-      return file.path.indexOf('hot-update') === -1;
-    });
+    // Don't add hot updates to manifest
+    files = files.filter(file => !file.path.includes('hot-update'));
 
     // Append optional basepath onto all references.
     // This allows output path to be reflected in the manifest.
     if (this.opts.basePath) {
-      files = files.map(function(file) {
+      files = files.map(file => {
         file.name = this.opts.basePath + file.name;
         return file;
-      }.bind(this));
+      });
     }
 
     if (publicPath) {
       // Similar to basePath but only affects the value (similar to how
       // output.publicPath turns require('foo/bar') into '/public/foo/bar', see
       // https://github.com/webpack/docs/wiki/configuration#outputpublicpath
-      files = files.map(function(file) {
+      files = files.map(file => {
         file.path = publicPath + file.path;
         return file;
-      }.bind(this));
+      });
     }
 
     files = files.map(file => {
@@ -145,21 +141,21 @@ ManifestPlugin.prototype.apply = function(compiler) {
       files = files.sort(this.opts.sort);
     }
 
-    var manifest;
+    let manifest;
     if (this.opts.generate) {
       manifest = this.opts.generate(seed, files);
     } else {
-      manifest = files.reduce(function (manifest, file) {
+      manifest = files.reduce((manifest, file) => {
         manifest[file.name] = file.path;
         return manifest;
       }, seed);
     }
 
-    var output = this.opts.serialize(manifest);
+    const output = this.opts.serialize(manifest);
 
-    var outputFolder = compilation.options.output.path;
-    var outputFile = path.resolve(compilation.options.output.path, this.opts.fileName);
-    var outputName = path.relative(outputFolder, outputFile);
+    const outputFolder = compilation.options.output.path;
+    const outputFile = path.resolve(compilation.options.output.path, this.opts.fileName);
+    const outputName = path.relative(outputFolder, outputFile);
 
     compilation.assets[outputName] = {
       source: function() {
@@ -177,27 +173,34 @@ ManifestPlugin.prototype.apply = function(compiler) {
     // NOTE: make sure webpack is not writing multiple manifests simultaneously
     lock(function(release) {
       if (compiler.hooks) {
-        compiler.hooks.afterEmit.tap('ManifestPlugin', function(compilation) {
+        compiler.hooks.afterEmit.tap('ManifestPlugin', compilation => {
           release();
         });
+
+        compilation.hooks.webpackManifestPluginAfterEmit.call(manifest, compileCallback);
       } else {
-        compiler.plugin('after-emit', function(compilation, cb) {
+        compiler.plugin('after-emit', (compilation, cb) => {
           release();
           cb();
         });
 
         compilation.applyPluginsAsync('webpack-manifest-plugin-after-emit', manifest, compileCallback);
       }
     });
-  }.bind(this);
+  };
 
   if (compiler.hooks) {
-    compiler.hooks.compilation.tap('ManifestPlugin', function (compilation) {
+    compiler.hooks.compilation.tap('ManifestPlugin', compilation => {
+
+      const SyncWaterfallHook = require('tapable').SyncWaterfallHook;
+
+      compilation.hooks.webpackManifestPluginAfterEmit = new SyncWaterfallHook(['manifest', 'compileCallback']);
+
       compilation.hooks.moduleAsset.tap('ManifestPlugin', moduleAsset);
     });
     compiler.hooks.emit.tap('ManifestPlugin', emit);
   } else {
-    compiler.plugin('compilation', function (compilation) {
+    compiler.plugin('compilation', compilation => {
       compilation.plugin('module-asset', moduleAsset);
     });
     compiler.plugin('emit', emit);

package.json

@@ -9,7 +9,7 @@
   "author": "Dane Thurber <[email protected]>",
   "license": "MIT",
   "engines": {
-    "node": ">=4"
+    "node": ">=6.5.0"
   },
   "peerDependencies": {
     "webpack": "2 || 3 || 4"
@@ -41,7 +41,8 @@
   "dependencies": {
     "fs-extra": "^0.30.0",
     "lodash": ">=3.5 <5",
-    "mutexify": "1.0.1"
+    "mutexify": "1.0.1",
+    "tapable": "^1.0.0"
   },
   "nyc": {
     "reporter": [