Merge pull request #176 from webpack-contrib/166-support-async-chunks…

…-with-this Fix parsing of async chunks that uses `this.webpackJsonp` instead of `window.webpackJsonp`
webpack-contrib · May 9, 2018 · ef1d700 · ef1d700
2 parents bf86048 + 28bbf3a
commit ef1d700
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/src/parseUtils.js b/src/parseUtils.js
@@ -74,7 +74,7 @@ function parseBundle(bundlePath) {
         // Additional bundles with webpack 4 are loaded with:
         // (window.webpackJsonp=window.webpackJsonp||[]).push([[chunkId], [<module>, <module>], [[optional_entries]]]);
         if (
-          isWindowPropertyPushExpression(node) &&
+          isAsyncChunkPushExpression(node) &&
           args.length === 1 &&
           isArgumentContainingChunkIdsAndModulesList(args[0])
         ) {
@@ -164,11 +164,18 @@ function isArgumentArrayConcatContainingChunks(arg) {
   return false;
 }
 
-function isWindowPropertyPushExpression(node) {
-  return node.callee.type === 'MemberExpression' &&
-    node.callee.property.name === 'push' &&
-    node.callee.object.type === 'AssignmentExpression' &&
-    node.callee.object.left.object.name === 'window';
+function isAsyncChunkPushExpression(node) {
+  const { callee } = node;
+  return (
+    callee.type === 'MemberExpression' &&
+    callee.property.name === 'push' &&
+    callee.object.type === 'AssignmentExpression' &&
+    (
+      callee.object.left.object.name === 'window' ||
+      // Webpack 4 uses `this` instead of `window`
+      callee.object.left.object.type === 'ThisExpression'
+    )
+  );
 }
 
 function isModuleWrapper(node) {

diff --git a/test/bundles/validWebpack4Chunk.js → test/bundles/validWebpack4AsyncChunk.js b/test/bundles/validWebpack4Chunk.js → test/bundles/validWebpack4AsyncChunk.js
diff --git a/test/bundles/validWebpack4Chunk.modules.json → ...dles/validWebpack4AsyncChunk.modules.json b/test/bundles/validWebpack4Chunk.modules.json → ...dles/validWebpack4AsyncChunk.modules.json
diff --git a/...undles/validWebpack4ChunkAndEntryPoint.js → ...s/validWebpack4AsyncChunkAndEntryPoint.js b/...undles/validWebpack4ChunkAndEntryPoint.js → ...s/validWebpack4AsyncChunkAndEntryPoint.js
diff --git a/...idWebpack4ChunkAndEntryPoint.modules.json → ...pack4AsyncChunkAndEntryPoint.modules.json b/...idWebpack4ChunkAndEntryPoint.modules.json → ...pack4AsyncChunkAndEntryPoint.modules.json
diff --git a/test/bundles/validWebpack4AsyncChunkUsingThisInsteadOfWindow.js b/test/bundles/validWebpack4AsyncChunkUsingThisInsteadOfWindow.js
@@ -0,0 +1 @@
+(this.webpackJsonp=this.webpackJsonp||[]).push([[27],{1:function(e,n,t){console.log("Chuck Norris")}}]);
diff --git a/test/bundles/validWebpack4AsyncChunkUsingThisInsteadOfWindow.modules.json b/test/bundles/validWebpack4AsyncChunkUsingThisInsteadOfWindow.modules.json
@@ -0,0 +1,5 @@
+{
+  "modules": {
+    "1": "function(e,n,t){console.log(\"Chuck Norris\")}"
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(this.webpackJsonp=this.webpackJsonp\|\|[]).push([[27],{1:function(e,n,t){console.log("Chuck Norris")}}]);