@rspack/dev-server 1.1.5 → 1.2.0

package/README.md

@@ -107,7 +107,9 @@ server.startCallback(() => {
 
 ## Credits
 
-Thanks to the [webpack-dev-server](https://github.com/webpack/webpack-dev-server) project created by [@sokra](https://github.com/sokra)
+This plugin is forked from [webpack-dev-server](https://github.com/webpack/webpack-dev-server), and is used to smooth out some differences between rspack and webpack, while also providing rspack-specific new features.
+
+> Thanks to the [webpack-dev-server](https://github.com/webpack/webpack-dev-server) project created by [@sokra](https://github.com/sokra)
 
 ## License
 

package/client/clients/SockJSClient.js

@@ -0,0 +1,34 @@
+/**
+ * The following code is modified based on
+ * https://github.com/webpack/webpack-dev-server
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
+ */
+import SockJS from '../modules/sockjs-client/index.js';
+import { log } from '../utils/log.js';
+var SockJSClient = /** @class */ (function () {
+    function SockJSClient(url) {
+        // SockJS requires `http` and `https` protocols
+        this.sock = new SockJS(url.replace(/^ws:/i, 'http:').replace(/^wss:/i, 'https:'));
+        this.sock.onerror = function (error) {
+            log.error(error);
+        };
+    }
+    SockJSClient.prototype.onOpen = function (fn) {
+        this.sock.onopen = fn;
+    };
+    SockJSClient.prototype.onClose = function (fn) {
+        this.sock.onclose = fn;
+    };
+    // call f with the message string as the first argument
+    SockJSClient.prototype.onMessage = function (fn) {
+        this.sock.onmessage = function (err) {
+            fn(err.data);
+        };
+    };
+    return SockJSClient;
+}());
+export default SockJSClient;

package/client/clients/WebSocketClient.js

@@ -0,0 +1,32 @@
+/**
+ * The following code is modified based on
+ * https://github.com/webpack/webpack-dev-server
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
+ */
+import { log } from '../utils/log.js';
+var WebSocketClient = /** @class */ (function () {
+    function WebSocketClient(url) {
+        this.client = new WebSocket(url);
+        this.client.onerror = function (error) {
+            log.error(error);
+        };
+    }
+    WebSocketClient.prototype.onOpen = function (fn) {
+        this.client.onopen = fn;
+    };
+    WebSocketClient.prototype.onClose = function (fn) {
+        this.client.onclose = fn;
+    };
+    // call fn with the message string as the first argument
+    WebSocketClient.prototype.onMessage = function (fn) {
+        this.client.onmessage = function (event) {
+            fn(event.data);
+        };
+    };
+    return WebSocketClient;
+}());
+export default WebSocketClient;

package/client/index.js

@@ -1,4 +1,12 @@
-// @ts-nocheck
+/**
+ * The following code is modified based on
+ * https://github.com/webpack/webpack-dev-server
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
+ */
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -10,58 +18,27 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+// @ts-expect-error: No type definitions available for '@rspack/core/hot/emitter.js'
 import hotEmitter from '@rspack/core/hot/emitter.js';
-/* global __resourceQuery, __webpack_hash__ */
 /* Rspack dev server runtime client */
-/// <reference types="webpack/module" />
+// @ts-expect-error: No type definitions available for '@rspack/core/hot/log.js'
 import webpackHotLog from '@rspack/core/hot/log.js';
-import { createOverlay, formatProblem, } from 'webpack-dev-server/client/overlay.js';
-import socket from 'webpack-dev-server/client/socket.js';
-import { defineProgressElement, isProgressSupported, } from 'webpack-dev-server/client/progress.js';
-import { log, setLogLevel } from 'webpack-dev-server/client/utils/log.js';
-import sendMessage from 'webpack-dev-server/client/utils/sendMessage.js';
-/**
- * @typedef {Object} OverlayOptions
- * @property {boolean | (error: Error) => boolean} [warnings]
- * @property {boolean | (error: Error) => boolean} [errors]
- * @property {boolean | (error: Error) => boolean} [runtimeErrors]
- * @property {string} [trustedTypesPolicyName]
- */
-/**
- * @typedef {Object} Options
- * @property {boolean} hot
- * @property {boolean} liveReload
- * @property {boolean} progress
- * @property {boolean | OverlayOptions} overlay
- * @property {string} [logging]
- * @property {number} [reconnect]
- */
-/**
- * @typedef {Object} Status
- * @property {boolean} isUnloading
- * @property {string} currentHash
- * @property {string} [previousHash]
- */
-/**
- * @param {boolean | { warnings?: boolean | string; errors?: boolean | string; runtimeErrors?: boolean | string; }} overlayOptions
- */
+import { createOverlay, formatProblem } from './overlay.js';
+import socket from './socket.js';
+import { defineProgressElement, isProgressSupported } from './progress.js';
+import { log, setLogLevel } from './utils/log.js';
+import sendMessage from './utils/sendMessage.js';
 var decodeOverlayOptions = function (overlayOptions) {
     if (typeof overlayOptions === 'object') {
         ['warnings', 'errors', 'runtimeErrors'].forEach(function (property) {
             if (typeof overlayOptions[property] === 'string') {
                 var overlayFilterFunctionString = decodeURIComponent(overlayOptions[property]);
-                // eslint-disable-next-line no-new-func
                 overlayOptions[property] = new Function('message', "var callback = ".concat(overlayFilterFunctionString, "\n\t\t\t\treturn callback(message)"));
             }
         });
     }
 };
-/**
- * @param {string} resourceQuery
- * @returns {{ [key: string]: string | boolean }}
- */
 var parseURL = function (resourceQuery) {
-    /** @type {{ [key: string]: string }} */
     var result = {};
     if (typeof resourceQuery === 'string' && resourceQuery !== '') {
         var searchParams = resourceQuery.slice(1).split('&');
@@ -86,22 +63,15 @@ var parseURL = function (resourceQuery) {
         }
         if (scriptSourceURL) {
             result = scriptSourceURL;
-            result.fromCurrentScript = true;
+            result['fromCurrentScript'] = 'true';
         }
     }
     return result;
 };
-/**
- * @type {Status}
- */
 var status = {
     isUnloading: false,
-    // eslint-disable-next-line camelcase
     currentHash: __webpack_hash__,
 };
-/**
- * @returns {string}
- */
 var getCurrentScriptSource = function () {
     // `document.currentScript` is the most accurate way to find the current script,
     // but is not supported in all browsers.
@@ -125,7 +95,6 @@ var enabledFeatures = {
     Progress: false,
     Overlay: false,
 };
-/** @type {Options} */
 var options = {
     hot: false,
     liveReload: false,
@@ -164,9 +133,6 @@ if (parsedResourceQuery.logging) {
 if (typeof parsedResourceQuery.reconnect !== 'undefined') {
     options.reconnect = Number(parsedResourceQuery.reconnect);
 }
-/**
- * @param {string} level
- */
 var setAllLogLevel = function (level) {
     // This is needed because the HMR logger operate separately from dev server logger
     webpackHotLog.setLogLevel(level === 'verbose' || level === 'log' ? 'info' : level);
@@ -205,24 +171,16 @@ var overlay = typeof window !== 'undefined'
             catchRuntimeError: options.overlay,
         })
     : { send: function () { } };
-/**
- * @param {Options} options
- * @param {Status} currentStatus
- */
 var reloadApp = function (_a, currentStatus) {
     var hot = _a.hot, liveReload = _a.liveReload;
     if (currentStatus.isUnloading) {
         return;
     }
     var currentHash = currentStatus.currentHash, previousHash = currentStatus.previousHash;
-    var isInitial = currentHash.indexOf(/** @type {string} */ (previousHash)) >= 0;
+    var isInitial = currentHash.indexOf(previousHash) >= 0;
     if (isInitial) {
         return;
     }
-    /**
-     * @param {Window} rootWindow
-     * @param {number} intervalId
-     */
     function applyReload(rootWindow, intervalId) {
         clearInterval(intervalId);
         log.info('App updated. Reloading...');
@@ -268,8 +226,6 @@ var ansiRegex = new RegExp([
  * Adapted from code originally released by Sindre Sorhus
  * Licensed the MIT License
  *
- * @param {string} string
- * @return {string}
  */
 var stripAnsi = function (string) {
     if (typeof string !== 'string') {
@@ -298,9 +254,6 @@ var onSocketMessage = {
         }
         sendMessage('Invalid');
     },
-    /**
-     * @param {string | undefined} hash
-     */
     hash: function hash(_hash) {
         if (!_hash) {
             return;
@@ -309,9 +262,6 @@ var onSocketMessage = {
         status.currentHash = _hash;
     },
     logging: setAllLogLevel,
-    /**
-     * @param {boolean} value
-     */
     overlay: function (value) {
         if (typeof document === 'undefined') {
             return;
@@ -319,24 +269,15 @@ var onSocketMessage = {
         options.overlay = value;
         decodeOverlayOptions(options.overlay);
     },
-    /**
-     * @param {number} value
-     */
     reconnect: function (value) {
         if (parsedResourceQuery.reconnect === 'false') {
             return;
         }
         options.reconnect = value;
     },
-    /**
-     * @param {boolean} value
-     */
     progress: function (value) {
         options.progress = value;
     },
-    /**
-     * @param {{ pluginName?: string, percent: number, msg: string }} data
-     */
     'progress-update': function progressUpdate(data) {
         if (options.progress) {
             log.info("".concat(data.pluginName ? "[".concat(data.pluginName, "] ") : '').concat(data.percent, "% - ").concat(data.msg, "."));
@@ -349,7 +290,7 @@ var onSocketMessage = {
                     progress = document.createElement('wds-progress');
                     document.body.appendChild(progress);
                 }
-                progress.setAttribute('progress', data.percent);
+                progress.setAttribute('progress', data.percent.toString());
                 progress.setAttribute('type', options.progress);
             }
         }
@@ -369,17 +310,10 @@ var onSocketMessage = {
         }
         reloadApp(options, status);
     },
-    /**
-     * @param {string} file
-     */
     'static-changed': function staticChanged(file) {
         log.info("".concat(file ? "\"".concat(file, "\"") : 'Content', " from static directory was changed. Reloading..."));
         self.location.reload();
     },
-    /**
-     * @param {Error[]} warnings
-     * @param {any} params
-     */
     warnings: function (warnings, params) {
         log.warn('Warnings while compiling.');
         var printableWarnings = warnings.map(function (error) {
@@ -410,9 +344,6 @@ var onSocketMessage = {
         }
         reloadApp(options, status);
     },
-    /**
-     * @param {Error[]} errors
-     */
     errors: function (errors) {
         log.error('Errors while compiling. Reload prevented.');
         var printableErrors = errors.map(function (error) {
@@ -439,9 +370,6 @@ var onSocketMessage = {
             }
         }
     },
-    /**
-     * @param {Error} error
-     */
     error: function (error) {
         log.error(error);
     },
@@ -453,10 +381,6 @@ var onSocketMessage = {
         sendMessage('Close');
     },
 };
-/**
- * @param {{ protocol?: string, auth?: string, hostname?: string, port?: string, pathname?: string, search?: string, hash?: string, slashes?: boolean }} objURL
- * @returns {string}
- */
 var formatURL = function (objURL) {
     var protocol = objURL.protocol || '';
     if (protocol && protocol.substr(-1) !== ':') {
@@ -497,19 +421,12 @@ var formatURL = function (objURL) {
     if (hash && hash.charAt(0) !== '#') {
         hash = "#".concat(hash);
     }
-    pathname = pathname.replace(/[?#]/g, 
-    /**
-     * @param {string} match
-     * @returns {string}
-     */
-    function (match) { return encodeURIComponent(match); });
+    pathname = pathname.replace(/[?#]/g, function (match) {
+        return encodeURIComponent(match);
+    });
     search = search.replace('#', '%23');
     return "".concat(protocol).concat(host).concat(pathname).concat(search).concat(hash);
 };
-/**
- * @param {URL & { fromCurrentScript?: boolean }} parsedURL
- * @returns {string}
- */
 var createSocketURL = function (parsedURL) {
     var hostname = parsedURL.hostname;
     // Node.js module parses it as `::`