fix: extracting polyfills (#1)

Author: dangreen

src/index.js

@@ -237,7 +237,7 @@ export default class OptimizePlugin {
   async generatePolyfillsChunk (polyfills, cwd, timings) {
     const ENTRY = '\0entry';
 
-    const entryContent = polyfills.reduce((str, p) => `${str}\nimport "${p}";`, '');
+    const entryContent = polyfills.reduce((str, p) => `${str}\nimport "${p.replace('.js', '')}";`, '');
 
     const COREJS = require.resolve('core-js/package.json').replace('package.json', '');
     const isCoreJsPath = /(?:^|\/)core-js\/(.+)$/;
@@ -306,11 +306,13 @@ export default class OptimizePlugin {
         //     });
         //   }
         // },
-        this.options.minify ? (
-          rollupPluginTerserSimple()
-        ) : (
-          rollupPluginStripComments()
-        )
+        this.options.minify
+          ? (
+            rollupPluginTerserSimple()
+          )
+          : (
+            rollupPluginStripComments()
+          )
       ].filter(Boolean)
     });
     this.setRollupCache(polyfillsBundle.cache);

test/_util.js

@@ -28,7 +28,7 @@ export function sleep (ms) {
 const gzip = util.promisify(gzipSync);
 const gzipSize = async x => (await gzip(x)).byteLength;
 
-export async function printSizes (assets, name) {
+export async function printSizes (assets, name, console) {
   let modernSize = 0;
   let legacySize = 0;
   const prettyBytes = (size) => {
@@ -58,7 +58,7 @@ export async function printSizes (assets, name) {
   console.log(str);
 }
 
-export function runWebpack (fixture, { output = {}, plugins = [], module = {}, resolve = {}, ...config } = {}) {
+export function runWebpack (fixture, { output = {}, plugins = [], module = {}, resolve = {}, ...config } = {}, console) {
   return run(callback => webpack({
     mode: 'production',
     devtool: false,
@@ -80,10 +80,10 @@ export function runWebpack (fixture, { output = {}, plugins = [], module = {}, r
       ])
     ].concat(plugins || []),
     ...config
-  }, callback));
+  }, callback), console);
 }
 
-export function watchWebpack (fixture, { output, plugins, context, ...config } = {}) {
+export function watchWebpack (fixture, { output, plugins, context, ...config } = {}, console) {
   context = context || path.resolve(__dirname, 'fixtures', fixture);
   const compiler = webpack({
     mode: 'production',
@@ -96,7 +96,7 @@ export function watchWebpack (fixture, { output, plugins, context, ...config } =
     },
     plugins: plugins || []
   });
-  compiler.doRun = () => run(compiler.run.bind(compiler));
+  compiler.doRun = () => run(compiler.run.bind(compiler), console);
   return compiler;
 }
 
@@ -108,7 +108,7 @@ export function statsWithAssets (stats) {
   return stats;
 }
 
-function run (runner) {
+function run (runner, console) {
   return new Promise((resolve, reject) => {
     runner((err, stats) => {
       if (err) return reject(err);

test/index.test.js

@@ -24,6 +24,24 @@ jest.setTimeout(30000);
 const concurrency = false;
 
 describe('optimize-plugin', () => {
+  const $console = {
+    log: console.log,
+    warn: console.warn,
+    info: console.info
+  };
+
+  beforeAll(() => {
+    console.warn = () => 0;
+    console.log = () => 0;
+    console.info = () => 0;
+  });
+
+  afterAll(() => {
+    console.warn = $console.warn;
+    console.log = $console.log;
+    console.info = $console.info;
+  });
+
   test('exports a class', () => {
     expect(OptimizePlugin).toBeInstanceOf(Function);
     expect(OptimizePlugin.prototype).toHaveProperty('apply', expect.any(Function));
@@ -42,7 +60,7 @@ describe('optimize-plugin', () => {
       plugins: [
         new OptimizePlugin({ concurrency })
       ]
-    });
+    }, $console);
 
     const assetNames = Object.keys(stats.assets);
     expect(assetNames).toHaveLength(3);
@@ -61,7 +79,7 @@ describe('optimize-plugin', () => {
     expect(polyfills).toMatch(/Object\.defineProperty/g);
     expect(polyfills).not.toMatch(/require\(/g);
 
-    await printSizes(stats.assets, '"it works"');
+    await printSizes(stats.assets, '"it works"', $console);
   });
 
   test('code splitting', async () => {
@@ -72,7 +90,7 @@ describe('optimize-plugin', () => {
       plugins: [
         new OptimizePlugin({ concurrency })
       ]
-    });
+    }, $console);
 
     const assetNames = Object.keys(stats.assets);
     expect(assetNames).toHaveLength(9);
@@ -97,7 +115,7 @@ describe('optimize-plugin', () => {
     expect(polyfills).toMatch(/Object\.defineProperty/g);
     expect(polyfills).not.toMatch(/require\(/g);
 
-    await printSizes(stats.assets, 'code splitting');
+    await printSizes(stats.assets, 'code splitting', $console);
   });
 
   describe('TypeScript Support', () => {
@@ -120,7 +138,7 @@ describe('optimize-plugin', () => {
         plugins: [
           new OptimizePlugin({ concurrency })
         ]
-      });
+      }, $console);
 
       const assetNames = Object.keys(stats.assets);
       expect(assetNames).toHaveLength(3);
@@ -139,7 +157,7 @@ describe('optimize-plugin', () => {
       expect(polyfills).toMatch(/Object\.defineProperty/g);
       expect(polyfills).not.toMatch(/require\(/g);
 
-      await printSizes(stats.assets, 'typescript support');
+      await printSizes(stats.assets, 'typescript support', $console);
     });
 
     test('using Sucrase', async () => {
@@ -158,7 +176,7 @@ describe('optimize-plugin', () => {
         plugins: [
           new OptimizePlugin({ concurrency })
         ]
-      });
+      }, $console);
 
       const assetNames = Object.keys(stats.assets);
       expect(assetNames).toHaveLength(3);
@@ -177,7 +195,7 @@ describe('optimize-plugin', () => {
       expect(polyfills).toMatch(/Object\.defineProperty/g);
       expect(polyfills).not.toMatch(/require\(/g);
 
-      await printSizes(stats.assets, 'sucrase');
+      await printSizes(stats.assets, 'sucrase', $console);
     });
   });
 });