@qse/edu-scripts 2.0.3 → 2.1.0

package/dist/index.d.mts

@@ -1,8 +1,14 @@
 import { Chalk } from "chalk";
 import { Compiler, Configuration, SwcLoaderOptions } from "@rspack/core";
-import { Configuration as Configuration$1 } from "@rspack/dev-server";
 import { RequestHandler } from "express";
+import { Configuration as Configuration$1 } from "@rspack/dev-server";
 
+//#region src/config/plugins/mock-server/defineMock.d.ts
+type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'CONNECT' | 'TRACE';
+type API = string;
+type MockConfig = Record<`${Method} ${API}`, string | number | null | undefined | boolean | Record<string, any> | RequestHandler>;
+declare function defineMock(config: MockConfig): MockConfig;
+//#endregion
 //#region src/utils/defineConfig.d.ts
 type ProxyConfigArray = NonNullable<Configuration$1['proxy']>;
 type Configuration$2 = {
@@ -81,10 +87,4 @@ type Configuration$2 = {
 };
 declare function defineConfig(config: Configuration$2): Configuration$2;
 //#endregion
-//#region src/config/plugins/mock-server/defineMock.d.ts
-type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'CONNECT' | 'TRACE';
-type API = string;
-type MockConfig = Record<`${Method} ${API}`, string | number | null | undefined | boolean | Record<string, any> | RequestHandler>;
-declare function defineMock(config: MockConfig): MockConfig;
-//#endregion
 export { defineConfig, defineMock };

package/dist/index.mjs

@@ -1,11 +1,11 @@
-//#region src/utils/defineConfig.ts
-function defineConfig(config) {
+//#region src/config/plugins/mock-server/defineMock.ts
+function defineMock(config) {
 	return config;
 }
 
 //#endregion
-//#region src/config/plugins/mock-server/defineMock.ts
-function defineMock(config) {
+//#region src/utils/defineConfig.ts
+function defineConfig(config) {
 	return config;
 }
 

package/package.json

@@ -1,10 +1,21 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "2.0.3",
-  "author": "Kinoko",
-  "license": "MIT",
   "type": "module",
+  "version": "2.1.0",
   "description": "教育工程化基础框架",
+  "author": "Kinoko",
+  "license": "MIT",
+  "homepage": "http://192.168.10.19:3339/qsxxwapdev/edu-scripts/",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "main": "dist/index.mjs",
+  "types": "dist/index.d.mts",
+  "bin": {
+    "edu-scripts": "dist/cli.mjs",
+    "edu": "dist/cli.mjs"
+  },
   "engines": {
     "node": ">=18"
   },
@@ -21,21 +32,10 @@
     "postversion": "npm run release",
     "test": "jest"
   },
-  "homepage": "http://192.168.10.19:3339/qsxxwapdev/edu-scripts/",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  },
-  "bin": {
-    "edu-scripts": "dist/cli.mjs",
-    "edu": "dist/cli.mjs"
-  },
-  "main": "dist/index.mjs",
-  "typings": "dist/index.d.mts",
   "dependencies": {
     "@babel/core": "~7.29.0",
     "@inquirer/prompts": "^8.3.0",
-    "@qse/ssh-sftp": "^1.3.1",
+    "@qse/ssh-sftp": "^1.4.0",
     "@rsdoctor/rspack-plugin": "^1.5.2",
     "@rspack/core": "^1.7.6",
     "@rspack/dev-server": "^1.2.1",
@@ -44,6 +44,7 @@
     "@swc-node/register": "^1.11.1",
     "@swc/helpers": "^0.5.19",
     "@types/express": "^4.17.25",
+    "@types/node": "^24.12.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "cookie-parser": "^1.4.7",
@@ -83,7 +84,7 @@
   "devDependencies": {
     "@babel/preset-env": "~7.29.0",
     "@babel/preset-typescript": "^7.28.5",
-    "@qse/eslint-config": "^1.0.0",
+    "@qse/eslint-config": "^1.1.2",
     "@types/cookie-parser": "^1.4.10",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^30.0.0",
@@ -96,13 +97,5 @@
     "rimraf": "^6.1.3",
     "tsdown": "^0.20.3",
     "vitepress": "^1.6.4"
-  },
-  "peerDependencies": {
-    "tailwindcss": "^3.0.0"
-  },
-  "peerDependenciesMeta": {
-    "tailwindcss": {
-      "optional": true
-    }
   }
 }

package/src/auto-refactor.ts

@@ -1,10 +1,11 @@
-import fs from 'fs-extra'
-import paths from './config/paths'
-import path from 'path'
+import { checkbox, input, select } from '@inquirer/prompts'
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { globby } from 'globby'
 import ora from 'ora'
-import { input, select, checkbox } from '@inquirer/prompts'
+import path from 'path'
+
+import paths from './config/paths'
 
 const pkg = fs.readJsonSync(paths.resolveOwn('package.json'))
 
@@ -39,8 +40,7 @@ export default async function autoRefactor() {
   const version = await input({
     message: '版本号',
     default: '1.0.0',
-    validate: (v) =>
-      /^\d+\.\d+\.\d+$/.test(v) || '请按格式输入 /^\\d+\\.\\d+\\.\\d+$/ 例如: 1.0.0',
+    validate: (v) => /^\d+\.\d+\.\d+$/.test(v) || '请按格式输入 /^\\d+\\.\\d+\\.\\d+$/ 例如: 1.0.0',
   })
 
   const mode = await select({

package/src/build.ts

@@ -1,11 +1,13 @@
-import { rspack, type Stats } from '@rspack/core'
+import type { Stats } from '@rspack/core'
+
+import { rspack } from '@rspack/core'
 import chalk from 'chalk'
-import getConfig from './utils/getConfig'
-// @ts-ignore
-import { measureFileSizesBeforeBuild, printFileSizesAfterBuild } from './utils/FileSizeReporter'
-import paths from './config/paths'
 import fs from 'fs-extra'
+
+import paths from './config/paths'
 import appConfig from './utils/appConfig'
+import { measureFileSizesBeforeBuild, printFileSizesAfterBuild } from './utils/FileSizeReporter'
+import getConfig from './utils/getConfig'
 
 const WARN_AFTER_BUNDLE_GZIP_SIZE = appConfig.single ? 1024 * 1024 : 30 * 1024
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024

package/src/cli.ts

@@ -1,18 +1,17 @@
 #!/usr/bin/env node
 import './utils/esm-register'
-
 import './utils/beforeStart'
 
 import fs from 'fs-extra'
 import yargs from 'yargs'
-import paths from './config/paths'
 
-import start from './start'
-import build from './build'
-import deploy from './deploy'
 import autoRefactor from './auto-refactor'
+import build from './build'
 import commitDist from './commit-dist'
+import paths from './config/paths'
+import deploy from './deploy'
 import * as generator from './generator'
+import start from './start'
 
 const pkg = fs.readJsonSync(paths.resolveOwn('package.json'))
 
@@ -46,7 +45,7 @@ yargs(process.argv.slice(2))
   )
   .command(
     'deploy',
-    '自动部署 dist 到 v1 服务器',
+    '自动部署 dist 到 v1 服务器，可以使用 @qse/ssh-sftp 工具生成.sftprc.json文件，或者直接使用命令行参数指定上传目标',
     (yargs) =>
       yargs
         .option('school', { alias: 's', desc: '上传到校端', default: false, boolean: true })

package/src/commit-dist.ts

@@ -1,9 +1,10 @@
 import chalk from 'chalk'
-import paths from './config/paths'
-import fs from 'fs-extra'
 import cp from 'child_process'
+import fs from 'fs-extra'
 import tmp from 'tmp'
 
+import paths from './config/paths'
+
 const exec = (cmd: string, opts?: cp.ExecSyncOptions) =>
   cp.execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', ...opts }) as string
 

package/src/config/paths.ts

@@ -1,7 +1,7 @@
-import path from 'path'
 import fs from 'fs-extra'
 import { globbySync } from 'globby'
 import { fileURLToPath } from 'node:url'
+import path from 'path'
 
 function resolveApp(...filePath: string[]) {
   return path.resolve(process.cwd(), ...filePath)

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

@@ -1,4 +1,5 @@
 import type { RequestHandler } from 'express'
+
 type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'CONNECT' | 'TRACE'
 type API = string
 

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

@@ -1,15 +1,18 @@
-import paths from '../../paths'
-import { globbySync } from 'globby'
+import chalk from 'chalk'
 import chokidar from 'chokidar'
+import cookieParser from 'cookie-parser'
 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 fs from 'fs-extra'
+import { globbySync } from 'globby'
 import multer from 'multer'
-import { pathToRegexp } from 'path-to-regexp'
 import { createRequire } from 'node:module'
+import { pathToRegexp } from 'path-to-regexp'
+
 import { resolveModule } from '@/utils/resolveModule'
+
+import paths from '../../paths'
+
 const require = createRequire(import.meta.url)
 
 let mockCache: Record<string, { handler: any; method: string; path: string }> = {}

package/src/config/plugins/postcss-safe-area.ts

@@ -1,4 +1,5 @@
 import type { Plugin } from 'postcss'
+
 const vars = [
   'safe-area-inset-top',
   'safe-area-inset-bottom',

package/src/config/webpackConfig.ts

@@ -1,6 +1,6 @@
-import { resolveModule } from '@/utils/resolveModule'
-import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin'
 import type { Compiler, Configuration, RuleSetRule, SwcLoaderOptions } from '@rspack/core'
+
+import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin'
 import { rspack } from '@rspack/core'
 import ReactRefreshPlugin from '@rspack/plugin-react-refresh'
 import chalk from 'chalk'
@@ -8,11 +8,15 @@ 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 { fileURLToPath } from 'node:url'
+
+import { resolveModule } from '@/utils/resolveModule'
+
 import type { Configuration as CustomConfiguration } from '../utils/defineConfig'
+
+import appConfig from '../utils/appConfig'
 import paths from './paths'
 import PostcssSafeAreaPlugin from './plugins/postcss-safe-area'
-import { fileURLToPath } from 'node:url'
 
 const require = createRequire(import.meta.url)
 const appPkg = fs.readJsonSync(paths.package) as { name: string; version: string }

package/src/config/webpackDevServerConfig.ts

@@ -1,5 +1,7 @@
 import type { Configuration } from '@rspack/dev-server'
+
 import type { Configuration as CustomConfiguration } from '../utils/defineConfig'
+
 import setupMockServer from './plugins/mock-server'
 
 interface ProxyConfig {
@@ -24,7 +26,10 @@ function createProxy(context: string, target: string, origin?: string): ProxyCon
   }
 }
 
-export default function getWebpackDevServerConfig(args: any, override: CustomConfiguration): Configuration {
+export default function getWebpackDevServerConfig(
+  args: any,
+  override: CustomConfiguration
+): Configuration {
   const host = process.env.HOST || '0.0.0.0'
 
   const devServer: Configuration = {

package/src/deploy.ts

@@ -1,14 +1,15 @@
-// @ts-ignore
+import type { Options as SshSftpOptions } from '@qse/ssh-sftp'
+
 import { sshSftp } from '@qse/ssh-sftp'
-import paths from './config/paths.js'
 import chalk from 'chalk'
 import fs from 'fs-extra'
-// @ts-ignore
-import changeDeployVersion from './utils/changeDeployVersion'
 import ora from 'ora'
-import appConfig from './utils/appConfig.js'
 import { format } from 'prettier'
 
+import paths from './config/paths.js'
+import appConfig from './utils/appConfig.js'
+import changeDeployVersion from './utils/changeDeployVersion'
+
 const appPkg = fs.readJsonSync(paths.package)
 
 const baseConfig = {
@@ -54,9 +55,9 @@ async function normalDeploy(args: DeployArgs) {
     return lines.slice(-50).join('\n')
   }
 
-  async function upload(opts: any) {
+  async function upload(opts: SshSftpOptions) {
     // 上传dist文件
-    const { sftp, opts: fullOpts } = await sshSftp(opts)
+    const { sftp, opts: fullOpts } = (await sshSftp(opts))!
 
     const spinner = ora('自动更新 ver.js 版本配置').start()
     // 指定远程需要修改的文件
@@ -113,7 +114,7 @@ async function normalDeploy(args: DeployArgs) {
     }
   }
 
-  const presetConfig = {
+  const presetConfig: Record<string, SshSftpOptions> = {
     s: { preset: { context: 'eduwebngv1', folder: 'userportal' } },
     b: { preset: { context: 'eduwebngv1', folder: 'bureaupc' } },
     d: { preset: { context: 'eduwebngv1', folder: 'documentshelves' } },
@@ -123,7 +124,7 @@ async function normalDeploy(args: DeployArgs) {
       remotePath: '/erp/edumaven/dingcorrection-page-dev/compositionshelves',
     },
   }
-  const uploadSftpConfigs = []
+  const uploadSftpConfigs: SshSftpOptions[] = []
   if (args.bureau) {
     uploadSftpConfigs.push(presetConfig.b)
   }
@@ -139,6 +140,11 @@ async function normalDeploy(args: DeployArgs) {
   if (args.compositionshelvesDingtalk) {
     uploadSftpConfigs.push(presetConfig.cd)
   }
+  if (uploadSftpConfigs.length === 0 && fs.existsSync(paths.sshSftp)) {
+    const config = fs.readJsonSync(paths.sshSftp)
+    uploadSftpConfigs.push(config)
+  }
+
   if (uploadSftpConfigs.length === 0) {
     console.log(
       `
@@ -146,7 +152,7 @@ async function normalDeploy(args: DeployArgs) {
     执行 ${chalk.green('npx edu-scripts deploy -h')} 查看具体用法
     `
     )
-    process.exit()
+    process.exit(1)
   }
 
   const uploadConfig = { ...baseConfig, ignore: [...baseConfig.ignore, 'js/ver.js'] }

package/src/generator.ts

@@ -1,6 +1,7 @@
+import chalk from 'chalk'
 import fs from 'fs-extra'
+
 import paths from './config/paths'
-import chalk from 'chalk'
 
 const getTmpPath = (...args: string[]) => paths.resolveOwn('asset', 'template', ...args)
 
@@ -56,4 +57,4 @@ async function generatorTailwind() {
   )
 }
 
-export { generatorOverride as override, generatorTsconfig as ts, generatorTailwind as tailwind }
+export { generatorOverride as override, generatorTailwind as tailwind, generatorTsconfig as ts }

package/src/index.ts

@@ -1,2 +1,2 @@
-export { defineConfig } from './utils/defineConfig'
 export { defineMock } from './config/plugins/mock-server/defineMock'
+export { defineConfig } from './utils/defineConfig'

package/src/start.ts

@@ -1,8 +1,9 @@
 import { rspack } from '@rspack/core'
 import { RspackDevServer } from '@rspack/dev-server'
-import getConfig from './utils/getConfig.js'
 import chalk from 'chalk'
 
+import getConfig from './utils/getConfig.js'
+
 interface StartArgs {
   port?: string
 }

package/src/utils/FileSizeReporter.ts

@@ -5,15 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import fs from 'fs-extra'
-import path from 'path'
+import type { Stats } from '@rspack/core'
+
 import chalk from 'chalk'
 import filesize from 'filesize'
+import fs from 'fs-extra'
+import { gzipSizeSync } from 'gzip-size'
+import path from 'path'
 // @ts-ignore
 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

package/src/utils/appConfig.ts

@@ -1,6 +1,7 @@
-import paths from '../config/paths'
 import fs from 'fs-extra'
 
+import paths from '../config/paths'
+
 const appPkg = fs.readJsonSync(paths.package)
 
 const edu = appPkg.edu || {}

package/src/utils/beforeStart.ts

@@ -1,7 +1,8 @@
-import fs from 'fs-extra'
-import paths from '../config/paths'
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import semver from 'semver'
+
+import paths from '../config/paths'
 import appConfig from './appConfig'
 
 const pkg = fs.readJsonSync(paths.resolveOwn('package.json'))

package/src/utils/changeDeployVersion.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { parse, traverse, types as t, transformFromAstSync } from '@babel/core'
+import { parse, types as t, transformFromAstSync, traverse } from '@babel/core'
 
 // ver.js 中定义模块的数组
 const TARGET_IDENTIFIER_NAME = 'project_apiArr'

package/src/utils/defineConfig.ts

@@ -1,6 +1,6 @@
-import type { Chalk } from 'chalk'
 import type { Compiler, Configuration as RspackConfiguration, SwcLoaderOptions } from '@rspack/core'
 import type { Configuration as DevServerConfiguration } from '@rspack/dev-server'
+import type { Chalk } from 'chalk'
 
 type ProxyConfigArray = NonNullable<DevServerConfiguration['proxy']>
 

package/src/utils/esm-register.ts

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

package/src/utils/exec.ts

@@ -1,4 +1,5 @@
 import cp from 'child_process'
+
 const exec = (cmd: string) => {
   console.log(`> ${cmd}`)
   return cp.execSync(cmd, { stdio: 'inherit', encoding: 'utf-8' })

package/src/utils/getConfig.ts

@@ -1,6 +1,4 @@
-// @ts-ignore
 import getWebpackConfig from '../config/webpackConfig'
-// @ts-ignore
 import getWebpackDevServerConfig from '../config/webpackDevServerConfig'
 import getOverride from './getOverride'
 

package/src/utils/getOverride.ts

@@ -1,7 +1,9 @@
 import fs from 'fs-extra'
-import paths from '../config/paths'
 import { createRequire } from 'node:module'
-import { type Configuration } from './defineConfig'
+
+import type { Configuration } from './defineConfig'
+
+import paths from '../config/paths'
 import { resolveModule } from './resolveModule'
 
 const require = createRequire(import.meta.url)

package/tsdown.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'tsdown'
 
 export default defineConfig({
-  entry: ['src/index.ts', 'src/cli.js'],
+  entry: ['src/index.ts', 'src/cli.ts'],
 })