fix: more consistent cache (#385)

webpack-contrib · Dec 19, 2018 · f61439d · f61439d
1 parent 15e38e8
commit f61439d
Show file tree

Hide file tree

Showing 10 changed files with 1,412 additions and 3,440 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -228,14 +228,12 @@ class UglifyJsPlugin {
             };
 
             if (this.options.cache) {
-              const { outputPath } = compiler;
               const defaultCacheKeys = {
                 // eslint-disable-next-line global-require
                 'uglify-js': require('uglify-js/package.json').version,
                 // eslint-disable-next-line global-require
                 'uglifyjs-webpack-plugin': require('../package.json').version,
                 'uglifyjs-webpack-plugin-options': this.options,
-                path: `${outputPath ? `${outputPath}/` : ''}${file}`,
                 hash: crypto
                   .createHash('md4')
                   .update(input)

diff --git a/test/__snapshots__/cache-option.test.js.snap b/test/__snapshots__/cache-option.test.js.snap
diff --git a/test/__snapshots__/test-option.test.js.snap b/test/__snapshots__/test-option.test.js.snap
diff --git a/test/cache-option.test.js b/test/cache-option.test.js
@@ -1,5 +1,3 @@
-import path from 'path';
-
 import cacache from 'cacache';
 import findCacheDir from 'find-cache-dir';
 
@@ -16,10 +14,11 @@ describe('when applied with `cache` option', () => {
   beforeEach(() => {
     compiler = createCompiler({
       entry: {
-        one: `${__dirname}/fixtures/entry.js`,
-        two: `${__dirname}/fixtures/entry.js`,
-        three: `${__dirname}/fixtures/entry.js`,
-        four: `${__dirname}/fixtures/entry.js`,
+        one: `${__dirname}/fixtures/cache.js`,
+        two: `${__dirname}/fixtures/cache-1.js`,
+        three: `${__dirname}/fixtures/cache-2.js`,
+        four: `${__dirname}/fixtures/cache-3.js`,
+        five: `${__dirname}/fixtures/cache-4.js`,
       },
     });
 
@@ -105,18 +104,6 @@ describe('when applied with `cache` option', () => {
             // Make sure that we cached files
             expect(cacheKeys.length).toBe(countAssets);
 
-            cacheKeys.forEach((cacheEntry) => {
-              // eslint-disable-next-line no-new-func
-              const cacheEntryOptions = new Function(
-                `'use strict'\nreturn ${cacheEntry}`
-              )();
-              const basename = path.basename(cacheEntryOptions.path);
-
-              expect([basename, cacheEntryOptions.hash]).toMatchSnapshot(
-                basename
-              );
-            });
-
             cacache.get.mockClear();
             cacache.put.mockClear();
           })
@@ -192,18 +179,6 @@ describe('when applied with `cache` option', () => {
             // Make sure that we cached files
             expect(cacheKeys.length).toBe(countAssets);
 
-            cacheKeys.forEach((cacheEntry) => {
-              // eslint-disable-next-line no-new-func
-              const cacheEntryOptions = new Function(
-                `'use strict'\nreturn ${cacheEntry}`
-              )();
-              const basename = path.basename(cacheEntryOptions.path);
-
-              expect([basename, cacheEntryOptions.hash]).toMatchSnapshot(
-                basename
-              );
-            });
-
             cacache.get.mockClear();
             cacache.put.mockClear();
           })
@@ -294,15 +269,11 @@ describe('when applied with `cache` option', () => {
               const cacheEntryOptions = new Function(
                 `'use strict'\nreturn ${cacheEntry}`
               )();
-              const basename = path.basename(cacheEntryOptions.path);
 
               expect(cacheEntryOptions.myCacheKey).toBe(1);
               expect(cacheEntryOptions.myCacheKeyBasedOnFile).toMatch(
                 /file-(.+)?\.js/
               );
-              expect([basename, cacheEntryOptions.hash]).toMatchSnapshot(
-                basename
-              );
             });
 
             cacache.get.mockClear();

diff --git a/test/fixtures/cache-1.js b/test/fixtures/cache-1.js
@@ -0,0 +1 @@
+module.exports = 'string';
diff --git a/test/fixtures/cache-2.js b/test/fixtures/cache-2.js
@@ -0,0 +1 @@
+module.exports = function getRegExp() { return /test/ };
diff --git a/test/fixtures/cache-3.js b/test/fixtures/cache-3.js
@@ -0,0 +1 @@
+module.exports = function foo() {};
diff --git a/test/fixtures/cache-4.js b/test/fixtures/cache-4.js
@@ -0,0 +1,9 @@
+// foo
+/* @preserve*/
+// bar
+var a = 2 + 2;
+
+module.exports = function Foo() {
+  var b = 2 + 2;
+  console.log(b + 1 + 2);
+};
diff --git a/test/fixtures/cache.js b/test/fixtures/cache.js
@@ -0,0 +1,9 @@
+// foo
+/* @preserve*/
+// bar
+var a = 2 + 2;
+
+module.exports = function Foo() {
+  var b = 2 + 2;
+  console.log(b + 1 + 2);
+};