HTML Reporter: Move files to src/ directory

Simplifies the directory structure, and also fixes an omission
in grunt `watch-repeatable` and `search` tasks, which didn't
monitor the `runner/` directory.

Also simply ESLint config while at it. Moving the config to eslintrc,
means that `eslint .`, `eslint --fix .` and IDE integration also
understands it, instead of being hidden inside Grunt-specific wiring.

.eslintrc.json

@@ -13,11 +13,11 @@
         "constructor-super": "error",
         "indent": ["error", "tab", {
                 "CallExpression": {
-                        "arguments": 1
+                    "arguments": 1
                 },
-		"MemberExpression": 1,
-		"SwitchCase": 0,
-		"outerIIFEBody": 1
+                "MemberExpression": 1,
+                "SwitchCase": 0,
+                "outerIIFEBody": 1
         }],
         "no-console": "off",
         "no-const-assign": "error",
@@ -33,6 +33,7 @@
         "wrap-iife": ["error", "any"]
     },
     "ignorePatterns": [
+        "__codeorigin/**",
         "coverage/**",
         "docs/_site/**",
         "dist/**",
@@ -61,6 +62,16 @@
             "rules": {
                 "no-process-exit": "off"
             }
+        },
+        {
+            "files": [
+                "test/**/*.html"
+            ],
+            "extends": ["eslint:recommended", "jquery"],
+            "rules": {
+                "wrap-iife": ["error", "any"],
+                "indent": "off"
+            }
         }
     ]
 }

Gruntfile.js

@@ -60,19 +60,7 @@ module.exports = function( grunt ) {
 			}
 		},
 		eslint: {
-			js: ".",
-			html: {
-				options: {
-					rules: {
-						indent: "off"
-					}
-				},
-				src: [
-
-					// Linting HTML files via eslint-plugin-html
-					"test/**/*.html"
-				]
-			}
+			all: "."
 		},
 		search: {
 			options: {
@@ -85,8 +73,7 @@ module.exports = function( grunt ) {
 				failOnMatch: true
 			},
 			xhtml: [
-				"src/**/*.js",
-				"reporter/**/*.js"
+				"src/**/*.js"
 			]
 		},
 		qunit: {
@@ -204,7 +191,7 @@ module.exports = function( grunt ) {
 				".eslintrc.json",
 				"*.js",
 				"build/*.js",
-				"{src,test,reporter}/**/*.js",
+				"{src,test}/**/*.js",
 				"src/qunit.css",
 				"test/*.{html,js}",
 				"test/**/*.html"

package.json

@@ -100,8 +100,6 @@
     "include": [
       "bin/**",
       "dist/**",
-      "reporter/**",
-      "runner/**",
       "src/**"
     ],
     "reporter": [

rollup.config.js

@@ -36,7 +36,10 @@ module.exports = {
 			// 1. Must not leak as global variable, since it's not full Map implementation.
 			// 2. Must be seen by fuzzysort as-is (e.g. not get renamed as normal
 			//    variables in an imported file would be).
-			return fs.readFileSync( __dirname + "/reporter/es6-map.js", "utf-8" ).toString().trim();
+			return fs.readFileSync(
+				__dirname + "/src/html-reporter/es6-map.js",
+				"utf-8"
+			).toString().trim();
 		},
 
 		globals: {

reporter/diff.js → src/html-reporter/diff.js

@@ -1,4 +1,4 @@
-import QUnit from "../src/core";
+import QUnit from "../core";
 import { escapeText } from "./html";
 
 /*

reporter/es6-map.js → src/html-reporter/es6-map.js

@@ -1,4 +1,4 @@
-// Support IE 9-10, PhantomJS: Fallback for fuzzysort.js used by /reporter/html.js
+// Support IE 9-10, PhantomJS: Fallback for fuzzysort.js used by ./html.js
 // eslint-disable-next-line no-unused-vars
 var Map = typeof Map === "function" ? Map : function StringMap() {
 	var store = Object.create( null );

runner/fixture.js → src/html-reporter/fixture.js

@@ -1,5 +1,5 @@
-import QUnit from "../src/core";
-import { window, document } from "../src/globals";
+import QUnit from "../core";
+import { window, document } from "../globals";
 
 ( function() {
 

reporter/html.js → src/html-reporter/html.js

@@ -1,8 +1,8 @@
-import QUnit from "../src/core";
-import Test from "../src/test";
-import { extractStacktrace } from "../src/core/stacktrace";
-import { now, extend } from "../src/core/utilities";
-import { window, document, navigator, console } from "../src/globals";
+import QUnit from "../core";
+import Test from "../test";
+import { extractStacktrace } from "../core/stacktrace";
+import { now, extend } from "../core/utilities";
+import { window, document, navigator, console } from "../globals";
 import "./urlparams";
 import fuzzysort from "fuzzysort";
 

reporter/reporter.js → src/html-reporter/reporter.js

@@ -1,2 +1,3 @@
+import "./fixture";
 import "./diff";
 import "./html";

reporter/urlparams.js → src/html-reporter/urlparams.js

@@ -1,5 +1,5 @@
-import QUnit from "../src/core";
-import { window } from "../src/globals";
+import QUnit from "../core";
+import { window } from "../globals";
 
 ( function() {
 

src/qunit.js

@@ -1,3 +1,2 @@
 import "./core";
-import "../runner/runner";
-import "../reporter/reporter";
+import "./html-reporter/reporter";