From 5966778b958bc30321a43eeba1f60678b27bf334 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 16 Jul 2024 15:54:04 +0200 Subject: [PATCH] [yarn] Update version to 4.3.1 --- .pnp.loader.mjs | 10 ++++++++-- package.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.pnp.loader.mjs b/.pnp.loader.mjs index 6815830b6..0d287915d 100644 --- a/.pnp.loader.mjs +++ b/.pnp.loader.mjs @@ -6,7 +6,7 @@ import { URL as URL$1, fileURLToPath, pathToFileURL } from 'url'; import path from 'path'; import { createHash } from 'crypto'; import { EOL } from 'os'; -import moduleExports, { isBuiltin } from 'module'; +import esmModule, { createRequire, isBuiltin } from 'module'; import assert from 'assert'; const SAFE_TIME = 456789e3; @@ -1975,6 +1975,13 @@ function packageImportsResolve({ name, base, conditions, readFileSyncFn }) { throwImportNotDefined(name, packageJSONUrl, base); } +let findPnpApi = esmModule.findPnpApi; +if (!findPnpApi) { + const require = createRequire(import.meta.url); + const pnpApi = require(`./.pnp.cjs`); + pnpApi.setup(); + findPnpApi = esmModule.findPnpApi; +} const pathRegExp = /^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/; const isRelativeRegexp = /^\.{0,2}\//; function tryReadFile(filePath) { @@ -2002,7 +2009,6 @@ async function resolvePrivateRequest(specifier, issuer, context, nextResolve) { } } async function resolve$1(originalSpecifier, context, nextResolve) { - const { findPnpApi } = moduleExports; if (!findPnpApi || isBuiltin(originalSpecifier)) return nextResolve(originalSpecifier, context, nextResolve); let specifier = originalSpecifier; diff --git a/package.json b/package.json index 93d6f4c3d..e11b23f03 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "typescript": "5.1.6", "yaml": "^2.3.4" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.1", "dependenciesMeta": { "@discordapp/twemoji@14.1.2": { "unplugged": true