@qse/edu-scripts 1.14.9 → 1.14.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # 更新日志
 
+## 1.14.11 (2025-05-12)
+
+- feat: 优化热更新能力，适配 v1 环境
+
+## 1.14.10 (2025-05-08)
+
+- feat: 部署增加文曲智阅（钉钉一方化）
+
+## 1.14.9 (2025-05-08)
+
+- feat: 打包时自动增加 webpackChunkName
+
 ## 1.14.8 (2025-02-12)
 
 - fix: 缓存依赖增加 theme.json 文件

package/lib/asset/template/edu-scripts.override.js.tpl

@@ -1,14 +1,7 @@
 const { defineConfig } = require('@qse/edu-scripts')
 
-// if (process.env.NODE_ENV === 'development') {
-//   process.env.BROWSERSLIST = 'ie 11'
-// }
-
 module.exports = defineConfig({
-  webpack: (config) => {
-    return config
-  },
-  devServer: (config) => {
-    return config
+  startup: ({ logger, chalk }) => {
+    logger.info('本地免登录开发地址:', chalk.cyan(`http://127.0.0.1:${process.env.PORT}/index.html`))
   },
 })

package/lib/cli.js

@@ -37,22 +37,17 @@ require("yargs").usage(`教育工程化 webpack5 基础框架
     desc: "上传到文曲智阅",
     default: false,
     boolean: true
+  }).option("compositionshelves-dingtalk", {
+    alias: "cd",
+    desc: "上传到文曲智阅(钉钉一方化)",
+    default: false,
+    boolean: true
   }),
   (args) => require("./deploy")(args)
 ).command(
   ["generator", "g"],
   "自动生成代码",
   (yargs) => yargs.command(
-    "page",
-    "生成 page 模版, 默认根据环境生成 js/ts 与 less 文件",
-    (yargs2) => yargs2.option("name", { desc: "模块名称", string: true }).demandOption("name", "必须输入模块名称").option("ts", { alias: "t", desc: "生成 ts 文件", boolean: true, default: true }).option("route", {
-      alias: "r",
-      desc: "生成 index.js 路由文件",
-      boolean: true,
-      default: true
-    }).option("fc", { alias: "f", desc: "生成 Function Component 文件", boolean: true }),
-    (args) => require("./generator").page(args)
-  ).command(
     "override",
     "创建 override 文件",
     {},

package/lib/config/plugins/ws-utils-createSocketURL.js

@@ -0,0 +1,118 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/config/plugins/ws-utils-createSocketURL.js
+var ws_utils_createSocketURL_exports = {};
+__export(ws_utils_createSocketURL_exports, {
+  default: () => ws_utils_createSocketURL_default
+});
+module.exports = __toCommonJS(ws_utils_createSocketURL_exports);
+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);
+}
+function createSocketURL(parsedURL) {
+  var hostname = parsedURL.hostname;
+  var isInAddrAny = hostname === "0.0.0.0" || hostname === "::" || hostname === "[::]";
+  if (isInAddrAny && self.location.hostname && self.location.protocol.indexOf("http") === 0) {
+    hostname = self.location.hostname;
+  }
+  var socketURLProtocol = parsedURL.protocol || self.location.protocol;
+  if (socketURLProtocol === "auto:" || hostname && isInAddrAny && self.location.protocol === "https:") {
+    socketURLProtocol = self.location.protocol;
+  }
+  socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, "ws");
+  var socketURLAuth = "";
+  if (parsedURL.username) {
+    socketURLAuth = parsedURL.username;
+    if (parsedURL.password) {
+      socketURLAuth = socketURLAuth.concat(":", parsedURL.password);
+    }
+  }
+  var socketURLHostname = (hostname || self.location.hostname || "localhost").replace(
+    /^\[(.*)\]$/,
+    "$1"
+  );
+  var socketURLPort = parsedURL.port;
+  if (!socketURLPort || socketURLPort === "0") {
+    socketURLPort = self.location.port;
+  }
+  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
+  });
+}
+var ws_utils_createSocketURL_default = createSocketURL;

package/lib/config/webpackConfig.js

@@ -1,3 +1,26 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
 // src/config/webpackConfig.js
 var fs = require("fs");
 var webpack = require("webpack");
@@ -318,6 +341,11 @@ module.exports = function getWebpackConfig(args, override) {
       qseCDN.isUseCommon && new webpack.DllReferencePlugin({
         manifest: require("../asset/dll/libcommon3-manifest.json")
       }),
+      new webpack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
+        if (resource.context.includes("webpack-dev-server")) {
+          resource.request = require.resolve("./plugins/ws-utils-createSocketURL");
+        }
+      }),
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/
@@ -327,8 +355,6 @@ module.exports = function getWebpackConfig(args, override) {
         "process.env.APP_VERSION": JSON.stringify(appPkg.version),
         "process.env.BABEL_ENV": JSON.stringify(process.env.BABEL_ENV),
         "process.env.BROWSERSLIST": JSON.stringify(process.env.BROWSERSLIST),
-        "process.env.WDS_SOCKET_HOST": JSON.stringify(process.env.WDS_SOCKET_HOST),
-        "process.env.WDS_SOCKET_PORT": JSON.stringify(process.env.WDS_SOCKET_PORT),
         ...override.define
       }),
       new webpack.ProgressPlugin(),

package/lib/config/webpackDevServerConfig.js

@@ -3,8 +3,6 @@ var WebpackDevServer = require("webpack-dev-server");
 var setupMockServer = require("./plugins/mock-server");
 module.exports = function getWebpackDevServerConfig(args, override) {
   const host = process.env.HOST || "0.0.0.0";
-  const sockHost = process.env.WDS_SOCKET_HOST;
-  const sockPort = process.env.WDS_SOCKET_PORT;
   const devServer = {
     hot: true,
     allowedHosts: "all",
@@ -13,7 +11,7 @@ module.exports = function getWebpackDevServerConfig(args, override) {
     open: args.open,
     host,
     client: {
-      webSocketURL: { protocol: "auto:", hostname: sockHost, port: sockPort },
+      webSocketURL: "auto://0.0.0.0:0/ws",
       overlay: {
         runtimeErrors: false,
         errors: true,

package/lib/deploy.js

@@ -17,24 +17,6 @@ var baseConfig = {
   noWarn: true
 };
 async function normalDeploy(args) {
-  const presetConfig = {
-    s: {
-      context: "eduwebngv1",
-      folder: "userportal"
-    },
-    b: {
-      context: "eduwebngv1",
-      folder: "bureaupc"
-    },
-    d: {
-      context: "eduwebngv1",
-      folder: "documentshelves"
-    },
-    c: {
-      context: "eduwebngv1",
-      folder: "compositionshelves"
-    }
-  };
   const resolve = (...pathSegments) => path.resolve(process.cwd(), ...pathSegments);
   function getLocalAndRemoteFilePath(remoteFilePath, opts) {
     const splited = remoteFilePath.split("/");
@@ -98,34 +80,37 @@ async function normalDeploy(args) {
       fs.removeSync(tmpBase);
     }
   }
-  const presets = [];
+  const presetConfig = {
+    s: { preset: { context: "eduwebngv1", folder: "userportal" } },
+    b: { preset: { context: "eduwebngv1", folder: "bureaupc" } },
+    d: { preset: { context: "eduwebngv1", folder: "documentshelves" } },
+    c: { preset: { context: "eduwebngv1", folder: "compositionshelves" } },
+    cd: {
+      preset: { server: "19" },
+      remotePath: "/erp/edumaven/dingcorrection-page-dev/compositionshelves"
+    }
+  };
+  const uploadSftpConfigs = [];
   if (args.b) {
-    presets.push(presetConfig.b);
+    uploadSftpConfigs.push(presetConfig.b);
   }
   if (args.s) {
-    presets.push(presetConfig.s);
+    uploadSftpConfigs.push(presetConfig.s);
   }
   if (args.d) {
-    presets.push(presetConfig.d);
+    uploadSftpConfigs.push(presetConfig.d);
   }
   if (args.c) {
-    presets.push(presetConfig.c);
+    uploadSftpConfigs.push(presetConfig.c);
+  }
+  if (args.cd) {
+    uploadSftpConfigs.push(presetConfig.cd);
   }
-  if (presets.length === 0) {
+  if (uploadSftpConfigs.length === 0) {
     console.log(
       `
     ${chalk.red("指定 deploy 部署范围")}
-
-    # 部署代码 校端
-    ${chalk.green("edu-scripts deploy -s")}
-    # 部署代码 局端
-    ${chalk.green("edu-scripts deploy -b")}
-    # 部署代码 公文
-    ${chalk.green("edu-scripts deploy -d")}
-    # 部署代码 文曲智阅
-    ${chalk.green("edu-scripts deploy -c")}
-    # 部署代码 校端 + 局端
-    ${chalk.green("edu-scripts deploy -s -b")}
+    执行 ${chalk.green("npx edu-scripts deploy -h")} 查看具体用法
     `
     );
     process.exit();
@@ -134,8 +119,8 @@ async function normalDeploy(args) {
   if (!appConfig.mainProject) {
     uploadConfig.ignore = [...uploadConfig.ignore, "!(js|images)"];
   }
-  for (const preset of presets) {
-    await upload({ ...uploadConfig, preset });
+  for (const config of uploadSftpConfigs) {
+    await upload({ ...uploadConfig, ...config });
   }
 }
 async function singleDeploy() {

package/lib/generator.js

@@ -1,58 +1,9 @@
 // src/generator.js
 var path = require("path");
 var fs = require("fs-extra");
-var { upperFirst, camelCase, has } = require("lodash");
 var paths = require("./config/paths");
 var chalk = require("chalk");
 var getTmpPath = (...args) => path.resolve(__dirname, "asset", "template", ...args);
-function genFile({ source, target, modulePath, replace }) {
-  let content = fs.readFileSync(source, "utf-8");
-  if (typeof replace === "object") {
-    Object.entries(replace).forEach(([searchValue, replaceValue]) => {
-      content = content.replaceAll(searchValue, replaceValue);
-    });
-  }
-  fs.writeFileSync(path.resolve(modulePath, target), content);
-}
-async function generatorPage(args) {
-  const tmpPath = getTmpPath("page", "index.[type].[ext].tpl");
-  const lessPath = tmpPath.replace("[type].[ext]", "less");
-  const moduleName = camelCase(args.name);
-  const ModuleName = upperFirst(moduleName);
-  const type = args.fc ? "fc" : "class";
-  const ext = fs.existsSync(paths.tsconfig) ? args.ts ? "tsx" : "js" : "js";
-  const jsPath = tmpPath.replace("[type]", type).replace("[ext]", ext);
-  const routePath = tmpPath.replace("index.[type].[ext]", "route.js");
-  const logicPath = tmpPath.replace("index.[type].[ext]", "logic.js");
-  const modulePath = path.resolve(paths.pages, moduleName);
-  const ModuleFileName = args.route ? ModuleName : "index";
-  const ModuleLogicName = args.route ? ModuleName + "Logic" : "logic";
-  const replace = { ModuleName, moduleName, ModuleFileName, ModuleLogicName };
-  fs.ensureDirSync(modulePath);
-  genFile({ source: jsPath, target: `${ModuleFileName}.${ext}`, modulePath, replace });
-  genFile({ source: lessPath, target: `${ModuleFileName}.less`, modulePath, replace });
-  if (type === "class" && ext === "js") {
-    genFile({
-      source: logicPath,
-      target: `${ModuleLogicName}.${ext.slice(0, 2)}`,
-      modulePath,
-      replace
-    });
-  }
-  if (args.route) {
-    genFile({ source: routePath, target: `index.${ext.slice(0, 2)}`, modulePath, replace });
-  }
-  console.log(
-    chalk.green(
-      [
-        `生成完毕:`,
-        `import ${ModuleName} from '@/pages/${moduleName}'`,
-        `const ${ModuleName} = lazy(() => import(/* webpackChunkName: '${moduleName}' */ '@/pages/${moduleName}'))`,
-        `{ path: '/${moduleName}', element: <${ModuleName} /> },`
-      ].join("\n")
-    )
-  );
-}
 async function generatorOverride() {
   if (fs.existsSync(paths.override)) {
     console.log(chalk.red(`文件已存在 ${paths.override}`));
@@ -93,7 +44,6 @@ async function generatorTailwind() {
   );
 }
 module.exports = {
-  page: generatorPage,
   override: generatorOverride,
   ts: generatorTsconfig,
   tailwind: generatorTailwind

package/lib/start.js

@@ -10,14 +10,12 @@ var WebpackDevServer = require("webpack-dev-server");
 var webpack = require("webpack");
 var getConfig = require("./utils/getConfig");
 var chalk = require("chalk");
-process.env.WDS_SOCKET_HOST = WebpackDevServer.internalIPSync("v4") || "127.0.0.1";
 module.exports = async function start(args) {
   const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT;
   const port = await WebpackDevServer.getFreePort(args.port || process.env.PORT);
   if (!(args.port || process.env.PORT) && +port !== +basePort) {
     console.log(chalk.bgYellow(`${basePort} 端口已被占用，现切换到 ${port} 端口运行`));
   }
-  process.env.WDS_SOCKET_PORT = port;
   args.port = port;
   process.env.PORT = port;
   const compiler = webpack(getConfig(args));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.14.9",
+  "version": "1.14.11",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",
@@ -34,63 +34,63 @@
     "extends": "qsb-react"
   },
   "dependencies": {
-    "@babel/core": "~7.24.7",
-    "@babel/plugin-proposal-decorators": "~7.24.7",
-    "@babel/plugin-transform-runtime": "~7.24.7",
-    "@babel/preset-env": "~7.24.7",
-    "@babel/preset-react": "~7.24.7",
-    "@babel/preset-typescript": "~7.24.7",
-    "@babel/register": "~7.24.6",
-    "@babel/runtime": "~7.24.7",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
+    "@babel/core": "~7.26.10",
+    "@babel/plugin-proposal-decorators": "~7.25.9",
+    "@babel/plugin-transform-runtime": "~7.26.10",
+    "@babel/preset-env": "~7.26.9",
+    "@babel/preset-react": "~7.26.3",
+    "@babel/preset-typescript": "~7.27.0",
+    "@babel/register": "~7.25.9",
+    "@babel/runtime": "~7.27.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.16",
     "@qse/ssh-sftp": "^1.0.1",
     "@svgr/webpack": "^8.1.0",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^9.2.1",
     "babel-plugin-import": "^1.13.8",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "css-loader": "^6.11.0",
     "cssnano": "^6.1.2",
-    "debug": "^4.3.5",
+    "debug": "^4.4.0",
     "esbuild-loader": "^2.21.0",
-    "express": "^4.19.2",
+    "express": "^4.21.2",
     "filesize": "^8.0.7",
     "fs-extra": "^10.1.0",
     "globby": "^11.1.0",
     "gzip-size": "^6.0.0",
-    "html-webpack-plugin": "^5.6.0",
+    "html-webpack-plugin": "^5.6.3",
     "image-minimizer-webpack-plugin": "^3.8.3",
     "inquirer": "^8.2.6",
     "less": "^3.13.1",
     "less-loader": "^10.2.0",
     "lodash": "^4.17.21",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.5-lts.2",
     "open": "^8.4.2",
-    "path-to-regexp": "^6.2.2",
-    "postcss": "^8.4.38",
+    "path-to-regexp": "^6.3.0",
+    "postcss": "^8.5.3",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^7.3.4",
     "postcss-momentum-scrolling": "^3.14.22",
     "postcss-normalize": "^8.0.1",
-    "postcss-preset-env": "^9.5.14",
+    "postcss-preset-env": "^9.6.0",
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "^0.4.1",
     "react-refresh": "^0.14.2",
     "recursive-readdir": "^2.2.3",
     "rimraf": "^3.0.2",
-    "semver": "^7.6.2",
+    "semver": "^7.7.1",
     "sharp": "^0.32.6",
     "strip-ansi": "^6.0.1",
     "style-loader": "^3.3.4",
-    "tailwindcss": "^3.4.4",
-    "terser-webpack-plugin": "~5.3.10",
+    "tailwindcss": "^3.4.17",
+    "terser-webpack-plugin": "~5.3.14",
     "tmp": "^0.2.3",
-    "typescript": "^5.4.5",
+    "typescript": "^5.8.3",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.92.0",
+    "webpack": "^5.99.6",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^4.15.2",
     "yargs": "^17.7.2"
@@ -98,10 +98,10 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^28.1.8",
-    "@types/yargs": "^17.0.32",
+    "@types/yargs": "^17.0.33",
     "dumi": "^1.1.54",
     "eslint-config-qsb-react": "^1.1.1",
-    "father": "^4.4.4",
+    "father": "^4.5.2",
     "jest": "^28.1.3"
   }
 }

package/src/asset/template/edu-scripts.override.js.tpl

@@ -1,14 +1,7 @@
 const { defineConfig } = require('@qse/edu-scripts')
 
-// if (process.env.NODE_ENV === 'development') {
-//   process.env.BROWSERSLIST = 'ie 11'
-// }
-
 module.exports = defineConfig({
-  webpack: (config) => {
-    return config
-  },
-  devServer: (config) => {
-    return config
+  startup: ({ logger, chalk }) => {
+    logger.info('本地免登录开发地址:', chalk.cyan(`http://127.0.0.1:${process.env.PORT}/index.html`))
   },
 })

