Merge branch 'master' of https://github.com/GoogleChromeLabs/preload-webpack-plugin

toxic-johann · toxic-johann · commit 4ff53e06ed09 · 2018-02-07T08:05:11.000+08:00
diff --git a/README.md b/README.md
@@ -132,15 +132,14 @@ will be injected into the document `<head>`:
 <link rel="preload" as="script" href="chunk.d15e7fdfc91b34bb78c4.js">
 ```
 
-You can also configure the plugin to preload all chunks (vendor, async, normal chunks) using
-`include`:
+You can also configure the plugin to preload all chunks (vendor, async, normal chunks) using `include: 'all'`, or only preload initial chunks with `include: 'initial'`:
 
 ```js
 plugins: [
   new HtmlWebpackPlugin(),
   new PreloadWebpackPlugin({
     rel: 'preload',
-    include: 'all'
+    include: 'all' // or 'initial'
   })
 ]
 ```
diff --git a/index.js b/index.js
@@ -23,13 +23,26 @@ const objectAssign = require('object-assign');
 
 const flatten = arr => arr.reduce((prev, curr) => prev.concat(curr), []);
 
-const isChunkBelongToHtml = (chunk, roots) => {
+const doesChunkBelongToHTML = (chunk, roots, visitedChunks) => {
+  // Prevent circular recursion.
+  // See https://github.com/GoogleChromeLabs/preload-webpack-plugin/issues/49
+  if (visitedChunks[chunk.renderedHash]) {
+    return false;
+  }
+  visitedChunks[chunk.renderedHash] = true;
+
   for (const root of roots) {
-    if (root.hash === chunk.renderedHash) return true;
+    if (root.hash === chunk.renderedHash) {
+      return true;
+    }
   }
+
   for (const parent of chunk.parents) {
-    if (isChunkBelongToHtml(parent, roots)) return true;
+    if (doesChunkBelongToHTML(parent, roots, visitedChunks)) {
+      return true;
+    }
   }
+
   return false;
 };
 
@@ -60,6 +73,12 @@ class PreloadPlugin {
           } catch (e) {
             extractedChunks = compilation.chunks;
           }
+        } else if (options.include === 'initial') {
+          try {
+            extractedChunks = compilation.chunks.filter(chunk => chunk.isInitial());
+          } catch (e) {
+            extractedChunks = compilation.chunks;
+          }
         } else if (options.include === 'all') {
             // Async chunks, vendor chunks, normal chunks.
           extractedChunks = compilation.chunks;
@@ -80,7 +99,8 @@ class PreloadPlugin {
         const publicPath = compilation.outputOptions.publicPath || '';
 
         // Only handle the chunk import by the htmlWebpackPlugin
-        extractedChunks = extractedChunks.filter(chunk => isChunkBelongToHtml(chunk, Object.values(htmlPluginData.assets.chunks)));
+        extractedChunks = extractedChunks.filter(chunk => doesChunkBelongToHTML(
+          chunk, Object.values(htmlPluginData.assets.chunks), {}));
 
         flatten(extractedChunks.map(chunk => chunk.files)).filter(entry => {
           return this.options.fileBlacklist.every(regex => regex.test(entry) === false);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preload-webpack-plugin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Enhances html-webpack-plugin with link rel=preload wiring capabilities for scripts",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "preload-webpack-plugin",`
`3`		`- "version": "2.1.0",`
	`3`	`+ "version": "2.2.0",`
`4`	`4`	`"description": "Enhances html-webpack-plugin with link rel=preload wiring capabilities for scripts",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`