@qse/edu-scripts 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 更新日志
 
+## 2.0.2 (2926-03-10)
+
+- fix: 修复 react 兼容问题
+- fix: 修复 mock 失效
+
+## 2.0.1 (2026-03-09)
+
+- fix: 修复 pnpm 启动失败
+
 ## 2.0.0 (2026-03-02)
 
 - breakchange: 使用 rspack 重构

package/README.md

@@ -1,12 +1,10 @@
 # 教育工程化基础框架
 
-svn://192.168.10.168/edu/code/A0.New-system/0A2.front-end-component/edu-scripts/trunk
-
-<Alert>内网里的 @qsb/edu-scripts 已经弃用，请更换成公网的 @qse/edu-scripts </Alert>
+svn://192.168.10.168/qsedu/code/00.common/02.front-end-component/06.edu-scripts/trunk
 
 ## 运行条件
 
-nodejs 版本至少 12+
+nodejs 版本至少 18+
 
 ## 快速体验
 
@@ -95,7 +93,7 @@ npx edu-scripts g override
 根目录生成 `theme.js` 或 `theme.json`
 
 ```js
-module.exports = {
+export default {
   '@primary-color': '#99f',
 }
 ```

package/dist/cli.mjs

@@ -1,6 +1,5 @@
 #!/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";
@@ -13,8 +12,9 @@ import { RspackDevServer } from "@rspack/dev-server";
 import { RsdoctorRspackPlugin } from "@rsdoctor/rspack-plugin";
 import ReactRefreshPlugin from "@rspack/plugin-react-refresh";
 import HtmlWebpackPlugin from "html-webpack-plugin";
+import path$1 from "node:path";
 import chokidar from "chokidar";
-import { debounce, memoize } from "lodash-es";
+import { debounce, memoize } from "es-toolkit";
 import express from "express";
 import cookieParser from "cookie-parser";
 import multer from "multer";
@@ -31,6 +31,11 @@ import { checkbox, input, select } from "@inquirer/prompts";
 import cp from "child_process";
 import tmp from "tmp";
 
