chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/internal/node-utils/src/prettier.ts
+++ b/internal/node-utils/src/prettier.ts
@@ -1,5 +1,5 @@
+import fs from 'fs-extra';
 import { format, getFileInfo, resolveConfig } from 'prettier';
-import { fs } from 'zx';

 async function prettierFormat(filepath: string) {
  const prettierOptions = await resolveConfig(filepath, {});