test: Fixed issue affecting running tests

bradennapier · Dec 9, 2022 · f854433 · f854433
1 parent f5e0016
commit f854433
Show file tree

Hide file tree

Showing 4 changed files with 829 additions and 772 deletions.
diff --git a/test/package.json b/test/package.json
@@ -12,6 +12,7 @@
     "typescript": "latest",
     "ts-patch": "link:../node_modules/ts-patch",
     "ts-node": "link:../node_modues/ts-node",
+    "tsp1": "npm:ts-patch@1.*.*",
     "@nrwl/cli": "^15.0.0",
     "@nrwl/js": "^15.0.0",
     "@nrwl/node": "^15.0.0",

diff --git a/test/prepare.js b/test/prepare.js
@@ -1,6 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const tsPatch = require("ts-patch");
+const tsp1 = require('tsp1');
 
 /* ****************************************************************************************************************** *
  * Config
@@ -13,12 +14,14 @@ const tsDirs = ["typescript-three", "typescript-four-seven", "typescript"];
  * Patch TS Modules
  * ****************************************************************************************************************** */
 
-const baseDirs = new Set();
+const baseDirs = new Map();
 
 for (const tsDirName of tsDirs) {
   const mainDir = path.resolve(rootDir, "node_modules", tsDirName);
-  if (!fs.existsSync(path.join(mainDir, "lib-backup"))) baseDirs.add(mainDir);
+  if (!fs.existsSync(path.join(mainDir, "lib-backup"))) baseDirs.set(tsDirName, mainDir);
 }
 
 // Patch discovered modules
-for (const dir of baseDirs) tsPatch.patch(["tsc.js", "typescript.js"], { basedir: dir });
+for (const [ dirName, dir ] of baseDirs)
+  if (dirName === 'typescript-three') tsp1.patch(["tsc.js", "typescript.js"], { basedir: dir })
+  else tsPatch.patch(["tsc.js", "typescript.js"], { dir });