From 93d1a4733127eb1cdb36aef3177ec0b75e8df30b Mon Sep 17 00:00:00 2001 From: NamesMT Date: Tue, 14 May 2024 04:42:56 +0000 Subject: [PATCH 1/4] fix: new `virtualStoreDirMaxLength` types yelling --- packages/tools/cli/src/lockfile/pnpm.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tools/cli/src/lockfile/pnpm.ts b/packages/tools/cli/src/lockfile/pnpm.ts index 789f0018..fdf2f9b7 100644 --- a/packages/tools/cli/src/lockfile/pnpm.ts +++ b/packages/tools/cli/src/lockfile/pnpm.ts @@ -20,7 +20,8 @@ export const buildPNPMDepTree = cache(async (dirPath: string): Promise { From 12b2b7b1bd02edab7b3d78ebb9aa59fd699939c1 Mon Sep 17 00:00:00 2001 From: NamesMT Date: Tue, 14 May 2024 05:19:41 +0000 Subject: [PATCH 2/4] chore: update `@pnpm/` deps --- package.json | 3 +- packages/tools/cli/package.json | 5 +- ...@pnpm__workspace.find-packages@2.0.4.patch | 103 ------------------ 3 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 patches/@pnpm__workspace.find-packages@2.0.4.patch diff --git a/package.json b/package.json index 126a5b52..13d7760d 100644 --- a/package.json +++ b/package.json @@ -141,8 +141,7 @@ "@types/npmcli__arborist@5.6.1": "patches/@types__npmcli__arborist@5.6.1.patch", "@npmcli/arborist@6.3.0": "patches/@npmcli__arborist@6.3.0.patch", "assert@2.1.0": "patches/assert@2.1.0.patch", - "@yarnpkg/parsers@3.0.0": "patches/@yarnpkg__parsers@3.0.0.patch", - "@pnpm/workspace.find-packages@2.0.4": "patches/@pnpm__workspace.find-packages@2.0.4.patch" + "@yarnpkg/parsers@3.0.0": "patches/@yarnpkg__parsers@3.0.0.patch" } }, "overrides": { diff --git a/packages/tools/cli/package.json b/packages/tools/cli/package.json index f5bf132e..adb4e829 100644 --- a/packages/tools/cli/package.json +++ b/packages/tools/cli/package.json @@ -22,8 +22,9 @@ "@nolyfill/internal": "workspace:*", "@nolyfill/promise.any": "workspace:*", "@npmcli/arborist": "^6.3.0", - "@pnpm/list": "^10.1.1", - "@pnpm/workspace.find-packages": "^2.0.4", + "@pnpm/list": "^10.1.2", + "@pnpm/list--old": "^10.1.2", + "@pnpm/workspace.find-packages": "^2.0.5", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", diff --git a/patches/@pnpm__workspace.find-packages@2.0.4.patch b/patches/@pnpm__workspace.find-packages@2.0.4.patch deleted file mode 100644 index e30f0884..00000000 --- a/patches/@pnpm__workspace.find-packages@2.0.4.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/lib/index.js b/lib/index.js -index c8d68e72ea0907b8f4dfcd83b30d26f9512a99ea..633e8a460c65c2d735ef452a41c02d2dfa951e60 100644 ---- a/lib/index.js -+++ b/lib/index.js -@@ -1,29 +1,29 @@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.arrayOfWorkspacePackagesToMap = exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0; --const cli_utils_1 = require("@pnpm/cli-utils"); -+// const cli_utils_1 = require("@pnpm/cli-utils"); - const workspace_read_manifest_1 = require("@pnpm/workspace.read-manifest"); - const util_lex_comparator_1 = require("@pnpm/util.lex-comparator"); - const fs_find_packages_1 = require("@pnpm/fs.find-packages"); --const logger_1 = require("@pnpm/logger"); --async function findWorkspacePackages(workspaceRoot, opts) { -- const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts); -- for (const pkg of pkgs) { -- (0, cli_utils_1.packageIsInstallable)(pkg.dir, pkg.manifest, opts ?? { -- supportedArchitectures: { -- os: ['current'], -- cpu: ['current'], -- libc: ['current'], -- }, -- }); -- // When setting shared-workspace-lockfile=false, `pnpm` can be set in sub-project's package.json. -- if (opts?.sharedWorkspaceLockfile && pkg.dir !== workspaceRoot) { -- checkNonRootProjectManifest(pkg); -- } -- } -- return pkgs; --} --exports.findWorkspacePackages = findWorkspacePackages; -+// const logger_1 = require("@pnpm/logger"); -+// async function findWorkspacePackages(workspaceRoot, opts) { -+// const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts); -+// for (const pkg of pkgs) { -+// (0, cli_utils_1.packageIsInstallable)(pkg.dir, pkg.manifest, opts ?? { -+// supportedArchitectures: { -+// os: ['current'], -+// cpu: ['current'], -+// libc: ['current'], -+// }, -+// }); -+// // When setting shared-workspace-lockfile=false, `pnpm` can be set in sub-project's package.json. -+// if (opts?.sharedWorkspaceLockfile && pkg.dir !== workspaceRoot) { -+// checkNonRootProjectManifest(pkg); -+// } -+// } -+// return pkgs; -+// } -+// exports.findWorkspacePackages = findWorkspacePackages; - async function findWorkspacePackagesNoCheck(workspaceRoot, opts) { - let patterns = opts?.patterns; - if (patterns == null) { -@@ -42,26 +42,26 @@ async function findWorkspacePackagesNoCheck(workspaceRoot, opts) { - return pkgs; - } - exports.findWorkspacePackagesNoCheck = findWorkspacePackagesNoCheck; --function arrayOfWorkspacePackagesToMap(pkgs) { -- return pkgs.reduce((acc, pkg) => { -- if (!pkg.manifest.name) -- return acc; -- if (!acc[pkg.manifest.name]) { -- acc[pkg.manifest.name] = {}; -- } -- acc[pkg.manifest.name][pkg.manifest.version ?? '0.0.0'] = pkg; -- return acc; -- }, {}); --} --exports.arrayOfWorkspacePackagesToMap = arrayOfWorkspacePackagesToMap; --function checkNonRootProjectManifest({ manifest, dir }) { -- for (const rootOnlyField of ['pnpm', 'resolutions']) { -- if (manifest?.[rootOnlyField]) { -- logger_1.logger.warn({ -- message: `The field "${rootOnlyField}" was found in ${dir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`, -- prefix: dir, -- }); -- } -- } --} -+// function arrayOfWorkspacePackagesToMap(pkgs) { -+// return pkgs.reduce((acc, pkg) => { -+// if (!pkg.manifest.name) -+// return acc; -+// if (!acc[pkg.manifest.name]) { -+// acc[pkg.manifest.name] = {}; -+// } -+// acc[pkg.manifest.name][pkg.manifest.version ?? '0.0.0'] = pkg; -+// return acc; -+// }, {}); -+// } -+// exports.arrayOfWorkspacePackagesToMap = arrayOfWorkspacePackagesToMap; -+// function checkNonRootProjectManifest({ manifest, dir }) { -+// for (const rootOnlyField of ['pnpm', 'resolutions']) { -+// if (manifest?.[rootOnlyField]) { -+// logger_1.logger.warn({ -+// message: `The field "${rootOnlyField}" was found in ${dir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`, -+// prefix: dir, -+// }); -+// } -+// } -+// } - //# sourceMappingURL=index.js.map From 35dd3c6caa135e49c4b690df09452c22e9701617 Mon Sep 17 00:00:00 2001 From: NamesMT Date: Tue, 14 May 2024 05:46:44 +0000 Subject: [PATCH 3/4] fix: support of lockfile v5 --- packages/tools/cli/package.json | 2 +- packages/tools/cli/src/lockfile/index.ts | 12 + packages/tools/cli/src/lockfile/pnpm.ts | 20 +- pnpm-lock.yaml | 472 ++++++++++++++++++----- 4 files changed, 401 insertions(+), 105 deletions(-) diff --git a/packages/tools/cli/package.json b/packages/tools/cli/package.json index adb4e829..67e5dc78 100644 --- a/packages/tools/cli/package.json +++ b/packages/tools/cli/package.json @@ -23,7 +23,7 @@ "@nolyfill/promise.any": "workspace:*", "@npmcli/arborist": "^6.3.0", "@pnpm/list": "^10.1.2", - "@pnpm/list--old": "^10.1.2", + "@pnpm/list--old": "npm:@pnpm/list@^9.1.10", "@pnpm/workspace.find-packages": "^2.0.5", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-json": "^6.1.0", diff --git a/packages/tools/cli/src/lockfile/index.ts b/packages/tools/cli/src/lockfile/index.ts index 99ab31f0..f3e20751 100644 --- a/packages/tools/cli/src/lockfile/index.ts +++ b/packages/tools/cli/src/lockfile/index.ts @@ -2,6 +2,8 @@ import type { PackageManager } from '../package-manager'; import { buildPNPMDepTree } from './pnpm'; import { buildNPMDepTree } from './npm'; import { buildYarnDepTree } from './yarn'; +import fsp from 'fs/promises'; +import path from 'path'; export interface PackageLockDeps { [depName: string]: PackageLockDep @@ -29,3 +31,13 @@ export function buildDepTrees(packageManager: PackageManager, dir: string) { throw new Error(`Unknown package manager: ${packageManager as string}`); } } + +export async function getPNPMLockfileVersion(dir: string) { + const content = await fsp.readFile(path.resolve(dir, 'pnpm-lock.yaml'), 'utf-8'); + const [, lockfileVersion] = content.match(/^lockfileVersion: '?(\d*(?:.\d*)?)'?$/m) ?? []; + + if (!lockfileVersion) + throw new Error(`Can't detect lockfile version`) + + return lockfileVersion; +} diff --git a/packages/tools/cli/src/lockfile/pnpm.ts b/packages/tools/cli/src/lockfile/pnpm.ts index fdf2f9b7..2c320dc9 100644 --- a/packages/tools/cli/src/lockfile/pnpm.ts +++ b/packages/tools/cli/src/lockfile/pnpm.ts @@ -1,9 +1,11 @@ import { searchForPackages } from '@pnpm/list'; +import { searchForPackages as searchForPackages_Old } from '@pnpm/list--old'; import type { PackageNode } from '../types'; import path from 'path'; import { fileExists } from '@nolyfill/internal'; import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.find-packages'; import { cache } from '../lib/cache'; +import { getPNPMLockfileVersion } from '.'; export const buildPNPMDepTree = cache(async (dirPath: string): Promise => { const dirPaths = [dirPath]; @@ -13,7 +15,7 @@ export const buildPNPMDepTree = cache(async (dirPath: string): Promise project.dir)); } - const result = await searchForPackages(['*'], dirPaths, { + const searchNew = () => searchForPackages(['*'], dirPaths, { depth: Infinity, lockfileDir: dirPath, include: { @@ -22,7 +24,21 @@ export const buildPNPMDepTree = cache(async (dirPath: string): Promise searchForPackages_Old(['*'], dirPaths, { + depth: Infinity, + lockfileDir: dirPath, + include: { + dependencies: true, + devDependencies: true, + optionalDependencies: false + }, + }) + + const lockfileVersion = await getPNPMLockfileVersion(dirPath) + + const result = await ((+lockfileVersion) < 6 ? searchOld() : searchNew()) return result.flatMap((dep) => { return [...(dep.dependencies ?? []), ...(dep.devDependencies ?? [])]; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 175c7161..0ec1d8a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,9 +106,6 @@ patchedDependencies: '@npmcli/arborist@6.3.0': hash: eobdrhtmolyi74xb3rpenl2k74 path: patches/@npmcli__arborist@6.3.0.patch - '@pnpm/workspace.find-packages@2.0.4': - hash: 4q7iu6aiup6pr6q4x7ao6u4tyu - path: patches/@pnpm__workspace.find-packages@2.0.4.patch '@types/npmcli__arborist@5.6.1': hash: 6ms3onjw4t22bbhdxmnddktj5e path: patches/@types__npmcli__arborist@5.6.1.patch @@ -812,11 +809,14 @@ importers: specifier: ^6.3.0 version: 6.3.0(patch_hash=eobdrhtmolyi74xb3rpenl2k74) '@pnpm/list': - specifier: ^10.1.1 - version: 10.1.1(@pnpm/logger@5.0.0) + specifier: ^10.1.2 + version: 10.1.2(@pnpm/logger@5.0.0) + '@pnpm/list--old': + specifier: npm:@pnpm/list@^9.1.10 + version: '@pnpm/list@9.1.12(@pnpm/logger@5.0.0)' '@pnpm/workspace.find-packages': - specifier: ^2.0.4 - version: 2.0.4(patch_hash=4q7iu6aiup6pr6q4x7ao6u4tyu)(@pnpm/logger@5.0.0) + specifier: ^2.0.5 + version: 2.0.5(@pnpm/logger@5.0.0) '@rollup/plugin-commonjs': specifier: ^25.0.7 version: 25.0.7(rollup@4.17.2) @@ -1110,8 +1110,8 @@ packages: resolution: {integrity: sha512-TUd6vCxrFEoaH4K8iOKelUkePuMu4RsrdoICcVd+nlpqUi6Mc2T1dzufnW5PqfuNSeHSaJyzNaYc3JOS6x9W6A==} engines: {node: '>=18.12'} - '@pnpm/cli-utils@3.0.4': - resolution: {integrity: sha512-vkaJ83hv8yc7Oi+ARcHQcoP1l+Z2x8tLHzfUvHM63DvvkwAL4IgZtjH3YGDR69qR4kY5GXzUg1xhYXxDJT75DQ==} + '@pnpm/cli-utils@3.0.5': + resolution: {integrity: sha512-tr9xgks2U9fTAZ+7bK01JHdBkfOuYa9P5nA4Db1ER2GVuC7XqxLvhFXMYaZMDs4NiChs3t4l1/bpxEefiC/UDg==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 @@ -1124,14 +1124,18 @@ packages: resolution: {integrity: sha512-tV71wOtu8ULW4Fv5c7MWph3Sfle1wkT2q83qF2Cx/0J5E2dpUsClO9evAouL4fbdmPonkXJbRYL5cGHKuqxr4w==} engines: {node: '>=18.12'} - '@pnpm/config@21.2.0': - resolution: {integrity: sha512-nqFMqW5I5sDOAS48uatsuNztv0E6XBhA07oxUEBfOCMvM2JXt7PhAlMg33CFfNoMC3FhxYlCispAp41c+ya9yA==} + '@pnpm/config@21.2.1': + resolution: {integrity: sha512-l86MYzQ0OZ9uKdY5aVn5/HN02/+uM4JWulZnxNiRW5D/klVQsCwjhPmfgoKYCPXddj3raq9HRTLu2kjns0geRQ==} engines: {node: '>=18.12'} '@pnpm/constants@6.2.0': resolution: {integrity: sha512-GlDVUkeTR2WK0oZAM+wtDY6RBMLw6b0Z/5qKgBbDszx4e+R7CHyfG7JofyypogRCfeWXeAXp2C2FkFTh+sNgIg==} engines: {node: '>=14.6'} + '@pnpm/constants@7.1.1': + resolution: {integrity: sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==} + engines: {node: '>=16.14'} + '@pnpm/constants@8.0.0': resolution: {integrity: sha512-yQosGUvYPpAjb1jOFcdbwekRjZRVxN6C0hHzfRCZrMKbxGjt/E0g0RcFlEDNVZ95tm4oMMcr7nEPa7H7LX3emw==} engines: {node: '>=18.12'} @@ -1142,6 +1146,10 @@ packages: peerDependencies: '@pnpm/logger': ^5.0.0 + '@pnpm/crypto.base32-hash@2.0.0': + resolution: {integrity: sha512-3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA==} + engines: {node: '>=16.14'} + '@pnpm/crypto.base32-hash@3.0.0': resolution: {integrity: sha512-iGKP6rRKng5Tcad1+S+j3UoY5wVZN+z0ZgemlGp69jNgn6EaM4N0Q3mvnDNJ7UZFmL2ClXZZYLNuCk9pUYV3Xg==} engines: {node: '>=18.12'} @@ -1154,12 +1162,16 @@ packages: resolution: {integrity: sha512-iCv/dc5dyXN/egiIu89qQn6yuLsQhiFjn0t1N+UKf4jSdMp59WFHjGh04jSsbxbGG91s6K9SQghOBW8BbZjinw==} engines: {node: '>=18.12'} - '@pnpm/default-reporter@13.0.3': - resolution: {integrity: sha512-/TZawVlLwpAtezfdw+eb/lxJuV+bUpQv5OvTcpgEqJDs+quedgOYfiLWxHy3Dyhb5roMuu241ekic7O4tlpYIg==} + '@pnpm/default-reporter@13.1.0': + resolution: {integrity: sha512-gk08Qo+BoNWJR6NZdE02wIBW/+2sNzwZxf08eJa7AAz83ORsBnamWiDQ/rMap9cyEdnZCxOD2m6NMRzQbvUs0A==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 + '@pnpm/dependency-path@2.1.8': + resolution: {integrity: sha512-ywBaTjy0iSEF7lH3DlF8UXrdL2bw4AQFV2tTOeNeY7wc1W5CE+RHSJhf9MXBYcZPesqGRrPiU7Pimj3l05L9VA==} + engines: {node: '>=16.14'} + '@pnpm/dependency-path@4.0.0': resolution: {integrity: sha512-d2tTvjnWJtqVjREPZa1h81i7wfQSeg7YkMc7BZAr8QJ4he5KlHY1Zmfa4LpyXVQJSV3trGfy/dmxhV2A5lo34g==} engines: {node: '>=18.12'} @@ -1168,8 +1180,12 @@ packages: resolution: {integrity: sha512-6UFakGqUDhnZVzYCfN+QaG1epxtBVS1M9mb9RzoBuvWxcimBYTT04fdYuyk1Nay8y/TvAVl3AVB/lCziWG0+2w==} engines: {node: '>=14.6'} - '@pnpm/error@6.0.0': - resolution: {integrity: sha512-SKtHdV09k9+6jkohv9YuYmKMKNpxknoGjo0c6eN8x2Z3MHW2cuSt1OD/L16eCqdKQL+FUbvULxig0b9X9VK2/g==} + '@pnpm/error@5.0.3': + resolution: {integrity: sha512-ONJU5cUeoeJSy50qOYsMZQHTA/9QKmGgh1ATfEpCLgtbdwqUiwD9MxHNeXUYYI/pocBCz6r1ZCFqiQvO+8SUKA==} + engines: {node: '>=16.14'} + + '@pnpm/error@6.0.1': + resolution: {integrity: sha512-7yjO0RgmWYb4OKgcWC33yD4Z2CxE7Tm7vXX1SmS7GDifDT/bgZZhHeS2xq/+W6y9yhwIrRSA+7AlQL1NM2wIvw==} engines: {node: '>=18.12'} '@pnpm/fetch@8.0.0': @@ -1186,18 +1202,26 @@ packages: resolution: {integrity: sha512-fnsaegb+0q7Ku6AyCmoVtBeCuO8ytB7YMEaGHC+0MGoRsxxa6EVLgi2H4abKr8LLslf5tHJBnOH24DjST3UNfQ==} engines: {node: '>=18.12'} - '@pnpm/fs.find-packages@3.0.0': - resolution: {integrity: sha512-kD86TBysavauiFai+BnEqkuOCXBfQZHXt7AEKimhzSh0fW+jtCEGreOM12u7wNF++lPmc5ejWA6hx3/OuhA4CA==} + '@pnpm/fs.find-packages@3.0.1': + resolution: {integrity: sha512-snENHR7Odyy6g59oZjtioagdOWiwQ6q7pEbzwpz0+tNQrUFFwO/l8jU4pjsVC1QP3bs9DCp0yVyh7//KX0PBYw==} engines: {node: '>=18.12'} '@pnpm/git-resolver@9.0.1': resolution: {integrity: sha512-B1FtKwEEUm8130XqmX7eqgMhqdBxJ5gPrWssOLnpIlp/rvmJFsfD2P//80OjORPNFWnpfqdfBF34c/+ZCzAxZg==} engines: {node: '>=18.12'} + '@pnpm/git-utils@1.0.0': + resolution: {integrity: sha512-lUI+XrzOJN4zdPGOGnFUrmtXAXpXi8wD8OI0nWOZmlh+raqbLzC3VkXu1zgaduOK6YonOcnQW88O+ojav1rAdA==} + engines: {node: '>=16.14'} + '@pnpm/git-utils@2.0.0': resolution: {integrity: sha512-k1rv4Zvno/5zJAqE/Mh9V0ehlm14NsYwpXTdaGMtyhkoHvlSckRfr23OIOIM7Q/TRX+LhqyJ2kep50SY2TsZ+g==} engines: {node: '>=18.12'} + '@pnpm/graceful-fs@3.2.0': + resolution: {integrity: sha512-vRoXJxscDpHak7YE9SqCkzfrayn+Lw+YueOeHIPEqkgokrHeYgYeONoc2kGh0ObHaRtNSsonozVfJ456kxLNvA==} + engines: {node: '>=16.14'} + '@pnpm/graceful-fs@4.0.0': resolution: {integrity: sha512-933nhV2Prp51522poxX6Chvb7kEW3U3kzVWoqDU1+icB+QE7z/2qQ8wYHsBt4jm0Uil/sF67t77ugOr8bR63kg==} engines: {node: '>=18.12'} @@ -1210,16 +1234,30 @@ packages: resolution: {integrity: sha512-QzmNiLShTnNyeTHr+cykG5hYjwph0+v49KHV36Dh8uA2rRMWw30qoZMARuxd00SYdoTwT8bIouqqmzi6TWfJHQ==} engines: {node: '>=10'} - '@pnpm/list@10.1.1': - resolution: {integrity: sha512-tWYjBCbYDMs02qH0voa6pnxn0+xMhR8h5N9oIN5I2JpIxGLRkCQTm406Iot/OEyCgFwk9x3e2Q5C6KJOor+9mg==} + '@pnpm/list@10.1.2': + resolution: {integrity: sha512-VSk8MuDM+vut677iRgJVvGqCXKjMZSEmWcJWfUzC0D/LBUfQeBsk8oPJLUTCSlwi8gLwobzqRoiFpKWeJqS5ew==} engines: {node: '>=18.12'} - '@pnpm/lockfile-file@9.0.4': - resolution: {integrity: sha512-WkiHN0UegyBB5hsLxEcbqrwJodcCpT1aA37Ngv/lWXWXWv0F0gL3mas4SltVqdVLV5pl5CoujThrzWOhWKD1kw==} + '@pnpm/list@9.1.12': + resolution: {integrity: sha512-y3B7aX4MnV3DCSvHrxcqoa0kEVMP3POobu/NSoiIpIYWkNQqx5i0vPcopFODsTfzpDNXFoSR60eUcfHF3oWXKQ==} + engines: {node: '>=16.14'} + + '@pnpm/lockfile-file@8.1.8': + resolution: {integrity: sha512-bRadYzGFyFtwiynwp4Mkn7NDNHkgKvJ9xtjsCT5XiE6S8wpzS3W8yx2WzHGk9Mm1J/2wM0F52+NzCWhlz5eIqA==} + engines: {node: '>=16.14'} + peerDependencies: + '@pnpm/logger': ^5.0.0 + + '@pnpm/lockfile-file@9.0.5': + resolution: {integrity: sha512-QQFYohFy39FkAQbtDEtqVIzNu5XZhA9aonh/AM/vwvptNcfnajeBuNKfAJepdjWPg/xSBDuU96So29pkPMK8+Q==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 + '@pnpm/lockfile-types@5.1.5': + resolution: {integrity: sha512-02FP0HynzX+2DcuPtuMy7PH+kLIC0pevAydAOK+zug2bwdlSLErlvSkc+4+3dw60eRWgUXUqyfO2eR/Ansdbng==} + engines: {node: '>=16.14'} + '@pnpm/lockfile-types@6.0.0': resolution: {integrity: sha512-a4/ULIPLZIIq8Qmi2HEoFgRTtEouGU5RNhuGDxnSmkxu1BjlNMNjLJeEI5jzMZCGOjBoML+AirY/XOO3bcEQ/w==} engines: {node: '>=18.12'} @@ -1228,6 +1266,10 @@ packages: resolution: {integrity: sha512-Zl5S1WW3Fk8SFjzjuV8jog7VYtPC+RMcsLpvmgFUDyMy/IRG1x2vQ7m3BY1SpmfRLf4XqxACRwKBlbjlRrVY4Q==} engines: {node: '>=18.12'} + '@pnpm/lockfile-utils@9.0.6': + resolution: {integrity: sha512-YhOL2V3iMonQEXOaTcHRwkYRjoQLVtCWTpkP8Pquowxmj5bTVh9LgbutneYYhPr3YRnk3ziYQD71Z/HHFuOZGA==} + engines: {node: '>=16.14'} + '@pnpm/lockfile.detect-dep-types@1.0.1': resolution: {integrity: sha512-ickBPORYRKQBvyszXtbJ0O3HIyklesZiPueslGwZp+palyAjEYhl77mbs25ERIOUu+0M5sBRzNr/dZmU2u5Mtg==} engines: {node: '>=18.12'} @@ -1236,18 +1278,30 @@ packages: resolution: {integrity: sha512-YfcB2QrX+Wx1o6LD1G2Y2fhDhOix/bAY/oAnMpHoNLsKkWIRbt1oKLkIFvxBMzLwAEPqnYWguJrYC+J6i4ywbw==} engines: {node: '>=12.17'} - '@pnpm/manifest-utils@6.0.0': - resolution: {integrity: sha512-LEIrd7TNUhMPTLKEvdXBKLPEf21blXRwLkKkVXiBLUMSps6Bl60iqybHtszxLAbtBcTmrRSP5nSOVnjhwx3GFA==} + '@pnpm/manifest-utils@6.0.1': + resolution: {integrity: sha512-Lf4uV5jcVDbYV7mWCV4cvNuoY1tdhUrz00bFzQ9OXxNHrLef9izfxx6olvJhNVyTve0uLEnzPdfNaT4lGlGsig==} engines: {node: '>=18.12'} + '@pnpm/matcher@5.0.0': + resolution: {integrity: sha512-uh+JBmW8XHGwz9x0K0Ok+TtMiu3ghEaqHHm7dqIubitBP8y9Y0LLP6D2fxWblogjpVzSlH3DpDR1Vicuhw9/cQ==} + engines: {node: '>=16.14'} + '@pnpm/matcher@6.0.0': resolution: {integrity: sha512-c2diPZzejRYnL6b00Ko70TnOlbsqydUOvAjOZ7THTs0ptXG/AARcwNp9YO5EXFq775TTmsSUBo99qisYF1ogNA==} engines: {node: '>=18.12'} + '@pnpm/merge-lockfile-changes@5.0.7': + resolution: {integrity: sha512-fYmX1+EHv3wg7l4A9FCEkjgEBIHaY6JosknkLk3pL8dbB9k6unjIrF9f2onNtpj3XUlWxZ3aBw9THk/Bf6hKow==} + engines: {node: '>=16.14'} + '@pnpm/merge-lockfile-changes@6.0.0': resolution: {integrity: sha512-K9ARTZ+o/EZ10RPZY4dftlSnvPgJrVeOG0QwZLNTb9Z9q8D6EqSVwEh7CxDobGFe5FAj2lkDK6DY7EgPI4hhdw==} engines: {node: '>=18.12'} + '@pnpm/modules-yaml@12.1.7': + resolution: {integrity: sha512-+BVpv52inGF6Ro1nLnxprMwYa5y97EwmDN+ZQjhZxPJ5MATPbFS7kSGolSPMHsnbMs83V5wew2Uos3KX7zBxbg==} + engines: {node: '>=16.14'} + '@pnpm/modules-yaml@13.1.0': resolution: {integrity: sha512-5mf4F+rlzuKkIRlh3EQS6q3bqUOCgHtc9NCpFOHIkaibUteGLdneoMkoPahY9KTfa4flqx9CBbvGvHW1NPrSUg==} engines: {node: '>=18.12'} @@ -1272,6 +1326,10 @@ packages: resolution: {integrity: sha512-eYwrzhKUBGFdq78rJStGjaHTUHA2VH+Avr//CVx/T+EJkI7hnFmOy6YghvcB2clj8HpO4V8tXRNuFNfRX08ayw==} engines: {node: ^10.17 || >=12.3} + '@pnpm/normalize-registries@5.0.6': + resolution: {integrity: sha512-wu6DvcSyBJbD99XLjBqlakeoYxQBdDOPPonkApFYvRntDv4k1YvIak92c5jeqz2ZDqCXiXhSo/ZcpPooAI/+nQ==} + engines: {node: '>=16.14'} + '@pnpm/normalize-registries@6.0.0': resolution: {integrity: sha512-V2Lj3zwjIANgUqnQkMOWYVBdwRc6ZVjmZ0AD9w3a9Gby8Ad7wIdwjKJab2R5p4rjX22cbcM/ao9Grt1FlSxEYA==} engines: {node: '>=18.12'} @@ -1284,26 +1342,30 @@ packages: resolution: {integrity: sha512-oQYP08exi6mOPdAZZWcNIGS+KKPsnNwUBzSuAEGWuCcqwMAt3k/WVCqVIXzBxhO5sP2b43og69VHmPj6IroKqw==} engines: {node: '>=14.6'} - '@pnpm/package-is-installable@9.0.0': - resolution: {integrity: sha512-czLj80Nj/07cvR0tV7bcpsXA0CuIlILbULU8C4GJwu5SR7udVU0XLDe8gmdDbhWVih24aNC/Mu5CrRHMO9C2vA==} + '@pnpm/package-is-installable@9.0.1': + resolution: {integrity: sha512-wDgFLZjmYCQSGze8lqlsgIRqnPEBYcIUXTStMhBlXv9iA2U5G+f2U85lxr8FoQ7oZg17BKbuLycQx6qnZRT46A==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 - '@pnpm/parse-overrides@5.0.0': - resolution: {integrity: sha512-P4Z4+4dsg3pXBOOAtEMUIz+GvMCTxCFh4oAWo5IEny72CFEat2Lkuddg9oQprTXacqVoN6ikxgsWt9l+KrQq4w==} + '@pnpm/parse-overrides@5.0.1': + resolution: {integrity: sha512-KD/cE0ovH2JkH5qeAuAo9TyU23Nqk0smlNf6O1t72zdIAOygvjAh5AzThGbYioBNWQP7h1MA7cAzrrDZRcrxgw==} engines: {node: '>=18.12'} '@pnpm/parse-wanted-dependency@6.0.0': resolution: {integrity: sha512-01hKf1qHKREZDOwa5wRXk01P+xBGOeZf/idg17si8ji7UWpdWEQkrUVmGfv3sT04XoiwIb7kaRiKPQT7ooB4fA==} engines: {node: '>=18.12'} + '@pnpm/pick-fetcher@2.0.1': + resolution: {integrity: sha512-rW9IqroTLSdrFgCRfxDOyL845e3ju0Lt8HmfljgJLIR8mIoCE6PUR7+JouoSUcauAx28mSMbYbbRYXKlxacdiA==} + engines: {node: '>=16.14'} + '@pnpm/pick-fetcher@3.0.0': resolution: {integrity: sha512-2eisylRAU/jeuxFEPnS1gjLZKJGbYc4QEtEW6MVUYjO4Xi+2ttkSm7825S0J5IPpUIvln8HYPCUS0eQWSfpOaQ==} engines: {node: '>=18.12'} - '@pnpm/pnpmfile@6.0.0': - resolution: {integrity: sha512-tpFQeTjhoNFiwUSuv8D7tc5tQAhHze3ygpnCdfJxBvGzMwA0H16U7vanqaGUUAYRHPC9ZMbAhz7J4OBT4f2ifQ==} + '@pnpm/pnpmfile@6.0.1': + resolution: {integrity: sha512-cUfTgUIUWQt+mUHXJq/WNzRjuq4mjuB+X1ybUxwrwq3cqV8zCPpKKTb+DZmVgr32RIH+21dTXbAcITDC8mtGng==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 @@ -1311,34 +1373,58 @@ packages: '@pnpm/ramda@0.28.1': resolution: {integrity: sha512-zcAG+lvU0fMziNeGXpPyCyCJYp5ZVrPElEE4t14jAmViaihohocZ+dDkcRIyAomox8pQsuZnv1EyHR+pOhmUWw==} + '@pnpm/read-modules-dir@6.0.1': + resolution: {integrity: sha512-/h+3VB1j+hhUlEYkE+dAH5WbhR/qYDDvliqWQxN/AA0CYAFwMud5z4FOKzYHgY6RD+KVVgEelLquxCi7fKvT8A==} + engines: {node: '>=16.14'} + '@pnpm/read-modules-dir@7.0.0': resolution: {integrity: sha512-gU2ZYvc5KnLWV1Ry4Vl2DUQ8X4wGboDvfINoj06Hjt7VYwHMPnY6ZUT4Q0LGSQNfzQFl/+hN1nNywj+kf102Gg==} engines: {node: '>=18.12'} - '@pnpm/read-package-json@9.0.0': - resolution: {integrity: sha512-nLRQcCjQ/74m6RsAv0Iab0PbFTn4nLgVX8PTAD3v92VWtP6TS0PJXA1/k9ulh02mdZogKOHFkGkKT1sqcPudBw==} + '@pnpm/read-package-json@8.0.8': + resolution: {integrity: sha512-q3qAKOXBZjbrMKfvlx6RCbXO6oflAUVH7SUm/JuGY2PRXHwfkZJkyMcflE0nsOXV1Yp1LuoequMotVcjtG5b0g==} + engines: {node: '>=16.14'} + + '@pnpm/read-package-json@9.0.1': + resolution: {integrity: sha512-NBKoKHXfMMkD1S9mkK7etEvY37xLONxj0ppgXCazeArid0ZIfmHyvJUsubQAcl8aVEOuf6JePai9IE8CCGkekQ==} engines: {node: '>=18.12'} - '@pnpm/read-project-manifest@6.0.0': - resolution: {integrity: sha512-X2LYdHErr7BQroRcV0LlilGXMA4SILf0D1adxQmr0CoEAxJThxcCEPIMLZqi9YukUF9oF5vV7qe/mdvI/r79Bw==} + '@pnpm/read-project-manifest@5.0.11': + resolution: {integrity: sha512-themRLiDt9Ud6Somlu0PJbeprBBQEhlI1xNG5bZIv26yfLsc1vYLd1TfgGViD1b8fP0jxAqsUrDM+WMaMKI+gw==} + engines: {node: '>=16.14'} + + '@pnpm/read-project-manifest@6.0.1': + resolution: {integrity: sha512-9rVutRLApTQibByEKuUl925areGRPtm7UuubqBJUFVXny+mEqQIX8iUhF8y0Z3yYR16+8eTzOOGvN/DP4QcdSg==} engines: {node: '>=18.12'} - '@pnpm/render-peer-issues@5.0.0': - resolution: {integrity: sha512-/gIYSX32DiwCHEKOwt3sIComaAnuESg6KBEVwIl3yVT5l9dc5dlxNhYmtrC1Khol5it/Uu4IlCWbalUgFPybGQ==} + '@pnpm/render-peer-issues@5.0.1': + resolution: {integrity: sha512-fi8o42Qzt1U3JhkSrZXiwrK5mrRIvYMsb7UtFBEHHUV/b+4Ii9KGOdVSvxpF2tCMZujnjRNzf1PTcAZjgdwDgQ==} engines: {node: '>=18.12'} + '@pnpm/resolver-base@11.1.0': + resolution: {integrity: sha512-y2qKaj18pwe1VWc3YXEitdYFo+WqOOt60aqTUuOVkJAirUzz0DzuYh3Ifct4znYWPdgUXHaN5DMphNF5iL85rA==} + engines: {node: '>=16.14'} + '@pnpm/resolver-base@12.0.0': resolution: {integrity: sha512-R5FmojIoHRIC8hZDyr6a9SM6TkpAQXQXgq5QrycUwknRvGjTnrOFD5JaTzMZohcfFg6TWdA3sp3B0w/mhj98Rg==} engines: {node: '>=18.12'} - '@pnpm/reviewing.dependencies-hierarchy@3.1.1': - resolution: {integrity: sha512-pxvdg6o2PRhpzzKh2iUPKBpDc0j0YdGHkrad8F9zPfmzb5Aybm23Hbc+78AatWrX+GH4wsk73ibvRHsxSjN5jg==} + '@pnpm/reviewing.dependencies-hierarchy@2.1.11': + resolution: {integrity: sha512-WPAqZtHE7i2df2GiREgx/p1eq6diCNkcux2HmE2p0L8OniONlld3kpMi4NovgYtJ011gugjzzZ7c1GfYJd5S1w==} + engines: {node: '>=16.14'} + + '@pnpm/reviewing.dependencies-hierarchy@3.1.2': + resolution: {integrity: sha512-J7kfOXwmkq+oR1p2oWDpIYqIh0AhyROQJ/swMAcEdFpJHvuO5JprzdsIRvXzhS96in8MIK4jqZTpAFwdP43lRg==} engines: {node: '>=18.12'} '@pnpm/store-controller-types@18.0.0': resolution: {integrity: sha512-cEUMC0yQD87EokGgOjVtNAsS4PSuHoGDXH0RQKcszjZiElR9bJ+qz0f/8nZhlP4WG3uhqHqxhbWK+AXj6E2N1w==} engines: {node: '>=18.12'} + '@pnpm/text.comments-parser@2.0.0': + resolution: {integrity: sha512-DRWtTmmxQQtuWHf1xPt9bqzCSq8d0MQF5x1kdpCDMLd7xk3nP4To2/OGkPrb8MKbrWsgCNDwXyKCFlEKrAg7fg==} + engines: {node: '>=16.14'} + '@pnpm/text.comments-parser@3.0.0': resolution: {integrity: sha512-BSGvYd59kPKVTUk1InekEp+TiPnJ8650/bQyiOUFSvqHi61YipcR+E4H2i3xTnk2e+GHdGbXvEtAZbQmyxb0/g==} engines: {node: '>=18.12'} @@ -1347,6 +1433,10 @@ packages: resolution: {integrity: sha512-P608MRTOExt5BkIN2hsrb/ycEchwaPW/x80ujJUAqxKZSXNVAOrlEu3KJ+2+jTCunyWmo/EcE01ZdwCw8jgVrQ==} engines: {node: '>=18.12'} + '@pnpm/types@9.4.2': + resolution: {integrity: sha512-g1hcF8Nv4gd76POilz9gD4LITAPXOe5nX4ijgr8ixCbLQZfcpYiMfJ+C1RlMNRUDo8vhlNB4O3bUlxmT6EAQXA==} + engines: {node: '>=16.14'} + '@pnpm/util.lex-comparator@1.0.0': resolution: {integrity: sha512-3aBQPHntVgk5AweBWZn+1I/fqZ9krK/w01197aYVkAJQGftb+BVWgEepxY5GChjSW12j52XX+CmfynYZ/p0DFQ==} engines: {node: '>=12.22.0'} @@ -1355,16 +1445,20 @@ packages: resolution: {integrity: sha512-ead+l3IiuVXwKDf/QJPX6G93cwhXki3yOVEA/VdAO7AhZ5vUuSBxHe6gQKEbB0QacJ4H5VsYxeM1xUgwjjOO/Q==} engines: {node: '>=18.12'} - '@pnpm/workspace.find-packages@2.0.4': - resolution: {integrity: sha512-uhmFQgOkH0VjdsAlLnQyrk52o09Txsd89/Y2fN97MRmLsLlscWDyCL2AMRoDQGRSb9juKJ4Yi/CSEP54DHGo+A==} + '@pnpm/workspace.find-packages@2.0.5': + resolution: {integrity: sha512-qI9Gc9BO50vN+r4A0vCkmO8o9sWaxg59OkIUO7V9ctdZ4/t2y4d7lL+Q0k16C3ZF/HYUijaK+8Dtzh8KZ6meDg==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': ^5.0.0 - '@pnpm/workspace.read-manifest@2.0.0': - resolution: {integrity: sha512-K7lxFSPk2Vv5ztoRGOmke8111p/YaNOLoUUwP60ugkPaTflYp+c/gvC2kwSA4klLR81xjVASrzRpWkVsyu1dNg==} + '@pnpm/workspace.read-manifest@2.0.1': + resolution: {integrity: sha512-Aqk77F3CFuN/qNeAIIm8MtwowRZvf5Ei9uq7cySLx44Q23XocGddE7r/5LnmVpD0t4e5Qu5j+mbcRqCJcjhMsQ==} engines: {node: '>=18.12'} + '@pnpm/write-project-manifest@5.0.6': + resolution: {integrity: sha512-3qkKCftRE/HXzoWedyDuaMMUQzheDwx8AQXR0DnA9ylsBnZQYNut19Ado/gzi5+IvznaMcqrBszw57j3y1/ILw==} + engines: {node: '>=16.14'} + '@pnpm/write-project-manifest@6.0.0': resolution: {integrity: sha512-DTjuH7Ls4v8CpfvOCtZkIIySpEKPGh7hEUpH5tqvVblzWQwfheoHfeBvyjGo975lvHsR2bCt2s8F7bv6DQ8o8g==} engines: {node: '>=18.12'} @@ -1773,6 +1867,10 @@ packages: resolution: {integrity: sha512-jVZa3njBv6tcOUw34nlUdUM/40wwtm/gnVF8rtk0tA6vNcokqYI8CFU1BZjlpFwUSZaXxYkrtuPE/f2MMFlTxQ==} engines: {node: '>=18.12.0'} + '@zkochan/js-yaml@0.0.6': + resolution: {integrity: sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==} + hasBin: true + '@zkochan/js-yaml@0.0.7': resolution: {integrity: sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==} hasBin: true @@ -2193,8 +2291,8 @@ packages: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} - detect-libc@2.0.2: - resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} + detect-libc@2.0.3: + resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} engines: {node: '>=8'} dir-glob@3.0.1: @@ -2222,6 +2320,10 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + encode-registry@3.0.1: + resolution: {integrity: sha512-6qOwkl1g0fv0DN3Y3ggr2EaZXN71aoAqPp3p/pVaWSBSIo+YjLOWN61Fva43oVyQNPf7kgm8lkudzlzojwE2jw==} + engines: {node: '>=10'} + encoding@0.1.13: resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} @@ -3360,11 +3462,6 @@ packages: rfc4648@1.5.3: resolution: {integrity: sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==} - right-pad@1.0.1: - resolution: {integrity: sha512-bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw==} - engines: {node: '>= 0.10'} - deprecated: Please use String.prototype.padEnd() over this package. - rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true @@ -4129,16 +4226,16 @@ snapshots: '@pnpm/types': 10.0.0 load-json-file: 6.2.0 - '@pnpm/cli-utils@3.0.4(@pnpm/logger@5.0.0)': + '@pnpm/cli-utils@3.0.5(@pnpm/logger@5.0.0)': dependencies: '@pnpm/cli-meta': 6.0.0 - '@pnpm/config': 21.2.0(@pnpm/logger@5.0.0) - '@pnpm/default-reporter': 13.0.3(@pnpm/logger@5.0.0) - '@pnpm/error': 6.0.0 + '@pnpm/config': 21.2.1(@pnpm/logger@5.0.0) + '@pnpm/default-reporter': 13.1.0(@pnpm/logger@5.0.0) + '@pnpm/error': 6.0.1 '@pnpm/logger': 5.0.0 - '@pnpm/manifest-utils': 6.0.0(@pnpm/logger@5.0.0) - '@pnpm/package-is-installable': 9.0.0(@pnpm/logger@5.0.0) - '@pnpm/read-project-manifest': 6.0.0 + '@pnpm/manifest-utils': 6.0.1(@pnpm/logger@5.0.0) + '@pnpm/package-is-installable': 9.0.1(@pnpm/logger@5.0.0) + '@pnpm/read-project-manifest': 6.0.1 '@pnpm/types': 10.0.0 chalk: 4.1.2 load-json-file: 6.2.0 @@ -4147,16 +4244,16 @@ snapshots: '@pnpm/config.env-replace@3.0.0': {} - '@pnpm/config@21.2.0(@pnpm/logger@5.0.0)': + '@pnpm/config@21.2.1(@pnpm/logger@5.0.0)': dependencies: '@pnpm/config.env-replace': 3.0.0 '@pnpm/constants': 8.0.0 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/git-utils': 2.0.0 '@pnpm/matcher': 6.0.0 '@pnpm/npm-conf': 2.2.2 - '@pnpm/pnpmfile': 6.0.0(@pnpm/logger@5.0.0) - '@pnpm/read-project-manifest': 6.0.0 + '@pnpm/pnpmfile': 6.0.1(@pnpm/logger@5.0.0) + '@pnpm/read-project-manifest': 6.0.1 '@pnpm/types': 10.0.0 better-path-resolve: 1.0.0 camelcase: 6.3.0 @@ -4176,6 +4273,8 @@ snapshots: '@pnpm/constants@6.2.0': {} + '@pnpm/constants@7.1.1': {} + '@pnpm/constants@8.0.0': {} '@pnpm/core-loggers@10.0.0(@pnpm/logger@5.0.0)': @@ -4183,6 +4282,10 @@ snapshots: '@pnpm/logger': 5.0.0 '@pnpm/types': 10.0.0 + '@pnpm/crypto.base32-hash@2.0.0': + dependencies: + rfc4648: 1.5.3 + '@pnpm/crypto.base32-hash@3.0.0': dependencies: rfc4648: 1.5.3 @@ -4195,15 +4298,15 @@ snapshots: '@pnpm/dedupe.types@2.0.0': {} - '@pnpm/default-reporter@13.0.3(@pnpm/logger@5.0.0)': + '@pnpm/default-reporter@13.1.0(@pnpm/logger@5.0.0)': dependencies: - '@pnpm/config': 21.2.0(@pnpm/logger@5.0.0) + '@pnpm/config': 21.2.1(@pnpm/logger@5.0.0) '@pnpm/core-loggers': 10.0.0(@pnpm/logger@5.0.0) '@pnpm/dedupe.issues-renderer': 2.0.0 '@pnpm/dedupe.types': 2.0.0 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/logger': 5.0.0 - '@pnpm/render-peer-issues': 5.0.0 + '@pnpm/render-peer-issues': 5.0.1 '@pnpm/types': 10.0.0 ansi-diff: 1.1.1 boxen: 5.1.2 @@ -4213,12 +4316,18 @@ snapshots: pretty-bytes: 5.6.0 pretty-ms: 7.0.1 ramda: '@pnpm/ramda@0.28.1' - right-pad: 1.0.1 rxjs: 7.8.1 semver: 7.6.0 stacktracey: 2.1.8 string-length: 4.0.2 + '@pnpm/dependency-path@2.1.8': + dependencies: + '@pnpm/crypto.base32-hash': 2.0.0 + '@pnpm/types': 9.4.2 + encode-registry: 3.0.1 + semver: 7.6.0 + '@pnpm/dependency-path@4.0.0': dependencies: '@pnpm/crypto.base32-hash': 3.0.0 @@ -4229,7 +4338,11 @@ snapshots: dependencies: '@pnpm/constants': 6.2.0 - '@pnpm/error@6.0.0': + '@pnpm/error@5.0.3': + dependencies: + '@pnpm/constants': 7.1.1 + + '@pnpm/error@6.0.1': dependencies: '@pnpm/constants': 8.0.0 @@ -4259,11 +4372,11 @@ snapshots: transitivePeerDependencies: - domexception - '@pnpm/fs.find-packages@3.0.0': + '@pnpm/fs.find-packages@3.0.1': dependencies: - '@pnpm/read-project-manifest': 6.0.0 + '@pnpm/read-project-manifest': 6.0.1 '@pnpm/types': 10.0.0 - '@pnpm/util.lex-comparator': 1.0.0 + '@pnpm/util.lex-comparator': 3.0.0 fast-glob: 3.3.2 p-filter: 2.1.0 @@ -4279,10 +4392,18 @@ snapshots: - domexception - supports-color + '@pnpm/git-utils@1.0.0': + dependencies: + execa: safe-execa@0.1.2 + '@pnpm/git-utils@2.0.0': dependencies: execa: safe-execa@0.1.2 + '@pnpm/graceful-fs@3.2.0': + dependencies: + graceful-fs: 4.2.11 + '@pnpm/graceful-fs@4.0.0': dependencies: graceful-fs: 4.2.11 @@ -4296,11 +4417,11 @@ snapshots: dependencies: lru-cache: 6.0.0 - '@pnpm/list@10.1.1(@pnpm/logger@5.0.0)': + '@pnpm/list@10.1.2(@pnpm/logger@5.0.0)': dependencies: - '@pnpm/read-package-json': 9.0.0 - '@pnpm/read-project-manifest': 6.0.0 - '@pnpm/reviewing.dependencies-hierarchy': 3.1.1(@pnpm/logger@5.0.0) + '@pnpm/read-package-json': 9.0.1 + '@pnpm/read-project-manifest': 6.0.1 + '@pnpm/reviewing.dependencies-hierarchy': 3.1.2(@pnpm/logger@5.0.0) '@pnpm/types': 10.0.0 archy: 1.0.0 chalk: 4.1.2 @@ -4312,11 +4433,46 @@ snapshots: - domexception - supports-color - '@pnpm/lockfile-file@9.0.4(@pnpm/logger@5.0.0)': + '@pnpm/list@9.1.12(@pnpm/logger@5.0.0)': + dependencies: + '@pnpm/read-package-json': 8.0.8 + '@pnpm/read-project-manifest': 5.0.11 + '@pnpm/reviewing.dependencies-hierarchy': 2.1.11(@pnpm/logger@5.0.0) + '@pnpm/types': 9.4.2 + archy: 1.0.0 + chalk: 4.1.2 + cli-columns: 4.0.0 + p-limit: 3.1.0 + ramda: '@pnpm/ramda@0.28.1' + transitivePeerDependencies: + - '@pnpm/logger' + + '@pnpm/lockfile-file@8.1.8(@pnpm/logger@5.0.0)': + dependencies: + '@pnpm/constants': 7.1.1 + '@pnpm/dependency-path': 2.1.8 + '@pnpm/error': 5.0.3 + '@pnpm/git-utils': 1.0.0 + '@pnpm/lockfile-types': 5.1.5 + '@pnpm/logger': 5.0.0 + '@pnpm/merge-lockfile-changes': 5.0.7 + '@pnpm/types': 9.4.2 + '@pnpm/util.lex-comparator': 1.0.0 + '@zkochan/rimraf': 2.1.3 + comver-to-semver: 1.0.0 + js-yaml: '@zkochan/js-yaml@0.0.6' + normalize-path: 3.0.0 + ramda: '@pnpm/ramda@0.28.1' + semver: 7.6.0 + sort-keys: 4.2.0 + strip-bom: 4.0.0 + write-file-atomic: 5.0.1 + + '@pnpm/lockfile-file@9.0.5(@pnpm/logger@5.0.0)': dependencies: '@pnpm/constants': 8.0.0 '@pnpm/dependency-path': 4.0.0 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/git-resolver': 9.0.1(@pnpm/logger@5.0.0) '@pnpm/git-utils': 2.0.0 '@pnpm/lockfile-types': 6.0.0 @@ -4338,6 +4494,10 @@ snapshots: - domexception - supports-color + '@pnpm/lockfile-types@5.1.5': + dependencies: + '@pnpm/types': 9.4.2 + '@pnpm/lockfile-types@6.0.0': dependencies: '@pnpm/types': 10.0.0 @@ -4352,6 +4512,16 @@ snapshots: get-npm-tarball-url: 2.1.0 ramda: '@pnpm/ramda@0.28.1' + '@pnpm/lockfile-utils@9.0.6': + dependencies: + '@pnpm/dependency-path': 2.1.8 + '@pnpm/lockfile-types': 5.1.5 + '@pnpm/pick-fetcher': 2.0.1 + '@pnpm/resolver-base': 11.1.0 + '@pnpm/types': 9.4.2 + get-npm-tarball-url: 2.1.0 + ramda: '@pnpm/ramda@0.28.1' + '@pnpm/lockfile.detect-dep-types@1.0.1': dependencies: '@pnpm/dependency-path': 4.0.0 @@ -4362,18 +4532,29 @@ snapshots: bole: 5.0.11 ndjson: 2.0.0 - '@pnpm/manifest-utils@6.0.0(@pnpm/logger@5.0.0)': + '@pnpm/manifest-utils@6.0.1(@pnpm/logger@5.0.0)': dependencies: '@pnpm/core-loggers': 10.0.0(@pnpm/logger@5.0.0) - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/types': 10.0.0 transitivePeerDependencies: - '@pnpm/logger' + '@pnpm/matcher@5.0.0': + dependencies: + escape-string-regexp: 4.0.0 + '@pnpm/matcher@6.0.0': dependencies: escape-string-regexp: 4.0.0 + '@pnpm/merge-lockfile-changes@5.0.7': + dependencies: + '@pnpm/lockfile-types': 5.1.5 + comver-to-semver: 1.0.0 + ramda: '@pnpm/ramda@0.28.1' + semver: 7.6.0 + '@pnpm/merge-lockfile-changes@6.0.0': dependencies: '@pnpm/lockfile-types': 6.0.0 @@ -4381,6 +4562,14 @@ snapshots: ramda: '@pnpm/ramda@0.28.1' semver: 7.6.0 + '@pnpm/modules-yaml@12.1.7': + dependencies: + '@pnpm/types': 9.4.2 + is-windows: 1.0.2 + ramda: '@pnpm/ramda@0.28.1' + read-yaml-file: 2.1.0 + write-yaml-file: 5.0.0 + '@pnpm/modules-yaml@13.1.0': dependencies: '@pnpm/types': 10.0.0 @@ -4423,6 +4612,12 @@ snapshots: transitivePeerDependencies: - domexception + '@pnpm/normalize-registries@5.0.6': + dependencies: + '@pnpm/types': 9.4.2 + normalize-registry-url: 2.0.0 + ramda: '@pnpm/ramda@0.28.1' + '@pnpm/normalize-registries@6.0.0': dependencies: '@pnpm/types': 10.0.0 @@ -4441,33 +4636,35 @@ snapshots: semver: 7.6.0 validate-npm-package-name: 4.0.0 - '@pnpm/package-is-installable@9.0.0(@pnpm/logger@5.0.0)': + '@pnpm/package-is-installable@9.0.1(@pnpm/logger@5.0.0)': dependencies: '@pnpm/core-loggers': 10.0.0(@pnpm/logger@5.0.0) - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/logger': 5.0.0 '@pnpm/types': 10.0.0 - detect-libc: 2.0.2 + detect-libc: 2.0.3 execa: safe-execa@0.1.2 mem: 8.1.1 semver: 7.6.0 - '@pnpm/parse-overrides@5.0.0': + '@pnpm/parse-overrides@5.0.1': dependencies: - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/parse-wanted-dependency': 6.0.0 '@pnpm/parse-wanted-dependency@6.0.0': dependencies: validate-npm-package-name: 5.0.0 + '@pnpm/pick-fetcher@2.0.1': {} + '@pnpm/pick-fetcher@3.0.0': {} - '@pnpm/pnpmfile@6.0.0(@pnpm/logger@5.0.0)': + '@pnpm/pnpmfile@6.0.1(@pnpm/logger@5.0.0)': dependencies: '@pnpm/core-loggers': 10.0.0(@pnpm/logger@5.0.0) '@pnpm/crypto.base32-hash': 3.0.0 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/hooks.types': 2.0.0 '@pnpm/lockfile-types': 6.0.0 '@pnpm/logger': 5.0.0 @@ -4478,21 +4675,49 @@ snapshots: '@pnpm/ramda@0.28.1': {} + '@pnpm/read-modules-dir@6.0.1': + dependencies: + graceful-fs: 4.2.11 + '@pnpm/read-modules-dir@7.0.0': dependencies: graceful-fs: 4.2.11 - '@pnpm/read-package-json@9.0.0': + '@pnpm/read-package-json@8.0.8': + dependencies: + '@pnpm/error': 5.0.3 + '@pnpm/types': 9.4.2 + load-json-file: 6.2.0 + normalize-package-data: 5.0.0 + + '@pnpm/read-package-json@9.0.1': dependencies: - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/types': 10.0.0 load-json-file: 6.2.0 normalize-package-data: 5.0.0 - '@pnpm/read-project-manifest@6.0.0': + '@pnpm/read-project-manifest@5.0.11': + dependencies: + '@gwhitney/detect-indent': 7.0.1 + '@pnpm/error': 5.0.3 + '@pnpm/graceful-fs': 3.2.0 + '@pnpm/text.comments-parser': 2.0.0 + '@pnpm/types': 9.4.2 + '@pnpm/write-project-manifest': 5.0.6 + fast-deep-equal: 3.1.3 + is-windows: 1.0.2 + json5: 2.2.3 + lodash.clonedeep: 4.5.0 + parse-json: 5.2.0 + read-yaml-file: 2.1.0 + sort-keys: 4.2.0 + strip-bom: 4.0.0 + + '@pnpm/read-project-manifest@6.0.1': dependencies: '@gwhitney/detect-indent': 7.0.1 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/graceful-fs': 4.0.0 '@pnpm/text.comments-parser': 3.0.0 '@pnpm/types': 10.0.0 @@ -4506,25 +4731,48 @@ snapshots: sort-keys: 4.2.0 strip-bom: 4.0.0 - '@pnpm/render-peer-issues@5.0.0': + '@pnpm/render-peer-issues@5.0.1': dependencies: - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 '@pnpm/matcher': 6.0.0 - '@pnpm/parse-overrides': 5.0.0 + '@pnpm/parse-overrides': 5.0.1 '@pnpm/types': 10.0.0 archy: 1.0.0 chalk: 4.1.2 cli-columns: 4.0.0 semver: 7.6.0 + '@pnpm/resolver-base@11.1.0': + dependencies: + '@pnpm/types': 9.4.2 + '@pnpm/resolver-base@12.0.0': dependencies: '@pnpm/types': 10.0.0 - '@pnpm/reviewing.dependencies-hierarchy@3.1.1(@pnpm/logger@5.0.0)': + '@pnpm/reviewing.dependencies-hierarchy@2.1.11(@pnpm/logger@5.0.0)': + dependencies: + '@pnpm/dependency-path': 2.1.8 + '@pnpm/lockfile-file': 8.1.8(@pnpm/logger@5.0.0) + '@pnpm/lockfile-utils': 9.0.6 + '@pnpm/matcher': 5.0.0 + '@pnpm/modules-yaml': 12.1.7 + '@pnpm/normalize-registries': 5.0.6 + '@pnpm/npm-package-arg': 1.0.0 + '@pnpm/read-modules-dir': 6.0.1 + '@pnpm/read-package-json': 8.0.8 + '@pnpm/types': 9.4.2 + normalize-path: 3.0.0 + realpath-missing: 1.1.0 + resolve-link-target: 2.0.0 + semver: 7.6.0 + transitivePeerDependencies: + - '@pnpm/logger' + + '@pnpm/reviewing.dependencies-hierarchy@3.1.2(@pnpm/logger@5.0.0)': dependencies: '@pnpm/dependency-path': 4.0.0 - '@pnpm/lockfile-file': 9.0.4(@pnpm/logger@5.0.0) + '@pnpm/lockfile-file': 9.0.5(@pnpm/logger@5.0.0) '@pnpm/lockfile-utils': 10.1.1 '@pnpm/lockfile.detect-dep-types': 1.0.1 '@pnpm/matcher': 6.0.0 @@ -4532,7 +4780,7 @@ snapshots: '@pnpm/normalize-registries': 6.0.0 '@pnpm/npm-package-arg': 1.0.0 '@pnpm/read-modules-dir': 7.0.0 - '@pnpm/read-package-json': 9.0.0 + '@pnpm/read-package-json': 9.0.1 '@pnpm/types': 10.0.0 normalize-path: 3.0.0 realpath-missing: 1.1.0 @@ -4549,31 +4797,45 @@ snapshots: '@pnpm/resolver-base': 12.0.0 '@pnpm/types': 10.0.0 + '@pnpm/text.comments-parser@2.0.0': + dependencies: + strip-comments-strings: 1.2.0 + '@pnpm/text.comments-parser@3.0.0': dependencies: strip-comments-strings: 1.2.0 '@pnpm/types@10.0.0': {} + '@pnpm/types@9.4.2': {} + '@pnpm/util.lex-comparator@1.0.0': {} '@pnpm/util.lex-comparator@3.0.0': {} - '@pnpm/workspace.find-packages@2.0.4(patch_hash=4q7iu6aiup6pr6q4x7ao6u4tyu)(@pnpm/logger@5.0.0)': + '@pnpm/workspace.find-packages@2.0.5(@pnpm/logger@5.0.0)': dependencies: - '@pnpm/cli-utils': 3.0.4(@pnpm/logger@5.0.0) - '@pnpm/fs.find-packages': 3.0.0 + '@pnpm/cli-utils': 3.0.5(@pnpm/logger@5.0.0) + '@pnpm/fs.find-packages': 3.0.1 '@pnpm/logger': 5.0.0 '@pnpm/types': 10.0.0 '@pnpm/util.lex-comparator': 3.0.0 - '@pnpm/workspace.read-manifest': 2.0.0 + '@pnpm/workspace.read-manifest': 2.0.1 - '@pnpm/workspace.read-manifest@2.0.0': + '@pnpm/workspace.read-manifest@2.0.1': dependencies: '@pnpm/constants': 8.0.0 - '@pnpm/error': 6.0.0 + '@pnpm/error': 6.0.1 read-yaml-file: 2.1.0 + '@pnpm/write-project-manifest@5.0.6': + dependencies: + '@pnpm/text.comments-parser': 2.0.0 + '@pnpm/types': 9.4.2 + json5: 2.2.3 + write-file-atomic: 5.0.1 + write-yaml-file: 5.0.0 + '@pnpm/write-project-manifest@6.0.0': dependencies: '@pnpm/text.comments-parser': 3.0.0 @@ -4987,6 +5249,10 @@ snapshots: js-yaml: 3.14.1 tslib: 2.6.2 + '@zkochan/js-yaml@0.0.6': + dependencies: + argparse: 2.0.1 + '@zkochan/js-yaml@0.0.7': dependencies: argparse: 2.0.1 @@ -5413,7 +5679,7 @@ snapshots: detect-indent@6.1.0: {} - detect-libc@2.0.2: {} + detect-libc@2.0.3: {} dir-glob@3.0.1: dependencies: @@ -5435,6 +5701,10 @@ snapshots: emoji-regex@9.2.2: {} + encode-registry@3.0.1: + dependencies: + mem: 8.1.1 + encoding@0.1.13: dependencies: iconv-lite: 0.6.3 @@ -6712,8 +6982,6 @@ snapshots: rfc4648@1.5.3: {} - right-pad@1.0.1: {} - rimraf@3.0.2: dependencies: glob: 7.2.3 From e3be3fb6f6af89128ccc0583bdbaa4ec264f72a1 Mon Sep 17 00:00:00 2001 From: NamesMT Date: Tue, 14 May 2024 05:53:31 +0000 Subject: [PATCH 4/4] perf: patch `@pnpm/` deps to reduce bundle size --- package.json | 5 +- patches/@pnpm__list@10.1.2.patch | 221 ++++++++++++++++++ patches/@pnpm__list@9.1.12.patch | 219 +++++++++++++++++ ...@pnpm__workspace.find-packages@2.0.5.patch | 105 +++++++++ pnpm-lock.yaml | 21 +- 5 files changed, 564 insertions(+), 7 deletions(-) create mode 100644 patches/@pnpm__list@10.1.2.patch create mode 100644 patches/@pnpm__list@9.1.12.patch create mode 100644 patches/@pnpm__workspace.find-packages@2.0.5.patch diff --git a/package.json b/package.json index 13d7760d..4f5044bf 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,10 @@ "@types/npmcli__arborist@5.6.1": "patches/@types__npmcli__arborist@5.6.1.patch", "@npmcli/arborist@6.3.0": "patches/@npmcli__arborist@6.3.0.patch", "assert@2.1.0": "patches/assert@2.1.0.patch", - "@yarnpkg/parsers@3.0.0": "patches/@yarnpkg__parsers@3.0.0.patch" + "@yarnpkg/parsers@3.0.0": "patches/@yarnpkg__parsers@3.0.0.patch", + "@pnpm/list@9.1.12": "patches/@pnpm__list@9.1.12.patch", + "@pnpm/list@10.1.2": "patches/@pnpm__list@10.1.2.patch", + "@pnpm/workspace.find-packages@2.0.5": "patches/@pnpm__workspace.find-packages@2.0.5.patch" } }, "overrides": { diff --git a/patches/@pnpm__list@10.1.2.patch b/patches/@pnpm__list@10.1.2.patch new file mode 100644 index 00000000..bb716fed --- /dev/null +++ b/patches/@pnpm__list@10.1.2.patch @@ -0,0 +1,221 @@ +diff --git a/lib/index.js b/lib/index.js +index 0a3e9ff710e410973c1be1f30d69dba04e34e417..2c9de253ad710b83be002e3c912a06aa4ae7cb42 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -3,52 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.list = exports.listForPackages = exports.searchForPackages = exports.flattenSearchedPackages = exports.renderTree = exports.renderParseable = exports.renderJson = void 0; +-const path_1 = __importDefault(require("path")); ++// exports.list = exports.listForPackages = exports.searchForPackages = exports.flattenSearchedPackages = exports.renderTree = exports.renderParseable = exports.renderJson = void 0; ++exports.searchForPackages = void 0; ++// const path_1 = __importDefault(require("path")); + const read_project_manifest_1 = require("@pnpm/read-project-manifest"); + const reviewing_dependencies_hierarchy_1 = require("@pnpm/reviewing.dependencies-hierarchy"); +-const renderJson_1 = require("./renderJson"); +-Object.defineProperty(exports, "renderJson", { enumerable: true, get: function () { return renderJson_1.renderJson; } }); +-const renderParseable_1 = require("./renderParseable"); +-Object.defineProperty(exports, "renderParseable", { enumerable: true, get: function () { return renderParseable_1.renderParseable; } }); +-const renderTree_1 = require("./renderTree"); +-Object.defineProperty(exports, "renderTree", { enumerable: true, get: function () { return renderTree_1.renderTree; } }); +-const pruneTree_1 = require("./pruneTree"); +-const DEFAULTS = { +- alwaysPrintRootPackage: true, +- depth: 0, +- long: false, +- registries: undefined, +- reportAs: 'tree', +- showExtraneous: true, +-}; +-function flattenSearchedPackages(pkgs, opts) { +- const flattedPkgs = []; +- for (const pkg of pkgs) { +- _walker([ +- ...(pkg.optionalDependencies ?? []), +- ...(pkg.dependencies ?? []), +- ...(pkg.devDependencies ?? []), +- ...(pkg.unsavedDependencies ?? []), +- ], path_1.default.relative(opts.lockfileDir, pkg.path) || '.'); +- } +- return flattedPkgs; +- function _walker(packages, depPath) { +- for (const pkg of packages) { +- const nextDepPath = `${depPath} > ${pkg.name}@${pkg.version}`; +- if (pkg.dependencies?.length) { +- _walker(pkg.dependencies, nextDepPath); +- } +- else { +- flattedPkgs.push({ +- depPath: nextDepPath, +- ...pkg, +- }); +- } +- } +- } +-} +-exports.flattenSearchedPackages = flattenSearchedPackages; ++// const renderJson_1 = require("./renderJson"); ++// Object.defineProperty(exports, "renderJson", { enumerable: true, get: function () { return renderJson_1.renderJson; } }); ++// const renderParseable_1 = require("./renderParseable"); ++// Object.defineProperty(exports, "renderParseable", { enumerable: true, get: function () { return renderParseable_1.renderParseable; } }); ++// const renderTree_1 = require("./renderTree"); ++// Object.defineProperty(exports, "renderTree", { enumerable: true, get: function () { return renderTree_1.renderTree; } }); ++// const pruneTree_1 = require("./pruneTree"); ++// const DEFAULTS = { ++// alwaysPrintRootPackage: true, ++// depth: 0, ++// long: false, ++// registries: undefined, ++// reportAs: 'tree', ++// showExtraneous: true, ++// }; ++// function flattenSearchedPackages(pkgs, opts) { ++// const flattedPkgs = []; ++// for (const pkg of pkgs) { ++// _walker([ ++// ...(pkg.optionalDependencies ?? []), ++// ...(pkg.dependencies ?? []), ++// ...(pkg.devDependencies ?? []), ++// ...(pkg.unsavedDependencies ?? []), ++// ], path_1.default.relative(opts.lockfileDir, pkg.path) || '.'); ++// } ++// return flattedPkgs; ++// function _walker(packages, depPath) { ++// for (const pkg of packages) { ++// const nextDepPath = `${depPath} > ${pkg.name}@${pkg.version}`; ++// if (pkg.dependencies?.length) { ++// _walker(pkg.dependencies, nextDepPath); ++// } ++// else { ++// flattedPkgs.push({ ++// depPath: nextDepPath, ++// ...pkg, ++// }); ++// } ++// } ++// } ++// } ++// exports.flattenSearchedPackages = flattenSearchedPackages; + async function searchForPackages(packages, projectPaths, opts) { + const search = (0, reviewing_dependencies_hierarchy_1.createPackagesSearcher)(packages); + return Promise.all(Object.entries(await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { +@@ -72,61 +73,61 @@ async function searchForPackages(packages, projectPaths, opts) { + })); + } + exports.searchForPackages = searchForPackages; +-async function listForPackages(packages, projectPaths, maybeOpts) { +- const opts = { ...DEFAULTS, ...maybeOpts }; +- const pkgs = await searchForPackages(packages, projectPaths, opts); +- const prunedPkgs = (0, pruneTree_1.pruneDependenciesTrees)(pkgs ?? null, 10); +- const print = getPrinter(opts.reportAs); +- return print(prunedPkgs, { +- alwaysPrintRootPackage: opts.alwaysPrintRootPackage, +- depth: opts.depth, +- long: opts.long, +- search: Boolean(packages.length), +- showExtraneous: opts.showExtraneous, +- }); +-} +-exports.listForPackages = listForPackages; +-async function list(projectPaths, maybeOpts) { +- const opts = { ...DEFAULTS, ...maybeOpts }; +- const pkgs = await Promise.all(Object.entries(opts.depth === -1 +- ? projectPaths.reduce((acc, projectPath) => { +- acc[projectPath] = {}; +- return acc; +- }, {}) +- : await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { +- depth: opts.depth, +- include: maybeOpts?.include, +- lockfileDir: maybeOpts?.lockfileDir, +- onlyProjects: maybeOpts?.onlyProjects, +- registries: opts.registries, +- modulesDir: opts.modulesDir, +- virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength, +- })) +- .map(async ([projectPath, dependenciesHierarchy]) => { +- const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {}; +- return { +- name: entryPkg.name, +- version: entryPkg.version, +- private: entryPkg.private, +- path: projectPath, +- ...dependenciesHierarchy, +- }; +- })); +- const print = getPrinter(opts.reportAs); +- return print(pkgs, { +- alwaysPrintRootPackage: opts.alwaysPrintRootPackage, +- depth: opts.depth, +- long: opts.long, +- search: false, +- showExtraneous: opts.showExtraneous, +- }); +-} +-exports.list = list; +-function getPrinter(reportAs) { +- switch (reportAs) { +- case 'parseable': return renderParseable_1.renderParseable; +- case 'json': return renderJson_1.renderJson; +- case 'tree': return renderTree_1.renderTree; +- } +-} ++// async function listForPackages(packages, projectPaths, maybeOpts) { ++// const opts = { ...DEFAULTS, ...maybeOpts }; ++// const pkgs = await searchForPackages(packages, projectPaths, opts); ++// const prunedPkgs = (0, pruneTree_1.pruneDependenciesTrees)(pkgs ?? null, 10); ++// const print = getPrinter(opts.reportAs); ++// return print(prunedPkgs, { ++// alwaysPrintRootPackage: opts.alwaysPrintRootPackage, ++// depth: opts.depth, ++// long: opts.long, ++// search: Boolean(packages.length), ++// showExtraneous: opts.showExtraneous, ++// }); ++// } ++// exports.listForPackages = listForPackages; ++// async function list(projectPaths, maybeOpts) { ++// const opts = { ...DEFAULTS, ...maybeOpts }; ++// const pkgs = await Promise.all(Object.entries(opts.depth === -1 ++// ? projectPaths.reduce((acc, projectPath) => { ++// acc[projectPath] = {}; ++// return acc; ++// }, {}) ++// : await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { ++// depth: opts.depth, ++// include: maybeOpts?.include, ++// lockfileDir: maybeOpts?.lockfileDir, ++// onlyProjects: maybeOpts?.onlyProjects, ++// registries: opts.registries, ++// modulesDir: opts.modulesDir, ++// virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength, ++// })) ++// .map(async ([projectPath, dependenciesHierarchy]) => { ++// const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {}; ++// return { ++// name: entryPkg.name, ++// version: entryPkg.version, ++// private: entryPkg.private, ++// path: projectPath, ++// ...dependenciesHierarchy, ++// }; ++// })); ++// const print = getPrinter(opts.reportAs); ++// return print(pkgs, { ++// alwaysPrintRootPackage: opts.alwaysPrintRootPackage, ++// depth: opts.depth, ++// long: opts.long, ++// search: false, ++// showExtraneous: opts.showExtraneous, ++// }); ++// } ++// exports.list = list; ++// function getPrinter(reportAs) { ++// switch (reportAs) { ++// case 'parseable': return renderParseable_1.renderParseable; ++// case 'json': return renderJson_1.renderJson; ++// case 'tree': return renderTree_1.renderTree; ++// } ++// } + //# sourceMappingURL=index.js.map diff --git a/patches/@pnpm__list@9.1.12.patch b/patches/@pnpm__list@9.1.12.patch new file mode 100644 index 00000000..f3a98702 --- /dev/null +++ b/patches/@pnpm__list@9.1.12.patch @@ -0,0 +1,219 @@ +diff --git a/lib/index.js b/lib/index.js +index fb43e867e7bcd6bac090c7aac1c6bfea48440a39..6195182d6a8816a89148badd7ed0f5a1e3e12c81 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -3,52 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.list = exports.listForPackages = exports.searchForPackages = exports.flattenSearchedPackages = exports.renderTree = exports.renderParseable = exports.renderJson = void 0; +-const path_1 = __importDefault(require("path")); ++// exports.list = exports.listForPackages = exports.searchForPackages = exports.flattenSearchedPackages = exports.renderTree = exports.renderParseable = exports.renderJson = void 0; ++exports.searchForPackages = void 0; ++// const path_1 = __importDefault(require("path")); + const read_project_manifest_1 = require("@pnpm/read-project-manifest"); + const reviewing_dependencies_hierarchy_1 = require("@pnpm/reviewing.dependencies-hierarchy"); +-const renderJson_1 = require("./renderJson"); +-Object.defineProperty(exports, "renderJson", { enumerable: true, get: function () { return renderJson_1.renderJson; } }); +-const renderParseable_1 = require("./renderParseable"); +-Object.defineProperty(exports, "renderParseable", { enumerable: true, get: function () { return renderParseable_1.renderParseable; } }); +-const renderTree_1 = require("./renderTree"); +-Object.defineProperty(exports, "renderTree", { enumerable: true, get: function () { return renderTree_1.renderTree; } }); +-const pruneTree_1 = require("./pruneTree"); +-const DEFAULTS = { +- alwaysPrintRootPackage: true, +- depth: 0, +- long: false, +- registries: undefined, +- reportAs: 'tree', +- showExtraneous: true, +-}; +-function flattenSearchedPackages(pkgs, opts) { +- const flattedPkgs = []; +- for (const pkg of pkgs) { +- _walker([ +- ...(pkg.optionalDependencies ?? []), +- ...(pkg.dependencies ?? []), +- ...(pkg.devDependencies ?? []), +- ...(pkg.unsavedDependencies ?? []), +- ], path_1.default.relative(opts.lockfileDir, pkg.path) || '.'); +- } +- return flattedPkgs; +- function _walker(packages, depPath) { +- for (const pkg of packages) { +- const nextDepPath = `${depPath} > ${pkg.name}@${pkg.version}`; +- if (pkg.dependencies?.length) { +- _walker(pkg.dependencies, nextDepPath); +- } +- else { +- flattedPkgs.push({ +- depPath: nextDepPath, +- ...pkg, +- }); +- } +- } +- } +-} +-exports.flattenSearchedPackages = flattenSearchedPackages; ++// const renderJson_1 = require("./renderJson"); ++// Object.defineProperty(exports, "renderJson", { enumerable: true, get: function () { return renderJson_1.renderJson; } }); ++// const renderParseable_1 = require("./renderParseable"); ++// Object.defineProperty(exports, "renderParseable", { enumerable: true, get: function () { return renderParseable_1.renderParseable; } }); ++// const renderTree_1 = require("./renderTree"); ++// Object.defineProperty(exports, "renderTree", { enumerable: true, get: function () { return renderTree_1.renderTree; } }); ++// const pruneTree_1 = require("./pruneTree"); ++// const DEFAULTS = { ++// alwaysPrintRootPackage: true, ++// depth: 0, ++// long: false, ++// registries: undefined, ++// reportAs: 'tree', ++// showExtraneous: true, ++// }; ++// function flattenSearchedPackages(pkgs, opts) { ++// const flattedPkgs = []; ++// for (const pkg of pkgs) { ++// _walker([ ++// ...(pkg.optionalDependencies ?? []), ++// ...(pkg.dependencies ?? []), ++// ...(pkg.devDependencies ?? []), ++// ...(pkg.unsavedDependencies ?? []), ++// ], path_1.default.relative(opts.lockfileDir, pkg.path) || '.'); ++// } ++// return flattedPkgs; ++// function _walker(packages, depPath) { ++// for (const pkg of packages) { ++// const nextDepPath = `${depPath} > ${pkg.name}@${pkg.version}`; ++// if (pkg.dependencies?.length) { ++// _walker(pkg.dependencies, nextDepPath); ++// } ++// else { ++// flattedPkgs.push({ ++// depPath: nextDepPath, ++// ...pkg, ++// }); ++// } ++// } ++// } ++// } ++// exports.flattenSearchedPackages = flattenSearchedPackages; + async function searchForPackages(packages, projectPaths, opts) { + const search = (0, reviewing_dependencies_hierarchy_1.createPackagesSearcher)(packages); + return Promise.all(Object.entries(await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { +@@ -71,60 +72,60 @@ async function searchForPackages(packages, projectPaths, opts) { + })); + } + exports.searchForPackages = searchForPackages; +-async function listForPackages(packages, projectPaths, maybeOpts) { +- const opts = { ...DEFAULTS, ...maybeOpts }; +- const pkgs = await searchForPackages(packages, projectPaths, opts); +- const prunedPkgs = (0, pruneTree_1.pruneDependenciesTrees)(pkgs ?? null, 10); +- const print = getPrinter(opts.reportAs); +- return print(prunedPkgs, { +- alwaysPrintRootPackage: opts.alwaysPrintRootPackage, +- depth: opts.depth, +- long: opts.long, +- search: Boolean(packages.length), +- showExtraneous: opts.showExtraneous, +- }); +-} +-exports.listForPackages = listForPackages; +-async function list(projectPaths, maybeOpts) { +- const opts = { ...DEFAULTS, ...maybeOpts }; +- const pkgs = await Promise.all(Object.entries(opts.depth === -1 +- ? projectPaths.reduce((acc, projectPath) => { +- acc[projectPath] = {}; +- return acc; +- }, {}) +- : await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { +- depth: opts.depth, +- include: maybeOpts?.include, +- lockfileDir: maybeOpts?.lockfileDir, +- onlyProjects: maybeOpts?.onlyProjects, +- registries: opts.registries, +- modulesDir: opts.modulesDir, +- })) +- .map(async ([projectPath, dependenciesHierarchy]) => { +- const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {}; +- return { +- name: entryPkg.name, +- version: entryPkg.version, +- private: entryPkg.private, +- path: projectPath, +- ...dependenciesHierarchy, +- }; +- })); +- const print = getPrinter(opts.reportAs); +- return print(pkgs, { +- alwaysPrintRootPackage: opts.alwaysPrintRootPackage, +- depth: opts.depth, +- long: opts.long, +- search: false, +- showExtraneous: opts.showExtraneous, +- }); +-} +-exports.list = list; +-function getPrinter(reportAs) { +- switch (reportAs) { +- case 'parseable': return renderParseable_1.renderParseable; +- case 'json': return renderJson_1.renderJson; +- case 'tree': return renderTree_1.renderTree; +- } +-} ++// async function listForPackages(packages, projectPaths, maybeOpts) { ++// const opts = { ...DEFAULTS, ...maybeOpts }; ++// const pkgs = await searchForPackages(packages, projectPaths, opts); ++// const prunedPkgs = (0, pruneTree_1.pruneDependenciesTrees)(pkgs ?? null, 10); ++// const print = getPrinter(opts.reportAs); ++// return print(prunedPkgs, { ++// alwaysPrintRootPackage: opts.alwaysPrintRootPackage, ++// depth: opts.depth, ++// long: opts.long, ++// search: Boolean(packages.length), ++// showExtraneous: opts.showExtraneous, ++// }); ++// } ++// exports.listForPackages = listForPackages; ++// async function list(projectPaths, maybeOpts) { ++// const opts = { ...DEFAULTS, ...maybeOpts }; ++// const pkgs = await Promise.all(Object.entries(opts.depth === -1 ++// ? projectPaths.reduce((acc, projectPath) => { ++// acc[projectPath] = {}; ++// return acc; ++// }, {}) ++// : await (0, reviewing_dependencies_hierarchy_1.buildDependenciesHierarchy)(projectPaths, { ++// depth: opts.depth, ++// include: maybeOpts?.include, ++// lockfileDir: maybeOpts?.lockfileDir, ++// onlyProjects: maybeOpts?.onlyProjects, ++// registries: opts.registries, ++// modulesDir: opts.modulesDir, ++// })) ++// .map(async ([projectPath, dependenciesHierarchy]) => { ++// const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {}; ++// return { ++// name: entryPkg.name, ++// version: entryPkg.version, ++// private: entryPkg.private, ++// path: projectPath, ++// ...dependenciesHierarchy, ++// }; ++// })); ++// const print = getPrinter(opts.reportAs); ++// return print(pkgs, { ++// alwaysPrintRootPackage: opts.alwaysPrintRootPackage, ++// depth: opts.depth, ++// long: opts.long, ++// search: false, ++// showExtraneous: opts.showExtraneous, ++// }); ++// } ++// exports.list = list; ++// function getPrinter(reportAs) { ++// switch (reportAs) { ++// case 'parseable': return renderParseable_1.renderParseable; ++// case 'json': return renderJson_1.renderJson; ++// case 'tree': return renderTree_1.renderTree; ++// } ++// } + //# sourceMappingURL=index.js.map diff --git a/patches/@pnpm__workspace.find-packages@2.0.5.patch b/patches/@pnpm__workspace.find-packages@2.0.5.patch new file mode 100644 index 00000000..ba96d187 --- /dev/null +++ b/patches/@pnpm__workspace.find-packages@2.0.5.patch @@ -0,0 +1,105 @@ +diff --git a/lib/index.js b/lib/index.js +index c8d68e72ea0907b8f4dfcd83b30d26f9512a99ea..c4dfd37d947bc4eae7faadfc9a1f1274768f353f 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -1,29 +1,30 @@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.arrayOfWorkspacePackagesToMap = exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0; +-const cli_utils_1 = require("@pnpm/cli-utils"); ++// exports.arrayOfWorkspacePackagesToMap = exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0; ++exports.findWorkspacePackagesNoCheck = void 0; ++// const cli_utils_1 = require("@pnpm/cli-utils"); + const workspace_read_manifest_1 = require("@pnpm/workspace.read-manifest"); + const util_lex_comparator_1 = require("@pnpm/util.lex-comparator"); + const fs_find_packages_1 = require("@pnpm/fs.find-packages"); +-const logger_1 = require("@pnpm/logger"); +-async function findWorkspacePackages(workspaceRoot, opts) { +- const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts); +- for (const pkg of pkgs) { +- (0, cli_utils_1.packageIsInstallable)(pkg.dir, pkg.manifest, opts ?? { +- supportedArchitectures: { +- os: ['current'], +- cpu: ['current'], +- libc: ['current'], +- }, +- }); +- // When setting shared-workspace-lockfile=false, `pnpm` can be set in sub-project's package.json. +- if (opts?.sharedWorkspaceLockfile && pkg.dir !== workspaceRoot) { +- checkNonRootProjectManifest(pkg); +- } +- } +- return pkgs; +-} +-exports.findWorkspacePackages = findWorkspacePackages; ++// const logger_1 = require("@pnpm/logger"); ++// async function findWorkspacePackages(workspaceRoot, opts) { ++// const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts); ++// for (const pkg of pkgs) { ++// (0, cli_utils_1.packageIsInstallable)(pkg.dir, pkg.manifest, opts ?? { ++// supportedArchitectures: { ++// os: ['current'], ++// cpu: ['current'], ++// libc: ['current'], ++// }, ++// }); ++// // When setting shared-workspace-lockfile=false, `pnpm` can be set in sub-project's package.json. ++// if (opts?.sharedWorkspaceLockfile && pkg.dir !== workspaceRoot) { ++// checkNonRootProjectManifest(pkg); ++// } ++// } ++// return pkgs; ++// } ++// exports.findWorkspacePackages = findWorkspacePackages; + async function findWorkspacePackagesNoCheck(workspaceRoot, opts) { + let patterns = opts?.patterns; + if (patterns == null) { +@@ -42,26 +43,26 @@ async function findWorkspacePackagesNoCheck(workspaceRoot, opts) { + return pkgs; + } + exports.findWorkspacePackagesNoCheck = findWorkspacePackagesNoCheck; +-function arrayOfWorkspacePackagesToMap(pkgs) { +- return pkgs.reduce((acc, pkg) => { +- if (!pkg.manifest.name) +- return acc; +- if (!acc[pkg.manifest.name]) { +- acc[pkg.manifest.name] = {}; +- } +- acc[pkg.manifest.name][pkg.manifest.version ?? '0.0.0'] = pkg; +- return acc; +- }, {}); +-} +-exports.arrayOfWorkspacePackagesToMap = arrayOfWorkspacePackagesToMap; +-function checkNonRootProjectManifest({ manifest, dir }) { +- for (const rootOnlyField of ['pnpm', 'resolutions']) { +- if (manifest?.[rootOnlyField]) { +- logger_1.logger.warn({ +- message: `The field "${rootOnlyField}" was found in ${dir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`, +- prefix: dir, +- }); +- } +- } +-} ++// function arrayOfWorkspacePackagesToMap(pkgs) { ++// return pkgs.reduce((acc, pkg) => { ++// if (!pkg.manifest.name) ++// return acc; ++// if (!acc[pkg.manifest.name]) { ++// acc[pkg.manifest.name] = {}; ++// } ++// acc[pkg.manifest.name][pkg.manifest.version ?? '0.0.0'] = pkg; ++// return acc; ++// }, {}); ++// } ++// exports.arrayOfWorkspacePackagesToMap = arrayOfWorkspacePackagesToMap; ++// function checkNonRootProjectManifest({ manifest, dir }) { ++// for (const rootOnlyField of ['pnpm', 'resolutions']) { ++// if (manifest?.[rootOnlyField]) { ++// logger_1.logger.warn({ ++// message: `The field "${rootOnlyField}" was found in ${dir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`, ++// prefix: dir, ++// }); ++// } ++// } ++// } + //# sourceMappingURL=index.js.map diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ec1d8a1..a159abcb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,6 +106,15 @@ patchedDependencies: '@npmcli/arborist@6.3.0': hash: eobdrhtmolyi74xb3rpenl2k74 path: patches/@npmcli__arborist@6.3.0.patch + '@pnpm/list@10.1.2': + hash: l7bpfljktl65jiumqxctryt3jy + path: patches/@pnpm__list@10.1.2.patch + '@pnpm/list@9.1.12': + hash: rsoqlqdrl6n4cha2bs4i43ari4 + path: patches/@pnpm__list@9.1.12.patch + '@pnpm/workspace.find-packages@2.0.5': + hash: fdtkzy6snufy64kmrc6u724vfq + path: patches/@pnpm__workspace.find-packages@2.0.5.patch '@types/npmcli__arborist@5.6.1': hash: 6ms3onjw4t22bbhdxmnddktj5e path: patches/@types__npmcli__arborist@5.6.1.patch @@ -810,13 +819,13 @@ importers: version: 6.3.0(patch_hash=eobdrhtmolyi74xb3rpenl2k74) '@pnpm/list': specifier: ^10.1.2 - version: 10.1.2(@pnpm/logger@5.0.0) + version: 10.1.2(patch_hash=l7bpfljktl65jiumqxctryt3jy)(@pnpm/logger@5.0.0) '@pnpm/list--old': specifier: npm:@pnpm/list@^9.1.10 - version: '@pnpm/list@9.1.12(@pnpm/logger@5.0.0)' + version: '@pnpm/list@9.1.12(patch_hash=rsoqlqdrl6n4cha2bs4i43ari4)(@pnpm/logger@5.0.0)' '@pnpm/workspace.find-packages': specifier: ^2.0.5 - version: 2.0.5(@pnpm/logger@5.0.0) + version: 2.0.5(patch_hash=fdtkzy6snufy64kmrc6u724vfq)(@pnpm/logger@5.0.0) '@rollup/plugin-commonjs': specifier: ^25.0.7 version: 25.0.7(rollup@4.17.2) @@ -4417,7 +4426,7 @@ snapshots: dependencies: lru-cache: 6.0.0 - '@pnpm/list@10.1.2(@pnpm/logger@5.0.0)': + '@pnpm/list@10.1.2(patch_hash=l7bpfljktl65jiumqxctryt3jy)(@pnpm/logger@5.0.0)': dependencies: '@pnpm/read-package-json': 9.0.1 '@pnpm/read-project-manifest': 6.0.1 @@ -4433,7 +4442,7 @@ snapshots: - domexception - supports-color - '@pnpm/list@9.1.12(@pnpm/logger@5.0.0)': + '@pnpm/list@9.1.12(patch_hash=rsoqlqdrl6n4cha2bs4i43ari4)(@pnpm/logger@5.0.0)': dependencies: '@pnpm/read-package-json': 8.0.8 '@pnpm/read-project-manifest': 5.0.11 @@ -4813,7 +4822,7 @@ snapshots: '@pnpm/util.lex-comparator@3.0.0': {} - '@pnpm/workspace.find-packages@2.0.5(@pnpm/logger@5.0.0)': + '@pnpm/workspace.find-packages@2.0.5(patch_hash=fdtkzy6snufy64kmrc6u724vfq)(@pnpm/logger@5.0.0)': dependencies: '@pnpm/cli-utils': 3.0.5(@pnpm/logger@5.0.0) '@pnpm/fs.find-packages': 3.0.1