Fix chunks ordering in case of manifest + vendor files

izeau · izeau · commit 17c010d50424 · 2017-08-28T10:31:38.000+02:00
diff --git a/index.js b/index.js
@@ -2,6 +2,7 @@ var RawSource = require('webpack-sources/lib/RawSource');
 var evaluate = require('eval');
 var path = require('path');
 var cheerio = require('cheerio');
+var JSDOM = require('jsdom').JSDOM;
 var url = require('url');
 var Promise = require('bluebird');
 var vm = require('vm');
@@ -127,31 +128,27 @@ function merge (a, b) {
  * Function to handle commonschunk plugin. Currently only supports a manifest file and single external
  * library file name vendor.
  */
-var loadChunkAssetsToScope = function(scope, compilation, webpackStatsJson) {
-  var chunkNames = Object.keys(webpackStatsJson.assetsByChunkName)
-  var chunkValues = chunkNames.map(function(chunk) {
-    return findAsset(chunk, compilation, webpackStatsJson);
-  });
+var loadChunkAssetsToScope = function(globals, compilation, webpackStatsJson) {
+  var dom = new JSDOM('', { runScripts: 'outside-only' });
+  var chunkNames = Object.keys(webpackStatsJson.assetsByChunkName);
 
-  if(!scope) {
-    scope = {};
+  // CommonChunksPlugin will place webpackJsonP manifest loading in last bundle
+  if (chunkNames[chunkNames.length - 1] === 'manifest') {
+    chunkNames = ['manifest'].concat(chunkNames.slice(0, -1));
   }
 
-  if (!scope.window) {
-    scope.window = {};
-  }
+  var chunkValues = chunkNames.map(function(chunk) {
+    return findAsset(chunk, compilation, webpackStatsJson);
+  });
 
-  var sandbox = {};
-  merge(sandbox, scope);
+  merge(dom.window, globals);
 
-  // CommonChunksPlugin will place webpackJsonP manifest loading in last bundle
-  chunkValues.reverse().map(function(chunk) {
+  chunkValues.map(function(chunk) {
     var script = new vm.Script(chunk.source());
-    script.runInNewContext(sandbox, {});
-    merge(sandbox, sandbox.window);
+    dom.runVMScript(script);
   });
 
-  return sandbox;
+  return dom.window;
 }
 
 var findAsset = function(src, compilation, webpackStatsJson) {
diff --git a/test/success-cases/multiple-commonschunk/expected-output/foo/bar/index.html b/test/success-cases/multiple-commonschunk/expected-output/foo/bar/index.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1>/foo/bar</h1>
+  </body>
+</html>
diff --git a/test/success-cases/multiple-commonschunk/expected-output/foo/index.html b/test/success-cases/multiple-commonschunk/expected-output/foo/index.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1>/foo</h1>
+  </body>
+</html>
diff --git a/test/success-cases/multiple-commonschunk/expected-output/index.html b/test/success-cases/multiple-commonschunk/expected-output/index.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1>/</h1>
+  </body>
+</html>
diff --git a/test/success-cases/multiple-commonschunk/index.js b/test/success-cases/multiple-commonschunk/index.js
@@ -0,0 +1,7 @@
+var bluebird = require('bluebird');
+
+module.exports = function(locals, callback) {
+  setTimeout(function() {
+    callback(null, locals.template({ html: '<h1>' + locals.path + '</h1>' }));
+  }, 10);
+};
diff --git a/test/success-cases/multiple-commonschunk/template.ejs b/test/success-cases/multiple-commonschunk/template.ejs
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%- html %>
+  </body>
+</html>
diff --git a/test/success-cases/multiple-commonschunk/webpack.config.js b/test/success-cases/multiple-commonschunk/webpack.config.js
@@ -0,0 +1,46 @@
+var StaticSiteGeneratorPlugin = require('../../../');
+var StatsWriterPlugin = require("webpack-stats-plugin").StatsWriterPlugin;
+var webpack = require('webpack');
+var ejs = require('ejs');
+var fs = require('fs');
+
+var template = ejs.compile(fs.readFileSync(__dirname + '/template.ejs', 'utf-8'))
+
+var paths = [
+  '/',
+  '/foo',
+  '/foo/bar'
+];
+
+module.exports = {
+  entry: {
+    index: __dirname + '/index.js',
+  },
+
+  output: {
+    filename: '[name].js',
+    path: __dirname + '/actual-output',
+    libraryTarget: 'umd'
+  },
+
+  plugins: [
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks: function(module) {
+        return module.context && module.context.indexOf('node_modules') !== -1;
+      }
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'manifest',
+      minChunks: Infinity
+    }),
+    new StaticSiteGeneratorPlugin({
+      entry: 'index',
+      paths: paths,
+      locals: {
+        template: template
+      }
+    }),
+    new StatsWriterPlugin() // Causes the asset's `size` method to be called
+  ]
+};

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<html>
 +  <body>
 +    <h1>/foo/bar</h1>
 +  </body>
 +</html>