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

package/lib/commands/add.js

@@ -201,15 +201,14 @@ class AddCommand extends cli_1.BaseCommand {
         await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyReplacement, afterWorkspaceDependencyReplacementList);
         if (askedQuestions)
             this.context.stdout.write(`\n`);
-        const installReport = await core_2.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             json: this.json,
             stdout: this.context.stdout,
-            includeLogs: !this.context.quiet,
-        }, async (report) => {
-            await project.install({ cache, report, mode: this.mode });
+            quiet: this.context.quiet,
+        }, {
+            cache,
+            mode: this.mode,
         });
-        return installReport.exitCode();
     }
 }
 AddCommand.paths = [

package/lib/commands/dedupe.js

@@ -61,14 +61,13 @@ class DedupeCommand extends cli_1.BaseCommand {
             return dedupedPackageCount ? 1 : 0;
         }
         else {
-            const installReport = await core_1.StreamReport.start({
-                configuration,
-                stdout: this.context.stdout,
+            return await project.installWithNewReport({
                 json: this.json,
-            }, async (report) => {
-                await project.install({ cache, report, mode: this.mode });
+                stdout: this.context.stdout,
+            }, {
+                cache,
+                mode: this.mode,
             });
-            return installReport.exitCode();
         }
     }
 }

package/lib/commands/install.js

@@ -7,7 +7,21 @@ const fslib_1 = require("@yarnpkg/fslib");
 const parsers_1 = require("@yarnpkg/parsers");
 const ci_info_1 = tslib_1.__importDefault(require("ci-info"));
 const clipanion_1 = require("clipanion");
+const semver_1 = tslib_1.__importDefault(require("semver"));
 const t = tslib_1.__importStar(require("typanion"));
+const LOCKFILE_MIGRATION_RULES = [{
+        selector: v => v === -1,
+        name: `nodeLinker`,
+        value: `node-modules`,
+    }, {
+        selector: v => v !== -1 && v < 8,
+        name: `enableGlobalCache`,
+        value: false,
+    }, {
+        selector: v => v !== -1 && v < 8,
+        name: `compressionLevel`,
+        value: `mixed`,
+    }];
 // eslint-disable-next-line arca/no-default-export
 class YarnCommand extends cli_1.BaseCommand {
     constructor() {
@@ -189,34 +203,6 @@ class YarnCommand extends cli_1.BaseCommand {
                 return fixReport.exitCode();
             }
         }
-        if (configuration.projectCwd !== null && typeof configuration.sources.get(`nodeLinker`) === `undefined`) {
-            const projectCwd = configuration.projectCwd;
-            let content;
-            try {
-                content = await fslib_1.xfs.readFilePromise(fslib_1.ppath.join(projectCwd, fslib_1.Filename.lockfile), `utf8`);
-            }
-            catch { }
-            // If migrating from a v1 install, we automatically enable the node-modules linker,
-            // since that's likely what the author intended to do.
-            if (content === null || content === void 0 ? void 0 : content.includes(`yarn lockfile v1`)) {
-                const nmReport = await core_1.StreamReport.start({
-                    configuration,
-                    json: this.json,
-                    stdout: this.context.stdout,
-                    includeFooter: false,
-                }, async (report) => {
-                    report.reportInfo(core_1.MessageName.AUTO_NM_SUCCESS, `Migrating from Yarn 1; automatically enabling the compatibility node-modules linker 👍`);
-                    report.reportSeparator();
-                    configuration.use(`<compat>`, { nodeLinker: `node-modules` }, projectCwd, { overwrite: true });
-                    await core_1.Configuration.updateConfiguration(projectCwd, {
-                        nodeLinker: `node-modules`,
-                    });
-                });
-                if (nmReport.hasErrors()) {
-                    return nmReport.exitCode();
-                }
-            }
-        }
         if (configuration.projectCwd !== null) {
             const telemetryReport = await core_1.StreamReport.start({
                 configuration,
@@ -224,18 +210,74 @@ class YarnCommand extends cli_1.BaseCommand {
                 stdout: this.context.stdout,
                 includeFooter: false,
             }, async (report) => {
-                var _a;
+                var _a, _b;
                 if ((_a = core_1.Configuration.telemetry) === null || _a === void 0 ? void 0 : _a.isNew) {
+                    core_1.Configuration.telemetry.commitMotd();
                     report.reportInfo(core_1.MessageName.TELEMETRY_NOTICE, `Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry`);
                     report.reportInfo(core_1.MessageName.TELEMETRY_NOTICE, `Run ${core_1.formatUtils.pretty(configuration, `yarn config set --home enableTelemetry 0`, core_1.formatUtils.Type.CODE)} to disable`);
                     report.reportSeparator();
                 }
+                else if (((_b = core_1.Configuration.telemetry) === null || _b === void 0 ? void 0 : _b.isMotd) && configuration.get(`enableMotd`)) {
+                    const data = await fetch(`https://repo.yarnpkg.com/tags`).then(res => res.json()).catch(() => null);
+                    if (data !== null) {
+                        let newVersion = null;
+                        const YarnVersion = `3.0.0`;
+                        if (YarnVersion !== null) {
+                            const isRcBinary = semver_1.default.prerelease(YarnVersion);
+                            const releaseType = isRcBinary ? `canary` : `stable`;
+                            const candidate = data.latest[releaseType];
+                            if (semver_1.default.gt(candidate, YarnVersion)) {
+                                newVersion = [releaseType, candidate];
+                            }
+                        }
+                        if (newVersion) {
+                            core_1.Configuration.telemetry.commitMotd();
+                            report.reportInfo(core_1.MessageName.VERSION_NOTICE, `${core_1.formatUtils.applyStyle(configuration, `A new ${newVersion[0]} version of Yarn is available:`, core_1.formatUtils.Style.BOLD)} ${core_1.structUtils.prettyReference(configuration, newVersion[1])}!`);
+                            report.reportInfo(core_1.MessageName.VERSION_NOTICE, `Upgrade now by running ${core_1.formatUtils.pretty(configuration, `yarn set version ${newVersion[1]}`, core_1.formatUtils.Type.CODE)}`);
+                            report.reportSeparator();
+                        }
+                        else {
+                            const motd = core_1.Configuration.telemetry.selectMotd(data.motd);
+                            if (motd) {
+                                report.reportInfo(core_1.MessageName.MOTD_NOTICE, core_1.formatUtils.pretty(configuration, motd.message, core_1.formatUtils.Type.MARKDOWN_INLINE));
+                                if (motd.url)
+                                    report.reportInfo(core_1.MessageName.MOTD_NOTICE, `Learn more at ${motd.url}`);
+                                report.reportSeparator();
+                            }
+                        }
+                    }
+                }
             });
             if (telemetryReport.hasErrors()) {
                 return telemetryReport.exitCode();
             }
         }
         const { project, workspace } = await core_1.Project.find(configuration, this.context.cwd);
+        const lockfileLastVersion = project.lockfileLastVersion;
+        if (lockfileLastVersion !== null) {
+            const compatReport = await core_1.StreamReport.start({
+                configuration,
+                json: this.json,
+                stdout: this.context.stdout,
+                includeFooter: false,
+            }, async (report) => {
+                const newSettings = {};
+                for (const rule of LOCKFILE_MIGRATION_RULES) {
+                    if (rule.selector(lockfileLastVersion) && typeof configuration.sources.get(rule.name) === `undefined`) {
+                        configuration.use(`<compat>`, { [rule.name]: rule.value }, project.cwd, { overwrite: true });
+                        newSettings[rule.name] = rule.value;
+                    }
+                }
+                if (Object.keys(newSettings).length > 0) {
+                    await core_1.Configuration.updateConfiguration(project.cwd, newSettings);
+                    report.reportInfo(core_1.MessageName.MIGRATION_SUCCESS, `Migrated your project to the latest Yarn version 🚀`);
+                    report.reportSeparator();
+                }
+            });
+            if (compatReport.hasErrors()) {
+                return compatReport.exitCode();
+            }
+        }
         const cache = await core_1.Cache.find(configuration, { immutable: immutableCache, check: this.checkCache });
         if (!workspace)
             throw new cli_1.WorkspaceRequiredError(project.cwd, this.context.cwd);
@@ -253,15 +295,15 @@ class YarnCommand extends cli_1.BaseCommand {
         // install logic should be implemented elsewhere (probably in either of
         // the Configuration and Install classes). Feel free to open an issue
         // in order to ask for design feedback before writing features.
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             json: this.json,
             stdout: this.context.stdout,
-            includeLogs: true,
-        }, async (report) => {
-            await project.install({ cache, report, immutable, checkResolutions, mode: this.mode });
+        }, {
+            cache,
+            immutable,
+            checkResolutions,
+            mode: this.mode,
         });
-        return report.exitCode();
     }
 }
 YarnCommand.paths = [
@@ -399,24 +441,25 @@ async function autofixLegacyPlugins(configuration, immutable) {
         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,
-        };
+    const changed = await core_1.Configuration.updateConfiguration(configuration.projectCwd, {
+        plugins: plugins => {
+            if (!Array.isArray(plugins))
+                return plugins;
+            const filteredPlugins = 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 (filteredPlugins.length === 0)
+                return core_1.Configuration.deleteProperty;
+            if (filteredPlugins.length === plugins.length)
+                return plugins;
+            return filteredPlugins;
+        },
     }, {
         immutable,
     });

package/lib/commands/link.js

@@ -68,13 +68,11 @@ class LinkCommand extends cli_1.BaseCommand {
                 reference: `portal:${target}`,
             });
         }
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
 LinkCommand.paths = [

package/lib/commands/plugin/remove.js

@@ -28,18 +28,19 @@ class PluginRemoveCommand extends cli_1.BaseCommand {
                 await fslib_1.xfs.removePromise(absolutePath);
             }
             report.reportInfo(core_1.MessageName.UNNAMED, `Updating the configuration...`);
-            await core_1.Configuration.updateConfiguration(project.cwd, (current) => {
-                if (!Array.isArray(current.plugins))
-                    return current;
-                const plugins = current.plugins.filter((plugin) => {
-                    return plugin.path !== relativePath;
-                });
-                if (current.plugins.length === plugins.length)
-                    return current;
-                return {
-                    ...current,
-                    plugins,
-                };
+            await core_1.Configuration.updateConfiguration(project.cwd, {
+                plugins: plugins => {
+                    if (!Array.isArray(plugins))
+                        return plugins;
+                    const filteredPlugins = plugins.filter((plugin) => {
+                        return plugin.path !== relativePath;
+                    });
+                    if (filteredPlugins.length === 0)
+                        return core_1.Configuration.deleteProperty;
+                    if (filteredPlugins.length === plugins.length)
+                        return plugins;
+                    return filteredPlugins;
+                },
             });
         });
         return report.exitCode();

package/lib/commands/rebuild.js

@@ -30,20 +30,20 @@ class RebuildCommand extends cli_1.BaseCommand {
             for (const pkg of project.storedPackages.values()) {
                 if (filteredIdents.has(pkg.identHash)) {
                     project.storedBuildState.delete(pkg.locatorHash);
+                    project.skippedBuilds.delete(pkg.locatorHash);
                 }
             }
         }
         else {
             project.storedBuildState.clear();
+            project.skippedBuilds.clear();
         }
-        const installReport = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-            includeLogs: !this.context.quiet,
-        }, async (report) => {
-            await project.install({ cache, report });
+            quiet: this.context.quiet,
+        }, {
+            cache,
         });
