Skip to content

Prefer using exclusively Corepack when possible #4254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arcanis merged 12 commits into from
Mar 29, 2022
Merged

Prefer using exclusively Corepack when possible #4254

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8d357b6
Uses exclusively Corepack by default
arcanis Mar 22, 2022
d3618e4
Fixes tests
arcanis Mar 23, 2022
2a0a0c4
Implements --yarn-path
arcanis Mar 24, 2022
5ca1203
Updates documentation
arcanis Mar 24, 2022
1567ad5
Fixes types
arcanis Mar 24, 2022
f69657b
Fixes types
arcanis Mar 24, 2022
7c61c58
Uses yarnPath by default if Corepack isnt enabled
arcanis Mar 25, 2022
a933e57
Adds tests
arcanis Mar 29, 2022
f7d9aea
Reverts parts of the changes
arcanis Mar 29, 2022
6f1b3d3
Fixes broken plugin tests
arcanis Mar 29, 2022
0aba7ff
Fixes windows set version from file
arcanis Mar 29, 2022
669d3c9
Fixes merge conflicts
arcanis Mar 29, 2022
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
Prev Previous commit
Fixes merge conflicts
  • Loading branch information
@arcanis
arcanis committed Mar 29, 2022
commit 669d3c95dc6322d159e77de9fc9b8b8f295611a1
17 changes: 1 addition & 16 deletions packages/plugin-essentials/sources/commands/set/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,34 +127,19 @@ export default class SetVersionCommand extends BaseCommand {
stdout: this.context.stdout,
includeLogs: !this.context.quiet,
}, async (report: StreamReport) => {
<<<<<<< Updated upstream
const fetchBuffer = async () => {
const filePrefix = `file://`;

if (bundleRef.url.startsWith(filePrefix)) {
report.reportInfo(MessageName.UNNAMED, `Retrieving ${formatUtils.pretty(configuration, bundleRef.url, FormatType.PATH)}`);
return await xfs.readFilePromise(npath.toPortablePath(bundleRef.url.slice(filePrefix.length)));
return await xfs.readFilePromise(bundleRef.url.slice(filePrefix.length) as PortablePath);
} else {
report.reportInfo(MessageName.UNNAMED, `Downloading ${formatUtils.pretty(configuration, bundleRef.url, FormatType.URL)}`);
return await httpUtils.get(bundleRef.url, {configuration});
}
};

await setVersion(configuration, bundleRef.version, fetchBuffer, {report, useYarnPath: this.useYarnPath});
=======
const filePrefix = `file://`;

let bundleBuffer: Buffer;
if (bundleUrl.startsWith(filePrefix)) {
report.reportInfo(MessageName.UNNAMED, `Downloading ${formatUtils.pretty(configuration, bundleUrl, FormatType.URL)}`);
bundleBuffer = await xfs.readFilePromise(bundleUrl.slice(filePrefix.length) as PortablePath);
} else {
report.reportInfo(MessageName.UNNAMED, `Retrieving ${formatUtils.pretty(configuration, bundleUrl, FormatType.PATH)}`);
bundleBuffer = await httpUtils.get(bundleUrl, {configuration});
}

await setVersion(configuration, null, bundleBuffer, {report});
>>>>>>> Stashed changes
});

return report.exitCode();
Expand Down