close #2

Author: Applelo

src/main.ts

@@ -3,13 +3,12 @@ import {compilation, Compiler, Plugin} from 'webpack';
 
 declare namespace HtmlWebpackInjectPreload {
   interface Options {
-    excludeOutputNames: RegExp[];
     files: HtmlWebpackInjectPreload.File[];
   }
 
   interface File {
     match: RegExp;
-    attributes: Record<string, string | boolean>;
+    attributes: Record<string, string|boolean>;
   }
 }
 
@@ -24,11 +23,11 @@ interface HtmlWebpackPluginData {
  *
  * @example
  * new HtmlWebpackInjectPreload({
- *  excludeOutputNames: [/scripts-hashed/],
  *  files: [
  *    {
  *      match: /.*\.woff2/,
- *      attributes: { rel: 'preload', as: 'font', type: 'font/woff2', crossorigin: true },
+ *      attributes: { rel: 'preload', as: 'font', type: 'font/woff2',
+ * crossorigin: true },
  *    },
  *    {
  *      match: /vendors\.[a-z-0-9]*.css/,
@@ -40,10 +39,10 @@ interface HtmlWebpackPluginData {
  * @class InjectPreloadFiles
  */
 class HtmlWebpackInjectPreload implements Plugin {
-  options: HtmlWebpackInjectPreload.Options = {
-    excludeOutputNames: [],
+  private options: HtmlWebpackInjectPreload.Options = {
     files: [],
   };
+  private replaceString = '<!-- html-webpack-inject-preload -->';
 
   /**
    * Creates an instance of HtmlWebpackInjectPreload.
@@ -54,12 +53,6 @@ class HtmlWebpackInjectPreload implements Plugin {
     this.options = Object.assign(this.options, options);
   }
 
-  private checkMatch(regexpArray: RegExp[], value: string) {
-    return regexpArray.some(function (regexp) {
-      return regexp.test(value);
-    });
-  }
-
   public generateLink(href: string) {
     const linkAttributes: string[] = [];
 
@@ -73,9 +66,8 @@ class HtmlWebpackInjectPreload implements Plugin {
         }
 
         for (const attribute in file.attributes) {
-          if (
-            Object.prototype.hasOwnProperty.call(file.attributes, attribute)
-          ) {
+          if (Object.prototype.hasOwnProperty.call(
+                  file.attributes, attribute)) {
             const value = file.attributes[attribute];
             if (value === true) {
               linkAttributes.push(`${attribute}`);
@@ -85,30 +77,23 @@ class HtmlWebpackInjectPreload implements Plugin {
           }
         }
 
-        return linkAttributes.length > 0
-          ? `<link ${linkAttributes.join(' ')}>`
-          : false;
+        return linkAttributes.length > 0 ?
+            `<link ${linkAttributes.join(' ')}>` :
+            false;
       }
     }
 
     return false;
   }
 
   private addLinks(
-    compilation: compilation.Compilation,
-    htmlPluginData: HtmlWebpackPluginData,
+      compilation: compilation.Compilation,
+      htmlPluginData: HtmlWebpackPluginData,
   ) {
-    const options = this.options;
     const links: string[] = [];
 
     // Bail out early if we're configured to exclude this file.
-    if (
-      this.checkMatch(
-        options.excludeOutputNames,
-        // @ts-ignore
-        htmlPluginData.plugin.options.filename,
-      )
-    ) {
+    if (!htmlPluginData.html.includes(this.replaceString)) {
       return htmlPluginData;
     }
 
@@ -123,30 +108,32 @@ class HtmlWebpackInjectPreload implements Plugin {
     });
 
     htmlPluginData.html = htmlPluginData.html.replace(
-      '<!-- html-webpack-inject-preload -->',
-      links.join(''),
+        this.replaceString,
+        links.join(''),
     );
 
     return htmlPluginData;
   }
 
   apply(compiler: Compiler) {
     compiler.hooks.compilation.tap('HtmlWebpackInjectPreload', compilation => {
-      // @ts-ignore
-      const hook = compilation.hooks.htmlWebpackPluginAfterHtmlProcessing
-        ? // @ts-ignore
-          compilation.hooks.htmlWebpackPluginAfterHtmlProcessing
-        : HtmlWebpackPlugin.getHooks(compilation).beforeEmit;
+      const hook = compilation
+                       .hooks
+                       // @ts-ignore
+                       .htmlWebpackPluginAfterHtmlProcessing ?
+          // @ts-ignore
+          compilation.hooks.htmlWebpackPluginAfterHtmlProcessing :
+          HtmlWebpackPlugin.getHooks(compilation).beforeEmit;
 
       hook.tapAsync(
-        'HtmlWebpackInjectPreload',
-        (htmlPluginData: HtmlWebpackPluginData, callback: any) => {
-          try {
-            callback(null, this.addLinks(compilation, htmlPluginData));
-          } catch (error) {
-            callback(error);
-          }
-        },
+          'HtmlWebpackInjectPreload',
+          (htmlPluginData: HtmlWebpackPluginData, callback: any) => {
+            try {
+              callback(null, this.addLinks(compilation, htmlPluginData));
+            } catch (error) {
+              callback(error);
+            }
+          },
       );
     });
   }

test/index.test.ts

@@ -1,7 +1,6 @@
 import HtmlWebpackInjectPreload from '../src/main';
 
 const options: HtmlWebpackInjectPreload.Options = {
-  excludeOutputNames: [/scripts-hashed/],
   files: [
     {
       match: /.*\.woff2/,
@@ -27,20 +26,20 @@ describe('HTMLWebpackInjectPreload', () => {
   it('generateLink', async () => {
     const expectCss = '<link rel="preload" as="style" href="test-alt.css">';
     const linkCss = new HtmlWebpackInjectPreload(options).generateLink(
-      'test.css',
+        'test.css',
     );
     expect(linkCss).toBe(expectCss);
 
     const expectWoff2 =
-      '<link href="test.woff2" rel="preload" as="font" type="font/woff2" crossorigin>';
+        '<link href="test.woff2" rel="preload" as="font" type="font/woff2" crossorigin>';
     const linkWoff2 = new HtmlWebpackInjectPreload(options).generateLink(
-      'test.woff2',
+        'test.woff2',
     );
     expect(linkWoff2).toBe(expectWoff2);
 
     const expectNull = false;
     const linkNull = new HtmlWebpackInjectPreload(options).generateLink(
-      'test.null',
+        'test.null',
     );
     expect(linkNull).toBe(expectNull);
   });