fixup! fixup! fixup! fixup! loader: return package format from defaul…

…tResolve if known
nodejs · Dec 4, 2021 · 33a4572 · 33a4572
1 parent 022a2eb
commit 33a4572
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/test/es-module/test-esm-resolve-type.js b/test/es-module/test-esm-resolve-type.js
@@ -20,6 +20,7 @@ const {
 
 const rel = (file) => path.join(tmpdir.path, file);
 const previousCwd = process.cwd();
+const nmDir = rel('node_modules');
 try {
   tmpdir.refresh();
   process.chdir(tmpdir.path);
@@ -60,7 +61,6 @@ try {
         }
       };
 
-      const nmDir = rel('node_modules');
       const mDir = rel(`node_modules/${moduleName}`);
       const subDir = rel(`node_modules/${moduleName}/subdir`);
       const pkg = rel(`node_modules/${moduleName}/package.json`);
@@ -80,11 +80,7 @@ try {
       const resolveResult = resolve(`${moduleName}`);
       assert.strictEqual(resolveResult.format, expectedResolvedType);
 
-      fs.unlinkSync(script);
-      fs.unlinkSync(pkg);
-      fs.rmdirSync(subDir);
-      fs.rmdirSync(mDir);
-      fs.rmdirSync(nmDir);
+      fs.rmSync(nmDir, { recursive: true, force: true });
     });
   })().then(common.mustCall());
 
@@ -134,7 +130,6 @@ try {
 
   const moduleName = 'my-dual-package';
 
-  const nmDir = rel('node_modules');
   const mDir = rel(`node_modules/${moduleName}`);
   const esSubDir = rel(`node_modules/${moduleName}/es`);
   const cjsSubDir = rel(`node_modules/${moduleName}/lib`);
@@ -172,21 +167,11 @@ try {
                      esm-resolve-tester: () => {return 42}}`
   );
 
-
   // test the resolve
   const resolveResult = resolve(`${moduleName}`);
   assert.strictEqual(resolveResult.format, 'module');
   assert.ok(resolveResult.url.includes('my-dual-package/es/index.js'));
-
-  // cleanup
-  fs.unlinkSync(esScript);
-  fs.unlinkSync(cjsScript);
-  fs.unlinkSync(pkg);
-  fs.unlinkSync(esmPkg);
-  fs.rmdirSync(esSubDir);
-  fs.rmdirSync(cjsSubDir);
-  fs.rmdirSync(mDir);
-  fs.rmdirSync(nmDir);
 } finally {
   process.chdir(previousCwd);
+  fs.rmSync(nmDir, { recursive: true, force: true });
 }