+//#region src/utils/esm-register.ts
+const { register } = createRequire(import.meta.url)("@swc-node/register/register");
+register();
+
+//#endregion
 //#region src/config/paths.ts
 function resolveApp(...filePath) {
 	return path.resolve(process.cwd(), ...filePath);
@@ -124,7 +129,7 @@ if (!(appConfig.single || appConfig.mainProject)) {
 		console.log(chalk.bgYellow("教育集成工程不能含有 public/static, 现已自动删除"));
 		try {
 			fs.rmSync(paths.static, { recursive: true });
-		} catch (e) {}
+		} catch {}
 	}
 }
 if (!fs.existsSync(paths.public) && !process.argv.includes("auto-refactor")) {
@@ -147,6 +152,12 @@ if (appPkg$2.eslintConfig) {
 	console.log(chalk.yellow("export default config"));
 }
 
+//#endregion
+//#region src/utils/resolveModule.ts
+function resolveModule(mod) {
+	return mod.default ? mod.default : mod;
+}
+
 //#endregion
 //#region src/config/plugins/postcss-safe-area.ts
 const expr = new RegExp(`env\\(\\s*(${[
@@ -165,16 +176,18 @@ const PostcssSafeAreaPlugin = () => {
 	};
 };
 
-//#endregion
-//#region src/utils/resolveModule.ts
-function resolveModule(mod) {
-	return mod.default ? mod.default : mod;
-}
-
 //#endregion
 //#region src/config/webpackConfig.ts
 const require$2 = createRequire(import.meta.url);
 const appPkg$1 = fs.readJsonSync(paths.package);
+const hasJsxRuntime = (() => {
+	try {
+		require$2.resolve("react/jsx-runtime");
+		return appConfig.single;
+	} catch {
+		return false;
+	}
+})();
 const jsMainPath = appConfig.grayscale ? `${appPkg$1.name}/beta/${appPkg$1.name}` : `${appPkg$1.name}/${appPkg$1.name}`;
 const assetPath = appConfig.grayscale ? `${appPkg$1.name}/beta/${appPkg$1.version}` : `${appPkg$1.name}/${appPkg$1.version}`;
 const cssRegex = /\.css$/;
@@ -294,6 +307,7 @@ function getWebpackConfig(args, override) {
 		resolve: {
 			alias: {
 				"@": paths.src,
+				"@swc/helpers": path$1.dirname(require$2.resolve("@swc/helpers/package.json")),
 				...override.alias
 			},
 			extensions: [
@@ -342,7 +356,7 @@ function getWebpackConfig(args, override) {
 							transform: {
 								legacyDecorator: override.decorators,
 								react: {
-									runtime: "automatic",
+									runtime: hasJsxRuntime ? "automatic" : "classic",
 									development: isDev,
 									refresh: isDev
 								}
@@ -559,9 +573,9 @@ const setupMock = debounce(function setupMock() {
 	}
 }, 100);
 const getPathReAndKeys = memoize((path) => {
-	const keys = [];
+	const { regexp, keys } = pathToRegexp(path);
 	return {
-		re: pathToRegexp(path, keys),
+		re: regexp,
 		keys
 	};
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "author": "Kinoko",
   "license": "MIT",
   "type": "module",
@@ -14,18 +14,17 @@
     "docs:build": "vitepress build docs",
     "docs:deploy": "ssh-sftp",
     "build": "tsdown",
-    "deploy": "node scripts/deploy.js",
-    "release": "npm run test && npm run build && npm publish && rimraf dist",
+    "deploy": "node scripts/deploy.js && rimraf .vitepress/dist",
+    "release": "npm run lint && npm run test && npm run build && npm publish && rimraf dist",
     "prettier": "prettier -c -w \"src/**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "lint": "eslint --fix src",
+    "lint": "eslint --fix src && tsc --noEmit",
     "postversion": "npm run release",
     "test": "jest"
   },
   "homepage": "http://192.168.10.19:3339/qsxxwapdev/edu-scripts/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "tag": "beta"
+    "access": "public"
   },
   "bin": {
     "edu-scripts": "dist/cli.mjs",
@@ -35,6 +34,7 @@
   "typings": "dist/index.d.mts",
   "dependencies": {
     "@babel/core": "~7.29.0",
+    "@inquirer/prompts": "^8.3.0",
     "@qse/ssh-sftp": "^1.3.1",
     "@rsdoctor/rspack-plugin": "^1.5.2",
     "@rspack/core": "^1.7.6",
@@ -48,38 +48,37 @@
     "chokidar": "^3.6.0",
     "cookie-parser": "^1.4.7",
     "css-loader": "^6.11.0",
-    "cssnano": "^6.1.2",
+    "cssnano": "^7.1.3",
+    "es-toolkit": "^1.45.1",
     "express": "^4.21.2",
     "filesize": "^8.0.7",
     "fs-extra": "^11.3.3",
     "globby": "^16.1.1",
     "gzip-size": "^7.0.0",
     "html-webpack-plugin": "^5.6.6",
-    "@inquirer/prompts": "^8.3.0",
     "less": "^3.13.1",
     "less-loader": "^10.2.0",
-    "lodash-es": "^4.17.23",
     "multer": "^2.1.0",
     "ora": "^9.3.0",
-    "path-to-regexp": "^6.3.0",
+    "path-to-regexp": "^8.3.0",
     "postcss": "^8.5.3",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-loader": "^7.3.4",
+    "postcss-loader": "^8.2.1",
     "postcss-momentum-scrolling": "^3.14.22",
-    "postcss-normalize": "^8.0.1",
-    "postcss-preset-env": "^9.6.0",
+    "postcss-normalize": "^13.0.1",
+    "postcss-preset-env": "^11.2.0",
     "prettier": "^3.8.1",
     "prettier-plugin-tailwindcss": "^0.7.2",
-    "react-refresh": "^0.14.2",
+    "react-refresh": "^0.18.0",
     "recursive-readdir": "^2.2.3",
     "semver": "^7.7.1",
-    "strip-ansi": "^6.0.1",
-    "style-loader": "^3.3.4",
+    "strip-ansi": "^7.2.0",
+    "style-loader": "^4.0.0",
     "tailwindcss": "^3.4.19",
     "tmp": "^0.2.3",
     "typescript": "^5.9.3",
     "url-loader": "^4.1.1",
-    "yargs": "^17.7.2"
+    "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@babel/preset-env": "~7.29.0",
@@ -88,7 +87,6 @@
     "@types/cookie-parser": "^1.4.10",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^30.0.0",
-    "@types/lodash-es": "^4.17.12",
     "@types/multer": "^2.0.0",
     "@types/semver": "^7.7.1",
     "@types/tmp": "^0.2.6",
@@ -98,5 +96,13 @@
     "rimraf": "^6.1.3",
     "tsdown": "^0.20.3",
     "vitepress": "^1.6.4"
+  },
+  "peerDependencies": {
+    "tailwindcss": "^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "tailwindcss": {
+      "optional": true
+    }
   }
 }

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+packages:
+  - 'test/app'

package/src/cli.ts

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

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

@@ -1,13 +1,13 @@
 import paths from '../../paths'
 import { globbySync } from 'globby'
 import chokidar from 'chokidar'
-import { debounce, memoize } from 'lodash-es'
+import { debounce, memoize } from 'es-toolkit'
 import chalk from 'chalk'
 import fs from 'fs-extra'
 import express from 'express'
 import cookieParser from 'cookie-parser'
 import multer from 'multer'
-import { pathToRegexp, type Key } from 'path-to-regexp'
+import { pathToRegexp } from 'path-to-regexp'
 import { createRequire } from 'node:module'
 import { resolveModule } from '@/utils/resolveModule'
 const require = createRequire(import.meta.url)
@@ -44,9 +44,8 @@ const setupMock = debounce(function setupMock() {
 }, 100)
 
 const getPathReAndKeys = memoize((path: string) => {
-  const keys: Key[] = []
-  const re = pathToRegexp(path, keys)
-  return { re, keys }
+  const { regexp, keys } = pathToRegexp(path)
+  return { re: regexp, keys }
 })
 
 function decodeParam(val: string) {

package/src/config/webpackConfig.ts

@@ -1,20 +1,30 @@
+import { resolveModule } from '@/utils/resolveModule'
 import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin'
+import type { Compiler, Configuration, RuleSetRule, SwcLoaderOptions } from '@rspack/core'
 import { rspack } from '@rspack/core'
-import type { Configuration, Compiler, RuleSetRule, SwcLoaderOptions } from '@rspack/core'
 import ReactRefreshPlugin from '@rspack/plugin-react-refresh'
 import chalk from 'chalk'
 import fs from 'fs-extra'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 import { createRequire } from 'node:module'
+import path from 'node:path'
 import appConfig from '../utils/appConfig'
 import type { Configuration as CustomConfiguration } from '../utils/defineConfig'
 import paths from './paths'
 import PostcssSafeAreaPlugin from './plugins/postcss-safe-area'
-import { resolveModule } from '@/utils/resolveModule'
 
 const require = createRequire(import.meta.url)
 const appPkg = fs.readJsonSync(paths.package) as { name: string; version: string }
 
+const hasJsxRuntime = (() => {
+  try {
+    require.resolve('react/jsx-runtime')
+    return appConfig.single
+  } catch {
+    return false
+  }
+})()
+
 const jsMainPath = appConfig.grayscale
   ? `${appPkg.name}/beta/${appPkg.name}`
   : `${appPkg.name}/${appPkg.name}`
@@ -200,6 +210,7 @@ export default function getWebpackConfig(args: any, override: CustomConfiguratio
     resolve: {
       alias: {
         '@': paths.src,
+        '@swc/helpers': path.dirname(require.resolve('@swc/helpers/package.json')),
         ...override.alias,
       },
       extensions: ['.web.js', '.web.mjs', '.js', '.mjs', '.jsx', '.ts', '.tsx', '.json', '.wasm'],
@@ -247,7 +258,7 @@ export default function getWebpackConfig(args: any, override: CustomConfiguratio
                       transform: {
                         legacyDecorator: override.decorators,
                         react: {
-                          runtime: 'automatic',
+                          runtime: hasJsxRuntime ? 'automatic' : 'classic',
                           development: isDev,
                           refresh: isDev,
                         },
@@ -402,7 +413,10 @@ export default function getWebpackConfig(args: any, override: CustomConfiguratio
         /@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)
+          resource.request = resource.request.replace(
+            /.*dev-server\/client\/index\.js/,
+            myClientPath
+          )
         }
       ),
       new rspack.IgnorePlugin({

package/src/utils/beforeStart.ts

@@ -35,7 +35,7 @@ if (!(appConfig.single || appConfig.mainProject)) {
     console.log(chalk.bgYellow('教育集成工程不能含有 public/static, 现已自动删除'))
     try {
       fs.rmSync(paths.static, { recursive: true })
-    } catch (e) {}
+    } catch {}
   }
 }
 

package/src/utils/esm-register.ts

@@ -0,0 +1,6 @@
+import { createRequire } from 'node:module'
+
+// 兼容 CommonJS 模块
+const require = createRequire(import.meta.url)
+const { register } = require('@swc-node/register/register')
+register()