fix: proper way for inner declaration of a function. webpack#7263

aleen42 · aleen42 · commit 9e136cd5d4f2 · 2018-05-29T14:10:07.000+08:00
Use a varaible declaration outside a condition block instead, according to https://eslint.org/docs/rules/no-inner-declarations
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -154,6 +154,7 @@ class JsonpMainTemplatePlugin {
 
 				return Template.asString([
 					"var script = document.createElement('script');",
+					"var onScriptComplete;",
 					jsonpScriptType
 						? `script.type = ${JSON.stringify(jsonpScriptType)};`
 						: "",
@@ -168,12 +169,7 @@ class JsonpMainTemplatePlugin {
 					),
 					"}",
 					"script.src = jsonpScriptSrc(chunkId);",
-					"var timeout = setTimeout(function(){",
-					Template.indent([
-						"onScriptComplete({ type: 'timeout', target: script });"
-					]),
-					`}, ${chunkLoadTimeout});`,
-					"function onScriptComplete(event) {",
+					"onScriptComplete = function (event) {",
 					Template.indent([
 						"// avoid mem leaks in IE.",
 						"script.onerror = script.onload = null;",
@@ -196,6 +192,11 @@ class JsonpMainTemplatePlugin {
 						"}"
 					]),
 					"};",
+					"var timeout = setTimeout(function(){",
+					Template.indent([
+						"onScriptComplete({ type: 'timeout', target: script });"
+					]),
+					`}, ${chunkLoadTimeout});`,
 					"script.onerror = script.onload = onScriptComplete;"
 				]);
 			}
