admin: fixed update scripts to not conflict with reticulate used in v6

ethers-io · Apr 13, 2022 · 948f770 · 948f770
1 parent 9e57e71
commit 948f770
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/misc/admin/lib/npm.js b/misc/admin/lib/npm.js
@@ -47,7 +47,11 @@ function getPackage(name, version) {
         if (version == null) {
             const versions = Object.keys(infos.versions);
             versions.sort(semver_1.default.compare);
-            version = versions.pop();
+            // HACK: So v5 continues working while v6 is managed by reticulate
+            version = "6.0.0";
+            while (version.indexOf("beta") >= 0 || semver_1.default.gte(version, "6.0.0")) {
+                version = versions.pop();
+            }
         }
         const info = infos.versions[version];
         return {

diff --git a/misc/admin/src.ts/npm.ts b/misc/admin/src.ts/npm.ts
@@ -32,7 +32,12 @@ export async function getPackage(name: string, version?: string): Promise<Packag
     if (version == null) {
         const versions = Object.keys(infos.versions);
         versions.sort(semver.compare);
-        version = versions.pop();
+
+        // HACK: So v5 continues working while v6 is managed by reticulate
+        version = "6.0.0";
+        while (version.indexOf("beta") >= 0 || semver.gte(version, "6.0.0")) {
+            version = versions.pop();
+        }
     }
 
     const info = infos.versions[version];