fix version comparison

Author: nonoroazoro

package.json

@@ -122,7 +122,6 @@
     "dependencies": {
         "@octokit/rest": "^19.0.11",
         "chokidar": "^3.5.3",
-        "compare-versions": "^6.1.0",
         "date-fns": "^2.30.0",
         "extract-zip": "^2.0.1",
         "fs-extra": "11.1.1",
@@ -133,6 +132,7 @@
         "lodash.debounce": "^4.0.8",
         "lodash.pick": "^4.4.0",
         "micromatch": "^4.0.5",
+        "semver": "^7.5.4",
         "tmp-promise": "^3.0.3",
         "tslib": "^2.6.2"
     },
@@ -148,7 +148,7 @@
         "@typescript-eslint/parser": "^6.7.5",
         "cross-env": "^7.0.3",
         "eslint": "^8.51.0",
-        "eslint-config-zoro": "^6.0.0",
+        "eslint-config-zoro": "^6.0.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^4.0.1",
         "fork-ts-checker-webpack-plugin": "^9.0.0",

src/core/Environment.ts

@@ -57,10 +57,15 @@ export class Environment
     public readonly snippetsDirectory: string;
 
     /**
-     * Gets the full path of VSCode's `.obsolete file`.
+     * Gets the full path of VSCode's `.obsolete` file.
      */
     public readonly obsoleteFilePath: string;
 
+    /**
+     * Gets the full path of VSCode's `extensions.json` file.
+     */
+    public readonly extensionsFilePath: string;
+
     private static _instance: Environment;
 
     private constructor()
@@ -76,6 +81,7 @@ export class Environment
         this.userDirectory = path.join(this.dataDirectory, "User");
         this.snippetsDirectory = this.getSettingsFilePath("snippets");
         this.obsoleteFilePath = path.join(this.extensionsDirectory, ".obsolete");
+        this.extensionsFilePath = path.join(this.extensionsDirectory, "extensions.json");
     }
 
     /**

src/core/Extension.ts

@@ -151,7 +151,7 @@ export class Extension
         }
 
         // Added since VSCode v1.20.
-        await this.updateObsolete(added, updated, removed);
+        await this.removeVSCodeExtensionFiles();
 
         return result as ISyncedItem;
     }
@@ -233,52 +233,21 @@ export class Extension
     }
 
     /**
-     * Updates the VSCode `.obsolete` file.
+     * Removes VSCode `.obsolete` and `extensions.json` file.
      */
-    public async updateObsolete(
-        added: IExtension[] = [],
-        removed: IExtension[] = [],
-        updated: IExtension[] = []
-    ): Promise<void>
+    public async removeVSCodeExtensionFiles(): Promise<void>
     {
-        const filepath = this._env.obsoleteFilePath;
-        // Record<extensionFolderName, boolean>
-        let obsolete: Record<string, boolean> | undefined;
         try
         {
-            obsolete = await fs.readJson(filepath);
-        }
-        catch
-        {
+            await fs.remove(this._env.obsoleteFilePath);
         }
+        catch { }
 
-        if (obsolete != null)
+        try
         {
-            for (const ext of [...added, ...updated])
-            {
-                delete obsolete[this._env.getExtensionDirectoryName(ext)];
-            }
-
-            for (const ext of removed)
-            {
-                obsolete[this._env.getExtensionDirectoryName(ext)] = true;
-            }
-
-            try
-            {
-                if (Object.keys(obsolete).length > 0)
-                {
-                    await fs.outputJson(filepath, obsolete);
-                }
-                else
-                {
-                    await fs.remove(filepath);
-                }
-            }
-            catch
-            {
-            }
+            await fs.remove(this._env.extensionsFilePath);
         }
+        catch { }
     }
 
     /**

src/utils/vscodeWebAPI.ts

@@ -1,4 +1,4 @@
-import { satisfies } from "compare-versions";
+import { coerce, satisfies } from "semver";
 import * as vscode from "vscode";
 
 import { CaseInsensitiveMap } from "../collections";
@@ -101,10 +101,10 @@ export function isVSIXSupported(version: ExtensionVersion, includePreRelease: bo
         }
     }
 
-    const requiredVersion = version.properties?.find(p => p.key === ExtensionPropertyType.ENGINE)?.value;
+    const requiredVersion = coerce(version.properties?.find(p => p.key === ExtensionPropertyType.ENGINE)?.value)?.version;
     try
     {
-        return requiredVersion == null ? true : satisfies(vscode.version, requiredVersion);
+        return requiredVersion == null ? true : satisfies(vscode.version, `^${requiredVersion}`);
     }
     catch
     {

yarn.lock

@@ -1875,11 +1875,6 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-compare-versions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a"
-  integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==
-
 [email protected]:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2107,10 +2102,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-zoro@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-zoro/-/eslint-config-zoro-6.0.0.tgz#b62949dfbc1be452c6bfd33a5c7218f4400c5db6"
-  integrity sha512-6KrqejHH2JbUaG4KnmJW8cvaoAEf0th7c05uVRZiE2lWB4WXEaN/G3y0b5tTYIon/UBtAYRv3RS8zmsEBTVLwg==
+eslint-config-zoro@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-zoro/-/eslint-config-zoro-6.0.1.tgz#4c38bafc2525d13c4edef2a7f1bf17cdc9fe7e80"
+  integrity sha512-LlLyeF/l5gTROo7le5iVVPUf2eFcwM4i60g7zXv+1WwIYP1KaZ0M08RCvjTBorHYcSsh3drSWKw+fh29SUEdhw==
 
 eslint-plugin-es@^3.0.0:
   version "3.0.1"