@@ -21683,7 +21683,7 @@ function String2(descriptor, ...args) {
21683
21683
}
21684
21684
21685
21685
// package.json
21686
- var version = "0.32 .0";
21686
+ var version = "0.33 .0";
21687
21687
21688
21688
// sources/Engine.ts
21689
21689
var import_fs9 = __toESM(require("fs"));
@@ -21697,7 +21697,7 @@ var import_valid4 = __toESM(require_valid2());
21697
21697
var config_default = {
21698
21698
definitions: {
21699
21699
npm: {
21700
- default: "11.1.0 +sha1.dba08f7d0f5301ebedaf968b4f74b2282f97a750 ",
21700
+ default: "11.4.1 +sha1.80350af543069991de20657ebcd07d9624cfad06 ",
21701
21701
fetchLatestFrom: {
21702
21702
type: "npm",
21703
21703
package: "npm"
@@ -21734,7 +21734,7 @@ var config_default = {
21734
21734
}
21735
21735
},
21736
21736
pnpm: {
21737
- default: "10.5.2 +sha1.ca68c0441df195b7e2992f1d1cb12fb731f82d78 ",
21737
+ default: "10.11.0 +sha1.4048eeefd564ff1ab248fac3e2854d38245fe2f1 ",
21738
21738
fetchLatestFrom: {
21739
21739
type: "npm",
21740
21740
package: "pnpm"
@@ -21798,7 +21798,7 @@ var config_default = {
21798
21798
package: "yarn"
21799
21799
},
21800
21800
transparent: {
21801
- default: "4.6.0 +sha224.acd0786f07ffc6c933940eb65fc1d627131ddf5455bddcc295dc90fd ",
21801
+ default: "4.9.1 +sha224.4285002185abb91fe2b781f27fd1e078086c37a7b095f6ea4ee25971 ",
21802
21802
commands: [
21803
21803
[
21804
21804
"yarn",
@@ -22105,6 +22105,10 @@ async function getProxyAgent(input) {
22105
22105
}
22106
22106
22107
22107
// sources/corepackUtils.ts
22108
+ var YARN_SWITCH_REGEX = /[/\\]switch[/\\]bin[/\\]/;
22109
+ function isYarnSwitchPath(p) {
22110
+ return YARN_SWITCH_REGEX.test(p);
22111
+ }
22108
22112
function getRegistryFromPackageManagerSpec(spec) {
22109
22113
return process.env.COREPACK_NPM_REGISTRY ? spec.npmRegistry ?? spec.registry : spec.registry;
22110
22114
}
@@ -22896,7 +22900,7 @@ var Engine = class {
22896
22900
case `NoSpec`: {
22897
22901
if (typeof locator.reference === `function`)
22898
22902
fallbackDescriptor.range = await locator.reference();
22899
- if (import_process3.default.env.COREPACK_ENABLE_AUTO_PIN !== `0 `) {
22903
+ if (import_process3.default.env.COREPACK_ENABLE_AUTO_PIN === `1 `) {
22900
22904
const resolved = await this.resolveDescriptor(fallbackDescriptor, { allowTags: true });
22901
22905
if (resolved === null)
22902
22906
throw new UsageError(`Failed to successfully resolve '${fallbackDescriptor.range}' to a valid ${fallbackDescriptor.name} release`);
@@ -22906,7 +22910,7 @@ var Engine = class {
22906
22910
console.error();
22907
22911
await setLocalPackageManager(import_path9.default.dirname(result.target), installSpec);
22908
22912
}
22909
- log(`Falling back to ${fallbackDescriptor.name}@${fallbackDescriptor.range} in the absence of "packageManage " field in ${result.target}`);
22913
+ log(`Falling back to ${fallbackDescriptor.name}@${fallbackDescriptor.range} in the absence of "packageManager " field in ${result.target}`);
22910
22914
return fallbackDescriptor;
22911
22915
}
22912
22916
case `Found`: {
@@ -23070,6 +23074,10 @@ var DisableCommand = class extends Command {
23070
23074
async removePosixLink(installDirectory, binName) {
23071
23075
const file = import_path10.default.join(installDirectory, binName);
23072
23076
try {
23077
+ if (binName.includes(`yarn`) && isYarnSwitchPath(await import_fs11.default.promises.realpath(file))) {
23078
+ console.warn(`${binName} is already installed in ${file} and points to a Yarn Switch install - skipping`);
23079
+ return;
23080
+ }
23073
23081
await import_fs11.default.promises.unlink(file);
23074
23082
} catch (err) {
23075
23083
if (err.code !== `ENOENT`) {
@@ -23147,6 +23155,10 @@ var EnableCommand = class extends Command {
23147
23155
const symlink = import_path11.default.relative(installDirectory, import_path11.default.join(distFolder, `${binName}.js`));
23148
23156
if (import_fs12.default.existsSync(file)) {
23149
23157
const currentSymlink = await import_fs12.default.promises.readlink(file);
23158
+ if (binName.includes(`yarn`) && isYarnSwitchPath(await import_fs12.default.promises.realpath(file))) {
23159
+ console.warn(`${binName} is already installed in ${file} and points to a Yarn Switch install - skipping`);
23160
+ return;
23161
+ }
23150
23162
if (currentSymlink !== symlink) {
23151
23163
await import_fs12.default.promises.unlink(file);
23152
23164
} else {
0 commit comments