From a0dc38cd4d3a1e4183a208bf7f387e19c6b8af24 Mon Sep 17 00:00:00 2001 From: Noritaka Kobayashi Date: Thu, 15 May 2025 15:35:12 +0900 Subject: [PATCH 1/2] refactor: simplify for loops to for...of in index.js and Server.js --- client-src/index.js | 15 +++++++-------- lib/Server.js | 5 +---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/client-src/index.js b/client-src/index.js index c9ea5d1233..917afe7122 100644 --- a/client-src/index.js +++ b/client-src/index.js @@ -103,8 +103,8 @@ const parseURL = (resourceQuery) => { if (typeof resourceQuery === "string" && resourceQuery !== "") { const searchParams = resourceQuery.slice(1).split("&"); - for (let i = 0; i < searchParams.length; i++) { - const pair = searchParams[i].split("="); + for (const searchParam of searchParams) { + const pair = searchParam.split("="); result[pair[0]] = decodeURIComponent(pair[1]); } @@ -218,8 +218,7 @@ const logEnabledFeatures = (features) => { let logString = "Server started:"; // Server started: Hot Module Replacement enabled, Live Reloading enabled, Overlay disabled. - for (let i = 0; i < listEnabledFeatures.length; i++) { - const key = listEnabledFeatures[i]; + for (const key of listEnabledFeatures) { logString += ` ${key} ${features[key] ? "enabled" : "disabled"},`; } // replace last comma with a period @@ -471,8 +470,8 @@ const onSocketMessage = { sendMessage("Warnings", printableWarnings); - for (let i = 0; i < printableWarnings.length; i++) { - log.warn(printableWarnings[i]); + for (const printableWarning of printableWarnings) { + log.warn(printableWarning); } const overlayWarningsSetting = @@ -515,8 +514,8 @@ const onSocketMessage = { sendMessage("Errors", printableErrors); - for (let i = 0; i < printableErrors.length; i++) { - log.error(printableErrors[i]); + for (const printableError of printableErrors) { + log.error(printableError); } const overlayErrorsSettings = diff --git a/lib/Server.js b/lib/Server.js index 6e208128f6..e8af8c87a1 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -3123,10 +3123,7 @@ class Server { // always allow localhost host, for convenience // allow if value is in allowedHosts if (Array.isArray(allowedHosts) && allowedHosts.length > 0) { - for (let hostIdx = 0; hostIdx < allowedHosts.length; hostIdx++) { - /** @type {string} */ - const allowedHost = allowedHosts[hostIdx]; - + for (const allowedHost of allowedHosts) { if (allowedHost === value) { return true; } From 9cc0c5afa16505e51ac23d89f9b75b1a4b977225 Mon Sep 17 00:00:00 2001 From: Noritaka Kobayashi Date: Thu, 15 May 2025 23:12:32 +0900 Subject: [PATCH 2/2] revert index.js refactor --- client-src/index.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/client-src/index.js b/client-src/index.js index 917afe7122..c9ea5d1233 100644 --- a/client-src/index.js +++ b/client-src/index.js @@ -103,8 +103,8 @@ const parseURL = (resourceQuery) => { if (typeof resourceQuery === "string" && resourceQuery !== "") { const searchParams = resourceQuery.slice(1).split("&"); - for (const searchParam of searchParams) { - const pair = searchParam.split("="); + for (let i = 0; i < searchParams.length; i++) { + const pair = searchParams[i].split("="); result[pair[0]] = decodeURIComponent(pair[1]); } @@ -218,7 +218,8 @@ const logEnabledFeatures = (features) => { let logString = "Server started:"; // Server started: Hot Module Replacement enabled, Live Reloading enabled, Overlay disabled. - for (const key of listEnabledFeatures) { + for (let i = 0; i < listEnabledFeatures.length; i++) { + const key = listEnabledFeatures[i]; logString += ` ${key} ${features[key] ? "enabled" : "disabled"},`; } // replace last comma with a period @@ -470,8 +471,8 @@ const onSocketMessage = { sendMessage("Warnings", printableWarnings); - for (const printableWarning of printableWarnings) { - log.warn(printableWarning); + for (let i = 0; i < printableWarnings.length; i++) { + log.warn(printableWarnings[i]); } const overlayWarningsSetting = @@ -514,8 +515,8 @@ const onSocketMessage = { sendMessage("Errors", printableErrors); - for (const printableError of printableErrors) { - log.error(printableError); + for (let i = 0; i < printableErrors.length; i++) { + log.error(printableErrors[i]); } const overlayErrorsSettings =