Merge pull request #34 from ch1ny/fix/build-main

fix: 修复主进程编译函数&主进程监听
ch1ny · Oct 26, 2023 · 8d00740 · 8d00740
2 parents 6729d6d + 2a9e69b
commit 8d00740
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 25 deletions.
diff --git a/src/creta/src/cli/scripts/dev.ts b/src/creta/src/cli/scripts/dev.ts
@@ -1,8 +1,8 @@
-import fs from 'fs';
 import path from 'path';
 import { createServer } from 'vite';
 import constants from '../constants';
 import { buildMain, buildPreload, getCretaConfigs, runElectron, tscWatch } from '../utils';
+import getChildrenScripts from '../utils/getChildrenScripts';
 
 const { defaultViteConfig, scriptsCwd } = constants;
 
@@ -59,11 +59,10 @@ const main = async () => {
 		await Promise.all([
 			// 2.2.1 tsc watch 主进程代码
 			new Promise<void>(async (resolve) => {
+				const filesToBuild = await getChildrenScripts(path.resolve(scriptsCwd, 'src', 'main'));
 				const mainConfigPath = path.resolve(scriptsCwd, 'src', 'main', 'tsconfig.json');
 				tscWatchPrograms.main = tscWatch(
-					(await fs.promises.readdir(path.resolve(scriptsCwd, 'src', 'main')))
-						.filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
-						.map((file) => path.resolve(scriptsCwd, 'src', 'main', file)),
+					filesToBuild,
 					mainConfigPath,
 					{
 						onAfterFirstCompile(program, defaultCallback?) {
@@ -127,10 +126,11 @@ const main = async () => {
 			// 2.2.2 tsc watch 预加载脚本代码
 			new Promise<void>(async (resolve) => {
 				const preloadConfigPath = path.resolve(scriptsCwd, 'src', 'preload', 'tsconfig.json');
+
+				const filesToBuild = await getChildrenScripts(path.resolve(scriptsCwd, 'src', 'preload'));
+
 				tscWatchPrograms.preload = tscWatch(
-					(await fs.promises.readdir(path.resolve(scriptsCwd, 'src', 'preload')))
-						.filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
-						.map((file) => path.resolve(scriptsCwd, 'src', 'preload', file)),
+					filesToBuild,
 					preloadConfigPath,
 					{
 						onAfterFirstCompile(program, defaultCallback?) {

diff --git a/src/creta/src/cli/utils/build.ts b/src/creta/src/cli/utils/build.ts
@@ -4,6 +4,7 @@ import { build } from 'vite';
 import constants from '../constants';
 import { getCretaConfigs } from './getCretaConfigs';
 import { tscBuild } from './tsc';
+import getChildrenScripts from './getChildrenScripts';
 
 const { defaultViteConfig, scriptsCwd } = constants;
 
@@ -29,23 +30,7 @@ export const buildPreload = async () =>
 	);
 
 export const buildMain = async () => {
-	const mainRootDir = path.resolve(scriptsCwd, 'src', 'main');
-	const nextDirList = [mainRootDir];
-	const filesToBuild: string[] = [];
-
-	let nextDir: string | undefined;
-	while ((nextDir = nextDirList.shift())) {
-		const files = await fs.promises.readdir(path.resolve(nextDir));
-		files.map(async (fileName) => {
-			const filePath = path.resolve(nextDir!, fileName);
-			const fsStatus = await fs.promises.stat(filePath);
-			if (fsStatus.isDirectory()) {
-				nextDirList.push(filePath);
-			} else if (filePath.endsWith('.js') || filePath.endsWith('.ts')) {
-				filesToBuild.push(filePath);
-			}
-		});
-	}
+	const filesToBuild = await getChildrenScripts(path.resolve(scriptsCwd, 'src', 'main'));
 
 	await tscBuild(filesToBuild, path.resolve(scriptsCwd, 'src', 'main', 'tsconfig.json'));
 };
diff --git a/src/creta/src/cli/utils/getChildrenScripts.ts b/src/creta/src/cli/utils/getChildrenScripts.ts
@@ -0,0 +1,27 @@
+import fs from 'fs';
+import path from 'path';
+
+export default async function (dir: string) {
+	const mainRootDir = path.resolve(dir);
+
+	const nextDirList = [mainRootDir];
+	const filesToBuild: string[] = [];
+
+	let nextDir: string | undefined;
+	while ((nextDir = nextDirList.shift())) {
+		const files = await fs.promises.readdir(path.resolve(nextDir));
+		await Promise.all(
+			files.map(async (fileName) => {
+				const filePath = path.resolve(nextDir!, fileName);
+				const fsStatus = await fs.promises.stat(filePath);
+				if (fsStatus.isDirectory()) {
+					nextDirList.push(filePath);
+				} else if (filePath.endsWith('.js') || filePath.endsWith('.ts')) {
+					filesToBuild.push(filePath);
+				}
+			})
+		);
+	}
+
+	return filesToBuild;
+}
diff --git a/src/creta/src/cli/utils/getMainScripts.ts b/src/creta/src/cli/utils/getMainScripts.ts
@@ -0,0 +1,26 @@
+import fs from 'fs';
+import path from 'path';
+import constants from '../constants';
+
+export default async function () {
+	const mainRootDir = path.resolve(constants.scriptsCwd, 'src', 'main');
+
+	const nextDirList = [mainRootDir];
+	const filesToBuild: string[] = [];
+
+	let nextDir: string | undefined;
+	while ((nextDir = nextDirList.shift())) {
+		const files = await fs.promises.readdir(path.resolve(nextDir));
+		files.map(async (fileName) => {
+			const filePath = path.resolve(nextDir!, fileName);
+			const fsStatus = await fs.promises.stat(filePath);
+			if (fsStatus.isDirectory()) {
+				nextDirList.push(filePath);
+			} else if (filePath.endsWith('.js') || filePath.endsWith('.ts')) {
+				filesToBuild.push(filePath);
+			}
+		});
+	}
+
+	return filesToBuild;
+}
diff --git a/src/creta/src/cli/utils/tsc.ts b/src/creta/src/cli/utils/tsc.ts
@@ -366,7 +366,6 @@ export const tscWatch = async (
 		createProgram,
 		reportDiagnostic,
 		reportWatchStatusChanged,
-		undefined,
 		undefined
 	);