From 55550dc1339813645d05933a4e24e77a73f1822b Mon Sep 17 00:00:00 2001
From: Benjamin Lim <bumbleblym@gmail.com>
Date: Tue, 27 Dec 2016 05:12:48 +0800
Subject: [PATCH] fix: allow arbitrary options

- allow arbitrary options
- narrow minify and chunksSortMode types
- export interfaces
- fix version
- add tests
- set strictNullChecks flag to true
- add tslint.json
---
 .../html-webpack-plugin-tests.ts              | 20 +++++++-
 html-webpack-plugin/index.d.ts                | 50 +++++++++++++------
 html-webpack-plugin/tsconfig.json             |  4 +-
 html-webpack-plugin/tslint.json               |  1 +
 4 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 html-webpack-plugin/tslint.json

diff --git a/html-webpack-plugin/html-webpack-plugin-tests.ts b/html-webpack-plugin/html-webpack-plugin-tests.ts
index 9d4ec35e11..485f6a81bf 100644
--- a/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -1,5 +1,5 @@
-import {Configuration} from "webpack";
 import HtmlWebpackPlugin = require("html-webpack-plugin");
+import { Configuration } from "webpack";
 
 const a: Configuration = {
     plugins: [
@@ -14,3 +14,21 @@ const b: Configuration = {
         })
     ]
 };
+
+const minify: HtmlWebpackPlugin.MinifyConfig = {
+    caseSensitive: true
+};
+
+new HtmlWebpackPlugin({
+    minify
+});
+
+new HtmlWebpackPlugin({
+    chunksSortMode: function compare(a, b) {
+        return 1;
+    }
+});
+
+new HtmlWebpackPlugin({
+  arbitrary: "data"
+});
diff --git a/html-webpack-plugin/index.d.ts b/html-webpack-plugin/index.d.ts
index 17f1023c68..c3dd776fef 100644
--- a/html-webpack-plugin/index.d.ts
+++ b/html-webpack-plugin/index.d.ts
@@ -1,14 +1,34 @@
-// Type definitions for html-webpack-plugin v2.22.2
+// Type definitions for html-webpack-plugin 2.11
 // Project: https://github.com/ampedandwired/html-webpack-plugin
-// Definitions by: Simon Hartcher <http://github.com/deevus>
+// Definitions by: Simon Hartcher <https://github.com/deevus>, Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="webpack" />
+import { Plugin } from "webpack";
+import { Options } from "html-minifier";
 
-declare module "html-webpack-plugin" {
-    import {Plugin} from "webpack";
+export = HtmlWebpackPlugin;
 
-    interface HtmlWebpackPluginConfiguration {
+declare class HtmlWebpackPlugin implements Plugin {
+    constructor(options?: HtmlWebpackPlugin.Config);
+}
+
+declare namespace HtmlWebpackPlugin {
+    export type MinifyConfig = Options;
+
+    /**
+    * It is assumed that each [chunk] contains at least the properties "id"
+    * (containing the chunk id) and "parents" (array containing the ids of the
+    * parent chunks).
+    */
+    export interface Chunk { // TODO: Import from webpack?
+        id: string;
+        parents: string[];
+        [propName: string]: any; // TODO: Narrow type
+    }
+
+    export type ChunkComparator = (a: Chunk, b: Chunk) => number;
+
+    export interface Config {
         /**
          * The title to use for the generated HTML document.
          */
@@ -37,11 +57,11 @@ declare module "html-webpack-plugin" {
         favicon?: string;
 
         /**
-         * Pass a html-minifier options object to minify the output.
+         * `{...} | false` Pass a html-minifier options object to minify the output.
          *
          * https://github.com/kangax/html-minifier#options-quick-reference
          */
-        minify?: any;
+        minify?: MinifyConfig | false;
 
         /**
          * `true | false` if `true` then append a unique webpack compilation hash to all included scripts and css files. This is useful for cache busting.
@@ -66,7 +86,7 @@ declare module "html-webpack-plugin" {
         /**
          * Allows to control how chunks should be sorted before they are included to the html. Allowed values: `'none' | 'auto' | 'dependency' | {function}` - default: `'auto'`
          */
-        chunksSortMode?: "none" | "auto" | "dependency" | Function;
+        chunksSortMode?: "none" | "auto" | "dependency" | ChunkComparator;
 
         /**
          * Allows you to skip some chunks (e.g. don't add the unit-test chunk)
@@ -77,13 +97,11 @@ declare module "html-webpack-plugin" {
          * `true | false` If `true` render the link tags as self-closing, XHTML compliant. Default is `false`
          */
         xhtml?: boolean;
-    }
 
-    interface HtmlWebpackPlugin {
-        new (): Plugin;
-        new (options: HtmlWebpackPluginConfiguration): Plugin;
+        /**
+         * In addition to the options actually used by this plugin, you can use
+         * this hash to pass arbitrary data through to your template.
+         */
+        [option: string]: any;
     }
-
-    const htmlWebpackPlugin: HtmlWebpackPlugin;
-    export = htmlWebpackPlugin;
 }
diff --git a/html-webpack-plugin/tsconfig.json b/html-webpack-plugin/tsconfig.json
index 61a4420bb2..c2dcadd4fa 100644
--- a/html-webpack-plugin/tsconfig.json
+++ b/html-webpack-plugin/tsconfig.json
@@ -4,7 +4,7 @@
         "target": "es6",
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -17,4 +17,4 @@
         "index.d.ts",
         "html-webpack-plugin-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/html-webpack-plugin/tslint.json b/html-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/html-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }