Merge branch 'release/2.1.0'

sueddeutsche · Aug 2, 2017 · 8e2b546 · 8e2b546
2 parents 3f10dbb + 35ccc28
commit 8e2b546
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -29,6 +29,11 @@ class StatsReplacePlugin {
      */
     constructor(configArray) {
         this.configArray = configArray;
+
+        // We store a list of assets this plugin has already "seen" in a compilation. This is used for
+        // webpack-dev-server as some loaders (e.g. the css-loader) do not remove assets from previous builds from the
+        // compilation, but just add the newest
+        this.knownAssets = [];
     }
 
     apply(compiler) {
@@ -40,6 +45,7 @@ class StatsReplacePlugin {
 
     process(compilation) {
         const assetNames = Object.keys(compilation.assets);
+        const newAssetNames = assetNames.filter((assetName) => this.knownAssets.indexOf(assetName) === -1);
 
         for (const config of this.configArray) {
             for (const assetName of assetNames) {
@@ -62,7 +68,18 @@ class StatsReplacePlugin {
                 let content = asset.source().toString("utf8");
 
                 for (const replacer of config.replacers) {
-                    let relatedAsset = assetNames.find((name) => replacer.asset.test(name));
+                    let relatedAsset = newAssetNames.find((name) => replacer.asset.test(name));
+
+                    // Only check all assets if there is no matching new one
+                    if (!relatedAsset) {
+                        relatedAsset = assetNames.find((name) => replacer.asset.test(name));
+                    }
+
+                    if (!relatedAsset) {
+                        const noMatchErr = new Error(`stats-replace-webpack-plugin: No matching asset for ${replacer}`);
+                        compilation.errors.push(noMatchErr);
+                        return;
+                    }
 
                     if (config.basename) {
                         relatedAsset = path.basename(relatedAsset);
@@ -72,6 +89,8 @@ class StatsReplacePlugin {
                         console.log(`[${assetName}] ${match} => ${relatedAsset}`);
                         return relatedAsset;
                     });
+
+                    this.knownAssets.push(relatedAsset);
                 }
 
                 compilation.assets[assetName] = new RawSource(Buffer.from(content, "utf8"));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stats-replace-webpack-plugin",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Fills placeholders in text files with the final name of compiled assets",
   "main": "lib/index.js",
   "directories": {