Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .yarn/versions/597bb1d9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
releases:
"@yarnpkg/cli": patch
"@yarnpkg/core": patch
"@yarnpkg/plugin-exec": patch
"@yarnpkg/plugin-npm-cli": patch
"@yarnpkg/plugin-pack": patch
"@yarnpkg/plugin-version": patch

declined:
- "@yarnpkg/plugin-compat"
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@yarnpkg/plugin-file"
- "@yarnpkg/plugin-git"
- "@yarnpkg/plugin-github"
- "@yarnpkg/plugin-http"
- "@yarnpkg/plugin-init"
- "@yarnpkg/plugin-interactive-tools"
- "@yarnpkg/plugin-link"
- "@yarnpkg/plugin-nm"
- "@yarnpkg/plugin-npm"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnp"
- "@yarnpkg/plugin-stage"
- "@yarnpkg/plugin-typescript"
- "@yarnpkg/plugin-workspace-tools"
- "@yarnpkg/builder"
- "@yarnpkg/doctor"
- "@yarnpkg/nm"
- "@yarnpkg/pnpify"
- "@yarnpkg/sdks"
4 changes: 2 additions & 2 deletions packages/plugin-exec/sources/ExecFetcher.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {execUtils, scriptUtils, structUtils, tgzUtils} from '@yarnpkg/core';
import {Locator} from '@yarnpkg/core';
import {Locator, formatUtils} from '@yarnpkg/core';
import {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
import {Filename, PortablePath, npath, ppath, xfs, NativePath} from '@yarnpkg/fslib';

Expand Down Expand Up @@ -154,7 +154,7 @@ export class ExecFetcher implements Fetcher {
const {code} = await execUtils.pipevp(process.execPath, [`--require`, npath.fromPortablePath(runtimeFile), npath.fromPortablePath(generatorPath), structUtils.stringifyIdent(locator)], {cwd, env, stdin, stdout, stderr});
if (code !== 0) {
xfs.detachTemp(logDir);
throw new Error(`Package generation failed (exit code ${code}, logs can be found here: ${logFile})`);
throw new Error(`Package generation failed (exit code ${code}, logs can be found here: ${formatUtils.pretty(opts.project.configuration, logFile, formatUtils.Type.PATH)})`);
}
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-npm-cli/sources/commands/npm/info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import * as npm from '@npm/types';
import {BaseCommand} from '@yarnpkg/cli';
import {Project, Configuration, structUtils, Descriptor} from '@yarnpkg/core';
import {StreamReport, MessageName, semverUtils} from '@yarnpkg/core';
import {Filename, npath, ppath} from '@yarnpkg/fslib';
import {npmHttpUtils} from '@yarnpkg/plugin-npm';
import {Command, Option, Usage, UsageError} from 'clipanion';
import path from 'path';
import semver from 'semver';
import {inspect} from 'util';

Expand Down Expand Up @@ -105,7 +105,7 @@ export default class InfoCommand extends BaseCommand {
if (identStr === `.`) {
const workspace = project.topLevelWorkspace;
if (!workspace.manifest.name)
throw new UsageError(`Missing 'name' field in ${path.join(workspace.cwd, `package.json`)}`);
throw new UsageError(`Missing 'name' field in ${npath.fromPortablePath(ppath.join(workspace.cwd, Filename.manifest))}`);

descriptor = structUtils.makeDescriptor(workspace.manifest.name, `unknown`);
} else {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-npm-cli/sources/commands/npm/tag/list.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {BaseCommand, WorkspaceRequiredError} from '@yarnpkg/cli';
import {Configuration, Project, Ident, structUtils, formatUtils, treeUtils, miscUtils} from '@yarnpkg/core';
import {ppath, Filename} from '@yarnpkg/fslib';
import {ppath, Filename, npath} from '@yarnpkg/fslib';
import {npmHttpUtils} from '@yarnpkg/plugin-npm';
import {Command, UsageError, Usage, Option} from 'clipanion';

Expand Down Expand Up @@ -42,7 +42,7 @@ export default class NpmTagListCommand extends BaseCommand {
throw new WorkspaceRequiredError(project.cwd, this.context.cwd);

if (!workspace.manifest.name)
throw new UsageError(`Missing 'name' field in ${ppath.join(workspace.cwd, Filename.manifest)}`);
throw new UsageError(`Missing 'name' field in ${npath.fromPortablePath(ppath.join(workspace.cwd, Filename.manifest))}`);

ident = workspace.manifest.name;
}
Expand Down
8 changes: 4 additions & 4 deletions packages/plugin-pack/sources/commands/pack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ export default class PackCommand extends BaseCommand {
json: this.json,
}, async report => {
await packUtils.prepareForPack(workspace, {report}, async () => {
report.reportJson({base: workspace.cwd});
report.reportJson({base: npath.fromPortablePath(workspace.cwd)});

const files = await packUtils.genPackList(workspace);

for (const file of files) {
report.reportInfo(null, file);
report.reportJson({location: file});
report.reportInfo(null, npath.fromPortablePath(file));
report.reportJson({location: npath.fromPortablePath(file)});
}

if (!this.dryRun) {
Expand All @@ -102,7 +102,7 @@ export default class PackCommand extends BaseCommand {

if (!this.dryRun) {
report.reportInfo(MessageName.UNNAMED, `Package archive generated in ${formatUtils.pretty(configuration, target, formatUtils.Type.PATH)}`);
report.reportJson({output: target});
report.reportJson({output: npath.fromPortablePath(target)});
}
});

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-version/sources/versionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ export function applyReleases(project: Project, newVersions: Map<Workspace, stri
: null;

report.reportInfo(MessageName.UNNAMED, `${structUtils.prettyLocator(project.configuration, workspace.anchoredLocator)}: Bumped to ${newVersion}`);
report.reportJson({cwd: workspace.cwd, ident: identString, oldVersion, newVersion});
report.reportJson({cwd: npath.fromPortablePath(workspace.cwd), ident: identString, oldVersion, newVersion});

const dependents = allDependents.get(workspace);
if (typeof dependents === `undefined`)
Expand Down
4 changes: 2 additions & 2 deletions packages/yarnpkg-core/sources/scriptUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port
return;

xfs.detachTemp(logDir);
throw new ReportError(MessageName.PACKAGE_PREPARATION_FAILED, `Packing the package failed (exit code ${code}, logs can be found here: ${logFile})`);
throw new ReportError(MessageName.PACKAGE_PREPARATION_FAILED, `Packing the package failed (exit code ${code}, logs can be found here: ${formatUtils.pretty(configuration, logFile, formatUtils.Type.PATH)})`);
});
});
});
Expand Down Expand Up @@ -476,7 +476,7 @@ export async function executeWorkspaceLifecycleScript(workspace: Workspace, life
await xfs.mktempPromise(async logDir => {
const logFile = ppath.join(logDir, `${lifecycleScriptName}.log` as PortablePath);

const header = `# This file contains the result of Yarn calling the "${lifecycleScriptName}" lifecycle script inside a workspace ("${workspace.cwd}")\n`;
const header = `# This file contains the result of Yarn calling the "${lifecycleScriptName}" lifecycle script inside a workspace ("${npath.fromPortablePath(workspace.cwd)}")\n`;

const {stdout, stderr} = configuration.getSubprocessStreams(logFile, {
report,
Expand Down