-        return installReport.exitCode();
     }
 }
 RebuildCommand.paths = [

package/lib/commands/remove.js

@@ -92,13 +92,12 @@ class RemoveCommand extends cli_1.BaseCommand {
             throw new clipanion_1.UsageError(`${patterns} ${core_1.formatUtils.prettyList(configuration, unreferencedPatterns, core_1.formatUtils.Type.CODE)} ${dont} match any packages referenced by ${which} workspace`);
         if (hasChanged) {
             await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyRemoval, afterWorkspaceDependencyRemovalList);
-            const report = await core_2.StreamReport.start({
-                configuration,
+            return await project.installWithNewReport({
                 stdout: this.context.stdout,
-            }, async (report) => {
-                await project.install({ cache, report, mode: this.mode });
+            }, {
+                cache,
+                mode: this.mode,
             });
-            return report.exitCode();
         }
         return 0;
     }

package/lib/commands/set/resolution.js

@@ -28,13 +28,11 @@ class SetResolutionCommand extends cli_1.BaseCommand {
         project.storedDescriptors.set(fromDescriptor.descriptorHash, fromDescriptor);
         project.storedDescriptors.set(toDescriptor.descriptorHash, toDescriptor);
         project.resolutionAliases.set(fromDescriptor.descriptorHash, toDescriptor.descriptorHash);
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
 SetResolutionCommand.paths = [

package/lib/commands/set/version/sources.d.ts

@@ -9,6 +9,7 @@ export default class SetVersionSourcesCommand extends BaseCommand {
     repository: string;
     branch: string;
     plugins: string[];
+    dryRun: boolean;
     noMinify: boolean;
     force: boolean;
     skipPlugins: boolean;

package/lib/commands/set/version/sources.js

@@ -27,10 +27,11 @@ const cloneWorkflow = ({ repository, branch }, target) => [
 const updateWorkflow = ({ branch }) => [
     [`git`, `fetch`, `origin`, `--depth=1`, getBranchRef(branch), `--force`],
     [`git`, `reset`, `--hard`, `FETCH_HEAD`],
-    [`git`, `clean`, `-dfx`],
+    [`git`, `clean`, `-dfx`, `-e`, `packages/yarnpkg-cli/bundles`],
 ];
-const buildWorkflow = ({ plugins, noMinify }, target) => [
+const buildWorkflow = ({ plugins, noMinify }, output, target) => [
     [`yarn`, `build:cli`, ...new Array().concat(...plugins.map(plugin => [`--plugin`, fslib_1.ppath.resolve(target, plugin)])), ...noMinify ? [`--no-minify`] : [], `|`],
+    [`mv`, `packages/yarnpkg-cli/bundles/yarn.js`, fslib_1.npath.fromPortablePath(output), `|`],
 ];
 // eslint-disable-next-line arca/no-default-export
 class SetVersionSourcesCommand extends cli_1.BaseCommand {
@@ -48,6 +49,9 @@ class SetVersionSourcesCommand extends cli_1.BaseCommand {
         this.plugins = clipanion_1.Option.Array(`--plugin`, [], {
             description: `An array of additional plugins that should be included in the bundle`,
         });
+        this.dryRun = clipanion_1.Option.Boolean(`-n,--dry-run`, false, {
+            description: `If set, the bundle will be built but not added to the project`,
+        });
         this.noMinify = clipanion_1.Option.Boolean(`--no-minify`, false, {
             description: `Build a bundle for development (debugging) - non-minified and non-mangled`,
         });
@@ -72,15 +76,20 @@ class SetVersionSourcesCommand extends cli_1.BaseCommand {
             report.reportSeparator();
             report.reportInfo(core_1.MessageName.UNNAMED, `Building a fresh bundle`);
             report.reportSeparator();
-            await runWorkflow(buildWorkflow(this, target), { configuration, context: this.context, target });
-            report.reportSeparator();
-            const bundlePath = fslib_1.ppath.resolve(target, `packages/yarnpkg-cli/bundles/yarn.js`);
+            const commitHash = await core_1.execUtils.execvp(`git`, [`rev-parse`, `--short`, `HEAD`], { cwd: target, strict: true });
+            const bundlePath = fslib_1.ppath.join(target, `packages/yarnpkg-cli/bundles/yarn-${commitHash.stdout.trim()}.js`);
+            if (!fslib_1.xfs.existsSync(bundlePath)) {
+                await runWorkflow(buildWorkflow(this, bundlePath, target), { configuration, context: this.context, target });
+                report.reportSeparator();
+            }
             const bundleBuffer = await fslib_1.xfs.readFilePromise(bundlePath);
-            const { bundleVersion } = await (0, version_1.setVersion)(configuration, null, async () => bundleBuffer, {
-                report,
-            });
-            if (!this.skipPlugins) {
-                await updatePlugins(this, bundleVersion, { project, report, target });
+            if (!this.dryRun) {
+                const { bundleVersion } = await (0, version_1.setVersion)(configuration, null, async () => bundleBuffer, {
+                    report,
+                });
+                if (!this.skipPlugins) {
+                    await updatePlugins(this, bundleVersion, { project, report, target });
+                }
             }
         });
         return report.exitCode();
@@ -141,7 +150,7 @@ async function prepareRepo(spec, { configuration, report, target }) {
             await runWorkflow(updateWorkflow(spec), { configuration, context: spec.context, target });
             ready = true;
         }
-        catch (error) {
+        catch {
             report.reportSeparator();
             report.reportWarning(core_1.MessageName.UNNAMED, `Repository update failed; we'll try to regenerate it`);
         }

package/lib/commands/set/version.js

@@ -170,7 +170,7 @@ async function setVersion(configuration, bundleVersion, fetchBuffer, { report, u
             await fslib_1.xfs.writeFilePromise(temporaryPath, bundleBuffer);
             const { stdout } = await core_2.execUtils.execvp(process.execPath, [fslib_1.npath.fromPortablePath(temporaryPath), `--version`], {
                 cwd: tmpDir,
-                env: { ...process.env, YARN_IGNORE_PATH: `1` },
+                env: { ...configuration.env, YARN_IGNORE_PATH: `1` },
             });
             bundleVersion = stdout.trim();
             if (!semver_1.default.valid(bundleVersion)) {

package/lib/commands/unlink.js

@@ -63,13 +63,12 @@ class UnlinkCommand extends cli_1.BaseCommand {
         topLevelWorkspace.manifest.resolutions = topLevelWorkspace.manifest.resolutions.filter(({ pattern }) => {
             return !workspacesToUnlink.has(pattern.descriptor.fullName);
         });
-        const report = await core_1.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+            quiet: this.context.quiet,
+        }, {
+            cache,
         });
-        return report.exitCode();
     }
 }
 UnlinkCommand.paths = [

package/lib/commands/up.js

@@ -75,13 +75,11 @@ class UpCommand extends cli_1.BaseCommand {
             project.storedDescriptors.delete(descriptor.descriptorHash);
             project.storedResolutions.delete(descriptor.descriptorHash);
         }
-        const installReport = await core_2.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report });
+        }, {
+            cache,
         });
-        return installReport.exitCode();
     }
     async executeUpClassic() {
         var _a;
@@ -236,13 +234,12 @@ class UpCommand extends cli_1.BaseCommand {
         await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyReplacement, afterWorkspaceDependencyReplacementList);
         if (askedQuestions)
             this.context.stdout.write(`\n`);
-        const installReport = await core_2.StreamReport.start({
-            configuration,
+        return await project.installWithNewReport({
             stdout: this.context.stdout,
-        }, async (report) => {
-            await project.install({ cache, report, mode: this.mode });
+        }, {
+            cache,
+            mode: this.mode,
         });
-        return installReport.exitCode();
     }
 }
 UpCommand.paths = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.46",
+  "version": "4.0.0-rc.48",
   "stableVersion": "3.3.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
@@ -9,8 +9,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.46",
-    "@yarnpkg/parsers": "^3.0.0-rc.46",
+    "@yarnpkg/fslib": "^3.0.0-rc.48",
+    "@yarnpkg/parsers": "^3.0.0-rc.48",
     "ci-info": "^3.2.0",
     "clipanion": "^3.2.1",
     "enquirer": "^2.3.6",
@@ -21,17 +21,17 @@
     "typanion": "^3.12.1"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.46",
-    "@yarnpkg/core": "^4.0.0-rc.46",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.46"
+    "@yarnpkg/cli": "^4.0.0-rc.48",
+    "@yarnpkg/core": "^4.0.0-rc.48",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.48"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.46",
-    "@yarnpkg/core": "^4.0.0-rc.46",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.46"
+    "@yarnpkg/cli": "^4.0.0-rc.48",
+    "@yarnpkg/core": "^4.0.0-rc.48",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.48"
   },
   "repository": {
     "type": "git",
@@ -53,6 +53,6 @@
     "/lib/**/*"
   ],
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=18.12.0"
   }
 }