fix(index): handle module extraction correctly (require.ensure)

src/index.js

@@ -143,7 +143,7 @@ class ExtractTextPlugin {
         });
         async.forEach(chunks, (chunk, callback) => { // eslint-disable-line no-shadow
           const extractedChunk = extractedChunks[chunks.indexOf(chunk)];
-          const shouldExtract = !!(options.allChunks || isInitialOrHasNoParents(chunk));
+          const shouldExtract = !!options.allChunks;
           chunk.sortModules();
           async.forEach(chunk.mapModules(c => c), (module, callback) => { // eslint-disable-line no-shadow
             let meta = module[NS];
@@ -152,8 +152,16 @@ class ExtractTextPlugin {
               // A stricter `shouldExtract !== wasExtracted` check to guard against cases where a previously extracted
               // module would be extracted twice. Happens when a module is a dependency of an initial and a non-initial
               // chunk. See issue #604
-              if (shouldExtract && !wasExtracted) {
-                module[`${NS}/extract`] = shouldExtract; // eslint-disable-line no-path-concat
+
+              // check every module's chunks.parents() to decide extract or not
+              for (let i = 0; i < module.chunks.length; i++) {
+                if (!isInitialOrHasNoParents(module.chunks[i]) && !module.extracted) {
+                  module.extracted = true;
+                  break;
+                }
+              }
+              if (shouldExtract || (!module.extracted && !wasExtracted)) {
+                module[`${NS}/extract`] = true; // eslint-disable-line no-path-concat
                 compilation.rebuildModule(module, (err) => {
                   if (err) {
                     compilation.errors.push(err);

test/__snapshots__/webpack-integration.test.js.snap

@@ -157,6 +157,10 @@ exports[`Webpack Integration Tests splitted-chunk 1`] = `
 "
 `;
 
+exports[`Webpack Integration Tests splitted-mix-multiple-entries 1`] = `"a"`;
+
+exports[`Webpack Integration Tests splitted-mix-multiple-entries 2`] = `"b"`;
+
 exports[`Webpack Integration Tests splitted-multiple-entries 1`] = `""`;
 
 exports[`Webpack Integration Tests splitted-multiple-entries 2`] = `""`;

test/cases/splitted-mix-multiple-entries/a.js

@@ -0,0 +1,2 @@
+require('./a.txt');
+require('./c.js');

test/cases/splitted-mix-multiple-entries/a.txt

@@ -0,0 +1 @@
+a

test/cases/splitted-mix-multiple-entries/b.js

@@ -0,0 +1,5 @@
+
+require('./b.txt');
+require.ensure([], (require) => {
+  require('./c.js');
+});

test/cases/splitted-mix-multiple-entries/b.txt

@@ -0,0 +1 @@
+b

test/cases/splitted-mix-multiple-entries/c.js

@@ -0,0 +1 @@
+require('./c.txt');

test/cases/splitted-mix-multiple-entries/c.txt

@@ -0,0 +1 @@
+c

test/cases/splitted-mix-multiple-entries/expected/a.txt

@@ -0,0 +1 @@
+a

test/cases/splitted-mix-multiple-entries/expected/b.txt

@@ -0,0 +1 @@
+b

test/cases/splitted-mix-multiple-entries/webpack.config.js

@@ -0,0 +1,14 @@
+import ExtractTextPlugin from '../../../src/index';
+
+module.exports = {
+  entry: {
+    a: './a',
+    b: './b',
+  },
+  plugins: [
+    new ExtractTextPlugin({
+      filename: '[name].txt',
+      allChunks: false,
+    }),
+  ],
+};