@yarnpkg/plugin-essentials 4.0.0-rc.44 → 4.0.0-rc.46

package/lib/commands/install.js

@@ -172,8 +172,16 @@ class YarnCommand extends cli_1.BaseCommand {
                 stdout: this.context.stdout,
                 includeFooter: false,
             }, async (report) => {
+                let changed = false;
+                if (await autofixLegacyPlugins(configuration, immutable)) {
+                    report.reportInfo(core_1.MessageName.AUTOMERGE_SUCCESS, `Automatically removed core plugins that are now builtins 👍`);
+                    changed = true;
+                }
                 if (await autofixMergeConflicts(configuration, immutable)) {
                     report.reportInfo(core_1.MessageName.AUTOMERGE_SUCCESS, `Automatically fixed merge conflicts 👍`);
+                    changed = true;
+                }
+                if (changed) {
                     report.reportSeparator();
                 }
             });
@@ -368,14 +376,14 @@ async function autofixMergeConflicts(configuration, immutable) {
     const merged = Object.assign({}, ...variants);
     // We must keep the lockfile version as small as necessary to force Yarn to
     // refresh the merged-in lockfile metadata that may be missing.
-    merged.__metadata.version = Math.min(0, ...variants.map(variant => {
+    merged.__metadata.version = `${Math.min(...variants.map(variant => {
         var _a;
-        return (_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : Infinity;
-    }));
-    merged.__metadata.cacheKey = Math.min(0, ...variants.map(variant => {
+        return parseInt((_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : 0);
+    }))}`;
+    merged.__metadata.cacheKey = `${Math.min(...variants.map(variant => {
         var _a;
-        return (_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0;
-    }));
+        return parseInt((_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0);
+    }))}`;
     // parse as valid YAML except that the objects become strings. We can use
     // that to detect them. Damn, it's really ugly though.
     for (const [key, value] of Object.entries(merged))
@@ -386,3 +394,36 @@ async function autofixMergeConflicts(configuration, immutable) {
     });
     return true;
 }
+async function autofixLegacyPlugins(configuration, immutable) {
+    if (!configuration.projectCwd)
+        return false;
+    const legacyPlugins = [];
+    const yarnPluginDir = fslib_1.ppath.join(configuration.projectCwd, `.yarn/plugins/@yarnpkg`);
+    const changed = await core_1.Configuration.updateConfiguration(configuration.projectCwd, current => {
+        if (!Array.isArray(current.plugins))
+            return current;
+        const plugins = current.plugins.filter((plugin) => {
+            if (!plugin.path)
+                return true;
+            const resolvedPath = fslib_1.ppath.resolve(configuration.projectCwd, plugin.path);
+            const isLegacy = core_1.LEGACY_PLUGINS.has(plugin.spec) && fslib_1.ppath.contains(yarnPluginDir, resolvedPath);
+            if (isLegacy)
+                legacyPlugins.push(resolvedPath);
+            return !isLegacy;
+        });
+        if (current.plugins.length === plugins.length)
+            return current;
+        return {
+            ...current,
+            plugins,
+        };
+    }, {
+        immutable,
+    });
+    if (!changed)
+        return false;
+    await Promise.all(legacyPlugins.map(async (pluginPath) => {
+        await fslib_1.xfs.removePromise(pluginPath);
+    }));
+    return true;
+}

package/lib/dedupeUtils.js

@@ -15,7 +15,7 @@ var Strategy;
      * - dependencies are never downgraded
      */
     Strategy["HIGHEST"] = "highest";
-})(Strategy = exports.Strategy || (exports.Strategy = {}));
+})(Strategy || (exports.Strategy = Strategy = {}));
 exports.acceptedStrategies = new Set(Object.values(Strategy));
 const DEDUPE_ALGORITHMS = {
     highest: async (project, patterns, { resolver, fetcher, resolveOptions, fetchOptions }) => {

package/lib/suggestUtils.js

@@ -12,19 +12,19 @@ var Target;
     Target["REGULAR"] = "dependencies";
     Target["DEVELOPMENT"] = "devDependencies";
     Target["PEER"] = "peerDependencies";
-})(Target = exports.Target || (exports.Target = {}));
+})(Target || (exports.Target = Target = {}));
 var Modifier;
 (function (Modifier) {
     Modifier["CARET"] = "^";
     Modifier["TILDE"] = "~";
     Modifier["EXACT"] = "";
-})(Modifier = exports.Modifier || (exports.Modifier = {}));
+})(Modifier || (exports.Modifier = Modifier = {}));
 var WorkspaceModifier;
 (function (WorkspaceModifier) {
     WorkspaceModifier["CARET"] = "^";
     WorkspaceModifier["TILDE"] = "~";
     WorkspaceModifier["EXACT"] = "*";
-})(WorkspaceModifier = exports.WorkspaceModifier || (exports.WorkspaceModifier = {}));
+})(WorkspaceModifier || (exports.WorkspaceModifier = WorkspaceModifier = {}));
 var Strategy;
 (function (Strategy) {
     /**
@@ -52,7 +52,7 @@ var Strategy;
      * versions of the package that are already within our cache.
      */
     Strategy["CACHE"] = "cache";
-})(Strategy = exports.Strategy || (exports.Strategy = {}));
+})(Strategy || (exports.Strategy = Strategy = {}));
 function getModifier(flags, project) {
     if (flags.exact)
         return Modifier.EXACT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.44",
+  "version": "4.0.0-rc.46",
   "stableVersion": "3.3.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
@@ -9,29 +9,29 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.44",
-    "@yarnpkg/parsers": "^3.0.0-rc.44",
+    "@yarnpkg/fslib": "^3.0.0-rc.46",
+    "@yarnpkg/parsers": "^3.0.0-rc.46",
     "ci-info": "^3.2.0",
-    "clipanion": "^3.2.0-rc.10",
+    "clipanion": "^3.2.1",
     "enquirer": "^2.3.6",
     "lodash": "^4.17.15",
     "micromatch": "^4.0.2",
     "semver": "^7.1.2",
     "tslib": "^2.4.0",
-    "typanion": "^3.3.0"
+    "typanion": "^3.12.1"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.44",
-    "@yarnpkg/core": "^4.0.0-rc.44",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.44"
+    "@yarnpkg/cli": "^4.0.0-rc.46",
+    "@yarnpkg/core": "^4.0.0-rc.46",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.46"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.44",
-    "@yarnpkg/core": "^4.0.0-rc.44",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.44"
+    "@yarnpkg/cli": "^4.0.0-rc.46",
+    "@yarnpkg/core": "^4.0.0-rc.46",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.46"
   },
   "repository": {
     "type": "git",