@qse/edu-scripts 1.15.0 → 2.0.1

package/src/config/{webpackConfig.js → webpackConfig.ts}

@@ -1,16 +1,20 @@
-const fs = require('fs')
-const webpack = require('webpack')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
-const ReactRefreshPlugin = require('@pmmmwh/react-refresh-webpack-plugin')
-const paths = require('./paths')
-const TerserPlugin = require('terser-webpack-plugin')
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin')
-const appPkg = require(paths.package)
-const appConfig = require('../utils/appConfig')
-const { ESBuildMinifyPlugin } = require('esbuild-loader')
-const { RetryChunkLoadPlugin } = require('webpack-retry-chunk-load-plugin')
-const once = require('lodash/once')
+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 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'
+
+const require = createRequire(import.meta.url)
+const appPkg = fs.readJsonSync(paths.package) as { name: string; version: string }
 
 const jsMainPath = appConfig.grayscale
   ? `${appPkg.name}/beta/${appPkg.name}`
@@ -26,10 +30,19 @@ const lessModuleRegex = /\.module\.less$/
 
 const imageInlineSizeLimit = 10 * 1024
 
-const qseCDN = (() => {
+interface QseCDN {
+  isUseCommon: boolean
+  isUseAxios: boolean
+  isUseMoment: boolean
+  isUseAntd: boolean
+  isUseQsbAntd: boolean
+  isUseQsbSchemeRender: boolean
+}
+
+const qseCDN: QseCDN = (() => {
   const contents = paths.indexHTML.map((url) => fs.readFileSync(url, 'utf-8'))
 
-  function include(pattern) {
+  function include(pattern: string | RegExp): boolean {
     const regexp = new RegExp(pattern)
     return contents.some((content) => regexp.test(content))
   }
@@ -44,16 +57,21 @@ const qseCDN = (() => {
   }
 })()
 
-/**
- * @param {*} args
- * @param {import('../utils/defineConfig').Config} override
- */
-module.exports = function getWebpackConfig(args, override) {
+interface CSSLoaderOptions {
+  importLoaders: number
+  sourceMap: boolean
+  modules: {
+    mode: 'global' | 'local'
+    localIdentName: string
+  }
+}
+
+export default function getWebpackConfig(args: any, override: CustomConfiguration): Configuration {
   const isDev = process.env.NODE_ENV === 'development'
   const isProd = process.env.NODE_ENV === 'production'
 
   // common function to get style loaders
-  const getStyleLoaders = (cssOptions, preProcessor) => {
+  const getStyleLoaders = (cssOptions: CSSLoaderOptions, preProcessor?: string) => {
     const loaders = [
       {
         loader: require.resolve('style-loader'),
@@ -87,10 +105,10 @@ module.exports = function getWebpackConfig(args, override) {
                   // https://preset-env.cssdb.org/features/#stage-2
                 },
               ],
-              isProd && require('./plugins/postcss-safe-area')(),
+              isProd && PostcssSafeAreaPlugin(),
               isProd && [require.resolve('postcss-momentum-scrolling'), ['scroll', 'auto']],
               require.resolve('postcss-normalize'),
-              ...override.extraPostCSSPlugins,
+              ...(override.extraPostCSSPlugins || []),
             ].filter(Boolean),
           },
           sourceMap: isDev,
@@ -103,19 +121,20 @@ module.exports = function getWebpackConfig(args, override) {
         options: {
           lessOptions: {
             javascriptEnabled: true,
-            modifyVars: fs.existsSync(paths.theme) ? require(paths.theme) : undefined,
+            modifyVars: fs.existsSync(paths.theme)
+              ? resolveModule(require(paths.theme))
+              : undefined,
           },
           sourceMap: true,
         },
-      })
+      } as any)
     }
     return loaders
   }
 
-  /** @type {webpack.Configuration} */
-  const config = {
+  const config: Configuration = {
     context: process.cwd(),
-    mode: process.env.NODE_ENV,
+    mode: process.env.NODE_ENV as 'development' | 'production' | 'none',
     entry: './src/index',
     target: 'browserslist',
     output: {
@@ -182,23 +201,18 @@ module.exports = function getWebpackConfig(args, override) {
     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'],
-    },
-    stats: isDev ? { preset: 'errors-warnings', timings: true } : undefined,
-    devtool: isDev ? 'cheap-module-source-map' : false,
-    cache: {
-      type: 'filesystem',
-      version: require('../../package.json').version,
-      buildDependencies: {
-        config: [__filename],
-        override: [paths.override, paths.theme].filter((f) => fs.existsSync(f)),
-        tsconfig: [paths.tsconfig, paths.jsconfig].filter((f) => fs.existsSync(f)),
+      tsConfig: {
+        configFile: paths.tsconfig,
+        references: 'auto',
       },
     },
+    stats: false,
+    devtool: isDev ? 'cheap-module-source-map' : false,
     module: {
-      parser: { javascript: { exportsPresence: 'error' } },
       rules: [
         {
           oneOf: [
@@ -207,16 +221,62 @@ module.exports = function getWebpackConfig(args, override) {
               type: 'asset/source',
             },
             {
-              test: /\.(j|t)sx?$/,
-              loader: require.resolve('babel-loader'),
+              test: /\.[cm]?[jt]sx?$/,
               exclude: /node_modules/,
-              options: require('./babel')(),
+              use: [
+                {
+                  loader: 'builtin:swc-loader',
+                  options: {
+                    env: { targets: process.env.BROWSERSLIST },
+                    rspackExperiments: {
+                      import: [
+                        {
+                          libraryName: 'lodash',
+                          libraryDirectory: '',
+                          camelToDashComponentName: false,
+                        },
+                        ...(override.import || []),
+                      ],
+                    },
+                    isModule: 'unknown',
+                    jsc: {
+                      parser: {
+                        syntax: 'typescript',
+                        tsx: true,
+                        decorators: override.decorators,
+                      },
+                      externalHelpers: true,
+                      transform: {
+                        legacyDecorator: override.decorators,
+                        react: {
+                          runtime: 'automatic',
+                          development: isDev,
+                          refresh: isDev,
+                        },
+                      },
+                    },
+                  } satisfies SwcLoaderOptions,
+                },
+              ],
             },
-            override.transformNodeModules && {
-              test: /\.m?js$/,
-              loader: require.resolve('babel-loader'),
-              exclude: /@babel(?:\/|\\{1,2})runtime/,
-              options: require('./babel.dependencies')(),
+            {
+              test: /\.[cm]?jsx?$/,
+              exclude: /node_modules[\\/](core-js|@swc[\\/]helpers)([\\/]|$)/,
+              use: [
+                {
+                  loader: 'builtin:swc-loader',
+                  options: {
+                    env: { targets: process.env.BROWSERSLIST },
+                    isModule: 'unknown',
+                    jsc: {
+                      parser: {
+                        syntax: 'ecmascript',
+                      },
+                      externalHelpers: true,
+                    },
+                  },
+                },
+              ],
             },
             {
               test: cssRegex,
@@ -328,41 +388,41 @@ module.exports = function getWebpackConfig(args, override) {
               // its runtime that would otherwise be processed through "file" loader.
               // Also exclude `html` and `json` extensions so they get processed
               // by webpacks internal loaders.
-              exclude: [/^$/, /\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
+              test: /\.(?!(?:js|mjs|jsx|ts|tsx|html|json)$)[^.]+$/,
               type: 'asset/resource',
             },
-          ].filter(Boolean),
+          ].filter(Boolean) as RuleSetRule[],
         },
       ],
     },
     plugins: [
       qseCDN.isUseCommon &&
-        new webpack.DllReferencePlugin({
-          manifest: require('../asset/dll/libcommon3-manifest.json'),
+        new rspack.DllReferencePlugin({
+          manifest: fs.readJsonSync(paths.resolveOwn('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 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 webpack.IgnorePlugin({
+      ),
+      new rspack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,
       }),
-      new RetryChunkLoadPlugin({
-        maxRetries: 3,
-        retryDelay: 300,
-        lastResortScript: `setTimeout(function() { window.location.reload(); }, 2000)`,
-      }),
-      new webpack.DefinePlugin({
+      new rspack.DefinePlugin({
         'process.env.APP_NAME': JSON.stringify(appPkg.name),
         '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),
         ...override.define,
       }),
-      new webpack.ProgressPlugin(),
-      isDev && new CaseSensitivePathsPlugin(),
+      new rspack.ProgressPlugin(),
+      isDev && new rspack.CaseSensitivePlugin(),
       isDev && new ReactRefreshPlugin({ overlay: false }),
       ...(isDev || process.env.OUTPUT_HTML || appConfig.single || appConfig.mainProject
         ? paths.indexHTML.map(
@@ -386,82 +446,53 @@ module.exports = function getWebpackConfig(args, override) {
               })
           )
         : []),
-      process.env.ANALYZE && isProd && new BundleAnalyzerPlugin(),
+      process.env.ANALYZE && isProd && new RsdoctorRspackPlugin(),
       isDev &&
-        !!override.startup &&
-        ((compiler) => {
-          compiler.hooks.afterDone.tap(
-            'edu-scripts-startup',
-            once(() => {
+        ((compiler: Compiler) => {
+          let isFirst = true
+          compiler.hooks.afterDone.tap('edu-scripts-startup', (stats) => {
+            if (!isFirst) console.clear()
+            isFirst = false
+
+            if (override.startup) {
               const logger = compiler.getInfrastructureLogger('edu-scripts')
-              override.startup({ logger, chalk: require('chalk'), compiler })
-            })
-          )
+              override.startup({ logger, chalk, compiler })
+            }
+            console.log(stats.toString({ preset: 'errors-warnings', timings: true, colors: true }))
+          })
         }),
     ].filter(Boolean),
     optimization: {
       minimize: isProd && override.minify !== false,
       minimizer: [
-        override.minify === 'esbuild' &&
-          new ESBuildMinifyPlugin({
-            pure: override.pure_funcs ?? ['console.log'],
-            drop: ['debugger'],
-            keepNames: false,
-            legalComments: 'none',
-            target: 'es5',
-          }),
-        // This is only used in production mode
-        override.minify === 'terser' &&
-          new TerserPlugin({
-            extractComments: false,
-            terserOptions: {
-              parse: {
-                // We want terser to parse ecma 8 code. However, we don't want it
-                // to apply any minification steps that turns valid ecma 5 code
-                // into invalid ecma 5 code. This is why the 'compress' and 'output'
-                // sections only apply transformations that are ecma 5 safe
-                // https://github.com/facebook/create-react-app/pull/4234
-                ecma: 8,
-              },
-              compress: {
-                pure_funcs: override.pure_funcs ?? ['console.log'],
-                drop_debugger: true,
-                ecma: 5,
-                warnings: false,
-                // Disabled because of an issue with Uglify breaking seemingly valid code:
-                // https://github.com/facebook/create-react-app/issues/2376
-                // Pending further investigation:
-                // https://github.com/mishoo/UglifyJS2/issues/2011
-                comparisons: false,
-                // Disabled because of an issue with Terser breaking valid code:
-                // https://github.com/facebook/create-react-app/issues/5250
-                // Pending further investigation:
-                // https://github.com/terser-js/terser/issues/120
-                inline: 2,
-              },
-              mangle: {
-                safari10: true,
-              },
-              // Added for profiling in devtools
-              keep_classnames: false,
-              keep_fnames: false,
-              output: {
-                ecma: 5,
-                comments: false,
-                // Turned on because emoji and regex is not minified properly using default
-                // https://github.com/facebook/create-react-app/issues/2488
-                ascii_only: true,
-              },
+        new rspack.SwcJsMinimizerRspackPlugin({
+          minimizerOptions: {
+            ecma: 5,
+            compress: {
+              pure_funcs: override.pure_funcs,
+              drop_debugger: true,
+              ecma: 5,
+              // Disabled because of an issue with Uglify breaking seemingly valid code:
+              // https://github.com/facebook/create-react-app/issues/2376
+              // Pending further investigation:
+              // https://github.com/mishoo/UglifyJS2/issues/2011
+              comparisons: false,
+              // Disabled because of an issue with Terser breaking valid code:
+              // https://github.com/facebook/create-react-app/issues/5250
+              // Pending further investigation:
+              // https://github.com/terser-js/terser/issues/120
+              inline: 2,
             },
-          }),
-      ].filter(Boolean),
+          },
+        }),
+      ],
       splitChunks: {
         minChunks: 2,
       },
     },
     performance: {
       maxEntrypointSize: appConfig.single ? 1024 * 1024 : 30 * 1024,
-      maxAssetSize: 1024 * 1024,
+      maxAssetSize: 2 * 1024 * 1024,
     },
   }
 

package/src/config/{webpackDevServerConfig.js → webpackDevServerConfig.ts}

@@ -1,8 +1,15 @@
-const WebpackDevServer = require('webpack-dev-server')
-const setupMockServer = require('./plugins/mock-server')
+import type { Configuration } from '@rspack/dev-server'
+import type { Configuration as CustomConfiguration } from '../utils/defineConfig'
+import setupMockServer from './plugins/mock-server'
 
-/** @returns {WebpackDevServer.ProxyConfigArrayItem} */
-function createProxy(context, target, origin) {
+interface ProxyConfig {
+  context: string[]
+  target: string
+  changeOrigin: boolean
+  onProxyReq: (proxyReq: any) => void
+}
+
+function createProxy(context: string, target: string, origin?: string): ProxyConfig {
   const url = new URL(origin || target)
 
   return {
@@ -17,20 +24,13 @@ function createProxy(context, target, origin) {
   }
 }
 
-/**
- * @param {*} args
- * @param {import('../utils/defineConfig').Config} override
- */
-module.exports = function getWebpackDevServerConfig(args, override) {
+export default function getWebpackDevServerConfig(args: any, override: CustomConfiguration): Configuration {
   const host = process.env.HOST || '0.0.0.0'
 
-  /** @type {WebpackDevServer.Configuration} */
-  const devServer = {
-    hot: true,
+  const devServer: Configuration = {
     allowedHosts: 'all',
     historyApiFallback: true,
     port: args.port,
-    open: args.open,
     host,
     client: {
       webSocketURL: 'auto://0.0.0.0:0/ws',
@@ -60,19 +60,19 @@ module.exports = function getWebpackDevServerConfig(args, override) {
 
   if (override.proxy) {
     if (Array.isArray(override.proxy)) {
-      devServer.proxy = [...override.proxy, ...devServer.proxy]
+      devServer.proxy = [...override.proxy, ...(devServer.proxy || [])]
     } else if (typeof override.proxy === 'object') {
       const proxies = Object.entries(override.proxy).map(([context, target]) => {
-        return createProxy(context, target)
+        return createProxy(context, target as string)
       })
-      devServer.proxy = [...proxies, ...devServer.proxy]
+      devServer.proxy = [...proxies, ...(devServer.proxy || [])]
     } else {
       throw new Error('proxy 必须是数组或对象')
     }
 
     // 清理重复的代理配置
-    const proxyMap = new Map()
-    devServer.proxy = devServer.proxy.filter((item) => {
+    const proxyMap = new Map<string, boolean>()
+    devServer.proxy = (devServer.proxy as ProxyConfig[]).filter((item) => {
       const key = JSON.stringify([...item.context].sort())
       if (!proxyMap.has(key)) {
         proxyMap.set(key, true)

package/src/{deploy.js → deploy.ts}

@@ -1,12 +1,15 @@
-const { sshSftp } = require('@qse/ssh-sftp')
-const path = require('path')
-const paths = require('./config/paths')
-const pkg = require(paths.package)
-const chalk = require('chalk')
-const fs = require('fs-extra')
-const changeDeployVersion = require('./utils/changeDeployVersion')
-const ora = require('ora')
-const appConfig = require('./utils/appConfig')
+// @ts-ignore
+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'
+
+const appPkg = fs.readJsonSync(paths.package)
 
 const baseConfig = {
   localPath: 'dist',
@@ -17,8 +20,8 @@ const baseConfig = {
   noWarn: true,
 }
 
-async function normalDeploy(args) {
-  const resolve = (...pathSegments) => path.resolve(process.cwd(), ...pathSegments)
+async function normalDeploy(args: DeployArgs) {
+  const resolve = paths.resolveApp
 
   /**
    * 生成路径
@@ -28,7 +31,7 @@ async function normalDeploy(args) {
    * @name tmpBase 本地临时文件夹 到`__tmp__`层
    * @param {string} remoteFilePath 远程文件相对`opts.remotePath`地址
    */
-  function getLocalAndRemoteFilePath(remoteFilePath, opts) {
+  function getLocalAndRemoteFilePath(remoteFilePath: string, opts: any) {
     const splited = remoteFilePath.split('/')
     const fileName = splited[splited.length - 1]
     const tmpBase = resolve(opts.localPath, '__tmp__')
@@ -45,13 +48,13 @@ async function normalDeploy(args) {
     date = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
     return date.toISOString().replace(/T/, ' ').replace(/\..+/, '')
   }
-  function updateLogContent(content, info) {
+  function updateLogContent(content: string, info: any) {
     const lines = content.trim().split('\n')
     lines.push(`[${dateTime()}] ${JSON.stringify(info)}\n`)
     return lines.slice(-50).join('\n')
   }
 
-  async function upload(opts) {
+  async function upload(opts: any) {
     // 上传dist文件
     const { sftp, opts: fullOpts } = await sshSftp(opts)
 
@@ -66,8 +69,8 @@ async function normalDeploy(args) {
       fs.mkdirSync(tmpDir, { recursive: true })
 
       const info = {
-        name: pkg.name,
-        version: pkg.version,
+        name: appPkg.name,
+        version: appPkg.version,
         grayscale: appConfig.grayscale,
       }
 
@@ -77,7 +80,8 @@ async function normalDeploy(args) {
 
         // 读取本地文件内容
         let code = await fs.readFile(tmpFile, { encoding: 'utf-8' })
-        code = changeDeployVersion(code, info)
+        code = await changeDeployVersion(code, info)
+        code = await format(code, { parser: 'babel', printWidth: 120 })
 
         await sftp.fastPut(tmpFile, remoteFile + '.bak')
         await fs.writeFile(tmpFile, code)
@@ -92,14 +96,14 @@ 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)
       }
 
       spinner.succeed('已更新 ver.js 版本配置')
-    } catch (e) {
+    } catch (e: any) {
       spinner.fail(`自动修改 ver.js 失败，请手动修改`)
       console.log(chalk.bgRed(e.message))
     } finally {
@@ -120,19 +124,19 @@ async function normalDeploy(args) {
     },
   }
   const uploadSftpConfigs = []
-  if (args.b) {
+  if (args.bureau) {
     uploadSftpConfigs.push(presetConfig.b)
   }
-  if (args.s) {
+  if (args.school) {
     uploadSftpConfigs.push(presetConfig.s)
   }
-  if (args.d) {
+  if (args.documentshelves) {
     uploadSftpConfigs.push(presetConfig.d)
   }
-  if (args.c) {
+  if (args.compositionshelves) {
     uploadSftpConfigs.push(presetConfig.c)
   }
-  if (args.cd) {
+  if (args.compositionshelvesDingtalk) {
     uploadSftpConfigs.push(presetConfig.cd)
   }
   if (uploadSftpConfigs.length === 0) {
@@ -170,7 +174,14 @@ async function singleDeploy() {
   sshSftp(config)
 }
 
-module.exports = function deploy(args) {
+interface DeployArgs {
+  school?: boolean
+  bureau?: boolean
+  documentshelves?: boolean
+  compositionshelves?: boolean
+  compositionshelvesDingtalk?: boolean
+}
+export default function deploy(args: DeployArgs) {
   if (appConfig.single) {
     singleDeploy()
   } else {

package/src/{generator.js → generator.ts}

@@ -1,13 +1,8 @@
-const path = require('path')
-const fs = require('fs-extra')
-const paths = require('./config/paths')
-const chalk = require('chalk')
+import fs from 'fs-extra'
+import paths from './config/paths'
+import chalk from 'chalk'
 
-/**
- * @param {string[]} args
- * @returns {string}
- */
-const getTmpPath = (...args) => path.resolve(__dirname, 'asset', 'template', ...args)
+const getTmpPath = (...args: string[]) => paths.resolveOwn('asset', 'template', ...args)
 
 async function generatorOverride() {
   if (fs.existsSync(paths.override)) {
@@ -61,8 +56,4 @@ async function generatorTailwind() {
   )
 }
 
-module.exports = {
-  override: generatorOverride,
-  ts: generatorTsconfig,
-  tailwind: generatorTailwind,
-}
+export { generatorOverride as override, generatorTsconfig as ts, generatorTailwind as tailwind }