@qse/edu-scripts 0.0.0-beta.5 → 0.0.0-beta.7

package/asset/rspack-dev-server-client.js

@@ -0,0 +1,534 @@
+/**
+ * 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++) {
+          s = arguments[i]
+          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]
+        }
+        return t
+      }
+    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'
+/* Rspack dev server runtime client */
+// @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 '@rspack/dev-server/client/overlay.js'
+import socket from '@rspack/dev-server/client/socket.js'
+import { defineProgressElement, isProgressSupported } from '@rspack/dev-server/client/progress.js'
+import { log, setLogLevel } from '@rspack/dev-server/client/utils/log.js'
+import sendMessage from '@rspack/dev-server/client/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])
+        overlayOptions[property] = new Function(
+          'message',
+          'var callback = '.concat(
+            overlayFilterFunctionString,
+            '\n\t\t\t\treturn callback(message)'
+          )
+        )
+      }
+    })
+  }
+}
+var parseURL = function (resourceQuery) {
+  var result = {}
+  if (typeof resourceQuery === 'string' && resourceQuery !== '') {
+    var searchParams = resourceQuery.slice(1).split('&')
+    for (var i = 0; i < searchParams.length; i++) {
+      var pair = searchParams[i].split('=')
+      result[pair[0]] = decodeURIComponent(pair[1])
+    }
+  } else {
+    // Else, get the url from the <script> this file was called with.
+    var scriptSource = getCurrentScriptSource()
+    var scriptSourceURL = void 0
+    try {
+      // The placeholder `baseURL` with `window.location.href`,
+      // is to allow parsing of path-relative or protocol-relative URLs,
+      // and will have no effect if `scriptSource` is a fully valid URL.
+      scriptSourceURL = new URL(scriptSource, self.location.href)
+    } catch (error) {
+      // URL parsing failed, do nothing.
+      // We will still proceed to see if we can recover using `resourceQuery`
+    }
+    if (scriptSourceURL) {
+      result = scriptSourceURL
+      result['fromCurrentScript'] = 'true'
+    }
+  }
+  return result
+}
+var status = {
+  isUnloading: false,
+  currentHash: __webpack_hash__,
+}
+var getCurrentScriptSource = function () {
+  // `document.currentScript` is the most accurate way to find the current script,
+  // but is not supported in all browsers.
+  if (document.currentScript) {
+    return document.currentScript.getAttribute('src')
+  }
+  // Fallback to getting all scripts running in the document.
+  var scriptElements = document.scripts || []
+  var scriptElementsWithSrc = Array.prototype.filter.call(scriptElements, function (element) {
+    return element.getAttribute('src')
+  })
+  if (scriptElementsWithSrc.length > 0) {
+    var currentScript = scriptElementsWithSrc[scriptElementsWithSrc.length - 1]
+    return currentScript.getAttribute('src')
+  }
+  // Fail as there was no script to use.
+  throw new Error('[webpack-dev-server] Failed to get current script source.')
+}
+var parsedResourceQuery = parseURL(__resourceQuery)
+var enabledFeatures = {
+  'Hot Module Replacement': false,
+  'Live Reloading': false,
+  Progress: false,
+  Overlay: false,
+}
+var options = {
+  hot: false,
+  liveReload: false,
+  progress: false,
+  overlay: false,
+}
+if (parsedResourceQuery.hot === 'true') {
+  options.hot = true
+  enabledFeatures['Hot Module Replacement'] = true
+}
+if (parsedResourceQuery['live-reload'] === 'true') {
+  options.liveReload = true
+  enabledFeatures['Live Reloading'] = true
+}
+if (parsedResourceQuery.progress === 'true') {
+  options.progress = true
+  enabledFeatures.Progress = true
+}
+if (parsedResourceQuery.overlay) {
+  try {
+    options.overlay = JSON.parse(parsedResourceQuery.overlay)
+  } catch (e) {
+    log.error('Error parsing overlay options from resource query:', e)
+  }
+  // Fill in default "true" params for partially-specified objects.
+  if (typeof options.overlay === 'object') {
+    options.overlay = __assign(
+      { errors: true, warnings: true, runtimeErrors: true },
+      options.overlay
+    )
+    decodeOverlayOptions(options.overlay)
+  }
+  enabledFeatures.Overlay = options.overlay !== false
+}
+if (parsedResourceQuery.logging) {
+  options.logging = parsedResourceQuery.logging
+}
+if (typeof parsedResourceQuery.reconnect !== 'undefined') {
+  options.reconnect = Number(parsedResourceQuery.reconnect)
+}
+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)
+  setLogLevel(level)
+}
+if (options.logging) {
+  setAllLogLevel(options.logging)
+}
+var logEnabledFeatures = function (features) {
+  var listEnabledFeatures = Object.keys(features)
+  if (!features || listEnabledFeatures.length === 0) {
+    return
+  }
+  var logString = 'Server started:'
+  // Server started: Hot Module Replacement enabled, Live Reloading enabled, Overlay disabled.
+  for (var i = 0; i < listEnabledFeatures.length; i++) {
+    var key = listEnabledFeatures[i]
+    logString += ' '.concat(key, ' ').concat(features[key] ? 'enabled' : 'disabled', ',')
+  }
+  // replace last comma with a period
+  logString = logString.slice(0, -1).concat('.')
+  log.info(logString)
+}
+logEnabledFeatures(enabledFeatures)
+self.addEventListener('beforeunload', function () {
+  status.isUnloading = true
+})
+var overlay =
+  typeof window !== 'undefined'
+    ? createOverlay(
+        typeof options.overlay === 'object'
+          ? {
+              trustedTypesPolicyName: options.overlay.trustedTypesPolicyName,
+              catchRuntimeError: options.overlay.runtimeErrors,
+            }
+          : {
+              trustedTypesPolicyName: false,
+              catchRuntimeError: options.overlay,
+            }
+      )
+    : { send: function () {} }
+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(previousHash) >= 0
+  if (isInitial) {
+    return
+  }
+  function applyReload(rootWindow, intervalId) {
+    clearInterval(intervalId)
+    log.info('App updated. Reloading...')
+    rootWindow.location.reload()
+  }
+  var search = self.location.search.toLowerCase()
+  var allowToHot = search.indexOf('webpack-dev-server-hot=false') === -1
+  var allowToLiveReload = search.indexOf('webpack-dev-server-live-reload=false') === -1
+  if (hot && allowToHot) {
+    log.info('App hot update...')
+    hotEmitter.emit('webpackHotUpdate', currentStatus.currentHash)
+    if (typeof self !== 'undefined' && self.window) {
+      // broadcast update to window
+      self.postMessage('webpackHotUpdate'.concat(currentStatus.currentHash), '*')
+    }
+  }
+  // allow refreshing the page only if liveReload isn't disabled
+  else if (liveReload && allowToLiveReload) {
+    var rootWindow_1 = self
+    // use parent window for reload (in case we're in an iframe with no valid src)
+    var intervalId_1 = self.setInterval(function () {
+      if (rootWindow_1.location.protocol !== 'about:') {
+        // reload immediately if protocol is valid
+        applyReload(rootWindow_1, intervalId_1)
+      } else {
+        rootWindow_1 = rootWindow_1.parent
+        if (rootWindow_1.parent === rootWindow_1) {
+          // if parent equals current window we've reached the root which would continue forever, so trigger a reload anyways
+          applyReload(rootWindow_1, intervalId_1)
+        }
+      }
+    })
+  }
+}
+var ansiRegex = new RegExp(
+  [
+    '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+    '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))',
+  ].join('|'),
+  'g'
+)
+/**
+ *
+ * Strip [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) from a string.
+ * Adapted from code originally released by Sindre Sorhus
+ * Licensed the MIT License
+ *
+ */
+var stripAnsi = function (string) {
+  if (typeof string !== 'string') {
+    throw new TypeError('Expected a `string`, got `'.concat(typeof string, '`'))
+  }
+  return string.replace(ansiRegex, '')
+}
+var onSocketMessage = {
+  hot: function () {
+    if (parsedResourceQuery.hot === 'false') {
+      return
+    }
+    options.hot = true
+  },
+  liveReload: function () {
+    if (parsedResourceQuery['live-reload'] === 'false') {
+      return
+    }
+    options.liveReload = true
+  },
+  invalid: function () {
+    log.info('App updated. Recompiling...')
+    // Fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
+    if (options.overlay) {
+      overlay.send({ type: 'DISMISS' })
+    }
+    sendMessage('Invalid')
+  },
+  hash: function hash(_hash) {
+    if (!_hash) {
+      return
+    }
+    status.previousHash = status.currentHash
+    status.currentHash = _hash
+  },
+  logging: setAllLogLevel,
+  overlay: function (value) {
+    if (typeof document === 'undefined') {
+      return
+    }
+    options.overlay = value
+    decodeOverlayOptions(options.overlay)
+  },
+  reconnect: function (value) {
+    if (parsedResourceQuery.reconnect === 'false') {
+      return
+    }
+    options.reconnect = value
+  },
+  progress: function (value) {
+    options.progress = value
+  },
+  'progress-update': function progressUpdate(data) {
+    if (options.progress) {
+      log.info(
+        ''
+          .concat(data.pluginName ? '['.concat(data.pluginName, '] ') : '')
+          .concat(data.percent, '% - ')
+          .concat(data.msg, '.')
+      )
+    }
+    if (isProgressSupported()) {
+      if (typeof options.progress === 'string') {
+        var progress = document.querySelector('wds-progress')
+        if (!progress) {
+          defineProgressElement()
+          progress = document.createElement('wds-progress')
+          document.body.appendChild(progress)
+        }
+        progress.setAttribute('progress', data.percent.toString())
+        progress.setAttribute('type', options.progress)
+      }
+    }
+    sendMessage('Progress', data)
+  },
+  'still-ok': function stillOk() {
+    log.info('Nothing changed.')
+    if (options.overlay) {
+      overlay.send({ type: 'DISMISS' })
+    }
+    sendMessage('StillOk')
+  },
+  ok: function () {
+    sendMessage('Ok')
+    if (options.overlay) {
+      overlay.send({ type: 'DISMISS' })
+    }
+    reloadApp(options, status)
+  },
+  'static-changed': function staticChanged(file) {
+    log.info(
+      ''.concat(
+        file ? '"'.concat(file, '"') : 'Content',
+        ' from static directory was changed. Reloading...'
+      )
+    )
+    self.location.reload()
+  },
+  warnings: function (warnings, params) {
+    log.warn('Warnings while compiling.')
+    var printableWarnings = warnings.map(function (error) {
+      var _a = formatProblem('warning', error),
+        header = _a.header,
+        body = _a.body
+      return ''.concat(header, '\n').concat(stripAnsi(body))
+    })
+    sendMessage('Warnings', printableWarnings)
+    for (var i = 0; i < printableWarnings.length; i++) {
+      log.warn(printableWarnings[i])
+    }
+    var overlayWarningsSetting =
+      typeof options.overlay === 'boolean'
+        ? options.overlay
+        : options.overlay && options.overlay.warnings
+    if (overlayWarningsSetting) {
+      var warningsToDisplay =
+        typeof overlayWarningsSetting === 'function'
+          ? warnings.filter(overlayWarningsSetting)
+          : warnings
+      if (warningsToDisplay.length) {
+        overlay.send({
+          type: 'BUILD_ERROR',
+          level: 'warning',
+          messages: warnings,
+        })
+      }
+    }
+    if (params && params.preventReloading) {
+      return
+    }
+    reloadApp(options, status)
+  },
+  errors: function (errors) {
+    log.error('Errors while compiling. Reload prevented.')
+    var printableErrors = errors.map(function (error) {
+      var _a = formatProblem('error', error),
+        header = _a.header,
+        body = _a.body
+      return ''.concat(header, '\n').concat(stripAnsi(body))
+    })
+    sendMessage('Errors', printableErrors)
+    for (var i = 0; i < printableErrors.length; i++) {
+      log.error(printableErrors[i])
+    }
+    var overlayErrorsSettings =
+      typeof options.overlay === 'boolean'
+        ? options.overlay
+        : options.overlay && options.overlay.errors
+    if (overlayErrorsSettings) {
+      var errorsToDisplay =
+        typeof overlayErrorsSettings === 'function' ? errors.filter(overlayErrorsSettings) : errors
+      if (errorsToDisplay.length) {
+        overlay.send({
+          type: 'BUILD_ERROR',
+          level: 'error',
+          messages: errors,
+        })
+      }
+    }
+  },
+  error: function (error) {
+    log.error(error)
+  },
+  close: function () {
+    log.info('Disconnected!')
+    if (options.overlay) {
+      overlay.send({ type: 'DISMISS' })
+    }
+    sendMessage('Close')
+  },
+}
+var formatURL = function (objURL) {
+  var protocol = objURL.protocol || ''
+  if (protocol && protocol.substr(-1) !== ':') {
+    protocol += ':'
+  }
+  var auth = objURL.auth || ''
+  if (auth) {
+    auth = encodeURIComponent(auth)
+    auth = auth.replace(/%3A/i, ':')
+    auth += '@'
+  }
+  var host = ''
+  if (objURL.hostname) {
+    host =
+      auth +
+      (objURL.hostname.indexOf(':') === -1 ? objURL.hostname : '['.concat(objURL.hostname, ']'))
+    if (objURL.port) {
+      host += ':'.concat(objURL.port)
+    }
+  }
+  var pathname = objURL.pathname || ''
+  if (objURL.slashes) {
+    host = '//'.concat(host || '')
+    if (pathname && pathname.charAt(0) !== '/') {
+      pathname = '/'.concat(pathname)
+    }
+  } else if (!host) {
+    host = ''
+  }
+  var search = objURL.search || ''
+  if (search && search.charAt(0) !== '?') {
+    search = '?'.concat(search)
+  }
+  var hash = objURL.hash || ''
+  if (hash && hash.charAt(0) !== '#') {
+    hash = '#'.concat(hash)
+  }
+  pathname = pathname.replace(/[?#]/g, function (match) {
+    return encodeURIComponent(match)
+  })
+  search = search.replace('#', '%23')
+  return ''.concat(protocol).concat(host).concat(pathname).concat(search).concat(hash)
+}
+var createSocketURL = function (parsedURL) {
+  var hostname = parsedURL.hostname
+  // Node.js module parses it as `::`
+  // `new URL(urlString, [baseURLString])` parses it as '[::]'
+  var isInAddrAny = hostname === '0.0.0.0' || hostname === '::' || hostname === '[::]'
+  // why do we need this check?
+  // hostname n/a for file protocol (example, when using electron, ionic)
+  // see: https://github.com/webpack/webpack-dev-server/pull/384
+  if (isInAddrAny && self.location.hostname && self.location.protocol.indexOf('http') === 0) {
+    hostname = self.location.hostname
+  }
+  var socketURLProtocol = parsedURL.protocol || self.location.protocol
+  // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
+  if (
+    socketURLProtocol === 'auto:' ||
+    (hostname && isInAddrAny && self.location.protocol === 'https:')
+  ) {
+    socketURLProtocol = self.location.protocol
+  }
+  socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, 'ws')
+  var socketURLAuth = ''
+  // `new URL(urlString, [baseURLstring])` doesn't have `auth` property
+  // Parse authentication credentials in case we need them
+  if (parsedURL.username) {
+    socketURLAuth = parsedURL.username
+    // Since HTTP basic authentication does not allow empty username,
+    // we only include password if the username is not empty.
+    if (parsedURL.password) {
+      // Result: <username>:<password>
+      socketURLAuth = socketURLAuth.concat(':', parsedURL.password)
+    }
+  }
+  // In case the host is a raw IPv6 address, it can be enclosed in
+  // the brackets as the brackets are needed in the final URL string.
+  // Need to remove those as url.format blindly adds its own set of brackets
+  // if the host string contains colons. That would lead to non-working
+  // double brackets (e.g. [[::]]) host
+  //
+  // All of these web socket url params are optionally passed in through resourceQuery,
+  // so we need to fall back to the default if they are not provided
+  var socketURLHostname = (hostname || self.location.hostname || 'localhost').replace(
+    /^\[(.*)\]$/,
+    '$1'
+  )
+  var socketURLPort = parsedURL.port
+  if (!socketURLPort || socketURLPort === '0') {
+    socketURLPort = self.location.port
+  }
+  // If path is provided it'll be passed in via the resourceQuery as a
+  // query param so it has to be parsed out of the querystring in order for the
+  // client to open the socket to the correct location.
+  var socketURLPathname = '/ws'
+  if (parsedURL.pathname && !parsedURL.fromCurrentScript) {
+    socketURLPathname = parsedURL.pathname
+
+    if (hostname.indexOf('zhidianbao.cn') > -1 || hostname.indexOf('qsban.cn') > -1) {
+      var ctx = self.location.pathname.split('/')[1]
+      if (ctx) {
+        socketURLPathname = '/' + ctx + socketURLPathname
+      }
+    }
+  }
+  return formatURL({
+    protocol: socketURLProtocol,
+    auth: socketURLAuth,
+    hostname: socketURLHostname,
+    port: socketURLPort,
+    pathname: socketURLPathname,
+    slashes: true,
+  })
+}
+var socketURL = createSocketURL(parsedResourceQuery)
+socket(socketURL, onSocketMessage, options.reconnect)
+export { getCurrentScriptSource, parseURL, createSocketURL }

