update to @jspm/[email protected] (#2536)

* update to @jspm/[email protected]

* windows support for tests, new generator behaviour

chompfile.toml

@@ -60,3 +60,4 @@ dep = 'test:'
 name = 'test:##'
 dep = 'test/##.test.ts'
 run = 'tsx $DEP'
+serial = true

package.json

@@ -12,7 +12,7 @@
     "jspm.js"
   ],
   "dependencies": {
-    "@jspm/generator": "^1.1.7",
+    "@jspm/generator": "^1.1.9",
     "cac": "^6.7.14",
     "ora": "^6.3.0",
     "picocolors": "^1.0.0"

test/ownname.test.ts

@@ -9,12 +9,11 @@ const scenarios: Scenario[] = [
     commands: ["jspm install app"],
     validationFn: async (files: Map<string, string>) => {
       // Installing the own-name package "app" should result in the version of
-      // es-module-lexer in the import map remaining the same, since it's a
-      // transitive dependency of "./app.js", even though it violates the lock:
-      // TODO: is this the behaviour we want?
+      // es-module-lexer in the import map being upgraded to 1.2.2, since it's a
+      // transitive dependency of "./app.js".
       const map = JSON.parse(files.get("importmap.json"));
       assert(
-        map?.imports?.["es-module-lexer"]?.includes("es-module-lexer@0.10.5")
+        map?.imports?.["es-module-lexer"]?.includes("es-module-lexer@1.2.1")
       );
     },
   },

test/scenarios.ts

@@ -46,8 +46,8 @@ export async function runScenario(scenario: Scenario) {
       cause: err,
     });
   } finally {
-    await deleteTmpPkg(dir);
     process.chdir(cwd);
+    await deleteTmpPkg(dir);
   }
 }
 
@@ -61,7 +61,7 @@ export async function mapDirectory(dir: string): Promise<Files> {
     } else {
       const subFiles = await mapDirectory(filePath);
       for (const [subFile, subData] of subFiles) {
-        files.set(path.join(file, subFile), subData);
+        files.set(path.join(file, subFile).replace(/\\/g, '/'), subData);
       }
     }
   }
@@ -99,7 +99,16 @@ async function createTmpPkg(scenario: Scenario): Promise<string> {
 async function deleteTmpPkg(dir: string) {
   if (dir.startsWith(os.tmpdir())) {
     // ensure it's a tmp dir
-    return fs.rm(dir, { recursive: true });
+    while (true) {
+      try {
+        await fs.rm(dir, { recursive: true });
+        return;
+      }
+      catch (err) {
+        if (err.code === 'EBUSY')
+          await new Promise(resolve => setTimeout(resolve, 10));
+      }
+    }
   } else {
     throw new Error(`Cannot delete ${dir} as it is not a temporary directory.`);
   }