@qse/edu-scripts 0.0.0-beta.5 → 0.0.0-beta.6

package/dist/cli.mjs

@@ -1,5 +1,6 @@
 #!/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";
@@ -58,9 +59,8 @@ const paths = {
 	jsconfig: resolveApp("jsconfig.json"),
 	package: resolveApp("package.json"),
 	tailwind: resolveApp("tailwind.config.js"),
-	indexJS: resolveApp("src", "index.js"),
 	pages: resolveApp("src", "pages"),
-	override: resolveApp("edu-scripts.override.js"),
+	override: getExistPath(resolveApp("edu-scripts.override.js"), resolveApp("edu-scripts.override.ts")),
 	indexHTML: globbySync("./public/*.html", { absolute: true }),
 	src: resolveApp("src"),
 	public: resolveApp("public"),
@@ -533,7 +533,6 @@ function getWebpackConfig(args, override) {
 //#endregion
 //#region src/config/plugins/mock-server/index.ts
 const require$1 = createRequire(import.meta.url);
-const { register } = require$1("@swc-node/register/register");
 let mockCache = {};
 let isSetup = false;
 const setupMock = debounce(function setupMock() {
@@ -628,7 +627,6 @@ const mockMiddlewave = function mockMiddlewave(req, res, next) {
 };
 function setupMockServer(middelwaves, _devServer) {
 	if (!fs.existsSync(paths.mock)) return;
-	register();
 	middelwaves.unshift({
 		name: "edu-scripts-mock-middelwave",
 		middleware: mockMiddlewave
@@ -1034,7 +1032,7 @@ 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);
@@ -1302,7 +1300,7 @@ function copyDistToRepo(info) {
 	exec(`svn co ${info.distBranchDirURL} ${tmpdir}`);
 	try {
 		exec(`svn rm * --force -q`, { cwd: tmpdir });
-	} catch (_e) {}
+	} catch {}
 	fs.copySync(paths.dist, tmpdir);
 	exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir });
 	exec(`svn ci -m "${`[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`}"`, { cwd: tmpdir });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "0.0.0-beta.5",
+  "version": "0.0.0-beta.6",
   "author": "Kinoko",
   "license": "MIT",
   "type": "module",

package/src/cli.ts

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

package/src/commit-dist.ts

@@ -61,10 +61,7 @@ function copyDistToRepo(info: WorkingCopyInfo) {
 
   try {
     exec(`svn rm * --force -q`, { cwd: tmpdir })
-  } catch (_e:any) {
-    // 如果目录为空，svn rm 会报错，忽略即可
-  }
-
+  } catch {}
   fs.copySync(paths.dist, tmpdir)
 
   exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir })

package/src/config/paths.ts

@@ -40,9 +40,8 @@ const paths = {
   jsconfig: resolveApp('jsconfig.json'),
   package: resolveApp('package.json'),
   tailwind: resolveApp('tailwind.config.js'),
-  indexJS: resolveApp('src', 'index.js'),
   pages: resolveApp('src', 'pages'),
-  override: resolveApp('edu-scripts.override.js'),
+  override: getExistPath(resolveApp('edu-scripts.override.js'), resolveApp('edu-scripts.override.ts')),
   indexHTML: globbySync('./public/*.html', { absolute: true }),
   src: resolveApp('src'),
   public: resolveApp('public'),

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

@@ -11,7 +11,6 @@ import { pathToRegexp, type Key } from 'path-to-regexp'
 import { createRequire } from 'node:module'
 import { resolveModule } from '@/utils/resolveModule'
 const require = createRequire(import.meta.url)
-const { register } = require('@swc-node/register/register')
 
 let mockCache: Record<string, { handler: any; method: string; path: string }> = {}
 let isSetup = false
@@ -129,8 +128,6 @@ type Middlewares = Parameters<
 function setupMockServer(middelwaves: Middlewares, _devServer: any) {
   if (!fs.existsSync(paths.mock)) return
 
-  register()
-
   middelwaves.unshift({
     name: 'edu-scripts-mock-middelwave',
     middleware: mockMiddlewave as any,

package/src/deploy.ts

@@ -96,7 +96,7 @@ async function normalDeploy(args: DeployArgs) {
         try {
           await sftp.fastGet(remoteLogFile, tmpLogFile)
           content = await fs.readFile(tmpLogFile, 'utf-8')
-        } catch (_error: any) {}
+        } catch {}
         content = updateLogContent(content, info)
         await fs.writeFile(tmpLogFile, content)
         await sftp.fastPut(tmpLogFile, remoteLogFile)

package/src/utils/FileSizeReporter.ts

@@ -13,17 +13,15 @@ import filesize from 'filesize'
 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
   sizes: Record<string, number>
 }
 
-interface WebpackStats {
-  stats?: WebpackStats[]
-  toJson: (options: { all: boolean; assets: boolean }) => {
-    assets: Array<{ name: string }>
-  }
+interface WebpackStats extends Stats {
+  stats?: Stats[]
 }
 
 function canReadAsset(asset: string): boolean {
@@ -48,7 +46,7 @@ function printFileSizesAfterBuild(
     .map((stats) =>
       stats
         .toJson({ all: false, assets: true })
-        .assets.filter((asset) => canReadAsset(asset.name))
+        .assets!.filter((asset) => canReadAsset(asset.name))
         .map((asset) => {
           const fileContents = fs.readFileSync(path.join(root, asset.name))
           const size = gzipSizeSync(fileContents)
@@ -143,12 +141,15 @@ function measureFileSizesBeforeBuild(buildFolder: string): Promise<SizeMap> {
     recursive(buildFolder, (err: any, fileNames: any) => {
       let sizes: Record<string, number> | undefined
       if (!err && fileNames) {
-        sizes = fileNames.filter(canReadAsset).reduce((memo: any, fileName: any) => {
-          const contents = fs.readFileSync(fileName)
-          const key = removeFileNameHash(buildFolder, fileName)
-          memo[key] = gzipSizeSync(contents)
-          return memo
-        }, {} as Record<string, number>)
+        sizes = fileNames.filter(canReadAsset).reduce(
+          (memo: any, fileName: any) => {
+            const contents = fs.readFileSync(fileName)
+            const key = removeFileNameHash(buildFolder, fileName)
+            memo[key] = gzipSizeSync(contents)
+            return memo
+          },
+          {} as Record<string, number>
+        )
       }
       resolve({
         root: buildFolder,