Merge branch 'master' into fix/6742

byzyk · web-flow · commit b8b11bf6009d · 2018-03-18T09:58:49.000+04:00
diff --git a/.editorconfig b/.editorconfig
@@ -8,19 +8,11 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 233
 
-[*.json]
-indent_style = space
-indent_size = 2
-
 [.prettierrc]
 indent_style = space
 indent_size = 2
 
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.yaml]
+[*.{yml,yaml,json}]
 indent_style = space
 indent_size = 2
 
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,16 +1,15 @@
 module.exports = {
-	"root": true,
-	"plugins": [
-		"prettier",
-		"node"
-	],
-	"extends": ["eslint:recommended", "plugin:node/recommended"],
-	"env": {
-		"node": true,
-		"es6": true,
+	root: true,
+	plugins: ["prettier", "node"],
+	extends: ["eslint:recommended", "plugin:node/recommended"],
+	env: {
+		node: true,
+		es6: true
 	},
-	"parserOptions": { "ecmaVersion": 2017 },
-	"rules": {
+	parserOptions: {
+		ecmaVersion: 2017
+	},
+	rules: {
 		"prettier/prettier": "error",
 		"no-undef": "error",
 		"no-extra-semi": "error",
@@ -25,7 +24,7 @@ module.exports = {
 		"no-extra-bind": "warn",
 		"no-process-exit": "warn",
 		"no-use-before-define": "off",
-		"no-unused-vars": ["error", { "args": "none" }],
+		"no-unused-vars": ["error", { args: "none" }],
 		"no-unsafe-negation": "error",
 		"no-loop-func": "warn",
 		"indent": "off",
@@ -34,16 +33,23 @@ module.exports = {
 		"node/no-unsupported-features": "error",
 		"node/no-deprecated-api": "error",
 		"node/no-missing-import": "error",
-		"node/no-missing-require": [
-			"error",
-			{
-				"allowModules": [
-					"webpack"
-				]
-			}
-		],
+		"node/no-missing-require": ["error", { allowModules: ["webpack"] }],
 		"node/no-unpublished-bin": "error",
 		"node/no-unpublished-require": "error",
 		"node/process-exit-as-throw": "error"
-	}
+	},
+	overrides: [
+		{
+			files: ["lib/**/*.runtime.js", "buildin/*.js", "hot/*.js"],
+			env: {
+				es6: false
+			},
+			globals: {
+				Promise: false,
+			},
+			parserOptions: {
+				ecmaVersion: 5
+			}
+		}
+	]
 };
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
@@ -19,13 +19,13 @@ module.exports = function() {
 		var fn = function(request) {
 			if (me.hot.active) {
 				if (installedModules[request]) {
-					if (!installedModules[request].parents.includes(moduleId))
+					if (installedModules[request].parents.indexOf(moduleId) === -1)
 						installedModules[request].parents.push(moduleId);
 				} else {
 					hotCurrentParents = [moduleId];
 					hotCurrentChildModule = request;
 				}
-				if (!me.children.includes(request)) me.children.push(request);
+				if (me.children.indexOf(request) === -1) me.children.push(request);
 			} else {
 				console.warn(
 					"[HMR] unexpected require(" +
@@ -316,7 +316,7 @@ module.exports = function() {
 							parentId: parentId
 						};
 					}
-					if (outdatedModules.includes(parentId)) continue;
+					if (outdatedModules.indexOf(parentId) !== -1) continue;
 					if (parent.hot._acceptedDependencies[moduleId]) {
 						if (!outdatedDependencies[parentId])
 							outdatedDependencies[parentId] = [];
@@ -343,7 +343,7 @@ module.exports = function() {
 		function addAllToSet(a, b) {
 			for (var i = 0; i < b.length; i++) {
 				var item = b[i];
-				if (!a.includes(item)) a.push(item);
+				if (a.indexOf(item) === -1) a.push(item);
 			}
 		}
 
@@ -551,7 +551,7 @@ module.exports = function() {
 						dependency = moduleOutdatedDependencies[i];
 						cb = module.hot._acceptedDependencies[dependency];
 						if (cb) {
-							if (callbacks.includes(cb)) continue;
+							if (callbacks.indexOf(cb) !== -1) continue;
 							callbacks.push(cb);
 						}
 					}
diff --git a/open-bot.yaml b/open-bot.yaml
@@ -100,7 +100,8 @@ rules:
         ```
         <details>
           <summary>Show remaining errors</summary>
-        ``` text
+
+        ```text
         {{{remainingErrors}}}
         ```
         </details>
diff --git a/package.json b/package.json
@@ -102,9 +102,9 @@
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run schema-lint",
-    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "fix": "npm run lint -- --fix",
-    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" --write",
+    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" --write",
     "schema-lint": "mocha test/*.lint.js --opts test/lint-mocha.opts",
     "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
     "cover": "npm run cover:init && npm run cover:all && npm run cover:report",
diff --git a/schemas/ajv.absolutePath.js b/schemas/ajv.absolutePath.js
@@ -10,6 +10,7 @@ const errorMessage = (schema, data, message) => ({
 const getErrorFor = (shouldBeAbsolute, data, schema) => {
 	const message = shouldBeAbsolute
 		? `The provided value ${JSON.stringify(data)} is not an absolute path!`
+
 		: `A relative path is expected. However, the provided value ${JSON.stringify(
 				data
 			)} is an absolute path!`;