package/src/cli.js

@@ -53,28 +53,17 @@ require('yargs')
           desc: '上传到文曲智阅',
           default: false,
           boolean: true,
+        })
+        .option('compositionshelves-dingtalk', {
+          alias: 'cd',
+          desc: '上传到文曲智阅(钉钉一方化)',
+          default: false,
+          boolean: true,
         }),
     (args) => require('./deploy')(args)
   )
   .command(['generator', 'g'], '自动生成代码', (yargs) =>
     yargs
-      .command(
-        'page',
-        '生成 page 模版, 默认根据环境生成 js/ts 与 less 文件',
-        (yargs) =>
-          yargs
-            .option('name', { desc: '模块名称', string: true })
-            .demandOption('name', '必须输入模块名称')
-            .option('ts', { alias: 't', desc: '生成 ts 文件', boolean: true, default: true })
-            .option('route', {
-              alias: 'r',
-              desc: '生成 index.js 路由文件',
-              boolean: true,
-              default: true,
-            })
-            .option('fc', { alias: 'f', desc: '生成 Function Component 文件', boolean: true }),
-        (args) => require('./generator').page(args)
-      )
       .command('override', '创建 override 文件', {}, (args) =>
         require('./generator').override(args)
       )

package/src/config/plugins/ws-utils-createSocketURL.js

@@ -0,0 +1,140 @@
+/* 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

package/src/config/webpackConfig.js

@@ -340,6 +340,11 @@ module.exports = function getWebpackConfig(args, override) {
         new webpack.DllReferencePlugin({
           manifest: require('../asset/dll/libcommon3-manifest.json'),
         }),
+      new webpack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
+        if (resource.context.includes('webpack-dev-server')) {
+          resource.request = require.resolve('./plugins/ws-utils-createSocketURL')
+        }
+      }),
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,
@@ -349,8 +354,6 @@ module.exports = function getWebpackConfig(args, override) {
         'process.env.APP_VERSION': JSON.stringify(appPkg.version),
         'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV),
         'process.env.BROWSERSLIST': JSON.stringify(process.env.BROWSERSLIST),
-        'process.env.WDS_SOCKET_HOST': JSON.stringify(process.env.WDS_SOCKET_HOST),
-        'process.env.WDS_SOCKET_PORT': JSON.stringify(process.env.WDS_SOCKET_PORT),
         ...override.define,
       }),
       new webpack.ProgressPlugin(),

package/src/config/webpackDevServerConfig.js

@@ -7,8 +7,6 @@ const setupMockServer = require('./plugins/mock-server')
  */
 module.exports = function getWebpackDevServerConfig(args, override) {
   const host = process.env.HOST || '0.0.0.0'
-  const sockHost = process.env.WDS_SOCKET_HOST
-  const sockPort = process.env.WDS_SOCKET_PORT
 
   /** @type {WebpackDevServer.Configuration} */
   const devServer = {
@@ -19,7 +17,7 @@ module.exports = function getWebpackDevServerConfig(args, override) {
     open: args.open,
     host,
     client: {
-      webSocketURL: { protocol: 'auto:', hostname: sockHost, port: sockPort },
+      webSocketURL: 'auto://0.0.0.0:0/ws',
       overlay: {
         runtimeErrors: false,
         errors: true,

package/src/deploy.js

@@ -18,25 +18,6 @@ const baseConfig = {
 }
 
 async function normalDeploy(args) {
-  const presetConfig = {
-    s: {
-      context: 'eduwebngv1',
-      folder: 'userportal',
-    },
-    b: {
-      context: 'eduwebngv1',
-      folder: 'bureaupc',
-    },
-    d: {
-      context: 'eduwebngv1',
-      folder: 'documentshelves',
-    },
-    c: {
-      context: 'eduwebngv1',
-      folder: 'compositionshelves',
-    },
-  }
-
   const resolve = (...pathSegments) => path.resolve(process.cwd(), ...pathSegments)
 
   /**
@@ -128,34 +109,37 @@ async function normalDeploy(args) {
     }
   }
 
-  const presets = []
+  const presetConfig = {
+    s: { preset: { context: 'eduwebngv1', folder: 'userportal' } },
+    b: { preset: { context: 'eduwebngv1', folder: 'bureaupc' } },
+    d: { preset: { context: 'eduwebngv1', folder: 'documentshelves' } },
+    c: { preset: { context: 'eduwebngv1', folder: 'compositionshelves' } },
+    cd: {
+      preset: { server: '19' },
+      remotePath: '/erp/edumaven/dingcorrection-page-dev/compositionshelves',
+    },
+  }
+  const uploadSftpConfigs = []
   if (args.b) {
-    presets.push(presetConfig.b)
+    uploadSftpConfigs.push(presetConfig.b)
   }
   if (args.s) {
-    presets.push(presetConfig.s)
+    uploadSftpConfigs.push(presetConfig.s)
   }
   if (args.d) {
-    presets.push(presetConfig.d)
+    uploadSftpConfigs.push(presetConfig.d)
   }
   if (args.c) {
-    presets.push(presetConfig.c)
+    uploadSftpConfigs.push(presetConfig.c)
+  }
+  if (args.cd) {
+    uploadSftpConfigs.push(presetConfig.cd)
   }
-  if (presets.length === 0) {
+  if (uploadSftpConfigs.length === 0) {
     console.log(
       `
     ${chalk.red('指定 deploy 部署范围')}
-
-    # 部署代码 校端
-    ${chalk.green('edu-scripts deploy -s')}
-    # 部署代码 局端
-    ${chalk.green('edu-scripts deploy -b')}
-    # 部署代码 公文
-    ${chalk.green('edu-scripts deploy -d')}
-    # 部署代码 文曲智阅
-    ${chalk.green('edu-scripts deploy -c')}
-    # 部署代码 校端 + 局端
-    ${chalk.green('edu-scripts deploy -s -b')}
+    执行 ${chalk.green('npx edu-scripts deploy -h')} 查看具体用法
     `
     )
     process.exit()
@@ -166,8 +150,8 @@ async function normalDeploy(args) {
     uploadConfig.ignore = [...uploadConfig.ignore, '!(js|images)']
   }
 
-  for (const preset of presets) {
-    await upload({ ...uploadConfig, preset })
+  for (const config of uploadSftpConfigs) {
+    await upload({ ...uploadConfig, ...config })
   }
 }
 

package/src/generator.js

@@ -1,6 +1,5 @@
 const path = require('path')
 const fs = require('fs-extra')
-const { upperFirst, camelCase, has } = require('lodash')
 const paths = require('./config/paths')
 const chalk = require('chalk')
 
@@ -10,74 +9,6 @@ const chalk = require('chalk')
  */
 const getTmpPath = (...args) => path.resolve(__dirname, 'asset', 'template', ...args)
 
-function genFile({ source, target, modulePath, replace }) {
-  let content = fs.readFileSync(source, 'utf-8')
-
-  if (typeof replace === 'object') {
-    Object.entries(replace).forEach(([searchValue, replaceValue]) => {
-      content = content.replaceAll(searchValue, replaceValue)
-    })
-  }
-
-  fs.writeFileSync(path.resolve(modulePath, target), content)
-}
-
-/**
- * @typedef {Object} PageArgs
- * @property {string} name
- * @property {boolean} [fc=false]
- * @property {boolean} [ts=true]
- * @property {boolean} [route=true]
- *
- * @param {PageArgs} args
- */
-async function generatorPage(args) {
-  const tmpPath = getTmpPath('page', 'index.[type].[ext].tpl')
-  const lessPath = tmpPath.replace('[type].[ext]', 'less')
-
-  const moduleName = camelCase(args.name)
-  const ModuleName = upperFirst(moduleName)
-  const type = args.fc ? 'fc' : 'class'
-  const ext = fs.existsSync(paths.tsconfig) ? (args.ts ? 'tsx' : 'js') : 'js'
-
-  const jsPath = tmpPath.replace('[type]', type).replace('[ext]', ext)
-  const routePath = tmpPath.replace('index.[type].[ext]', 'route.js')
-  const logicPath = tmpPath.replace('index.[type].[ext]', 'logic.js')
-
-  const modulePath = path.resolve(paths.pages, moduleName)
-
-  const ModuleFileName = args.route ? ModuleName : 'index'
-  const ModuleLogicName = args.route ? ModuleName + 'Logic' : 'logic'
-
-  const replace = { ModuleName, moduleName, ModuleFileName, ModuleLogicName }
-
-  fs.ensureDirSync(modulePath)
-  genFile({ source: jsPath, target: `${ModuleFileName}.${ext}`, modulePath, replace })
-  genFile({ source: lessPath, target: `${ModuleFileName}.less`, modulePath, replace })
-  if (type === 'class' && ext === 'js') {
-    genFile({
-      source: logicPath,
-      target: `${ModuleLogicName}.${ext.slice(0, 2)}`,
-      modulePath,
-      replace,
-    })
-  }
-  if (args.route) {
-    genFile({ source: routePath, target: `index.${ext.slice(0, 2)}`, modulePath, replace })
-  }
-
-  console.log(
-    chalk.green(
-      [
-        `生成完毕:`,
-        `import ${ModuleName} from '@/pages/${moduleName}'`,
-        `const ${ModuleName} = lazy(() => import(/* webpackChunkName: '${moduleName}' */ '@/pages/${moduleName}'))`,
-        `{ path: '/${moduleName}', element: <${ModuleName} /> },`,
-      ].join('\n')
-    )
-  )
-}
-
 async function generatorOverride() {
   if (fs.existsSync(paths.override)) {
     console.log(chalk.red(`文件已存在 ${paths.override}`))
@@ -131,7 +62,6 @@ async function generatorTailwind() {
 }
 
 module.exports = {
-  page: generatorPage,
   override: generatorOverride,
   ts: generatorTsconfig,
   tailwind: generatorTailwind,

package/src/start.js

@@ -15,15 +15,12 @@ const webpack = require('webpack')
 const getConfig = require('./utils/getConfig')
 const chalk = require('chalk')
 
-process.env.WDS_SOCKET_HOST = WebpackDevServer.internalIPSync('v4') || '127.0.0.1'
-
 module.exports = async function start(args) {
   const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT
   const port = await WebpackDevServer.getFreePort(args.port || process.env.PORT)
   if (!(args.port || process.env.PORT) && +port !== +basePort) {
     console.log(chalk.bgYellow(`${basePort} 端口已被占用，现切换到 ${port} 端口运行`))
   }
-  process.env.WDS_SOCKET_PORT = port
   args.port = port
   process.env.PORT = port
 

package/lib/asset/template/page/index.class.js.tpl

@@ -1,24 +0,0 @@
-import styles from './ModuleFileName.less'
-import React from 'react'
-import { Component } from 'refast'
-import logic from './ModuleLogicName'
-
-/**
- * @typedef {object} ModuleNameProps
- * @property {string} [name]
- */
-
-/**
- * @extends {React.Component<ModuleNameProps>}
- */
-export default class ModuleName extends Component {
-  constructor(props) {
-    super(props, logic)
-    this.state = {
-
-    }
-  }
-  render() {
-    return <div className={styles.ModuleName}></div>
-  }
-}

package/lib/asset/template/page/index.class.tsx.tpl

@@ -1,10 +0,0 @@
-import styles from './ModuleFileName.less'
-import React, { Component } from 'react'
-
-export interface ModuleNameState {}
-export interface ModuleNameProps {}
-export default class ModuleName extends Component<ModuleNameProps, ModuleNameState> {
-  render() {
-    return <div className={styles.ModuleName}></div>
-  }
-}

package/lib/asset/template/page/index.fc.js.tpl

@@ -1,16 +0,0 @@
-import styles from './ModuleFileName.less'
-import React from 'react'
-
-/**
- * @typedef {object} ModuleNameProps
- * @property {string} [name]
- */
-
-/**
- * @type {React.FC<ModuleNameProps>}
- */
-const ModuleName = (props) => {
-  return <div className={styles.ModuleName}></div>
-}
-
-export default ModuleName

package/lib/asset/template/page/index.fc.tsx.tpl

@@ -1,9 +0,0 @@
-import styles from './ModuleFileName.less'
-import React, { FC } from 'react'
-
-export interface ModuleNameProps {}
-const ModuleName: FC<ModuleNameProps> = (props) => {
-  return <div className={styles.ModuleName}></div>
-}
-
-export default ModuleName

package/lib/asset/template/page/index.less.tpl

@@ -1,3 +0,0 @@
-:local(.ModuleName) {
-
-}

package/lib/asset/template/page/logic.js.tpl

@@ -1,4 +0,0 @@
-const ModuleLogicName = {
-
-}
-export default ModuleLogicName

package/lib/asset/template/page/route.js.tpl

@@ -1,12 +0,0 @@
-import { Control } from 'react-keeper'
-
-const moduleNameRoute = {
-  Load: (callback) => {
-    const prePath = Control.path
-    import(/* webpackChunkName: 'moduleName' */ './ModuleName').then((mod) => {
-      callback(Control.path === prePath ? mod.default : null)
-    })
-  },
-}
-
-export default moduleNameRoute

package/src/asset/template/page/index.class.js.tpl

@@ -1,24 +0,0 @@
-import styles from './ModuleFileName.less'
-import React from 'react'
-import { Component } from 'refast'
-import logic from './ModuleLogicName'
-
-/**
- * @typedef {object} ModuleNameProps
- * @property {string} [name]
- */
-
-/**
- * @extends {React.Component<ModuleNameProps>}
- */
-export default class ModuleName extends Component {
-  constructor(props) {
-    super(props, logic)
-    this.state = {
-
-    }
-  }
-  render() {
-    return <div className={styles.ModuleName}></div>
-  }
-}

package/src/asset/template/page/index.class.tsx.tpl

@@ -1,10 +0,0 @@
-import styles from './ModuleFileName.less'
-import React, { Component } from 'react'
-
-export interface ModuleNameState {}
-export interface ModuleNameProps {}
-export default class ModuleName extends Component<ModuleNameProps, ModuleNameState> {
-  render() {
-    return <div className={styles.ModuleName}></div>
-  }
-}

package/src/asset/template/page/index.fc.js.tpl

@@ -1,16 +0,0 @@
-import styles from './ModuleFileName.less'
-import React from 'react'
-
-/**
- * @typedef {object} ModuleNameProps
- * @property {string} [name]
- */
-
-/**
- * @type {React.FC<ModuleNameProps>}
- */
-const ModuleName = (props) => {
-  return <div className={styles.ModuleName}></div>
-}
-
-export default ModuleName

package/src/asset/template/page/index.fc.tsx.tpl

@@ -1,9 +0,0 @@
-import styles from './ModuleFileName.less'
-import React, { FC } from 'react'
-
-export interface ModuleNameProps {}
-const ModuleName: FC<ModuleNameProps> = (props) => {
-  return <div className={styles.ModuleName}></div>
-}
-
-export default ModuleName

package/src/asset/template/page/index.less.tpl

@@ -1,3 +0,0 @@
-:local(.ModuleName) {
-
-}

package/src/asset/template/page/logic.js.tpl

@@ -1,4 +0,0 @@
-const ModuleLogicName = {
-
-}
-export default ModuleLogicName

package/src/asset/template/page/route.js.tpl

@@ -1,12 +0,0 @@
-import { Control } from 'react-keeper'
-
-const moduleNameRoute = {
-  Load: (callback) => {
-    const prePath = Control.path
-    import(/* webpackChunkName: 'moduleName' */ './ModuleName').then((mod) => {
-      callback(Control.path === prePath ? mod.default : null)
-    })
-  },
-}
-
-export default moduleNameRoute