webpack-assets-manifest 3.0.0 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-assets-manifest",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "This Webpack plugin will generate a JSON file that matches the original filename with the hashed version.",
   "license": "MIT",
   "repository": {
@@ -12,6 +12,8 @@
   },
   "homepage": "https://github.com/webdeveric/webpack-assets-manifest",
   "keywords": [
+    "webpack-assets-manifest",
+    "webpack-plugin",
     "webpack",
     "plugin",
     "assets",
@@ -46,27 +48,29 @@
     "lodash.get": "^4.0",
     "lodash.has": "^4.0",
     "mkdirp": "^0.5",
-    "schema-utils": "^0.4.5",
-    "tapable": "^1.0.0"
+    "schema-utils": "^1.0.0",
+    "tapable": "^1.0.0",
+    "webpack-sources": "^1.0.0"
   },
   "peerDependencies": {
-    "webpack": ">=4.0.0",
-    "webpack-sources": "^1.0"
+    "webpack": ">=4.4.0"
   },
   "devDependencies": {
-    "chai": "^4.0",
+    "chai": "^4.2.0",
     "chai-spies": "^1.0.0",
-    "eslint": "^4.19.1",
+    "css-loader": "^1.0.1",
+    "eslint": "^5.9.0",
     "eslint-config-webdeveric": "^0.3",
-    "file-loader": "^1.1.11",
-    "fs-extra": "^5.0",
+    "file-loader": "^2.0.0",
+    "fs-extra": "^7.0.1",
     "istanbul": "^0.4",
     "jsdoc": "^3.0",
     "memory-fs": "^0.4.1",
-    "mocha": "^5.0.5",
+    "mini-css-extract-plugin": "^0.4.4",
+    "mocha": "^5.2.0",
     "rimraf": "^2.0",
-    "superagent": "^3.8.2",
-    "webpack": "^4.2.0",
-    "webpack-dev-server": "^3.1.1"
+    "superagent": "^3.8.3",
+    "webpack": "^4.25.1",
+    "webpack-dev-server": "^3.1.10"
   }
 }

package/readme.md

@@ -9,7 +9,7 @@ This Webpack plugin will generate a JSON file that matches the original filename
 
 ## Installation
 
-:warning: Starting with version 2, this plugin works with Webpack 4+.
+:warning: Starting with version 2, this plugin works with Webpack 4+. Version 3.1 requires Webpack 4.4+.
 
 ```shell
 npm install webpack-assets-manifest --save-dev

package/src/WebpackAssetsManifest.js

@@ -414,17 +414,21 @@ class WebpackAssetsManifest
   getEntrypointFilesGroupedByExtension( entrypoints )
   {
     const files = Object.create(null);
+    const removeHMR = f => ! this.isHMR(f);
+    const groupFilesByExtension = (files, file) => {
+      const ext = this.getExtension(file).replace(/^\.+/, '').toLowerCase();
 
-    for ( const [ name, entrypoint ] of entrypoints ) {
-      entrypoint.getFiles().reduce( (files, file) => {
-        const ext = this.getExtension(file).replace(/^\.+/, '').toLowerCase();
+      files[ ext ] = files[ ext ] || [];
+      files[ ext ].push( this.getPublicPath( file ) );
 
-        files[ name ] = files[ name ] || Object.create(null);
-        files[ name ][ ext ] = files[ name ][ ext ] || [];
-        files[ name ][ ext ].push( this.getPublicPath( file ) );
+      return files;
+    };
 
-        return files;
-      }, files );
+    for ( const [ name, entrypoint ] of entrypoints ) {
+      files[ name ] = entrypoint
+        .getFiles()
+        .filter( removeHMR )
+        .reduce( groupFilesByExtension, Object.create(null) );
     }
 
     return files;
@@ -504,6 +508,9 @@ class WebpackAssetsManifest
    */
   handleAfterEmit(compilation)
   {
+    // Reset the internal mapping of hashed name to original name after every compilation.
+    this.assetNames.clear();
+
     if ( ! this.options.writeToDisk ) {
       return Promise.resolve();
     }
@@ -527,24 +534,27 @@ class WebpackAssetsManifest
   }
 
   /**
-   * Record module asset names
+   * Record asset names
    *
+   * @param  {object} loaderContext
    * @param  {object} module
-   * @param  {string} hashedFile
    */
-  handleModuleAsset(module, hashedFile)
+  handleNormalModuleLoader(loaderContext, module)
   {
-    if ( this.isHMR( hashedFile ) ) {
-      return false;
-    }
+    const { emitFile } = loaderContext;
 
-    return this.assetNames.set(
-      hashedFile,
-      path.join(
-        path.dirname(hashedFile),
-        path.basename(module.userRequest)
-      )
-    ).has( hashedFile );
+    loaderContext.emitFile = (name, content, sourceMap) => {
+      if ( ! this.assetNames.has( name ) ) {
+        const originalName = path.join(
+          path.dirname(name),
+          path.basename(module.userRequest)
+        );
+
+        this.assetNames.set(name, originalName);
+      }
+
+      return emitFile.call(module, name, content, sourceMap);
+    };
   }
 
   /**
@@ -554,7 +564,7 @@ class WebpackAssetsManifest
    */
   handleCompilation(compilation)
   {
-    compilation.hooks.moduleAsset.tap(PLUGIN_NAME, this.handleModuleAsset.bind(this));
+    compilation.hooks.normalModuleLoader.tap(PLUGIN_NAME, this.handleNormalModuleLoader.bind(this));
   }
 
   /**