@qse/edu-scripts 1.15.0 → 2.0.1

package/src/{commit-dist.js → commit-dist.ts}

@@ -1,16 +1,27 @@
-const chalk = require('chalk')
-const paths = require('./config/paths')
-const fs = require('fs-extra')
-const exec = (cmd, opts) =>
-  require('child_process').execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', ...opts })
-const tmp = require('tmp')
-
-function validateSVNRoot(root) {
+import chalk from 'chalk'
+import paths from './config/paths'
+import fs from 'fs-extra'
+import cp from 'child_process'
+import tmp from 'tmp'
+
+const exec = (cmd: string, opts?: cp.ExecSyncOptions) =>
+  cp.execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', ...opts }) as string
+
+function validateSVNRoot(root: string) {
   const ls = exec(`svn ls ${root}`)
   return ['trunk', 'branches'].every((s) => ls.includes(s))
 }
 
-function getWorkingCopyInfo() {
+interface WorkingCopyInfo {
+  url: string
+  branch: string
+  revision: string
+  author: string
+  distBranchURL: string
+  distBranchDirURL: string
+  root: string
+}
+function getWorkingCopyInfo(): WorkingCopyInfo {
   exec(`svn up`)
   const url = exec(`svn info --show-item url`).trim()
   const revision = exec(`svn info --show-item last-changed-revision`).trim()
@@ -19,7 +30,7 @@ function getWorkingCopyInfo() {
   let branch = 'trunk'
   let root = url.replace(/\/trunk$/, '')
   if (url.includes('/branches/')) {
-    branch = url.split('/').pop()
+    branch = url.split('/').pop()!
     root = url.replace(/\/branches\/[^/]+$/, '')
   }
   let distBranchURL = root + '/branches/dist'
@@ -32,12 +43,12 @@ function getWorkingCopyInfo() {
   return { url, branch, revision, author, distBranchURL, distBranchDirURL, root }
 }
 
-function copyDistToRepo(info) {
+function copyDistToRepo(info: WorkingCopyInfo) {
   const tmpdir = tmp.dirSync().name
 
   try {
     exec(`svn ls ${info.distBranchDirURL} --depth empty`)
-  } catch (error) {
+  } catch (error: any) {
     if (error.message.includes('non-existent')) {
       exec(
         `svn mkdir ${info.distBranchDirURL} --parents -m "[edu-scripts] create ${info.branch} dist"`
@@ -50,8 +61,7 @@ function copyDistToRepo(info) {
 
   try {
     exec(`svn rm * --force -q`, { cwd: tmpdir })
-  } catch (error) {}
-
+  } catch {}
   fs.copySync(paths.dist, tmpdir)
 
   exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir })
@@ -62,13 +72,10 @@ function copyDistToRepo(info) {
   fs.removeSync(tmpdir)
 }
 
-/**
- * svn commit dist folder to dish branches
- *
- * @param {Object} args
- * @param {boolean} args.rmLocal
- */
-module.exports = async function commitDist(args) {
+interface CommitDistArgs {
+  rmLocal?: boolean
+}
+export default async function commitDist(args: CommitDistArgs) {
   if (!fs.existsSync(paths.dist)) {
     console.log(chalk.red('未找到 dist 文件夹，请先 edu-scpirts build'))
     process.exit(1)

package/src/config/paths.ts

@@ -0,0 +1,52 @@
+import path from 'path'
+import fs from 'fs-extra'
+import { globbySync } from 'globby'
+import { fileURLToPath } from 'node:url'
+
+function resolveApp(...filePath: string[]) {
+  return path.resolve(process.cwd(), ...filePath)
+}
+
+function resolveOwn(...filePath: string[]) {
+  let current = path.dirname(fileURLToPath(import.meta.url))
+  while (!fs.existsSync(path.join(current, 'package.json'))) {
+    const parent = path.dirname(current)
+    if (parent === current) {
+      throw new Error('package.json not found')
+    }
+    current = parent
+  }
+
+  return path.resolve(current, ...filePath)
+}
+
+function getExistPath(...paths: string[]) {
+  for (const path of paths) {
+    if (fs.existsSync(path)) {
+      return path
+    }
+  }
+  return paths[0]
+}
+
+const paths = {
+  resolveApp,
+  resolveOwn,
+  eduAppEnv: resolveApp('src', 'edu-app-env.d.ts'),
+  dist: resolveApp('dist'),
+  sshSftp: resolveApp('.sftprc.json'),
+  nodeModules: resolveApp('node_modules'),
+  tsconfig: resolveApp('tsconfig.json'),
+  jsconfig: resolveApp('jsconfig.json'),
+  package: resolveApp('package.json'),
+  tailwind: resolveApp('tailwind.config.js'),
+  pages: resolveApp('src', 'pages'),
+  override: getExistPath(resolveApp('edu-scripts.override.js'), resolveApp('edu-scripts.override.ts')),
+  indexHTML: globbySync('./public/*.html', { absolute: true }),
+  src: resolveApp('src'),
+  public: resolveApp('public'),
+  static: resolveApp('public', 'static'),
+  theme: getExistPath(resolveApp('theme.json'), resolveApp('theme.js')),
+  mock: resolveApp('mock'),
+}
+export default paths

package/src/config/plugins/mock-server/{index.js → index.ts}

@@ -1,29 +1,25 @@
-const paths = require('../../paths')
-const globby = require('globby')
-const chokidar = require('chokidar')
-const debounce = require('lodash/debounce')
-const memoize = require('lodash/memoize')
-const chalk = require('chalk')
-const fs = require('fs-extra')
-const express = require('express')
-const cookieParser = require('cookie-parser')
-const multer = require('multer')
-const { pathToRegexp } = require('path-to-regexp')
-
-/**
- * @type {Record<string,{handler:any;method:string;path:string}>}
- */
-let mockCache = {}
+import paths from '../../paths'
+import { globbySync } from 'globby'
+import chokidar from 'chokidar'
+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 { createRequire } from 'node:module'
+import { resolveModule } from '@/utils/resolveModule'
+const require = createRequire(import.meta.url)
+
+let mockCache: Record<string, { handler: any; method: string; path: string }> = {}
 let isSetup = false
 
-/**
- * @param {import('webpack-dev-server').Middleware[]} middelwaves
- */
 const setupMock = debounce(function setupMock() {
   // clean
   mockCache = {}
 
-  const files = globby.sync(paths.mock, { expandDirectories: { extensions: ['js', 'ts'] } })
+  const files = globbySync(paths.mock, { expandDirectories: { extensions: ['js', 'ts'] } })
 
   if (isSetup) {
     console.log(chalk.green('Mock files changed, reloaded'))
@@ -35,26 +31,25 @@ const setupMock = debounce(function setupMock() {
   for (const file of files) {
     delete require.cache[require.resolve(file)]
     try {
-      let mock = require(file)
-      mock = mock.default || mock
+      const mock = resolveModule(require(file))
 
       for (const key in mock) {
         const [method, path] = key.split(' ')
         mockCache[key] = { method, path, handler: mock[key] }
       }
-    } catch (e) {
+    } catch (e: any) {
       console.error(chalk.red(`Mock file ${file} error: ${e.message}`))
     }
   }
 }, 100)
 
-const getPathReAndKeys = memoize((path) => {
-  const keys = []
+const getPathReAndKeys = memoize((path: string) => {
+  const keys: Key[] = []
   const re = pathToRegexp(path, keys)
   return { re, keys }
 })
 
-function decodeParam(val) {
+function decodeParam(val: string) {
   if (typeof val !== 'string' || val.length === 0) {
     return val
   }
@@ -75,7 +70,7 @@ function decodeParam(val) {
 /**
  * @type {import('express').RequestHandler}
  */
-function mockMiddlewave(req, res, next) {
+const mockMiddlewave: express.RequestHandler = function mockMiddlewave(req, res, next) {
   const { method, path } = req
   for (const key in mockCache) {
     const mock = mockCache[key]
@@ -93,6 +88,7 @@ function mockMiddlewave(req, res, next) {
           const prop = key.name
           const val = decodeParam(m[i])
           if (val !== undefined) {
+            // @ts-ignore
             params[prop] = val
           }
         }
@@ -125,23 +121,16 @@ function mockMiddlewave(req, res, next) {
   next()
 }
 
-/**
- * @param {import('webpack-dev-server').Middleware[]} middelwaves
- * @param {import('webpack-dev-server')} devServer
- */
-function setupMockServer(middelwaves, devServer) {
-  if (!fs.existsSync(paths.mock)) return
+type Middlewares = Parameters<
+  NonNullable<import('@rspack/dev-server').Configuration['setupMiddlewares']>
+>[0]
 
-  require('@babel/register')({
-    presets: [['@babel/preset-env', { modules: 'cjs' }], '@babel/preset-typescript'],
-    babelrc: false,
-    only: [/\/mock\//, /\/src\//],
-    extensions: ['.js', '.ts'],
-  })
+function setupMockServer(middelwaves: Middlewares, _devServer: any) {
+  if (!fs.existsSync(paths.mock)) return
 
   middelwaves.unshift({
     name: 'edu-scripts-mock-middelwave',
-    middleware: mockMiddlewave,
+    middleware: mockMiddlewave as any,
   })
 
   console.log(
@@ -153,4 +142,4 @@ function setupMockServer(middelwaves, devServer) {
   return middelwaves
 }
 
-module.exports = setupMockServer
+export default setupMockServer

package/src/config/plugins/{postcss-safe-area.js → postcss-safe-area.ts}

@@ -1,3 +1,4 @@
+import type { Plugin } from 'postcss'
 const vars = [
   'safe-area-inset-top',
   'safe-area-inset-bottom',
@@ -7,8 +8,7 @@ const vars = [
 
 const expr = new RegExp(`env\\(\\s*(${vars.join('|')})\\s*,?\\s*([^)]+)?\\s*\\)`, 'g')
 
-/** @type {import('postcss').PluginCreator} */
-module.exports = () => {
+const PostcssSafeAreaPlugin = (): Plugin => {
   return {
     postcssPlugin: 'postcss-safe-area',
     Declaration(decl) {
@@ -19,3 +19,5 @@ module.exports = () => {
     },
   }
 }
+
+export default PostcssSafeAreaPlugin