package/dist/cli.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
+import "@swc-node/register/esm-register";
 import fs from "fs-extra";
 import path from "path";
 import { globby, globbySync } from "globby";
@@ -58,9 +59,8 @@ const paths = {
 	jsconfig: resolveApp("jsconfig.json"),
 	package: resolveApp("package.json"),
 	tailwind: resolveApp("tailwind.config.js"),
-	indexJS: resolveApp("src", "index.js"),
 	pages: resolveApp("src", "pages"),
-	override: resolveApp("edu-scripts.override.js"),
+	override: getExistPath(resolveApp("edu-scripts.override.js"), resolveApp("edu-scripts.override.ts")),
 	indexHTML: globbySync("./public/*.html", { absolute: true }),
 	src: resolveApp("src"),
 	public: resolveApp("public"),
@@ -453,8 +453,9 @@ function getWebpackConfig(args, override) {
 		].filter(Boolean) }] },
 		plugins: [
 			qseCDN.isUseCommon && new rspack.DllReferencePlugin({ manifest: fs.readJsonSync(paths.resolveOwn("asset", "dll", "libcommon3-manifest.json")) }),
-			new rspack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
-				if (resource.context.includes("webpack-dev-server")) resource.request = paths.resolveOwn("asset", "ws-utils-createSocketURL.js");
+			new rspack.NormalModuleReplacementPlugin(/@rspack\/dev-server\/client\/index\.js/, (resource) => {
+				const myClientPath = paths.resolveOwn("asset", "rspack-dev-server-client.js");
+				resource.request = resource.request.replace(/.*dev-server\/client\/index\.js/, myClientPath);
 			}),
 			new rspack.IgnorePlugin({
 				resourceRegExp: /^\.\/locale$/,
@@ -533,7 +534,6 @@ function getWebpackConfig(args, override) {
 //#endregion
 //#region src/config/plugins/mock-server/index.ts
 const require$1 = createRequire(import.meta.url);
-const { register } = require$1("@swc-node/register/register");
 let mockCache = {};
 let isSetup = false;
 const setupMock = debounce(function setupMock() {
@@ -628,7 +628,6 @@ const mockMiddlewave = function mockMiddlewave(req, res, next) {
 };
 function setupMockServer(middelwaves, _devServer) {
 	if (!fs.existsSync(paths.mock)) return;
-	register();
 	middelwaves.unshift({
 		name: "edu-scripts-mock-middelwave",
 		middleware: mockMiddlewave
@@ -742,6 +741,7 @@ async function start(args) {
 	process.env.BABEL_ENV = "development";
 	process.env.BROWSERSLIST = "chrome >= 70";
 	process.env.WEBPACK_DEV_SERVER_BASE_PORT = "3000";
+	process.env.BROWSERSLIST_IGNORE_OLD_DATA = "true";
 	const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT;
 	const port = await RspackDevServer.getFreePort(args.port || process.env.PORT);
 	if (!(args.port || process.env.PORT) && +port !== +basePort) console.log(chalk.bgYellow(`${basePort} 端口已被占用，现切换到 ${port} 端口运行`));
@@ -865,6 +865,7 @@ async function build(args) {
 	process.env.NODE_ENV = "production";
 	process.env.BABEL_ENV = "production";
 	process.env.BROWSERSLIST = ">0.2%, iOS>=9, ie 11, chrome>=49, not op_mini all";
+	process.env.BROWSERSLIST_IGNORE_OLD_DATA = "true";
 	if (args.analyze) process.env.ANALYZE = "1";
 	if (args.outputHtml) process.env.OUTPUT_HTML = "1";
 	const previousSizeMap = await measureFileSizesBeforeBuild(paths.dist);
@@ -1034,7 +1035,7 @@ async function normalDeploy(args) {
 				try {
 					await sftp.fastGet(remoteLogFile, tmpLogFile);
 					content = await fs.readFile(tmpLogFile, "utf-8");
-				} catch (_error) {}
+				} catch {}
 				content = updateLogContent(content, info);
 				await fs.writeFile(tmpLogFile, content);
 				await sftp.fastPut(tmpLogFile, remoteLogFile);
@@ -1302,7 +1303,7 @@ function copyDistToRepo(info) {
 	exec(`svn co ${info.distBranchDirURL} ${tmpdir}`);
 	try {
 		exec(`svn rm * --force -q`, { cwd: tmpdir });
-	} catch (_e) {}
+	} catch {}
 	fs.copySync(paths.dist, tmpdir);
 	exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir });
 	exec(`svn ci -m "${`[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`}"`, { cwd: tmpdir });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "0.0.0-beta.5",
+  "version": "0.0.0-beta.7",
   "author": "Kinoko",
   "license": "MIT",
   "type": "module",
@@ -35,7 +35,7 @@
   "typings": "dist/index.d.mts",
   "dependencies": {
     "@babel/core": "~7.29.0",
-    "@qse/ssh-sftp": "^1.2.0",
+    "@qse/ssh-sftp": "^1.3.0",
     "@rsdoctor/rspack-plugin": "^1.5.2",
     "@rspack/core": "^1.7.6",
     "@rspack/dev-server": "^1.2.1",

package/src/build.ts

@@ -18,6 +18,7 @@ export default async function build(args: BuildArgs) {
   process.env.NODE_ENV = 'production'
   process.env.BABEL_ENV = 'production'
   process.env.BROWSERSLIST = '>0.2%, iOS>=9, ie 11, chrome>=49, not op_mini all'
+  process.env.BROWSERSLIST_IGNORE_OLD_DATA = 'true'
 
   if (args.analyze) {
     process.env.ANALYZE = '1'

package/src/cli.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import '@swc-node/register/esm-register'
 import './utils/beforeStart'
 
 import fs from 'fs-extra'

package/src/commit-dist.ts

@@ -61,10 +61,7 @@ function copyDistToRepo(info: WorkingCopyInfo) {
 
   try {
     exec(`svn rm * --force -q`, { cwd: tmpdir })
-  } catch (_e:any) {
-    // 如果目录为空，svn rm 会报错，忽略即可
-  }
-
+  } catch {}
   fs.copySync(paths.dist, tmpdir)
 
   exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir })

package/src/config/paths.ts

@@ -40,9 +40,8 @@ const paths = {
   jsconfig: resolveApp('jsconfig.json'),
   package: resolveApp('package.json'),
   tailwind: resolveApp('tailwind.config.js'),
-  indexJS: resolveApp('src', 'index.js'),
   pages: resolveApp('src', 'pages'),
-  override: resolveApp('edu-scripts.override.js'),
+  override: getExistPath(resolveApp('edu-scripts.override.js'), resolveApp('edu-scripts.override.ts')),
   indexHTML: globbySync('./public/*.html', { absolute: true }),
   src: resolveApp('src'),
   public: resolveApp('public'),

package/src/config/plugins/mock-server/index.ts

@@ -11,7 +11,6 @@ import { pathToRegexp, type Key } from 'path-to-regexp'
 import { createRequire } from 'node:module'
 import { resolveModule } from '@/utils/resolveModule'
 const require = createRequire(import.meta.url)
-const { register } = require('@swc-node/register/register')
 
 let mockCache: Record<string, { handler: any; method: string; path: string }> = {}
 let isSetup = false
@@ -129,8 +128,6 @@ type Middlewares = Parameters<
 function setupMockServer(middelwaves: Middlewares, _devServer: any) {
   if (!fs.existsSync(paths.mock)) return
 
-  register()
-
   middelwaves.unshift({
     name: 'edu-scripts-mock-middelwave',
     middleware: mockMiddlewave as any,

package/src/config/webpackConfig.ts

@@ -398,11 +398,13 @@ export default function getWebpackConfig(args: any, override: CustomConfiguratio
         new rspack.DllReferencePlugin({
           manifest: fs.readJsonSync(paths.resolveOwn('asset', 'dll', 'libcommon3-manifest.json')),
         }),
-      new rspack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
-        if (resource.context.includes('webpack-dev-server')) {
-          resource.request = paths.resolveOwn('asset', 'ws-utils-createSocketURL.js')
+      new rspack.NormalModuleReplacementPlugin(
+        /@rspack\/dev-server\/client\/index\.js/,
+        (resource) => {
+          const myClientPath = paths.resolveOwn('asset', 'rspack-dev-server-client.js')
+          resource.request = resource.request.replace(/.*dev-server\/client\/index\.js/, myClientPath)
         }
-      }),
+      ),
       new rspack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,

package/src/deploy.ts

@@ -96,7 +96,7 @@ async function normalDeploy(args: DeployArgs) {
         try {
           await sftp.fastGet(remoteLogFile, tmpLogFile)
           content = await fs.readFile(tmpLogFile, 'utf-8')
-        } catch (_error: any) {}
+        } catch {}
         content = updateLogContent(content, info)
         await fs.writeFile(tmpLogFile, content)
         await sftp.fastPut(tmpLogFile, remoteLogFile)

package/src/start.ts

@@ -11,6 +11,7 @@ export default async function start(args: StartArgs) {
   process.env.BABEL_ENV = 'development'
   process.env.BROWSERSLIST = 'chrome >= 70'
   process.env.WEBPACK_DEV_SERVER_BASE_PORT = '3000'
+  process.env.BROWSERSLIST_IGNORE_OLD_DATA = 'true'
 
   const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT
   // @ts-ignore
@@ -24,15 +25,15 @@ export default async function start(args: StartArgs) {
   const config = getConfig(args)
   const compiler = rspack(config)
   const middleware = rspack.lazyCompilationMiddleware(compiler)
-  const oldSetupMiddlewares = config.devServer.setupMiddlewares
-  config.devServer.setupMiddlewares = (middlewares: any, devServer: any) => {
+  const oldSetupMiddlewares = config.devServer!.setupMiddlewares
+  config.devServer!.setupMiddlewares = (middlewares: any, devServer: any) => {
     if (oldSetupMiddlewares) {
       middlewares = oldSetupMiddlewares(middlewares, devServer)
     }
     middlewares.unshift(middleware)
     return middlewares
   }
-  const devServer = new RspackDevServer(config.devServer, compiler)
+  const devServer = new RspackDevServer(config.devServer!, compiler)
   devServer.start()
   ;['SIGINT', 'SIGTERM'].forEach(function (sig) {
     process.on(sig, function () {

package/src/utils/FileSizeReporter.ts

@@ -13,17 +13,15 @@ import filesize from 'filesize'
 import recursive from 'recursive-readdir'
 import stripAnsi from 'strip-ansi'
 import { gzipSizeSync } from 'gzip-size'
+import type { Stats } from '@rspack/core'
 
 interface SizeMap {
   root: string
   sizes: Record<string, number>
 }
 
-interface WebpackStats {
-  stats?: WebpackStats[]
-  toJson: (options: { all: boolean; assets: boolean }) => {
-    assets: Array<{ name: string }>
-  }
+interface WebpackStats extends Stats {
+  stats?: Stats[]
 }
 
 function canReadAsset(asset: string): boolean {
@@ -48,7 +46,7 @@ function printFileSizesAfterBuild(
     .map((stats) =>
       stats
         .toJson({ all: false, assets: true })
-        .assets.filter((asset) => canReadAsset(asset.name))
+        .assets!.filter((asset) => canReadAsset(asset.name))
         .map((asset) => {
           const fileContents = fs.readFileSync(path.join(root, asset.name))
           const size = gzipSizeSync(fileContents)
@@ -143,12 +141,15 @@ function measureFileSizesBeforeBuild(buildFolder: string): Promise<SizeMap> {
     recursive(buildFolder, (err: any, fileNames: any) => {
       let sizes: Record<string, number> | undefined
       if (!err && fileNames) {
-        sizes = fileNames.filter(canReadAsset).reduce((memo: any, fileName: any) => {
-          const contents = fs.readFileSync(fileName)
-          const key = removeFileNameHash(buildFolder, fileName)
-          memo[key] = gzipSizeSync(contents)
-          return memo
-        }, {} as Record<string, number>)
+        sizes = fileNames.filter(canReadAsset).reduce(
+          (memo: any, fileName: any) => {
+            const contents = fs.readFileSync(fileName)
+            const key = removeFileNameHash(buildFolder, fileName)
+            memo[key] = gzipSizeSync(contents)
+            return memo
+          },
+          {} as Record<string, number>
+        )
       }
       resolve({
         root: buildFolder,

package/asset/ws-utils-createSocketURL.js

@@ -1,140 +0,0 @@
-/* eslint-disable no-restricted-globals */
-
-/**
- * @param {{ protocol?: string, auth?: string, hostname?: string, port?: string, pathname?: string, search?: string, hash?: string, slashes?: boolean }} objURL
- * @returns {string}
- */
-function format(objURL) {
-  var protocol = objURL.protocol || ''
-  if (protocol && protocol.substr(-1) !== ':') {
-    protocol += ':'
-  }
-  var auth = objURL.auth || ''
-  if (auth) {
-    auth = encodeURIComponent(auth)
-    auth = auth.replace(/%3A/i, ':')
-    auth += '@'
-  }
-  var host = ''
-  if (objURL.hostname) {
-    host =
-      auth +
-      (objURL.hostname.indexOf(':') === -1 ? objURL.hostname : '['.concat(objURL.hostname, ']'))
-    if (objURL.port) {
-      host += ':'.concat(objURL.port)
-    }
-  }
-  var pathname = objURL.pathname || ''
-  if (objURL.slashes) {
-    host = '//'.concat(host || '')
-    if (pathname && pathname.charAt(0) !== '/') {
-      pathname = '/'.concat(pathname)
-    }
-  } else if (!host) {
-    host = ''
-  }
-  var search = objURL.search || ''
-  if (search && search.charAt(0) !== '?') {
-    search = '?'.concat(search)
-  }
-  var hash = objURL.hash || ''
-  if (hash && hash.charAt(0) !== '#') {
-    hash = '#'.concat(hash)
-  }
-  pathname = pathname.replace(
-    /[?#]/g,
-    /**
-     * @param {string} match
-     * @returns {string}
-     */
-    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}
- */
-function createSocketURL(parsedURL) {
-  var hostname = parsedURL.hostname
-
-  // Node.js module parses it as `::`
-  // `new URL(urlString, [baseURLString])` parses it as '[::]'
-  var isInAddrAny = hostname === '0.0.0.0' || hostname === '::' || hostname === '[::]'
-
-  // why do we need this check?
-  // hostname n/a for file protocol (example, when using electron, ionic)
-  // see: https://github.com/webpack/webpack-dev-server/pull/384
-  if (isInAddrAny && self.location.hostname && self.location.protocol.indexOf('http') === 0) {
-    hostname = self.location.hostname
-  }
-  var socketURLProtocol = parsedURL.protocol || self.location.protocol
-
-  // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
-  if (
-    socketURLProtocol === 'auto:' ||
-    (hostname && isInAddrAny && self.location.protocol === 'https:')
-  ) {
-    socketURLProtocol = self.location.protocol
-  }
-  socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, 'ws')
-  var socketURLAuth = ''
-
-  // `new URL(urlString, [baseURLstring])` doesn't have `auth` property
-  // Parse authentication credentials in case we need them
-  if (parsedURL.username) {
-    socketURLAuth = parsedURL.username
-
-    // Since HTTP basic authentication does not allow empty username,
-    // we only include password if the username is not empty.
-    if (parsedURL.password) {
-      // Result: <username>:<password>
-      socketURLAuth = socketURLAuth.concat(':', parsedURL.password)
-    }
-  }
-
-  // In case the host is a raw IPv6 address, it can be enclosed in
-  // the brackets as the brackets are needed in the final URL string.
-  // Need to remove those as url.format blindly adds its own set of brackets
-  // if the host string contains colons. That would lead to non-working
-  // double brackets (e.g. [[::]]) host
-  //
-  // All of these web socket url params are optionally passed in through resourceQuery,
-  // so we need to fall back to the default if they are not provided
-  var socketURLHostname = (hostname || self.location.hostname || 'localhost').replace(
-    /^\[(.*)\]$/,
-    '$1'
-  )
-  var socketURLPort = parsedURL.port
-  if (!socketURLPort || socketURLPort === '0') {
-    socketURLPort = self.location.port
-  }
-
-  // If path is provided it'll be passed in via the resourceQuery as a
-  // query param so it has to be parsed out of the querystring in order for the
-  // client to open the socket to the correct location.
-  var socketURLPathname = '/ws'
-  if (parsedURL.pathname && !parsedURL.fromCurrentScript) {
-    socketURLPathname = parsedURL.pathname
-
-    if (hostname.indexOf('zhidianbao.cn') > -1 || hostname.indexOf('qsban.cn') > -1) {
-      var ctx = self.location.pathname.split('/')[1]
-      if (ctx) {
-        socketURLPathname = '/' + ctx + socketURLPathname
-      }
-    }
-  }
-  return format({
-    protocol: socketURLProtocol,
-    auth: socketURLAuth,
-    hostname: socketURLHostname,
-    port: socketURLPort,
-    pathname: socketURLPathname,
-    slashes: true,
-  })
-}
-export default createSocketURL