From d8754873f668b40cec703284047228490c8002ff Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 23 Jul 2019 10:37:07 -0500 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: Tobias Koppers --- lib/TemplatedPathPlugin.js | 2 +- test/HotModuleReplacementPlugin.test.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/TemplatedPathPlugin.js b/lib/TemplatedPathPlugin.js index 1f7721529..64a2c2aab 100644 --- a/lib/TemplatedPathPlugin.js +++ b/lib/TemplatedPathPlugin.js @@ -56,7 +56,7 @@ const getReplacer = (value, allowEmpty) => { const escapePathVariables = value => { return typeof value === "string" ? value.replace( - /\[(name|id|moduleid|file|query|filebase|url|hash|chunkhash|modulehash|contenthash)\]/g, + /\[(\\*[\w:]+\\*)\]/gi, "[\\$1\\]" ) : value; diff --git a/test/HotModuleReplacementPlugin.test.js b/test/HotModuleReplacementPlugin.test.js index 50211ff2a..f653c991c 100644 --- a/test/HotModuleReplacementPlugin.test.js +++ b/test/HotModuleReplacementPlugin.test.js @@ -231,14 +231,14 @@ describe("HotModuleReplacementPlugin", () => { }); fs.writeFileSync(entryFile, "1", "utf-8"); compiler.run((err, stats) => { - if (err) throw err; + if (err) return done(err); fs.writeFileSync(statsFile3, stats.toString()); compiler.run((err, stats) => { - if (err) throw err; + if (err) return done(err); fs.writeFileSync(statsFile4, stats.toString()); fs.writeFileSync(entryFile, "2", "utf-8"); compiler.run((err, stats) => { - if (err) throw err; + if (err) return done(err); fs.writeFileSync(statsFile3, stats.toString()); let foundUpdates = false;