test: update

Author: alexander-akait

src/hmr/hotModuleReplacement.js

@@ -100,8 +100,8 @@ function getCurrentScriptUrl(moduleId) {
 }
 
 /**
- * @param {string} url url
- * @returns {boolean} true when is url can be requested, otherwise false
+ * @param {string} url URL
+ * @returns {boolean} true when URL can be request, otherwise false
  */
 function isUrlRequest(url) {
   // An URL is not an request if
@@ -138,7 +138,8 @@ function updateCss(el, url) {
     return;
   }
 
-  if (!url || !url.includes(".css")) {
+  // eslint-disable-next-line unicorn/prefer-includes
+  if (!url || !(url.indexOf(".css") > -1)) {
     return;
   }
 
@@ -191,7 +192,8 @@ function getReloadUrl(href, src) {
      */
     // eslint-disable-next-line array-callback-return
     (url) => {
-      if (href.includes(src)) {
+      // eslint-disable-next-line unicorn/prefer-includes
+      if (href.indexOf(src) > -1) {
         ret = url;
       }
     },

src/hmr/normalize-url.js

@@ -31,9 +31,9 @@ module.exports = function normalizeUrl(urlString) {
     return urlString;
   }
 
-  const protocol = urlString.includes("//")
-    ? `${urlString.split("//")[0]}//`
-    : "";
+  const protocol =
+    // eslint-disable-next-line unicorn/prefer-includes
+    urlString.indexOf("//") !== -1 ? `${urlString.split("//")[0]}//` : "";
   const components = urlString
     .replace(new RegExp(protocol, "i"), "")
     .split("/");

test/cases/hmr-locals/expected/main.js

@@ -7,13 +7,14 @@
   \************************************************/
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-/* eslint-env browser */
+/* global document */
 /*
   eslint-disable
   no-console,
   func-names
 */
 
+// eslint-disable-next-line jsdoc/no-restricted-syntax
 /** @typedef {any} TODO */
 
 const normalizeUrl = __webpack_require__(/*! ./normalize-url */ "../../../src/hmr/normalize-url.js");
@@ -24,36 +25,40 @@ const noDocument = typeof document === "undefined";
 
 const { forEach } = Array.prototype;
 
+// eslint-disable-next-line jsdoc/no-restricted-syntax
 /**
- * @param {function} fn
- * @param {number} time
- * @returns {(function(): void)|*}
+ * @param {Function} fn any function
+ * @param {number} time time
+ * @returns {() => void} wrapped function
  */
 function debounce(fn, time) {
   let timeout = 0;
 
   return function () {
-    // @ts-ignore
+    // @ts-expect-error
     const self = this;
     // eslint-disable-next-line prefer-rest-params
     const args = arguments;
-
+    // eslint-disable-next-line func-style
     const functionCall = function functionCall() {
       return fn.apply(self, args);
     };
 
     clearTimeout(timeout);
 
-    // @ts-ignore
+    // @ts-expect-error
     timeout = setTimeout(functionCall, time);
   };
 }
 
+/**
+ * @returns {void}
+ */
 function noop() {}
 
 /**
- * @param {TODO} moduleId
- * @returns {TODO}
+ * @param {string | number} moduleId a module id
+ * @returns {TODO} current script url
  */
 function getCurrentScriptUrl(moduleId) {
   let src = srcByModuleId[moduleId];
@@ -74,8 +79,8 @@ function getCurrentScriptUrl(moduleId) {
   }
 
   /**
-   * @param {string} fileMap
-   * @returns {null | string[]}
+   * @param {string} fileMap file map
+   * @returns {null | string[]} normalized files
    */
   return function (fileMap) {
     if (!src) {
@@ -97,15 +102,30 @@ function getCurrentScriptUrl(moduleId) {
       const reg = new RegExp(`${filename}\\.js$`, "g");
 
       return normalizeUrl(
-        src.replace(reg, `${mapRule.replace(/{fileName}/g, filename)}.css`)
+        src.replace(reg, `${mapRule.replace(/{fileName}/g, filename)}.css`),
       );
     });
   };
 }
 
 /**
- * @param {TODO} el
- * @param {string} [url]
+ * @param {string} url URL
+ * @returns {boolean} true when URL can be request, otherwise false
+ */
+function isUrlRequest(url) {
+  // An URL is not an request if
+
+  // It is not http or https
+  if (!/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(url)) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * @param {TODO} el html link element
+ * @param {string=} url a URL
  */
 function updateCss(el, url) {
   if (!url) {
@@ -127,11 +147,11 @@ function updateCss(el, url) {
     return;
   }
 
+  // eslint-disable-next-line unicorn/prefer-includes
   if (!url || !(url.indexOf(".css") > -1)) {
     return;
   }
 
-  // eslint-disable-next-line no-param-reassign
   el.visited = true;
 
   const newEl = el.cloneNode();
@@ -166,34 +186,34 @@ function updateCss(el, url) {
 }
 
 /**
- * @param {string} href
- * @param {TODO} src
- * @returns {TODO}
+ * @param {string} href href
+ * @param {TODO} src src
+ * @returns {undefined | string} a reload url
  */
 function getReloadUrl(href, src) {
   let ret;
 
-  // eslint-disable-next-line no-param-reassign
   href = normalizeUrl(href);
 
   src.some(
     /**
-     * @param {string} url
+     * @param {string} url url
      */
     // eslint-disable-next-line array-callback-return
     (url) => {
+      // eslint-disable-next-line unicorn/prefer-includes
       if (href.indexOf(src) > -1) {
         ret = url;
       }
-    }
+    },
   );
 
   return ret;
 }
 
 /**
- * @param {string} [src]
- * @returns {boolean}
+ * @param {string=} src source
+ * @returns {boolean} true when loaded, otherwise false
  */
 function reloadStyle(src) {
   if (!src) {
@@ -210,7 +230,7 @@ function reloadStyle(src) {
 
     const url = getReloadUrl(el.href, src);
 
-    if (!isUrlRequest(url)) {
+    if (url && !isUrlRequest(url)) {
       return;
     }
 
@@ -228,6 +248,9 @@ function reloadStyle(src) {
   return loaded;
 }
 
+/**
+ * @returns {void}
+ */
 function reloadAll() {
   const elements = document.querySelectorAll("link");
 
@@ -241,24 +264,9 @@ function reloadAll() {
 }
 
 /**
- * @param {string} url
- * @returns {boolean}
- */
-function isUrlRequest(url) {
-  // An URL is not an request if
-
-  // It is not http or https
-  if (!/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(url)) {
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * @param {TODO} moduleId
- * @param {TODO} options
- * @returns {TODO}
+ * @param {number | string} moduleId a module id
+ * @param {TODO} options options
+ * @returns {TODO} wrapper function
  */
 module.exports = function (moduleId, options) {
   if (noDocument) {
@@ -269,6 +277,9 @@ module.exports = function (moduleId, options) {
 
   const getScriptSrc = getCurrentScriptUrl(moduleId);
 
+  /**
+   * @returns {void}
+   */
   function update() {
     const src = getScriptSrc(options.filename);
     const reloaded = reloadStyle(src);
@@ -302,15 +313,13 @@ module.exports = function (moduleId, options) {
   \*****************************************/
 /***/ ((module) => {
 
-/* eslint-disable */
-
 /**
- * @param {string[]} pathComponents
- * @returns {string}
+ * @param {string[]} pathComponents path components
+ * @returns {string} normalized url
  */
-function normalizeUrl(pathComponents) {
+function normalizeUrlInner(pathComponents) {
   return pathComponents
-    .reduce(function (accumulator, item) {
+    .reduce((accumulator, item) => {
       switch (item) {
         case "..":
           accumulator.pop();
@@ -327,24 +336,27 @@ function normalizeUrl(pathComponents) {
 }
 
 /**
- * @param {string} urlString
- * @returns {string}
+ * @param {string} urlString url string
+ * @returns {string} normalized url string
  */
-module.exports = function (urlString) {
+module.exports = function normalizeUrl(urlString) {
   urlString = urlString.trim();
 
   if (/^data:/i.test(urlString)) {
     return urlString;
   }
 
-  var protocol =
-    urlString.indexOf("//") !== -1 ? urlString.split("//")[0] + "//" : "";
-  var components = urlString.replace(new RegExp(protocol, "i"), "").split("/");
-  var host = components[0].toLowerCase().replace(/\.$/, "");
+  const protocol =
+    // eslint-disable-next-line unicorn/prefer-includes
+    urlString.indexOf("//") !== -1 ? `${urlString.split("//")[0]}//` : "";
+  const components = urlString
+    .replace(new RegExp(protocol, "i"), "")
+    .split("/");
+  const host = components[0].toLowerCase().replace(/\.$/, "");
 
   components[0] = "";
 
-  var path = normalizeUrl(components);
+  const path = normalizeUrlInner(components);
 
   return protocol + host + path;
 };