chore: cleanup rename function

electron · Jan 8, 2024 · 1f1a432 · 1f1a432
1 parent 6d3103a
commit 1f1a432
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/plugin/vite/src/util/package.ts b/packages/plugin/vite/src/util/package.ts
@@ -14,7 +14,7 @@ export interface SourceAndDestination {
   dest: string;
 }
 
-function isRootDirectory(dir: string) {
+function isRootPath(dir: string) {
   // Linux or Windows root path
   return dir === '/' || /^[A-Z]:\\$/i.test(dir);
 }
@@ -30,7 +30,7 @@ export async function lookupNodeModulesPaths(root: string, paths: string[] = [])
   }
   root = path.join(root, '..');
 
-  return isRootDirectory(root) ? paths : await lookupNodeModulesPaths(root, paths);
+  return isRootPath(root) ? paths : await lookupNodeModulesPaths(root, paths);
 }
 
 export async function readPackageJson(root = process.cwd()): Promise<PackageJsonManifest> {
@@ -57,7 +57,7 @@ export async function resolveDependencies(root: string) {
         let curPath = prePath,
           depPath = null,
           packageJson = null;
-        while (!packageJson && !isRootDirectory(curPath)) {
+        while (!packageJson && !isRootPath(curPath)) {
           const allNodeModules = await lookupNodeModulesPaths(curPath);
 
           for (const nodeModules of allNodeModules) {

diff --git a/packages/template/vite-typescript/test/ViteTypeScriptTemplate_spec_slow.ts b/packages/template/vite-typescript/test/ViteTypeScriptTemplate_spec_slow.ts
@@ -21,7 +21,16 @@ describe('ViteTypeScriptTemplate', () => {
   after(async () => {
     await yarnOrNpmSpawn(['link:remove']);
     await killWindowsEsbuildExe();
-    await fs.remove(dir);
+    try {
+      await fs.remove(dir);
+    } catch (err1) {
+      console.log('[plugin-vite] err1:', err1);
+      try {
+        fs.rmSync(dir, { recursive: true, force: true });
+      } catch (err2) {
+        console.log('[plugin-vite] err2:', err2);
+      }
+    }
   });
 
   describe('template files are copied to project', () => {