From e6b3846b75bcf14378b71c055039d271820bda2f Mon Sep 17 00:00:00 2001 From: Grzegorz Abramczyk Date: Sat, 24 Sep 2022 13:38:52 +0200 Subject: [PATCH 1/8] feat: merge readPackage hook from opts and pnpmfile Prevent hook provided in opts from being discarded Closes #5306 --- .changeset/rich-grapes-jog.md | 6 +++ packages/core/src/install/index.ts | 19 ++++++--- packages/core/test/install/hooks.ts | 39 +++++++++++++++++ .../src/recursive.ts | 12 +++++- .../test/miscRecursive.ts | 42 +++++++++++++++++++ 5 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 .changeset/rich-grapes-jog.md diff --git a/.changeset/rich-grapes-jog.md b/.changeset/rich-grapes-jog.md new file mode 100644 index 00000000000..3e550a72a5a --- /dev/null +++ b/.changeset/rich-grapes-jog.md @@ -0,0 +1,6 @@ +--- +"@pnpm/core": patch +"@pnpm/plugin-commands-installation": patch +--- + +Combining readPackage hook from options and from pnpmfile diff --git a/packages/core/src/install/index.ts b/packages/core/src/install/index.ts index 153a2f77421..99b1ec23f2c 100644 --- a/packages/core/src/install/index.ts +++ b/packages/core/src/install/index.ts @@ -51,6 +51,7 @@ import { DependenciesField, DependencyManifest, PackageExtension, + PackageManifest, PeerDependencyIssues, PeerDependencyRules, ProjectManifest, @@ -152,6 +153,9 @@ export type MutatedProject = ProjectOptions & DependenciesMutation export type MutateModulesOptions = InstallOptions & { preferredVersions?: PreferredVersions + hooks?: { + readPackage?: ReadPackageHook[] | ReadPackageHook + } | InstallOptions['hooks'] } export async function mutateModules ( @@ -585,7 +589,7 @@ export function createReadPackageHook ( overrides?: Record packageExtensions?: Record peerDependencyRules?: PeerDependencyRules - readPackageHook?: ReadPackageHook + readPackageHook?: ReadPackageHook[] | ReadPackageHook } ): ReadPackageHook | undefined { const hooks: ReadPackageHook[] = [] @@ -608,15 +612,18 @@ export function createReadPackageHook ( ) { hooks.push(createPeerDependencyPatcher(peerDependencyRules)) } + if (Array.isArray(readPackageHook)) { + hooks.push(...readPackageHook) + } else if (readPackageHook) { + hooks.push(readPackageHook) + } + if (hooks.length === 0) { - return readPackageHook + return undefined } const readPackageAndExtend = hooks.length === 1 ? hooks[0] - : pipeWith(async (f, res) => f(await res), hooks as any) as ReadPackageHook // eslint-disable-line @typescript-eslint/no-explicit-any - if (readPackageHook != null) { - return (async (manifest: ProjectManifest, dir?: string) => readPackageAndExtend(await readPackageHook(manifest, dir), dir)) as ReadPackageHook - } + : ((pkg: PackageManifest | ProjectManifest, dir: string) => pipeWith(async (f, res) => f(await res, dir), hooks as any)(pkg)) as ReadPackageHook // eslint-disable-line @typescript-eslint/no-explicit-any return readPackageAndExtend } diff --git a/packages/core/test/install/hooks.ts b/packages/core/test/install/hooks.ts index ab8f46b4225..e5de59f90e7 100644 --- a/packages/core/test/install/hooks.ts +++ b/packages/core/test/install/hooks.ts @@ -83,3 +83,42 @@ test('readPackage, afterAllResolved async hooks', async () => { const wantedLockfile = await project.readLockfile() expect(wantedLockfile['foo']).toEqual('foo') }) + +test('readPackage hooks array', async () => { + const project = prepareEmpty() + + // w/o the hook, 100.1.0 would be installed + await addDistTag({ package: '@pnpm.e2e/dep-of-pkg-with-1-dep', version: '100.1.0', distTag: 'latest' }) + + function readPackageHook1 (manifest: PackageManifest) { + switch (manifest.name) { + case '@pnpm.e2e/pkg-with-1-dep': + if (manifest.dependencies == null) { + throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field') + } + manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '50.0.0' + break + } + return manifest + } + + function readPackageHook2 (manifest: PackageManifest) { + switch (manifest.name) { + case '@pnpm.e2e/pkg-with-1-dep': + if (manifest.dependencies == null) { + throw new Error('@pnpm.e2e/pkg-with-1-dep expected to have a dependencies field') + } + manifest.dependencies['@pnpm.e2e/dep-of-pkg-with-1-dep'] = '100.0.0' + break + } + return manifest + } + + await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], await testDefaults({ + hooks: { + readPackage: [readPackageHook1, readPackageHook2], + }, + })) + + await project.storeHas('@pnpm.e2e/dep-of-pkg-with-1-dep', '100.0.0') +}) \ No newline at end of file diff --git a/packages/plugin-commands-installation/src/recursive.ts b/packages/plugin-commands-installation/src/recursive.ts index fee111f87a0..2df12aa841e 100755 --- a/packages/plugin-commands-installation/src/recursive.ts +++ b/packages/plugin-commands-installation/src/recursive.ts @@ -289,7 +289,17 @@ export default async function recursive ( const limitInstallation = pLimit(opts.workspaceConcurrency ?? 4) await Promise.all(pkgPaths.map(async (rootDir: string) => limitInstallation(async () => { - const hooks = opts.ignorePnpmfile ? {} : requireHooks(rootDir, opts) + const pnpmfileHooks = opts.ignorePnpmfile ? {} : requireHooks(rootDir, opts) + const optsHooks = opts.hooks ?? {} + const hooks = { + ...optsHooks, + ...pnpmfileHooks, + readPackage: pnpmfileHooks.readPackage + ? optsHooks.readPackage + ? [pnpmfileHooks.readPackage, optsHooks.readPackage] + : pnpmfileHooks.readPackage + : optsHooks.readPackage, + } try { if (opts.ignoredPackages?.has(rootDir)) { return diff --git a/packages/plugin-commands-installation/test/miscRecursive.ts b/packages/plugin-commands-installation/test/miscRecursive.ts index 18e3d87603d..8dee4b6f276 100644 --- a/packages/plugin-commands-installation/test/miscRecursive.ts +++ b/packages/plugin-commands-installation/test/miscRecursive.ts @@ -715,3 +715,45 @@ test('installing in monorepo with shared lockfile should work on virtual drives' await projects['project-1'].has('is-positive') }) + +test('pass readPackage with shared lockfile', async () => { + const projects = preparePackages([ + { + name: 'project-1', + version: '1.0.0', + dependencies: { + 'is-negative': '1.0.0', + }, + }, + { + name: 'project-2', + version: '1.0.0', + dependencies: { + 'is-negative': '1.0.0', + }, + }, + ]) + + await install.handler({ + ...DEFAULT_OPTS, + ...await readProjects(process.cwd(), []), + dir: process.cwd(), + recursive: true, + workspaceDir: process.cwd(), + hooks: { + readPackage (pkg) { + return { + ...pkg, + dependencies: { + 'is-positive': '1.0.0', + }, + } + }, + }, + }) + + await projects['project-1'].has('is-positive') + await projects['project-1'].hasNot('is-negative') + await projects['project-2'].has('is-positive') + await projects['project-2'].hasNot('is-negative') +}) \ No newline at end of file From 916fa3222e2d2d9491ef6c5b4c3bf50ecf266e25 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 17:48:02 +0300 Subject: [PATCH 2/8] refactor: hooks --- packages/core/src/getPeerDependencyIssues.ts | 2 +- .../core/src/install/createReadPackageHook.ts | 66 ++++++++++++++++ .../core/src/install/extendInstallOptions.ts | 21 +++++- packages/core/src/install/index.ts | 75 ++----------------- packages/core/test/install/hooks.ts | 10 +-- packages/get-context/src/index.ts | 14 ++-- .../src/recursive.ts | 22 +++--- .../test/miscRecursive.ts | 10 +-- packages/pnpmfile/src/requireHooks.ts | 44 +++++------ 9 files changed, 134 insertions(+), 130 deletions(-) create mode 100644 packages/core/src/install/createReadPackageHook.ts diff --git a/packages/core/src/getPeerDependencyIssues.ts b/packages/core/src/getPeerDependencyIssues.ts index db545de53c9..6d486d6450e 100644 --- a/packages/core/src/getPeerDependencyIssues.ts +++ b/packages/core/src/getPeerDependencyIssues.ts @@ -1,7 +1,7 @@ import resolveDependencies, { getWantedDependencies } from '@pnpm/resolve-dependencies' import { PeerDependencyIssuesByProjects } from '@pnpm/types' import getContext, { GetContextOptions, ProjectOptions } from '@pnpm/get-context' -import { createReadPackageHook } from './install' +import { createReadPackageHook } from './install/createReadPackageHook' import { getPreferredVersionsFromLockfile } from './install/getPreferredVersions' import { InstallOptions } from './install/extendInstallOptions' import { DEFAULT_REGISTRIES } from '@pnpm/normalize-registries' diff --git a/packages/core/src/install/createReadPackageHook.ts b/packages/core/src/install/createReadPackageHook.ts new file mode 100644 index 00000000000..8bb10756252 --- /dev/null +++ b/packages/core/src/install/createReadPackageHook.ts @@ -0,0 +1,66 @@ +import { packageExtensions as compatPackageExtensions } from '@yarnpkg/extensions' +import { + PackageExtension, + PackageManifest, + PeerDependencyRules, + ProjectManifest, + ReadPackageHook, +} from '@pnpm/types' +import fromPairs from 'ramda/src/fromPairs' +import isEmpty from 'ramda/src/isEmpty' +import pipeWith from 'ramda/src/pipeWith' +import createPackageExtender from './createPackageExtender' +import createVersionsOverrider from './createVersionsOverrider' +import createPeerDependencyPatcher from './createPeerDependencyPatcher' + +export function createReadPackageHook ( + { + ignoreCompatibilityDb, + lockfileDir, + overrides, + packageExtensions, + peerDependencyRules, + readPackageHook, + }: { + ignoreCompatibilityDb?: boolean + lockfileDir: string + overrides?: Record + packageExtensions?: Record + peerDependencyRules?: PeerDependencyRules + readPackageHook?: ReadPackageHook[] | ReadPackageHook + } +): ReadPackageHook | undefined { + const hooks: ReadPackageHook[] = [] + if (!isEmpty(overrides ?? {})) { + hooks.push(createVersionsOverrider(overrides!, lockfileDir)) + } + if (!ignoreCompatibilityDb) { + hooks.push(createPackageExtender(fromPairs(compatPackageExtensions))) + } + if (!isEmpty(packageExtensions ?? {})) { + hooks.push(createPackageExtender(packageExtensions!)) + } + if ( + peerDependencyRules != null && + ( + !isEmpty(peerDependencyRules.ignoreMissing) || + !isEmpty(peerDependencyRules.allowedVersions) || + !isEmpty(peerDependencyRules.allowAny) + ) + ) { + hooks.push(createPeerDependencyPatcher(peerDependencyRules)) + } + if (Array.isArray(readPackageHook)) { + hooks.push(...readPackageHook) + } else if (readPackageHook) { + hooks.push(readPackageHook) + } + + if (hooks.length === 0) { + return undefined + } + const readPackageAndExtend = hooks.length === 1 + ? hooks[0] + : ((pkg: PackageManifest | ProjectManifest, dir: string) => pipeWith(async (f, res) => f(await res, dir), hooks as any)(pkg)) as ReadPackageHook // eslint-disable-line @typescript-eslint/no-explicit-any + return readPackageAndExtend +} diff --git a/packages/core/src/install/extendInstallOptions.ts b/packages/core/src/install/extendInstallOptions.ts index b1d29a5b037..1c934945b2a 100644 --- a/packages/core/src/install/extendInstallOptions.ts +++ b/packages/core/src/install/extendInstallOptions.ts @@ -15,6 +15,7 @@ import { } from '@pnpm/types' import pnpmPkgJson from '../pnpmPkgJson' import { ReporterFunction } from '../types' +import { createReadPackageHook } from './createReadPackageHook' import { PreResolutionHookContext } from './hooks' export interface StrictInstallOptions { @@ -71,9 +72,9 @@ export interface StrictInstallOptions { } pruneLockfileImporters: boolean hooks: { - readPackage?: ReadPackageHook + readPackage?: ReadPackageHook[] preResolution?: (ctx: PreResolutionHookContext) => Promise - afterAllResolved?: (lockfile: Lockfile) => Lockfile | Promise + afterAllResolved?: Array<(lockfile: Lockfile) => Lockfile | Promise> } sideEffectsCacheRead: boolean sideEffectsCacheWrite: boolean @@ -198,9 +199,13 @@ const defaults = async (opts: InstallOptions) => { } as StrictInstallOptions } +export type ProcessedInstallOptions = StrictInstallOptions & { + readPackageHook?: ReadPackageHook +} + export default async ( opts: InstallOptions -): Promise => { +): Promise => { if (opts) { for (const key in opts) { if (opts[key] === undefined) { @@ -212,11 +217,19 @@ export default async ( throw new PnpmError('CONFIG_CONFLICT_BUILT_DEPENDENCIES', 'Cannot have both neverBuiltDependencies and onlyBuiltDependencies') } const defaultOpts = await defaults(opts) - const extendedOpts = { + const extendedOpts: ProcessedInstallOptions = { ...defaultOpts, ...opts, storeDir: defaultOpts.storeDir, } + extendedOpts.readPackageHook = createReadPackageHook({ + ignoreCompatibilityDb: extendedOpts.ignoreCompatibilityDb, + readPackageHook: extendedOpts.hooks?.readPackage, + overrides: extendedOpts.overrides, + lockfileDir: extendedOpts.lockfileDir, + packageExtensions: extendedOpts.packageExtensions, + peerDependencyRules: extendedOpts.peerDependencyRules, + }) if (extendedOpts.lockfileOnly) { extendedOpts.ignoreScripts = true if (!extendedOpts.useLockfile) { diff --git a/packages/core/src/install/index.ts b/packages/core/src/install/index.ts index 99b1ec23f2c..8fa8d6066ac 100644 --- a/packages/core/src/install/index.ts +++ b/packages/core/src/install/index.ts @@ -50,14 +50,10 @@ import { import { DependenciesField, DependencyManifest, - PackageExtension, - PackageManifest, PeerDependencyIssues, - PeerDependencyRules, ProjectManifest, ReadPackageHook, } from '@pnpm/types' -import { packageExtensions as compatPackageExtensions } from '@yarnpkg/extensions' import rimraf from '@zkochan/rimraf' import isInnerLink from 'is-inner-link' import pFilter from 'p-filter' @@ -72,12 +68,9 @@ import unnest from 'ramda/src/unnest' import parseWantedDependencies from '../parseWantedDependencies' import removeDeps from '../uninstall/removeDeps' import allProjectsAreUpToDate from './allProjectsAreUpToDate' -import createPackageExtender from './createPackageExtender' -import createVersionsOverrider from './createVersionsOverrider' -import createPeerDependencyPatcher from './createPeerDependencyPatcher' import extendOptions, { InstallOptions, - StrictInstallOptions, + ProcessedInstallOptions as StrictInstallOptions, } from './extendInstallOptions' import { getPreferredVersionsFromLockfile, getAllUniqueSpecs } from './getPreferredVersions' import linkPackages from './link' @@ -180,14 +173,6 @@ export async function mutateModules ( // When running install/update on a subset of projects, the root project might not be included, // so reading its manifest explicitly here. await safeReadProjectManifestOnly(opts.lockfileDir) - opts.hooks.readPackage = createReadPackageHook({ - ignoreCompatibilityDb: opts.ignoreCompatibilityDb, - readPackageHook: opts.hooks.readPackage, - overrides: opts.overrides, - lockfileDir: opts.lockfileDir, - packageExtensions: opts.packageExtensions, - peerDependencyRules: opts.peerDependencyRules, - }) const ctx = await getContext(projects, opts) @@ -575,58 +560,6 @@ export function createObjectChecksum (obj: Object) { return crypto.createHash('md5').update(s).digest('hex') } -export function createReadPackageHook ( - { - ignoreCompatibilityDb, - lockfileDir, - overrides, - packageExtensions, - peerDependencyRules, - readPackageHook, - }: { - ignoreCompatibilityDb?: boolean - lockfileDir: string - overrides?: Record - packageExtensions?: Record - peerDependencyRules?: PeerDependencyRules - readPackageHook?: ReadPackageHook[] | ReadPackageHook - } -): ReadPackageHook | undefined { - const hooks: ReadPackageHook[] = [] - if (!isEmpty(overrides ?? {})) { - hooks.push(createVersionsOverrider(overrides!, lockfileDir)) - } - if (!ignoreCompatibilityDb) { - hooks.push(createPackageExtender(fromPairs(compatPackageExtensions))) - } - if (!isEmpty(packageExtensions ?? {})) { - hooks.push(createPackageExtender(packageExtensions!)) - } - if ( - peerDependencyRules != null && - ( - !isEmpty(peerDependencyRules.ignoreMissing) || - !isEmpty(peerDependencyRules.allowedVersions) || - !isEmpty(peerDependencyRules.allowAny) - ) - ) { - hooks.push(createPeerDependencyPatcher(peerDependencyRules)) - } - if (Array.isArray(readPackageHook)) { - hooks.push(...readPackageHook) - } else if (readPackageHook) { - hooks.push(readPackageHook) - } - - if (hooks.length === 0) { - return undefined - } - const readPackageAndExtend = hooks.length === 1 - ? hooks[0] - : ((pkg: PackageManifest | ProjectManifest, dir: string) => pipeWith(async (f, res) => f(await res, dir), hooks as any)(pkg)) as ReadPackageHook // eslint-disable-line @typescript-eslint/no-explicit-any - return readPackageAndExtend -} - function cacheExpired (prunedAt: string, maxAgeInMinutes: number) { return ((Date.now() - new Date(prunedAt).valueOf()) / (1000 * 60)) > maxAgeInMinutes } @@ -834,7 +767,9 @@ const _installInContext: InstallFunction = async (projects, ctx, opts) => { engineStrict: opts.engineStrict, force: opts.force, forceFullResolution, - hooks: opts.hooks, + hooks: { + readPackage: opts.readPackageHook, + }, linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? (opts.saveWorkspaceProtocol ? 0 : -1), lockfileDir: opts.lockfileDir, nodeVersion: opts.nodeVersion, @@ -889,7 +824,7 @@ const _installInContext: InstallFunction = async (projects, ctx, opts) => { }) newLockfile = ((opts.hooks?.afterAllResolved) != null) - ? await opts.hooks?.afterAllResolved(newLockfile) + ? await pipeWith(async (f, res) => f(await res), opts.hooks.afterAllResolved as any)(newLockfile) as Lockfile // eslint-disable-line : newLockfile if (opts.updateLockfileMinorVersion) { diff --git a/packages/core/test/install/hooks.ts b/packages/core/test/install/hooks.ts index e5de59f90e7..f5513e92fe5 100644 --- a/packages/core/test/install/hooks.ts +++ b/packages/core/test/install/hooks.ts @@ -33,8 +33,8 @@ test('readPackage, afterAllResolved hooks', async () => { await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], await testDefaults({ hooks: { - afterAllResolved, - readPackage: readPackageHook, + afterAllResolved: [afterAllResolved], + readPackage: [readPackageHook], }, })) @@ -71,8 +71,8 @@ test('readPackage, afterAllResolved async hooks', async () => { await addDependenciesToPackage({}, ['@pnpm.e2e/pkg-with-1-dep'], await testDefaults({ hooks: { - afterAllResolved, - readPackage: readPackageHook, + afterAllResolved: [afterAllResolved], + readPackage: [readPackageHook], }, })) @@ -121,4 +121,4 @@ test('readPackage hooks array', async () => { })) await project.storeHas('@pnpm.e2e/dep-of-pkg-with-1-dep', '100.0.0') -}) \ No newline at end of file +}) diff --git a/packages/get-context/src/index.ts b/packages/get-context/src/index.ts index fbe8dec3906..a342f782ea6 100644 --- a/packages/get-context/src/index.ts +++ b/packages/get-context/src/index.ts @@ -75,9 +75,7 @@ export interface GetContextOptions { lockfileDir: string modulesDir?: string nodeLinker: 'isolated' | 'hoisted' | 'pnp' - hooks?: { - readPackage?: ReadPackageHook - } + readPackageHook?: ReadPackageHook include?: IncludedDependencies registries: Registries storeDir: string @@ -135,10 +133,10 @@ export default async function getContext ( prefix: project.rootDir, }) }) - if ((opts.hooks?.readPackage) != null) { + if (opts.readPackageHook != null) { for (const project of importersContext.projects) { project.originalManifest = project.manifest - project.manifest = await opts.hooks.readPackage(clone(project.manifest), project.rootDir) + project.manifest = await opts.readPackageHook(clone(project.manifest), project.rootDir) } } @@ -372,9 +370,7 @@ export async function getContextForSingleImporter ( lockfileDir: string nodeLinker: 'isolated' | 'hoisted' | 'pnp' modulesDir?: string - hooks?: { - readPackage?: ReadPackageHook - } + readPackageHook?: ReadPackageHook include?: IncludedDependencies dir: string registries: Registries @@ -463,7 +459,7 @@ export async function getContextForSingleImporter ( importerId, include: opts.include ?? include, lockfileDir: opts.lockfileDir, - manifest: await opts.hooks?.readPackage?.(manifest) ?? manifest, + manifest: await opts.readPackageHook?.(manifest) ?? manifest, modulesDir, modulesFile: modules, pendingBuilds, diff --git a/packages/plugin-commands-installation/src/recursive.ts b/packages/plugin-commands-installation/src/recursive.ts index 2df12aa841e..80fca5d9e74 100755 --- a/packages/plugin-commands-installation/src/recursive.ts +++ b/packages/plugin-commands-installation/src/recursive.ts @@ -289,17 +289,17 @@ export default async function recursive ( const limitInstallation = pLimit(opts.workspaceConcurrency ?? 4) await Promise.all(pkgPaths.map(async (rootDir: string) => limitInstallation(async () => { - const pnpmfileHooks = opts.ignorePnpmfile ? {} : requireHooks(rootDir, opts) - const optsHooks = opts.hooks ?? {} - const hooks = { - ...optsHooks, - ...pnpmfileHooks, - readPackage: pnpmfileHooks.readPackage - ? optsHooks.readPackage - ? [pnpmfileHooks.readPackage, optsHooks.readPackage] - : pnpmfileHooks.readPackage - : optsHooks.readPackage, - } + const hooks = opts.ignorePnpmfile + ? {} + : (() => { + const pnpmfileHooks = requireHooks(rootDir, opts) + return { + ...opts.hooks, + ...pnpmfileHooks, + afterAllResolved: [...(pnpmfileHooks.afterAllResolved ?? []), ...(opts.hooks?.afterAllResolved ?? [])], + readPackage: [...(pnpmfileHooks.readPackage ?? []), ...(opts.hooks?.readPackage ?? [])], + } + })() try { if (opts.ignoredPackages?.has(rootDir)) { return diff --git a/packages/plugin-commands-installation/test/miscRecursive.ts b/packages/plugin-commands-installation/test/miscRecursive.ts index 8dee4b6f276..3fa170fb7c5 100644 --- a/packages/plugin-commands-installation/test/miscRecursive.ts +++ b/packages/plugin-commands-installation/test/miscRecursive.ts @@ -741,14 +741,14 @@ test('pass readPackage with shared lockfile', async () => { recursive: true, workspaceDir: process.cwd(), hooks: { - readPackage (pkg) { - return { + readPackage: [ + (pkg) => ({ ...pkg, dependencies: { 'is-positive': '1.0.0', }, - } - }, + }), + ], }, }) @@ -756,4 +756,4 @@ test('pass readPackage with shared lockfile', async () => { await projects['project-1'].hasNot('is-negative') await projects['project-2'].has('is-positive') await projects['project-2'].hasNot('is-negative') -}) \ No newline at end of file +}) diff --git a/packages/pnpmfile/src/requireHooks.ts b/packages/pnpmfile/src/requireHooks.ts index 62ef34635e3..87044aaa93d 100644 --- a/packages/pnpmfile/src/requireHooks.ts +++ b/packages/pnpmfile/src/requireHooks.ts @@ -30,10 +30,10 @@ type Cook any> = ( ) => ReturnType export interface CookedHooks { - readPackage?: Cook['readPackage']> + readPackage: Array['readPackage']>> preResolution?: Cook['preResolution']> - afterAllResolved?: Cook['afterAllResolved']> - filterLog?: Cook['filterLog']> + afterAllResolved: Array['afterAllResolved']>> + filterLog: Array['filterLog']>> importPackage?: ImportIndexedPackage fetchers?: CustomFetchers } @@ -52,37 +52,31 @@ export default function requireHooks ( requirePnpmfile(path.join(prefix, '.pnpmfile.cjs'), prefix) let hooks: Hooks = pnpmFile?.hooks - if (!globalHooks && !hooks) return {} + if (!globalHooks && !hooks) return { afterAllResolved: [], filterLog: [], readPackage: [] } globalHooks = globalHooks || {} hooks = hooks || {} - const cookedHooks: CookedHooks = {} + const cookedHooks: CookedHooks = { + afterAllResolved: [], + filterLog: [], + readPackage: [], + } for (const hookName of ['readPackage', 'afterAllResolved']) { - if (globalHooks[hookName] && hooks[hookName]) { - const globalHookContext = createReadPackageHookContext(globalPnpmfile.filename, prefix, hookName) - const localHookContext = createReadPackageHookContext(pnpmFile.filename, prefix, hookName) - // the `arg` is a package manifest in case of readPackage() and a lockfile object in case of afterAllResolved() - cookedHooks[hookName] = async (arg: object) => { - return hooks[hookName]( - await globalHooks[hookName](arg, globalHookContext), - localHookContext - ) - } - } else if (globalHooks[hookName]) { + if (globalHooks[hookName]) { const globalHook = globalHooks[hookName] const context = createReadPackageHookContext(globalPnpmfile.filename, prefix, hookName) - cookedHooks[hookName] = (pkg: object) => globalHook(pkg, context) - } else if (hooks[hookName]) { + cookedHooks[hookName].push((pkg: object) => globalHook(pkg, context)) + } + if (hooks[hookName]) { const hook = hooks[hookName] const context = createReadPackageHookContext(pnpmFile.filename, prefix, hookName) - cookedHooks[hookName] = (pkg: object) => hook(pkg, context) + cookedHooks[hookName].push((pkg: object) => hook(pkg, context)) } } - const globalFilterLog = globalHooks.filterLog - const filterLog = hooks.filterLog - if (globalFilterLog != null && filterLog != null) { - cookedHooks.filterLog = (log: Log) => globalFilterLog(log) && filterLog(log) - } else { - cookedHooks.filterLog = globalFilterLog ?? filterLog + if (globalHooks.filterLog != null) { + cookedHooks.filterLog.push(globalHooks.filterLog) + } + if (hooks.filterLog != null) { + cookedHooks.filterLog.push(hooks.filterLog) } // `importPackage`, `preResolution` and `fetchers` can only be defined via a global pnpmfile From f0ced453334a851aa55094c70d6ac63ffb75218d Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 18:37:37 +0300 Subject: [PATCH 3/8] refactor: default-reporter --- packages/default-reporter/src/index.ts | 6 +++++- packages/default-reporter/test/filterLogHook.ts | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/default-reporter/src/index.ts b/packages/default-reporter/src/index.ts index 39bf10aa293..ac83d3da3e7 100644 --- a/packages/default-reporter/src/index.ts +++ b/packages/default-reporter/src/index.ts @@ -194,7 +194,11 @@ export function toOutput$ ( }, 0) let other = Rx.from(otherPushStream) if (opts.context.config?.hooks?.filterLog != null) { - other = other.pipe(filter(opts.context.config.hooks.filterLog)) + const filterLogs = opts.context.config.hooks.filterLog + const filterFn = filterLogs.length === 1 + ? filterLogs[0] + : (log: logs.Log) => filterLogs.every!((filterLog) => filterLog(log)) + other = other.pipe(filter(filterFn)) } const log$ = { context: Rx.from(contextPushStream), diff --git a/packages/default-reporter/test/filterLogHook.ts b/packages/default-reporter/test/filterLogHook.ts index e472522086e..770f120d389 100644 --- a/packages/default-reporter/test/filterLogHook.ts +++ b/packages/default-reporter/test/filterLogHook.ts @@ -8,7 +8,7 @@ test('logger with filterLog hook', (done) => { argv: ['install'], config: { hooks: { - filterLog: (log: Log) => { + filterLog: [(log: Log) => { if (log.level === 'debug') { return false } @@ -21,7 +21,7 @@ test('logger with filterLog hook', (done) => { } } return true - }, + }], }, } as any, // eslint-disable-line }, @@ -61,4 +61,4 @@ test('logger with filterLog hook', (done) => { done() subscription.unsubscribe() }, 10) -}) \ No newline at end of file +}) From 57facb4ca77a52df39648b5f9bc4d359881dbbed Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 18:51:50 +0300 Subject: [PATCH 4/8] fix: deploy --- .changeset/silly-nails-remember.md | 5 +++++ packages/plugin-commands-deploy/src/deploy.ts | 8 ++++---- packages/pnpmfile/src/requireHooks.ts | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .changeset/silly-nails-remember.md diff --git a/.changeset/silly-nails-remember.md b/.changeset/silly-nails-remember.md new file mode 100644 index 00000000000..a8a615c8aee --- /dev/null +++ b/.changeset/silly-nails-remember.md @@ -0,0 +1,5 @@ +--- +"@pnpm/pnpmfile": major +--- + +Returns an array of hook functions. diff --git a/packages/plugin-commands-deploy/src/deploy.ts b/packages/plugin-commands-deploy/src/deploy.ts index 4966578f4d7..1efbf77cfe5 100644 --- a/packages/plugin-commands-deploy/src/deploy.ts +++ b/packages/plugin-commands-deploy/src/deploy.ts @@ -73,15 +73,15 @@ export async function handler ( await rimraf(deployDir) await fs.promises.mkdir(deployDir, { recursive: true }) await copyProject(deployedDir, deployDir) - const readPackageHook = opts.hooks?.readPackage - // eslint-disable-next-line - const newReadPackageHook = readPackageHook ? (async (pkg: any, context: any) => deployHook(await readPackageHook(pkg, context))) : deployHook await install.handler({ ...opts, depth: Infinity, hooks: { ...opts.hooks, - readPackage: newReadPackageHook, + readPackage: [ + ...(opts.hooks?.readPackage ?? []), + deployHook, + ], }, frozenLockfile: false, preferFrozenLockfile: false, diff --git a/packages/pnpmfile/src/requireHooks.ts b/packages/pnpmfile/src/requireHooks.ts index 87044aaa93d..e36753bb651 100644 --- a/packages/pnpmfile/src/requireHooks.ts +++ b/packages/pnpmfile/src/requireHooks.ts @@ -30,10 +30,10 @@ type Cook any> = ( ) => ReturnType export interface CookedHooks { - readPackage: Array['readPackage']>> + readPackage?: Array['readPackage']>> preResolution?: Cook['preResolution']> - afterAllResolved: Array['afterAllResolved']>> - filterLog: Array['filterLog']>> + afterAllResolved?: Array['afterAllResolved']>> + filterLog?: Array['filterLog']>> importPackage?: ImportIndexedPackage fetchers?: CustomFetchers } @@ -55,7 +55,7 @@ export default function requireHooks ( if (!globalHooks && !hooks) return { afterAllResolved: [], filterLog: [], readPackage: [] } globalHooks = globalHooks || {} hooks = hooks || {} - const cookedHooks: CookedHooks = { + const cookedHooks: CookedHooks & Required> = { afterAllResolved: [], filterLog: [], readPackage: [], From afed5916c557efddef042ca093fc71ba9413571e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 18:58:11 +0300 Subject: [PATCH 5/8] test: fix --- packages/pnpmfile/test/index.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/pnpmfile/test/index.ts b/packages/pnpmfile/test/index.ts index 55414cd0f11..058ccf90bbb 100644 --- a/packages/pnpmfile/test/index.ts +++ b/packages/pnpmfile/test/index.ts @@ -1,4 +1,5 @@ import path from 'path' +import { Log } from '@pnpm/core-loggers' import { requireHooks, requirePnpmfile, BadReadPackageHookError } from '@pnpm/pnpmfile' test('ignoring a pnpmfile that exports undefined', () => { @@ -29,12 +30,14 @@ test('filterLog hook combines with the global hook', () => { const hooks = requireHooks(__dirname, { globalPnpmfile, pnpmfile }) expect(hooks.filterLog).toBeDefined() - expect(hooks.filterLog!({ + expect(hooks.filterLog!.length).toBe(2) + const filterLog = (log: Log) => hooks.filterLog!.every((hook) => hook(log)) + expect(filterLog({ name: 'pnpm:summary', level: 'error', prefix: 'test', })).toBeTruthy() - expect(hooks.filterLog!({ + expect(filterLog({ name: 'pnpm:summary', level: 'debug', prefix: 'test', From cc3f50884ebc02c4bda5a19f50a2eb97d74eb4f0 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 19:23:10 +0300 Subject: [PATCH 6/8] fix: types --- packages/pnpm/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pnpm/src/types.ts b/packages/pnpm/src/types.ts index 8978a5864a5..9e4f3657a87 100644 --- a/packages/pnpm/src/types.ts +++ b/packages/pnpm/src/types.ts @@ -18,7 +18,7 @@ export type PnpmOptions = Omit & { } hooks?: { - readPackage?: ReadPackageHook + readPackage?: ReadPackageHook[] } ignoreFile?: (filename: string) => boolean From 6fdbe1c69e6b88cac0f29d484c289e4b7062498e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 19:58:12 +0300 Subject: [PATCH 7/8] refactor: create read-package-hook package --- .changeset/curvy-socks-press.md | 5 + packages/core/package.json | 3 +- packages/core/src/getPeerDependencyIssues.ts | 2 +- .../core/src/install/extendInstallOptions.ts | 2 +- packages/core/tsconfig.json | 6 +- packages/hooks.read-package-hook/README.md | 13 + .../hooks.read-package-hook/jest.config.js | 3 + packages/hooks.read-package-hook/package.json | 51 ++ .../src}/createPackageExtender.ts | 0 .../src}/createPeerDependencyPatcher.ts | 0 .../src}/createReadPackageHook.ts | 0 .../src}/createVersionsOverrider.ts | 0 packages/hooks.read-package-hook/src/index.ts | 1 + .../test}/createPackageExtender.test.ts | 2 +- .../test}/createPeerDependencyPatcher.test.ts | 2 +- .../test}/createVersionOverrider.test.ts | 2 +- .../hooks.read-package-hook/tsconfig.json | 25 + .../tsconfig.lint.json | 8 + pnpm-lock.yaml | 657 +++++++++++------- 19 files changed, 519 insertions(+), 263 deletions(-) create mode 100644 .changeset/curvy-socks-press.md create mode 100644 packages/hooks.read-package-hook/README.md create mode 100644 packages/hooks.read-package-hook/jest.config.js create mode 100644 packages/hooks.read-package-hook/package.json rename packages/{core/src/install => hooks.read-package-hook/src}/createPackageExtender.ts (100%) rename packages/{core/src/install => hooks.read-package-hook/src}/createPeerDependencyPatcher.ts (100%) rename packages/{core/src/install => hooks.read-package-hook/src}/createReadPackageHook.ts (100%) rename packages/{core/src/install => hooks.read-package-hook/src}/createVersionsOverrider.ts (100%) create mode 100644 packages/hooks.read-package-hook/src/index.ts rename packages/{core/test/install => hooks.read-package-hook/test}/createPackageExtender.test.ts (95%) rename packages/{core/test/install => hooks.read-package-hook/test}/createPeerDependencyPatcher.test.ts (96%) rename packages/{core/test/install => hooks.read-package-hook/test}/createVersionOverrider.test.ts (98%) create mode 100644 packages/hooks.read-package-hook/tsconfig.json create mode 100644 packages/hooks.read-package-hook/tsconfig.lint.json diff --git a/.changeset/curvy-socks-press.md b/.changeset/curvy-socks-press.md new file mode 100644 index 00000000000..183f643954d --- /dev/null +++ b/.changeset/curvy-socks-press.md @@ -0,0 +1,5 @@ +--- +"@pnpm/hooks.read-package-hook": major +--- + +First release. diff --git a/packages/core/package.json b/packages/core/package.json index 4ea78111ef1..ed08ca61788 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -26,6 +26,7 @@ "@pnpm/graph-sequencer": "1.0.0", "@pnpm/headless": "workspace:*", "@pnpm/hoist": "workspace:*", + "@pnpm/hooks.read-package-hook": "workspace:*", "@pnpm/lifecycle": "workspace:*", "@pnpm/link-bins": "workspace:*", "@pnpm/lockfile-file": "workspace:*", @@ -39,7 +40,6 @@ "@pnpm/normalize-registries": "workspace:*", "@pnpm/npm-package-arg": "^1.0.0", "@pnpm/package-requester": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", "@pnpm/parse-wanted-dependency": "workspace:*", "@pnpm/prune-lockfile": "workspace:*", "@pnpm/read-modules-dir": "workspace:*", @@ -52,7 +52,6 @@ "@pnpm/symlink-dependency": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/which-version-is-pinned": "workspace:*", - "@yarnpkg/extensions": "1.2.0-rc.1", "@zkochan/rimraf": "^2.1.2", "dependency-path": "workspace:*", "is-inner-link": "^4.0.0", diff --git a/packages/core/src/getPeerDependencyIssues.ts b/packages/core/src/getPeerDependencyIssues.ts index 6d486d6450e..94141dbe5db 100644 --- a/packages/core/src/getPeerDependencyIssues.ts +++ b/packages/core/src/getPeerDependencyIssues.ts @@ -1,7 +1,7 @@ import resolveDependencies, { getWantedDependencies } from '@pnpm/resolve-dependencies' import { PeerDependencyIssuesByProjects } from '@pnpm/types' import getContext, { GetContextOptions, ProjectOptions } from '@pnpm/get-context' -import { createReadPackageHook } from './install/createReadPackageHook' +import { createReadPackageHook } from '@pnpm/hooks.read-package-hook' import { getPreferredVersionsFromLockfile } from './install/getPreferredVersions' import { InstallOptions } from './install/extendInstallOptions' import { DEFAULT_REGISTRIES } from '@pnpm/normalize-registries' diff --git a/packages/core/src/install/extendInstallOptions.ts b/packages/core/src/install/extendInstallOptions.ts index 1c934945b2a..6b9dd3638cf 100644 --- a/packages/core/src/install/extendInstallOptions.ts +++ b/packages/core/src/install/extendInstallOptions.ts @@ -1,6 +1,7 @@ import { WANTED_LOCKFILE } from '@pnpm/constants' import PnpmError from '@pnpm/error' import { HoistingLimits } from '@pnpm/headless' +import { createReadPackageHook } from '@pnpm/hooks.read-package-hook' import { Lockfile } from '@pnpm/lockfile-file' import { IncludedDependencies } from '@pnpm/modules-yaml' import normalizeRegistries, { DEFAULT_REGISTRIES } from '@pnpm/normalize-registries' @@ -15,7 +16,6 @@ import { } from '@pnpm/types' import pnpmPkgJson from '../pnpmPkgJson' import { ReporterFunction } from '../types' -import { createReadPackageHook } from './createReadPackageHook' import { PreResolutionHookContext } from './hooks' export interface StrictInstallOptions { diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index a20f883a99d..024996f28a4 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -63,6 +63,9 @@ { "path": "../hoist" }, + { + "path": "../hooks.read-package-hook" + }, { "path": "../lifecycle" }, @@ -102,9 +105,6 @@ { "path": "../package-store" }, - { - "path": "../parse-overrides" - }, { "path": "../parse-wanted-dependency" }, diff --git a/packages/hooks.read-package-hook/README.md b/packages/hooks.read-package-hook/README.md new file mode 100644 index 00000000000..8ba8b3926e4 --- /dev/null +++ b/packages/hooks.read-package-hook/README.md @@ -0,0 +1,13 @@ +# @pnpm/hooks.read-package-hook + +> Creates the default package reader hook used by pnpm + +## Installation + +```sh +pnpm add @pnpm/hooks.read-package-hook +``` + +## License + +MIT diff --git a/packages/hooks.read-package-hook/jest.config.js b/packages/hooks.read-package-hook/jest.config.js new file mode 100644 index 00000000000..9b65513eba2 --- /dev/null +++ b/packages/hooks.read-package-hook/jest.config.js @@ -0,0 +1,3 @@ +const config = require('../../jest.config.js'); + +module.exports = Object.assign({}, config, {}); diff --git a/packages/hooks.read-package-hook/package.json b/packages/hooks.read-package-hook/package.json new file mode 100644 index 00000000000..87762e20f8a --- /dev/null +++ b/packages/hooks.read-package-hook/package.json @@ -0,0 +1,51 @@ +{ + "name": "@pnpm/hooks.read-package-hook", + "version": "0.0.0", + "description": "Creates the default package reader hook used by pnpm", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "files": [ + "lib", + "!*.map" + ], + "scripts": { + "lint": "eslint src/**/*.ts test/**/*.ts", + "_test": "jest", + "test": "pnpm run compile && pnpm run _test", + "prepublishOnly": "pnpm run compile", + "compile": "tsc --build && pnpm run lint --fix" + }, + "repository": "https://github.com/pnpm/pnpm/blob/main/packages/hooks.read-package-hook", + "keywords": [ + "pnpm7" + ], + "engines": { + "node": ">=14.6" + }, + "license": "MIT", + "bugs": { + "url": "https://github.com/pnpm/pnpm/issues" + }, + "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/hooks.read-package-hook#readme", + "dependencies": { + "@pnpm/matcher": "workspace:*", + "@pnpm/parse-overrides": "workspace:*", + "@pnpm/parse-wanted-dependency": "workspace:*", + "@pnpm/types": "workspace:*", + "@yarnpkg/extensions": "1.2.0-rc.1", + "normalize-path": "^3.0.0", + "ramda": "npm:@pnpm/ramda@0.28.1", + "semver": "^7.3.7" + }, + "devDependencies": { + "@pnpm/hooks.read-package-hook": "workspace:*", + "@types/normalize-path": "^3.0.0", + "@types/ramda": "0.28.15", + "@types/semver": "7.3.10", + "@yarnpkg/core": "4.0.0-rc.14" + }, + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } +} diff --git a/packages/core/src/install/createPackageExtender.ts b/packages/hooks.read-package-hook/src/createPackageExtender.ts similarity index 100% rename from packages/core/src/install/createPackageExtender.ts rename to packages/hooks.read-package-hook/src/createPackageExtender.ts diff --git a/packages/core/src/install/createPeerDependencyPatcher.ts b/packages/hooks.read-package-hook/src/createPeerDependencyPatcher.ts similarity index 100% rename from packages/core/src/install/createPeerDependencyPatcher.ts rename to packages/hooks.read-package-hook/src/createPeerDependencyPatcher.ts diff --git a/packages/core/src/install/createReadPackageHook.ts b/packages/hooks.read-package-hook/src/createReadPackageHook.ts similarity index 100% rename from packages/core/src/install/createReadPackageHook.ts rename to packages/hooks.read-package-hook/src/createReadPackageHook.ts diff --git a/packages/core/src/install/createVersionsOverrider.ts b/packages/hooks.read-package-hook/src/createVersionsOverrider.ts similarity index 100% rename from packages/core/src/install/createVersionsOverrider.ts rename to packages/hooks.read-package-hook/src/createVersionsOverrider.ts diff --git a/packages/hooks.read-package-hook/src/index.ts b/packages/hooks.read-package-hook/src/index.ts new file mode 100644 index 00000000000..5e105d3378e --- /dev/null +++ b/packages/hooks.read-package-hook/src/index.ts @@ -0,0 +1 @@ +export { createReadPackageHook } from './createReadPackageHook' diff --git a/packages/core/test/install/createPackageExtender.test.ts b/packages/hooks.read-package-hook/test/createPackageExtender.test.ts similarity index 95% rename from packages/core/test/install/createPackageExtender.test.ts rename to packages/hooks.read-package-hook/test/createPackageExtender.test.ts index 28b2ced5308..2facbbccaa9 100644 --- a/packages/core/test/install/createPackageExtender.test.ts +++ b/packages/hooks.read-package-hook/test/createPackageExtender.test.ts @@ -1,4 +1,4 @@ -import createPackageExtender from '../../lib/install/createPackageExtender' +import createPackageExtender from '../lib/createPackageExtender' const packageExtender = createPackageExtender({ foo: { diff --git a/packages/core/test/install/createPeerDependencyPatcher.test.ts b/packages/hooks.read-package-hook/test/createPeerDependencyPatcher.test.ts similarity index 96% rename from packages/core/test/install/createPeerDependencyPatcher.test.ts rename to packages/hooks.read-package-hook/test/createPeerDependencyPatcher.test.ts index 135f2118271..16f77736e26 100644 --- a/packages/core/test/install/createPeerDependencyPatcher.test.ts +++ b/packages/hooks.read-package-hook/test/createPeerDependencyPatcher.test.ts @@ -1,4 +1,4 @@ -import createPeerDependencyPatcher from '../../lib/install/createPeerDependencyPatcher' +import createPeerDependencyPatcher from '../lib/createPeerDependencyPatcher' test('createPeerDependencyPatcher() ignores missing', () => { const patcher = createPeerDependencyPatcher({ diff --git a/packages/core/test/install/createVersionOverrider.test.ts b/packages/hooks.read-package-hook/test/createVersionOverrider.test.ts similarity index 98% rename from packages/core/test/install/createVersionOverrider.test.ts rename to packages/hooks.read-package-hook/test/createVersionOverrider.test.ts index d8267b13b79..d16f42516ac 100644 --- a/packages/core/test/install/createVersionOverrider.test.ts +++ b/packages/hooks.read-package-hook/test/createVersionOverrider.test.ts @@ -1,5 +1,5 @@ import path from 'path' -import createVersionsOverrider from '../../lib/install/createVersionsOverrider' +import createVersionsOverrider from '../lib/createVersionsOverrider' test('createVersionsOverrider() matches subranges', () => { const overrider = createVersionsOverrider({ diff --git a/packages/hooks.read-package-hook/tsconfig.json b/packages/hooks.read-package-hook/tsconfig.json new file mode 100644 index 00000000000..2cdd5062363 --- /dev/null +++ b/packages/hooks.read-package-hook/tsconfig.json @@ -0,0 +1,25 @@ +{ + "extends": "@pnpm/tsconfig", + "compilerOptions": { + "outDir": "lib", + "rootDir": "src" + }, + "include": [ + "src/**/*.ts", + "../../typings/**/*.d.ts" + ], + "references": [ + { + "path": "../matcher" + }, + { + "path": "../parse-overrides" + }, + { + "path": "../parse-wanted-dependency" + }, + { + "path": "../types" + } + ] +} diff --git a/packages/hooks.read-package-hook/tsconfig.lint.json b/packages/hooks.read-package-hook/tsconfig.lint.json new file mode 100644 index 00000000000..0dc5add6b7b --- /dev/null +++ b/packages/hooks.read-package-hook/tsconfig.lint.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src/**/*.ts", + "test/**/*.ts", + "../../typings/**/*.d.ts" + ] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7d48c28ff8a..35b9bf291eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,10 +55,10 @@ importers: version: link:utils/eslint-config '@pnpm/meta-updater': specifier: 0.2.0 - version: 0.2.0_typanion@3.12.0 + version: 0.2.0_typanion@3.9.0 '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/tsconfig': specifier: workspace:* version: link:utils/tsconfig @@ -112,7 +112,7 @@ importers: version: 4.8.3 verdaccio: specifier: ^5.15.3 - version: 5.15.3_typanion@3.12.0 + version: 5.15.3_typanion@3.9.0 .meta-updater: dependencies: @@ -578,6 +578,9 @@ importers: '@pnpm/hoist': specifier: workspace:* version: link:../hoist + '@pnpm/hooks.read-package-hook': + specifier: workspace:* + version: link:../hooks.read-package-hook '@pnpm/lifecycle': specifier: workspace:* version: link:../lifecycle @@ -620,9 +623,6 @@ importers: '@pnpm/package-requester': specifier: workspace:* version: link:../package-requester - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../parse-overrides '@pnpm/parse-wanted-dependency': specifier: workspace:* version: link:../parse-wanted-dependency @@ -659,9 +659,6 @@ importers: '@pnpm/which-version-is-pinned': specifier: workspace:* version: link:../which-version-is-pinned - '@yarnpkg/extensions': - specifier: 1.2.0-rc.1 - version: 1.2.0-rc.1_@yarnpkg+core@4.0.0-rc.14 '@zkochan/rimraf': specifier: ^2.1.2 version: 2.1.2 @@ -728,7 +725,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/store-path': specifier: workspace:* version: link:../store-path @@ -758,7 +755,7 @@ importers: version: 10.0.13 '@yarnpkg/core': specifier: 4.0.0-rc.14 - version: 4.0.0-rc.14_typanion@3.12.0 + version: 4.0.0-rc.14_typanion@3.9.0 deep-require-cwd: specifier: 1.0.0 version: 1.0.0 @@ -1657,7 +1654,7 @@ importers: version: link:../read-projects-context '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/store-path': specifier: workspace:* version: link:../store-path @@ -1738,6 +1735,49 @@ importers: specifier: 0.28.15 version: 0.28.15 + packages/hooks.read-package-hook: + dependencies: + '@pnpm/matcher': + specifier: workspace:* + version: link:../matcher + '@pnpm/parse-overrides': + specifier: workspace:* + version: link:../parse-overrides + '@pnpm/parse-wanted-dependency': + specifier: workspace:* + version: link:../parse-wanted-dependency + '@pnpm/types': + specifier: workspace:* + version: link:../types + '@yarnpkg/extensions': + specifier: 1.2.0-rc.1 + version: 1.2.0-rc.1_@yarnpkg+core@4.0.0-rc.14 + normalize-path: + specifier: ^3.0.0 + version: 3.0.0 + ramda: + specifier: npm:@pnpm/ramda@0.28.1 + version: /@pnpm/ramda/0.28.1 + semver: + specifier: ^7.3.7 + version: 7.3.7 + devDependencies: + '@pnpm/hooks.read-package-hook': + specifier: workspace:* + version: 'link:' + '@types/normalize-path': + specifier: ^3.0.0 + version: 3.0.0 + '@types/ramda': + specifier: 0.28.15 + version: 0.28.15 + '@types/semver': + specifier: 7.3.10 + version: 7.3.10 + '@yarnpkg/core': + specifier: 4.0.0-rc.14 + version: 4.0.0-rc.14_typanion@3.9.0 + packages/lifecycle: dependencies: '@pnpm/core-loggers': @@ -1751,7 +1791,7 @@ importers: version: 4.0.0 '@pnpm/npm-lifecycle': specifier: ^2.0.0-1 - version: 2.0.0-1_typanion@3.12.0 + version: 2.0.0-1_typanion@3.9.0 '@pnpm/read-package-json': specifier: workspace:* version: link:../read-package-json @@ -2751,7 +2791,7 @@ importers: version: 'link:' '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/test-fixtures': specifier: workspace:* version: link:../../privatePackages/test-fixtures @@ -3050,7 +3090,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 packages/plugin-commands-env: dependencies: @@ -3238,7 +3278,7 @@ importers: version: link:../types '@yarnpkg/core': specifier: 4.0.0-rc.14 - version: 4.0.0-rc.14_typanion@3.12.0 + version: 4.0.0-rc.14_typanion@3.9.0 '@yarnpkg/lockfile': specifier: ^1.1.0 version: 1.1.0 @@ -3317,7 +3357,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/test-fixtures': specifier: workspace:* version: link:../../privatePackages/test-fixtures @@ -3417,7 +3457,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -3514,7 +3554,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -3581,7 +3621,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -3681,7 +3721,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/cross-spawn': specifier: ^6.0.2 version: 6.0.2 @@ -3835,7 +3875,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/test-fixtures': specifier: workspace:* version: link:../../privatePackages/test-fixtures @@ -3941,7 +3981,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/is-windows': specifier: ^1.0.0 version: 1.0.0 @@ -4130,7 +4170,7 @@ importers: version: link:../../privatePackages/prepare '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@types/archy': specifier: 0.0.32 version: 0.0.32 @@ -4275,7 +4315,7 @@ importers: version: link:../read-project-manifest '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/run-npm': specifier: workspace:* version: link:../run-npm @@ -4630,7 +4670,7 @@ importers: version: link:../lockfile-utils '@yarnpkg/nm': specifier: 4.0.0-rc.14 - version: 4.0.0-rc.14_typanion@3.12.0 + version: 4.0.0-rc.14_typanion@3.9.0 dependency-path: specifier: workspace:* version: link:../dependency-path @@ -4753,7 +4793,7 @@ importers: version: link:../which-version-is-pinned '@yarnpkg/core': specifier: 4.0.0-rc.14 - version: 4.0.0-rc.14_typanion@3.12.0 + version: 4.0.0-rc.14_typanion@3.9.0 dependency-path: specifier: workspace:* version: link:../dependency-path @@ -5181,7 +5221,7 @@ importers: version: link:../../packages/modules-yaml '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -5221,7 +5261,7 @@ importers: version: link:../../packages/cafs '@pnpm/registry-mock': specifier: 3.0.0-3 - version: 3.0.0-3_typanion@3.12.0 + version: 3.0.0-3_typanion@3.9.0 path-exists: specifier: ^4.0.0 version: 4.0.0 @@ -5443,8 +5483,8 @@ packages: semver: 6.3.0 dev: true - /@babel/helper-create-class-features-plugin/7.19.0_@babel+core@7.19.1: - resolution: {integrity: sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==} + /@babel/helper-create-class-features-plugin/7.18.13_@babel+core@7.19.1: + resolution: {integrity: sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -5452,10 +5492,10 @@ packages: '@babel/core': 7.19.1 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 + '@babel/helper-function-name': 7.18.9 '@babel/helper-member-expression-to-functions': 7.18.9 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.19.1 + '@babel/helper-replace-supers': 7.18.9 '@babel/helper-split-export-declaration': 7.18.6 transitivePeerDependencies: - supports-color @@ -5466,6 +5506,14 @@ packages: engines: {node: '>=6.9.0'} dev: true + /@babel/helper-function-name/7.18.9: + resolution: {integrity: sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.18.10 + '@babel/types': 7.19.0 + dev: true + /@babel/helper-function-name/7.19.0: resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==} engines: {node: '>=6.9.0'} @@ -5495,6 +5543,22 @@ packages: '@babel/types': 7.19.0 dev: true + /@babel/helper-module-transforms/7.18.9: + resolution: {integrity: sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-module-imports': 7.18.6 + '@babel/helper-simple-access': 7.18.6 + '@babel/helper-split-export-declaration': 7.18.6 + '@babel/helper-validator-identifier': 7.18.6 + '@babel/template': 7.18.10 + '@babel/traverse': 7.18.13 + '@babel/types': 7.19.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helper-module-transforms/7.19.0: resolution: {integrity: sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==} engines: {node: '>=6.9.0'} @@ -5503,7 +5567,7 @@ packages: '@babel/helper-module-imports': 7.18.6 '@babel/helper-simple-access': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.18.6 '@babel/template': 7.18.10 '@babel/traverse': 7.19.1 '@babel/types': 7.19.0 @@ -5518,19 +5582,19 @@ packages: '@babel/types': 7.19.0 dev: true - /@babel/helper-plugin-utils/7.19.0: - resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==} + /@babel/helper-plugin-utils/7.18.9: + resolution: {integrity: sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==} engines: {node: '>=6.9.0'} dev: true - /@babel/helper-replace-supers/7.19.1: - resolution: {integrity: sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==} + /@babel/helper-replace-supers/7.18.9: + resolution: {integrity: sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-member-expression-to-functions': 7.18.9 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.19.1 + '@babel/traverse': 7.18.13 '@babel/types': 7.19.0 transitivePeerDependencies: - supports-color @@ -5555,8 +5619,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier/7.19.1: - resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==} + /@babel/helper-validator-identifier/7.18.6: + resolution: {integrity: sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==} engines: {node: '>=6.9.0'} /@babel/helper-validator-option/7.18.6: @@ -5579,7 +5643,7 @@ packages: resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.18.6 chalk: 2.4.2 js-tokens: 4.0.0 @@ -5610,7 +5674,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.19.1 dev: true @@ -5620,7 +5684,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.19.1: @@ -5629,7 +5693,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.19.1: @@ -5638,7 +5702,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.19.1: @@ -5647,7 +5711,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.19.1: @@ -5656,7 +5720,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.19.1: @@ -5665,7 +5729,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.19.1: @@ -5675,7 +5739,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.19.1: @@ -5684,7 +5748,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.19.1: @@ -5693,7 +5757,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.19.1: @@ -5702,7 +5766,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.19.1: @@ -5711,7 +5775,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.19.1: @@ -5720,7 +5784,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.19.1: @@ -5729,7 +5793,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.19.1: @@ -5739,7 +5803,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.19.1: @@ -5749,7 +5813,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 dev: true /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.19.1: @@ -5759,23 +5823,23 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-module-transforms': 7.19.0 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-module-transforms': 7.18.9 + '@babel/helper-plugin-utils': 7.18.9 '@babel/helper-simple-access': 7.18.6 babel-plugin-dynamic-import-node: 2.3.3 transitivePeerDependencies: - supports-color dev: true - /@babel/plugin-transform-typescript/7.19.1_@babel+core@7.19.1: - resolution: {integrity: sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==} + /@babel/plugin-transform-typescript/7.18.12_@babel+core@7.19.1: + resolution: {integrity: sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-create-class-features-plugin': 7.19.0_@babel+core@7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-create-class-features-plugin': 7.18.13_@babel+core@7.19.1 + '@babel/helper-plugin-utils': 7.18.9 '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.19.1 transitivePeerDependencies: - supports-color @@ -5788,15 +5852,15 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.1 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 '@babel/helper-validator-option': 7.18.6 - '@babel/plugin-transform-typescript': 7.19.1_@babel+core@7.19.1 + '@babel/plugin-transform-typescript': 7.18.12_@babel+core@7.19.1 transitivePeerDependencies: - supports-color dev: true - /@babel/runtime/7.19.0: - resolution: {integrity: sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==} + /@babel/runtime/7.18.9: + resolution: {integrity: sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.9 @@ -5810,6 +5874,24 @@ packages: '@babel/types': 7.19.0 dev: true + /@babel/traverse/7.18.13: + resolution: {integrity: sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.18.6 + '@babel/generator': 7.19.0 + '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-function-name': 7.18.9 + '@babel/helper-hoist-variables': 7.18.6 + '@babel/helper-split-export-declaration': 7.18.6 + '@babel/parser': 7.19.1_@babel+types@7.19.0 + '@babel/types': 7.19.0 + debug: 4.3.4 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/traverse/7.19.1: resolution: {integrity: sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==} engines: {node: '>=6.9.0'} @@ -5832,7 +5914,7 @@ packages: resolution: {integrity: sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.18.6 to-fast-properties: 2.0.0 dev: true @@ -5841,7 +5923,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.18.10 - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.18.6 to-fast-properties: 2.0.0 dev: true @@ -5852,7 +5934,7 @@ packages: /@changesets/apply-release-plan/6.1.0: resolution: {integrity: sha512-fMNBUAEc013qaA4KUVjdwgYMmKrf5Mlgf6o+f97MJVNzVnikwpWY47Lc3YR1jhC874Fonn5MkjkWK9DAZsdQ5g==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/config': 2.1.1 '@changesets/get-version-range-type': 0.3.2 '@changesets/git': 1.4.1 @@ -5870,7 +5952,7 @@ packages: /@changesets/assemble-release-plan/5.2.1: resolution: {integrity: sha512-d6ckasOWlKF9Mzs82jhl6TKSCgVvfLoUK1ERySrTg2TQJdrVUteZue6uEIYUTA7SgMu67UOSwol6R9yj1nTdjw==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.3 '@changesets/types': 5.1.0 @@ -5888,7 +5970,7 @@ packages: resolution: {integrity: sha512-87JSwMv38zS3QW3062jXZYLsCNRtA08wa7vt3VnMmkGLfUMn2TTSfD+eSGVnKPJ/ycDCvAcCDnrv/B+gSX5KVA==} hasBin: true dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/apply-release-plan': 6.1.0 '@changesets/assemble-release-plan': 5.2.1 '@changesets/changelog-git': 0.1.12 @@ -5954,7 +6036,7 @@ packages: /@changesets/get-release-plan/3.0.14: resolution: {integrity: sha512-xzSfeyIOvUnbqMuQXVKTYUizreWQfICwoQpvEHoePVbERLocc1tPo5lzR7dmVCFcaA/DcnbP6mxyioeq+JuzSg==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/assemble-release-plan': 5.2.1 '@changesets/config': 2.1.1 '@changesets/pre': 1.0.12 @@ -5970,7 +6052,7 @@ packages: /@changesets/git/1.4.1: resolution: {integrity: sha512-GWwRXEqBsQ3nEYcyvY/u2xUK86EKAevSoKV/IhELoZ13caZ1A1TSak/71vyKILtzuLnFPk5mepP5HjBxr7lZ9Q==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/errors': 0.1.4 '@changesets/types': 5.1.0 '@manypkg/get-packages': 1.1.3 @@ -5994,7 +6076,7 @@ packages: /@changesets/pre/1.0.12: resolution: {integrity: sha512-RFzWYBZx56MtgMesXjxx7ymyI829/rcIw/41hvz3VJPnY8mDscN7RJyYu7Xm7vts2Fcd+SRcO0T/Ws3I1/6J7g==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/errors': 0.1.4 '@changesets/types': 5.1.0 '@manypkg/get-packages': 1.1.3 @@ -6004,7 +6086,7 @@ packages: /@changesets/read/0.5.7: resolution: {integrity: sha512-Iteg0ccTPpkJ+qFzY97k7qqdVE5Kz30TqPo9GibpBk2g8tcLFUqf+Qd0iXPLcyhUZpPL1U6Hia1gINHNKIKx4g==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/git': 1.4.1 '@changesets/logger': 0.0.5 '@changesets/parse': 0.3.14 @@ -6025,7 +6107,7 @@ packages: /@changesets/write/0.2.0: resolution: {integrity: sha512-iKHqGYXZvneRzRfvEBpPqKfpGELOEOEP63MKdM/SdSRon40rsUijkTmsGCHT1ueLi3iJPZPmYuZJvjjKrMzumA==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/types': 5.1.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -6298,7 +6380,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 jest-message-util: 29.0.3 jest-util: 29.0.3 @@ -6319,14 +6401,14 @@ packages: '@jest/test-result': 29.0.3 '@jest/transform': 29.0.3_@babel+types@7.19.0 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 ansi-escapes: 4.3.2 chalk: 4.1.2 - ci-info: 3.4.0 + ci-info: 3.3.2 exit: 0.1.2 graceful-fs: 4.2.10 jest-changed-files: 29.0.0 - jest-config: 29.0.3_mwv7abiyjbee3otg3oy7ew4v44 + jest-config: 29.0.3_sqomacscyibqsibz3on6xu2nni jest-haste-map: 29.0.3 jest-message-util: 29.0.3 jest-regex-util: 29.0.0 @@ -6354,7 +6436,7 @@ packages: dependencies: '@jest/fake-timers': 29.0.3 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 jest-mock: 29.0.3 dev: true @@ -6381,7 +6463,7 @@ packages: dependencies: '@jest/types': 29.0.3 '@sinonjs/fake-timers': 9.1.2 - '@types/node': 18.7.18 + '@types/node': 18.7.14 jest-message-util: 29.0.3 jest-mock: 29.0.3 jest-util: 29.0.3 @@ -6414,7 +6496,7 @@ packages: '@jest/transform': 29.0.3_@babel+types@7.19.0 '@jest/types': 29.0.3 '@jridgewell/trace-mapping': 0.3.15 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -6442,7 +6524,7 @@ packages: resolution: {integrity: sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@sinclair/typebox': 0.24.41 + '@sinclair/typebox': 0.24.31 dev: true /@jest/source-map/29.0.0: @@ -6505,7 +6587,7 @@ packages: '@jest/schemas': 29.0.0 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.7.18 + '@types/node': 18.7.14 '@types/yargs': 17.0.12 chalk: 4.1.2 dev: true @@ -6558,7 +6640,7 @@ packages: /@manypkg/find-root/1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -6567,7 +6649,7 @@ packages: /@manypkg/get-packages/1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -6624,7 +6706,7 @@ packages: dev: false optional: true - /@pnpm/build-modules/9.3.6_3rj5voppa5hhw6lgzxyp2543na: + /@pnpm/build-modules/9.3.6_2bmkf3mqfpwcchiyckc674yzd4: resolution: {integrity: sha512-WV3EoffXJZnnpU8RmYDiAsawqXjaW0T0wA+BT3zZYI4iVesx30eAsDhV9sAwb25A73HzoZ6WfQFy3uEA9Xlz7Q==} engines: {node: '>=14.6'} peerDependencies: @@ -6634,7 +6716,7 @@ packages: '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 '@pnpm/error': 3.0.1 '@pnpm/graph-sequencer': 1.0.0 - '@pnpm/lifecycle': 13.1.7_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/lifecycle': 13.1.7_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/link-bins': 7.2.5_@pnpm+logger@4.0.0 '@pnpm/logger': 4.0.0 '@pnpm/read-package-json': 6.0.8 @@ -6688,15 +6770,15 @@ packages: load-json-file: 6.2.0 dev: true - /@pnpm/cli-utils/0.7.36_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/cli-utils/0.7.36_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-2cG87icTe9+1fb3ziGW9GHmeeR550czVYa6ALpKn4uEv+D2REOPMr6rVnFtDCB/E4Cktoslk5PkGK3nR3ZWkig==} engines: {node: '>=14.6'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: '@pnpm/cli-meta': 3.0.6 - '@pnpm/config': 15.10.5_zyvpl6qeqdom6ckmoznuohthne - '@pnpm/default-reporter': 9.1.25_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/config': 15.10.5_xjpkmc2z33rxp4g57jahz5wnay + '@pnpm/default-reporter': 9.1.25_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/error': 3.0.1 '@pnpm/logger': 4.0.0 '@pnpm/manifest-utils': 3.1.2_@pnpm+logger@4.0.0 @@ -6720,7 +6802,7 @@ packages: chalk: 4.1.2 dev: false - /@pnpm/config/15.10.5_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/config/15.10.5_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-FGzgeFztN6epouoPbiX1GlhLruX8P/U2gFaTCChBEXVvhH2COv5ed4Y9VdHsrwHtnheBa3cp2YSEKEWBjPipyQ==} engines: {node: '>=14.6'} dependencies: @@ -6729,7 +6811,7 @@ packages: '@pnpm/git-utils': 0.1.0 '@pnpm/matcher': 3.0.0 '@pnpm/npm-conf': 2.0.0 - '@pnpm/pnpmfile': 2.2.9_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/pnpmfile': 2.2.9_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/read-project-manifest': 3.0.9 '@pnpm/types': 8.5.0 camelcase: 6.3.0 @@ -6771,13 +6853,13 @@ packages: '@pnpm/types': 8.5.0 dev: true - /@pnpm/core/5.11.5_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/core/5.11.5_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-taW5qD/cjMg2RZz4IBrbnPDHR0K/fjw5o5jfjpnyyfTBWMclGewe3Sm/8pcXyxRgRpslkLPIy2AGHV3bdiU7kg==} engines: {node: '>=14.6'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/build-modules': 9.3.6_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/build-modules': 9.3.6_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/calc-dep-state': 3.0.1 '@pnpm/constants': 6.1.0 '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 @@ -6786,9 +6868,9 @@ packages: '@pnpm/filter-lockfile': 6.0.18_@pnpm+logger@4.0.0 '@pnpm/get-context': 6.2.10_@pnpm+logger@4.0.0 '@pnpm/graph-sequencer': 1.0.0 - '@pnpm/headless': 18.7.1_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/headless': 18.7.1_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/hoist': 6.2.9_@pnpm+logger@4.0.0 - '@pnpm/lifecycle': 13.1.7_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/lifecycle': 13.1.7_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/link-bins': 7.2.5_@pnpm+logger@4.0.0 '@pnpm/lockfile-file': 5.3.4_@pnpm+logger@4.0.0 '@pnpm/lockfile-to-pnp': 1.0.1_@pnpm+logger@4.0.0 @@ -6809,7 +6891,7 @@ packages: '@pnpm/read-package-json': 6.0.8 '@pnpm/read-project-manifest': 3.0.9 '@pnpm/remove-bins': 3.0.9_@pnpm+logger@4.0.0 - '@pnpm/resolve-dependencies': 28.3.11_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/resolve-dependencies': 28.3.11_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/resolver-base': 9.1.0 '@pnpm/store-controller-types': 14.1.1 '@pnpm/symlink-dependency': 5.0.7_@pnpm+logger@4.0.0 @@ -6844,13 +6926,13 @@ packages: rfc4648: 1.5.2 dev: true - /@pnpm/default-reporter/9.1.25_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/default-reporter/9.1.25_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-vyAiEdZucnjXNC47VfFfWF5VZ9nYN4t2jJRgM5/uu/wdE2gdgmzrfVyex9DkPhigu8K1HD7FoEj0XSPfAxg2fg==} engines: {node: '>=14.6'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/config': 15.10.5_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/config': 15.10.5_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 '@pnpm/error': 3.0.1 '@pnpm/logger': 4.0.0 @@ -6956,11 +7038,11 @@ packages: find-up: 5.0.0 dev: true - /@pnpm/find-workspace-packages/4.0.36_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/find-workspace-packages/4.0.36_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-1sxHssbIbZbZ9bTQ5zfgrYhlOsjxjACmwazBqfP3eW7KQFFNlE8Gml00b7iqN/gTMtVemI5kHM4cwUVsgww+PQ==} engines: {node: '>=14.6'} dependencies: - '@pnpm/cli-utils': 0.7.36_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/cli-utils': 0.7.36_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/constants': 6.1.0 '@pnpm/types': 8.5.0 find-packages: 9.0.9 @@ -7011,20 +7093,20 @@ packages: /@pnpm/graph-sequencer/1.0.0: resolution: {integrity: sha512-iIJhmi7QjmafhijaEkh34Yxhjq3S/eiZnxww9K/SRXuDB5/30QnCyihR4R7vep8ONsGIR29hNPAtaNGd1rC/VA==} - /@pnpm/headless/18.7.1_3rj5voppa5hhw6lgzxyp2543na: + /@pnpm/headless/18.7.1_2bmkf3mqfpwcchiyckc674yzd4: resolution: {integrity: sha512-6woK547O1EI+MZ7BMZrI1vFlusy79oGklsFVwnPXm9bFXP6LN9TEzmxfRt+gm9x6+bJjcailHr7RRI7IhBM2Lg==} engines: {node: '>=14.6'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/build-modules': 9.3.6_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/build-modules': 9.3.6_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/calc-dep-state': 3.0.1 '@pnpm/constants': 6.1.0 '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 '@pnpm/error': 3.0.1 '@pnpm/filter-lockfile': 6.0.18_@pnpm+logger@4.0.0 '@pnpm/hoist': 6.2.9_@pnpm+logger@4.0.0 - '@pnpm/lifecycle': 13.1.7_3rj5voppa5hhw6lgzxyp2543na + '@pnpm/lifecycle': 13.1.7_2bmkf3mqfpwcchiyckc674yzd4 '@pnpm/link-bins': 7.2.5_@pnpm+logger@4.0.0 '@pnpm/lockfile-file': 5.3.4_@pnpm+logger@4.0.0 '@pnpm/lockfile-to-pnp': 1.0.1_@pnpm+logger@4.0.0 @@ -7036,7 +7118,7 @@ packages: '@pnpm/package-requester': 19.0.2_@pnpm+logger@4.0.0 '@pnpm/read-package-json': 6.0.8 '@pnpm/read-project-manifest': 3.0.9 - '@pnpm/real-hoist': 0.2.17_typanion@3.12.0 + '@pnpm/real-hoist': 0.2.17_typanion@3.9.0 '@pnpm/store-controller-types': 14.1.1 '@pnpm/symlink-dependency': 5.0.7_@pnpm+logger@4.0.0 '@pnpm/types': 8.5.0 @@ -7072,7 +7154,7 @@ packages: ramda: /@pnpm/ramda/0.28.1 dev: true - /@pnpm/lifecycle/13.1.7_3rj5voppa5hhw6lgzxyp2543na: + /@pnpm/lifecycle/13.1.7_2bmkf3mqfpwcchiyckc674yzd4: resolution: {integrity: sha512-sc9DD3RtywNJADhhpuieHea6FZB9WRdoWsfYEKqkw0r/KWloyHgSkCtcHixR4XarFgotP89NosZUzAFynrWuEw==} engines: {node: '>=14.6'} peerDependencies: @@ -7081,7 +7163,7 @@ packages: '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 '@pnpm/directory-fetcher': 3.1.1 '@pnpm/logger': 4.0.0 - '@pnpm/npm-lifecycle': 2.0.0-1_typanion@3.12.0 + '@pnpm/npm-lifecycle': 2.0.0-1_typanion@3.9.0 '@pnpm/read-package-json': 6.0.8 '@pnpm/store-controller-types': 14.1.1 '@pnpm/types': 8.5.0 @@ -7222,16 +7304,16 @@ packages: semver: 7.3.7 dev: true - /@pnpm/meta-updater/0.2.0_typanion@3.12.0: + /@pnpm/meta-updater/0.2.0_typanion@3.9.0: resolution: {integrity: sha512-jMQ3xQgYQQSr9ZiYg+urE5lWjK7IcgLxdqRPTPp6SHGDoSKMy4sBVhWHARNdQTPm+JeodUGPPeWTRGAmmAXTQA==} engines: {node: '>=10.12'} hasBin: true dependencies: '@pnpm/find-workspace-dir': 4.0.2 - '@pnpm/find-workspace-packages': 4.0.36_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/find-workspace-packages': 4.0.36_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/logger': 4.0.0 '@pnpm/types': 8.5.0 - '@yarnpkg/core': 4.0.0-rc.14_typanion@3.12.0 + '@yarnpkg/core': 4.0.0-rc.14_typanion@3.9.0 load-json-file: 7.0.1 meow: 10.1.3 print-diff: 1.0.0 @@ -7325,12 +7407,12 @@ packages: '@pnpm/network.ca-file': 1.0.1 config-chain: 1.1.13 - /@pnpm/npm-lifecycle/2.0.0-1_typanion@3.12.0: + /@pnpm/npm-lifecycle/2.0.0-1_typanion@3.9.0: resolution: {integrity: sha512-eUeRVUxnr9xP50ESMuRDrWYN/AQmaV2g/Wvs3ckHBx7XFJw8ljix66L7R1S1FoUqxNn0BeyPeIE9ANwn/syIAQ==} engines: {node: '>=12.17'} dependencies: '@pnpm/byline': 1.0.0 - '@yarnpkg/shell': 3.2.0-rc.8_typanion@3.12.0 + '@yarnpkg/shell': 3.2.0-rc.8_typanion@3.9.0 node-gyp: 8.4.1 resolve-from: 5.0.0 slide: 1.1.6 @@ -7490,13 +7572,13 @@ packages: '@pnpm/types': 8.5.0 dev: true - /@pnpm/pnpmfile/2.2.9_zyvpl6qeqdom6ckmoznuohthne: + /@pnpm/pnpmfile/2.2.9_xjpkmc2z33rxp4g57jahz5wnay: resolution: {integrity: sha512-pwtM++Zy82G/aUpBNPT6cfnJTy/NEagFNjECf35cOVKOGFCTGnwON7v1HmQZMImoZxDxiyTBT74Am3Lz9idqmQ==} engines: {node: '>=14.6'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/core': 5.11.5_zyvpl6qeqdom6ckmoznuohthne + '@pnpm/core': 5.11.5_xjpkmc2z33rxp4g57jahz5wnay '@pnpm/core-loggers': 7.0.6_@pnpm+logger@4.0.0 '@pnpm/error': 3.0.1 '@pnpm/lockfile-types': 4.3.1 @@ -7576,19 +7658,19 @@ packages: realpath-missing: 1.1.0 dev: true - /@pnpm/real-hoist/0.2.17_typanion@3.12.0: + /@pnpm/real-hoist/0.2.17_typanion@3.9.0: resolution: {integrity: sha512-zq3HE0bPbIF5BgWOTj6bnyUSjdr5jbj1bqX9V/A5DDmo5F35ujjuipUr+UfN+moHvZ9HtKKGOYmCy1p7VysWwg==} engines: {node: '>=14.6'} dependencies: '@pnpm/error': 3.0.1 '@pnpm/lockfile-utils': 4.2.4 - '@yarnpkg/nm': 4.0.0-rc.14_typanion@3.12.0 + '@yarnpkg/nm': 4.0.0-rc.14_typanion@3.9.0 dependency-path: 9.2.4 transitivePeerDependencies: - typanion dev: true - /@pnpm/registry-mock/3.0.0-3_typanion@3.12.0: + /@pnpm/registry-mock/3.0.0-3_typanion@3.9.0: resolution: {integrity: sha512-Go58qv+MvnuQR5OnHHFj8E76NSfoLq8XmW22roVOXSJWeN20g3+vmW+IRcmYKHB5eNfdKK45TRLtLOhVEbKFAw==} engines: {node: '>=10.13'} hasBin: true @@ -7599,7 +7681,7 @@ packages: read-yaml-file: 2.1.0 rimraf: 3.0.2 tempy: 1.0.1 - verdaccio: 5.15.3_typanion@3.12.0 + verdaccio: 5.15.1_typanion@3.9.0 write-yaml-file: 4.2.0 transitivePeerDependencies: - bufferutil @@ -7635,7 +7717,7 @@ packages: cli-columns: 4.0.0 dev: true - /@pnpm/resolve-dependencies/28.3.11_3rj5voppa5hhw6lgzxyp2543na: + /@pnpm/resolve-dependencies/28.3.11_2bmkf3mqfpwcchiyckc674yzd4: resolution: {integrity: sha512-F2CJMqQ6qMLftzdTovYdDCytzlj6d7vu8e6cjBY1Mcb6+Qipz41Krls9u22D0XTrnPCntJA0xzYD8yE+ykpr5g==} engines: {node: '>=14.6'} peerDependencies: @@ -7656,7 +7738,7 @@ packages: '@pnpm/store-controller-types': 14.1.1 '@pnpm/types': 8.5.0 '@pnpm/which-version-is-pinned': 3.0.0 - '@yarnpkg/core': 4.0.0-rc.14_typanion@3.12.0 + '@yarnpkg/core': 4.0.0-rc.14_typanion@3.9.0 dependency-path: 9.2.4 encode-registry: 3.0.0 filenamify: 4.3.0 @@ -7757,8 +7839,8 @@ packages: write-yaml-file: 4.2.0 dev: true - /@sinclair/typebox/0.24.41: - resolution: {integrity: sha512-TJCgQurls4FipFvHeC+gfAzb+GGstL0TDwYJKQVtTeSvJIznWzP7g3bAd5gEBlr8+bIxqnWS9VGVWREDhmE8jA==} + /@sinclair/typebox/0.24.31: + resolution: {integrity: sha512-uWZaAsh9WFhcY1rWLLcMU/omiIIAQ/PmgqplaF6UWY6ULPH0ZO8hupJRAydzlTQZJIK3Voz8o8dYlEx+Cm6BAA==} dev: true /@sindresorhus/is/4.6.0: @@ -7823,7 +7905,7 @@ packages: /@types/adm-zip/0.4.34: resolution: {integrity: sha512-8ToYLLAYhkRfcmmljrKi22gT2pqu7hGMDtORP1emwIEGmgUTZOsaDjzWFzW5N2frcFRz/50CWt4zA1CxJ73pmQ==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /@types/archy/0.0.32: @@ -7866,7 +7948,7 @@ packages: /@types/byline/4.2.33: resolution: {integrity: sha512-LJYez7wrWcJQQDknqZtrZuExMGP0IXmPl1rOOGDqLbu+H7UNNRfKNuSxCBcQMLH1EfjeWidLedC/hCc5dDfBog==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /@types/cacheable-request/6.0.2: @@ -7874,19 +7956,19 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 18.7.18 + '@types/node': 18.7.14 '@types/responselike': 1.0.0 /@types/concat-stream/2.0.0: resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 dev: true /@types/cross-spawn/6.0.2: resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /@types/emscripten/1.39.6: @@ -7895,20 +7977,20 @@ packages: /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true - /@types/glob/8.0.0: - resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==} + /@types/glob/7.2.0: + resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: - '@types/minimatch': 5.1.2 - '@types/node': 18.7.18 + '@types/minimatch': 5.1.1 + '@types/node': 18.7.14 dev: true /@types/graceful-fs/4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 dev: true /@types/hosted-git-info/3.0.2: @@ -7921,7 +8003,7 @@ packages: /@types/is-ci/3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} dependencies: - ci-info: 3.4.0 + ci-info: 3.3.2 dev: true /@types/is-windows/1.0.0: @@ -7931,7 +8013,7 @@ packages: /@types/isexe/2.0.1: resolution: {integrity: sha512-leMb+b2fOo1s7NsCVGQr07/zXI/CNodvhHE3IMizhWVzoN/8+gSdyqlo/SWxL/zEoVcYdV6F8/RZHg5Hm+wrfw==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 dev: true /@types/istanbul-lib-coverage/2.0.4: @@ -7961,6 +8043,9 @@ packages: resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==} dev: true + /@types/json-buffer/3.0.0: + resolution: {integrity: sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==} + /@types/json-schema/7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: false @@ -7972,7 +8057,7 @@ packages: /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 /@types/lodash/4.14.181: resolution: {integrity: sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==} @@ -7989,8 +8074,8 @@ packages: '@types/braces': 3.0.1 dev: true - /@types/minimatch/5.1.2: - resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} + /@types/minimatch/5.1.1: + resolution: {integrity: sha512-v55NF6Dz0wrj14Rn8iEABTWrhYRmgkJYuokduunSiq++t3hZ9VZ6dvcDt+850Pm5sGJZk8RaHzkFCXPxVINZ+g==} dev: true /@types/minimist/1.2.2: @@ -8000,7 +8085,7 @@ packages: /@types/mz/2.7.4: resolution: {integrity: sha512-Zs0imXxyWT20j3Z2NwKpr0IO2LmLactBblNyLua5Az4UHuqOQ02V3jPTgyKwDkuc33/ahw+C3O1PIZdrhFMuQA==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /@types/node/12.20.55: @@ -8012,9 +8097,10 @@ packages: /@types/node/14.18.29: resolution: {integrity: sha512-LhF+9fbIX4iPzhsRLpK5H7iPdvW8L4IwGciXQIOEcuF62+9nw/VQVsOViAOOGxY3OlOKGLFv0sWwJXdwQeTn6A==} + dev: true - /@types/node/18.7.18: - resolution: {integrity: sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==} + /@types/node/18.7.14: + resolution: {integrity: sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==} /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -8048,7 +8134,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 /@types/retry/0.12.2: resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==} @@ -8057,8 +8143,8 @@ packages: /@types/rimraf/3.0.2: resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} dependencies: - '@types/glob': 8.0.0 - '@types/node': 14.18.29 + '@types/glob': 7.2.0 + '@types/node': 18.7.14 dev: true /@types/semver/6.2.3: @@ -8066,6 +8152,7 @@ packages: /@types/semver/7.3.10: resolution: {integrity: sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==} + dev: true /@types/semver/7.3.12: resolution: {integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==} @@ -8087,7 +8174,7 @@ packages: /@types/ssri/7.1.1: resolution: {integrity: sha512-DPP/jkDaqGiyU75MyMURxLWyYLwKSjnAuGe9ZCsLp9QZOpXmDfuevk769F0BS86TmRuD5krnp06qw9nSoNO+0g==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 /@types/stack-utils/2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} @@ -8100,20 +8187,20 @@ packages: /@types/tar-stream/2.2.2: resolution: {integrity: sha512-1AX+Yt3icFuU6kxwmPakaiGrJUwG44MpuiqPg4dSolRFk6jmvs4b3IbUol9wKDLIgU76gevn3EwE8y/DkSJCZQ==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 dev: true /@types/tar/6.1.2: resolution: {integrity: sha512-bnX3RRm70/n1WMwmevdOAeDU4YP7f5JSubgnuU+yrO+xQQjwDboJj3u2NTJI5ngCQhXihqVVAH5h5J8YpdpEvg==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 minipass: 3.3.5 dev: true /@types/touch/3.1.2: resolution: {integrity: sha512-6YYYfTc90glAZBvyjpmz6JFLtBRyLWXckmlNgK4R2czsWg63cRCI9Rb3aKJ6LPbw8jpHf7nZdVvMd6gUg4hVsw==} dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.14 dev: true /@types/treeify/1.0.0: @@ -8142,7 +8229,7 @@ packages: /@types/write-file-atomic/3.0.3: resolution: {integrity: sha512-RfbL28ev+HeIcQyl8TDU5pxHdDQrKyuKHXfz2bKFJn4/IFa34SGDT1DDXYsIf9s/KuW6zGBR+yZoe8pAlvMPXg==} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /@types/yargs-parser/21.0.0: @@ -8333,22 +8420,22 @@ packages: /@verdaccio/ui-theme/6.0.0-6-next.28: resolution: {integrity: sha512-1sJ28aVGMiRJrSz0e8f4t+IUgt/cyYmuDLhogXHOEjEIIEcfMNyQ5bVYqq03wLVoKWEh5D6gHo1hQnVKQl1L5g==} - /@yarnpkg/core/4.0.0-rc.14_typanion@3.12.0: + /@yarnpkg/core/4.0.0-rc.14_typanion@3.9.0: resolution: {integrity: sha512-SWq+T56I7GiRMrMECGsvCJvQmbXi+pBexjX9sYICPj+OgTHbWDmIOh/OrSC8honE6WEE2ZzPNmwF4Y355NKgew==} engines: {node: '>=14.15.0'} dependencies: '@arcanis/slice-ansi': 1.1.1 '@types/lodash': 4.14.181 - '@types/semver': 7.3.10 + '@types/semver': 7.3.12 '@types/treeify': 1.0.0 - '@yarnpkg/fslib': 3.0.0-rc.18 - '@yarnpkg/libzip': 3.0.0-rc.18 - '@yarnpkg/parsers': 3.0.0-rc.18 - '@yarnpkg/shell': 4.0.0-rc.18_typanion@3.12.0 + '@yarnpkg/fslib': 3.0.0-rc.15 + '@yarnpkg/libzip': 3.0.0-rc.15 + '@yarnpkg/parsers': 3.0.0-rc.15 + '@yarnpkg/shell': 4.0.0-rc.15_typanion@3.9.0 camelcase: 5.3.1 chalk: 3.0.0 - ci-info: 3.4.0 - clipanion: 3.2.0-rc.6_typanion@3.12.0 + ci-info: 3.3.2 + clipanion: 3.2.0-rc.6_typanion@3.9.0 cross-spawn: 7.0.3 diff: 5.1.0 globby: 11.1.0 @@ -8366,22 +8453,22 @@ packages: transitivePeerDependencies: - typanion - /@yarnpkg/core/4.0.0-rc.18_typanion@3.12.0: - resolution: {integrity: sha512-wZ+UZOFm2cJIEu6+wF7uZTI/gtYhJbEIxDTUJJ1oaUJ6fJc7Eg1IjZUQfBNj1LCUE6AR5PfhxPmlvd19gYvg3w==} + /@yarnpkg/core/4.0.0-rc.15_typanion@3.9.0: + resolution: {integrity: sha512-v34N4INBg756z1GzbXGEgFPnlIbO4Bf+PN1i6ay1Qv/cEhzINtLBrDJ9IRLhVfqfdsyJTd6my4yzDup9hNIHzg==} engines: {node: '>=14.15.0'} dependencies: '@arcanis/slice-ansi': 1.1.1 '@types/lodash': 4.14.181 '@types/semver': 7.3.12 '@types/treeify': 1.0.0 - '@yarnpkg/fslib': 3.0.0-rc.18 - '@yarnpkg/libzip': 3.0.0-rc.18 - '@yarnpkg/parsers': 3.0.0-rc.18 - '@yarnpkg/shell': 4.0.0-rc.18_typanion@3.12.0 + '@yarnpkg/fslib': 3.0.0-rc.15 + '@yarnpkg/libzip': 3.0.0-rc.15 + '@yarnpkg/parsers': 3.0.0-rc.15 + '@yarnpkg/shell': 4.0.0-rc.15_typanion@3.9.0 camelcase: 5.3.1 chalk: 3.0.0 - ci-info: 3.4.0 - clipanion: 3.2.0-rc.6_typanion@3.12.0 + ci-info: 3.3.2 + clipanion: 3.2.0-rc.6_typanion@3.9.0 cross-spawn: 7.0.3 diff: 5.1.0 globby: 11.1.0 @@ -8405,7 +8492,7 @@ packages: peerDependencies: '@yarnpkg/core': '*' dependencies: - '@yarnpkg/core': 4.0.0-rc.14_typanion@3.12.0 + '@yarnpkg/core': 4.0.0-rc.14_typanion@3.9.0 /@yarnpkg/fslib/2.7.1: resolution: {integrity: sha512-xUf0KTuTfVgWWW33sa7SopIPjpq1K7c8Ta/vYLI5FmEHTZ3uBc8FssEjXDXVkIv6HwO3DVI+5mhRfqlTrQSSNw==} @@ -8414,11 +8501,11 @@ packages: '@yarnpkg/libzip': 2.2.4 tslib: 1.14.1 - /@yarnpkg/fslib/3.0.0-rc.18: - resolution: {integrity: sha512-32TflNeNkkcA592MG9MNqN+lpzU6qpc93fFjRg4B3YUfjftGj32GLkF0NF8RMbIqq7qvCPeJdozHgBZsNlNSNA==} + /@yarnpkg/fslib/3.0.0-rc.15: + resolution: {integrity: sha512-fNhpyLLtjUsk7zU6Dabw1FcJDQGZ5oSeeD3XJbsFajYlbCsOi7/EztTfCW64pOLfN/BxD3p+dr1MU03DkDbFRw==} engines: {node: '>=14.15.0'} dependencies: - '@yarnpkg/libzip': 3.0.0-rc.18 + '@yarnpkg/libzip': 3.0.0-rc.15 tslib: 2.4.0 /@yarnpkg/libzip/2.2.4: @@ -8428,8 +8515,8 @@ packages: '@types/emscripten': 1.39.6 tslib: 1.14.1 - /@yarnpkg/libzip/3.0.0-rc.18: - resolution: {integrity: sha512-424cg+VcLF/QjJ/uWUKJsShQZO3tgeeWQrwIdDYxnAgQxJ4NdNGc5ru+3gDAzQOqrgc/JzHGlALUne/Wgug+qQ==} + /@yarnpkg/libzip/3.0.0-rc.15: + resolution: {integrity: sha512-9yhjUkzoukqaAKeddLzFcTdIaGpyyizak3rRpmVyHTCLezntPf3/S612c5rwQVOZWY4tJ4XGw4PPKGbe9Ni0aQ==} engines: {node: '>=14.15.0'} dependencies: '@types/emscripten': 1.39.6 @@ -8438,12 +8525,12 @@ packages: /@yarnpkg/lockfile/1.1.0: resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} - /@yarnpkg/nm/4.0.0-rc.14_typanion@3.12.0: + /@yarnpkg/nm/4.0.0-rc.14_typanion@3.9.0: resolution: {integrity: sha512-bPKKI6+IqDTLNUQcKYlphPov9iHDXmx9ktWrm1fT3xG65EyqpJR4pN5UnQ39uFbNqQvczj719yKwmVjsrVG1Bw==} engines: {node: '>=14.15.0'} dependencies: - '@yarnpkg/core': 4.0.0-rc.18_typanion@3.12.0 - '@yarnpkg/fslib': 3.0.0-rc.18 + '@yarnpkg/core': 4.0.0-rc.15_typanion@3.9.0 + '@yarnpkg/fslib': 3.0.0-rc.15 transitivePeerDependencies: - typanion @@ -8462,8 +8549,8 @@ packages: tslib: 1.14.1 dev: false - /@yarnpkg/parsers/3.0.0-rc.18: - resolution: {integrity: sha512-bnl6X1jTecByEg3YjCTxtXAEg+gwCiTA5qaK6391hqqbSijwH+42+D4crHvkLUJuquosGnu9oUDMHa4Wx42n5g==} + /@yarnpkg/parsers/3.0.0-rc.15: + resolution: {integrity: sha512-eVqfw2v7tcMZbYTfuF4vAWga/zIAhMJIuWJyOb+opNmQh1mi81XKJIU6eC8D6Ue5WIkDGf05cuzB6rFwO1hf+g==} engines: {node: '>=14.15.0'} dependencies: js-yaml: 3.14.1 @@ -8477,7 +8564,7 @@ packages: '@yarnpkg/fslib': 2.7.1 tslib: 1.14.1 - /@yarnpkg/shell/3.2.0-rc.8_typanion@3.12.0: + /@yarnpkg/shell/3.2.0-rc.8_typanion@3.9.0: resolution: {integrity: sha512-UEcdjx+0gUwa3N/fWfnlqae//b7cNc1Imla+W7jqc9XMoydk3CG5EISx+5KY2hjrhpaZ55bXUP9Z6q0mjo+KdA==} engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'} hasBin: true @@ -8485,7 +8572,7 @@ packages: '@yarnpkg/fslib': 2.7.1 '@yarnpkg/parsers': 2.5.1 chalk: 3.0.0 - clipanion: 3.2.0-rc.6_typanion@3.12.0 + clipanion: 3.2.0-rc.6_typanion@3.9.0 cross-spawn: 7.0.3 fast-glob: 3.2.12 micromatch: 4.0.5 @@ -8494,15 +8581,15 @@ packages: transitivePeerDependencies: - typanion - /@yarnpkg/shell/4.0.0-rc.18_typanion@3.12.0: - resolution: {integrity: sha512-GwkWDdeXePwQ2Mf0uC8tAVwSNa1SCkXdw1uKUbkHEndbrLzFifrp4A1uj6nRG64LwjL9UnWTWxGclIC4zK3x8w==} + /@yarnpkg/shell/4.0.0-rc.15_typanion@3.9.0: + resolution: {integrity: sha512-uFyvo4zKCEZN6cG5iOkKL2KsHj9Pw09DGWqpvefmw6puyGOMgpCHfdLAZZl3tCU4phc2a1GkUE1F/VQTi+ynxg==} engines: {node: '>=14.15.0'} hasBin: true dependencies: - '@yarnpkg/fslib': 3.0.0-rc.18 - '@yarnpkg/parsers': 3.0.0-rc.18 + '@yarnpkg/fslib': 3.0.0-rc.15 + '@yarnpkg/parsers': 3.0.0-rc.15 chalk: 3.0.0 - clipanion: 3.2.0-rc.6_typanion@3.12.0 + clipanion: 3.2.0-rc.6_typanion@3.9.0 cross-spawn: 7.0.3 fast-glob: 3.2.12 micromatch: 4.0.5 @@ -8832,8 +8919,8 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 - get-intrinsic: 1.1.3 + es-abstract: 1.20.1 + get-intrinsic: 1.1.2 is-string: 1.0.7 dev: false @@ -8847,7 +8934,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 es-shim-unscopables: 1.0.0 /arrify/1.0.1: @@ -8931,7 +9018,7 @@ packages: resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} engines: {node: '>=8'} dependencies: - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.18.9 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.2.0_@babel+types@7.19.0 @@ -9098,10 +9185,10 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001399 - electron-to-chromium: 1.4.249 + caniuse-lite: 1.0.30001385 + electron-to-chromium: 1.4.235 node-releases: 2.0.6 - update-browserslist-db: 1.0.9_browserslist@4.21.3 + update-browserslist-db: 1.0.5_browserslist@4.21.3 dev: true /bs-logger/0.2.6: @@ -9242,7 +9329,7 @@ packages: clone-response: 1.0.3 get-stream: 5.2.0 http-cache-semantics: 4.1.0 - keyv: 4.5.0 + keyv: 4.4.1 lowercase-keys: 2.0.0 normalize-url: 6.1.0 responselike: 2.0.1 @@ -9251,7 +9338,7 @@ packages: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: function-bind: 1.1.1 - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 /callsites/3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} @@ -9294,8 +9381,8 @@ packages: dependencies: path-temp: 2.0.0 - /caniuse-lite/1.0.30001399: - resolution: {integrity: sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==} + /caniuse-lite/1.0.30001385: + resolution: {integrity: sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==} dev: true /caseless/0.12.0: @@ -9354,8 +9441,8 @@ packages: /ci-info/2.0.0: resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} - /ci-info/3.4.0: - resolution: {integrity: sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==} + /ci-info/3.3.2: + resolution: {integrity: sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==} /cjs-module-lexer/1.2.2: resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==} @@ -9387,12 +9474,12 @@ packages: resolution: {integrity: sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==} dev: true - /clipanion/3.2.0-rc.6_typanion@3.12.0: + /clipanion/3.2.0-rc.6_typanion@3.9.0: resolution: {integrity: sha512-lcByFNxi1L/sskjD/YybFZI43bnkm/AuUNFcF5i5Znz6nvWCH9gfq4qkNmAk5MhS/MPY5Im8jiqYH54h23Vc7Q==} peerDependencies: typanion: '*' dependencies: - typanion: 3.12.0 + typanion: 3.9.0 /cliui/6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} @@ -9525,6 +9612,13 @@ packages: dot-prop: 5.3.0 dev: true + /compress-brotli/1.3.8: + resolution: {integrity: sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==} + engines: {node: '>= 12'} + dependencies: + '@types/json-buffer': 3.0.0 + json-buffer: 3.0.1 + /compressible/2.0.18: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} @@ -10023,7 +10117,7 @@ packages: resolution: {integrity: sha512-Plha9WCF08aSGB39IsOhlk0AHecwcXtq/gMbHgylRNEv7JV3lnlt7akfdax7mnUHndEuuh57CmBaKSSXns7+YA==} engines: {node: '>=12.13'} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.18.9 fastest-levenshtein: 1.0.16 lodash.deburr: 4.1.0 dev: false @@ -10118,8 +10212,8 @@ packages: /ee-first/1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - /electron-to-chromium/1.4.249: - resolution: {integrity: sha512-GMCxR3p2HQvIw47A599crTKYZprqihoBL4lDSAUmr7IYekXFK5t/WgEBrGJDCa2HWIZFQEkGuMqPCi05ceYqPQ==} + /electron-to-chromium/1.4.235: + resolution: {integrity: sha512-eNU2SmVZYTzYVA5aAWmhAJbdVil5/8H5nMq6kGD0Yxd4k2uKIuT8YmS46I0QXY7iOoPPcb6jjem9/2xyuH5+XQ==} dev: true /emittery/0.10.2: @@ -10175,21 +10269,21 @@ packages: dependencies: is-arrayish: 0.2.1 - /es-abstract/1.20.2: - resolution: {integrity: sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==} + /es-abstract/1.20.1: + resolution: {integrity: sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 es-to-primitive: 1.2.1 function-bind: 1.1.1 function.prototype.name: 1.1.5 - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 get-symbol-description: 1.0.0 has: 1.0.3 has-property-descriptors: 1.0.0 has-symbols: 1.0.3 internal-slot: 1.0.3 - is-callable: 1.2.5 + is-callable: 1.2.4 is-negative-zero: 2.0.2 is-regex: 1.1.4 is-shared-array-buffer: 1.0.2 @@ -10212,7 +10306,7 @@ packages: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} engines: {node: '>= 0.4'} dependencies: - is-callable: 1.2.5 + is-callable: 1.2.4 is-date-object: 1.0.5 is-symbol: 1.0.4 @@ -11209,7 +11303,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 functions-have-names: 1.2.3 /functional-red-black-tree/1.0.1: @@ -11302,8 +11396,8 @@ packages: tiny-each-async: 2.0.3 dev: false - /get-intrinsic/1.1.3: - resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==} + /get-intrinsic/1.1.2: + resolution: {integrity: sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==} dependencies: function-bind: 1.1.1 has: 1.0.3 @@ -11343,7 +11437,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 /getopts/2.3.0: resolution: {integrity: sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA==} @@ -11563,7 +11657,7 @@ packages: /has-property-descriptors/1.0.0: resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} dependencies: - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 /has-symbols/1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} @@ -11794,7 +11888,7 @@ packages: resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 has: 1.0.3 side-channel: 1.0.4 @@ -11865,8 +11959,8 @@ packages: resolution: {integrity: sha512-v5DA9z/rmk4UdJtb3N1jYqjvCA5roRVf5Q6vprHOcF6U/98TmAJ/AvbPeRMEOYWDW4eMr/pJj5Fnfe0T2wL1Bg==} engines: {node: '>=0.10.0'} - /is-callable/1.2.5: - resolution: {integrity: sha512-ZIWRujF6MvYGkEuHMYtFRkL2wAtFw89EHfKlXrkPkjQZZRWeh9L1q3SV13NIfHnqxugjLvAOkEHx9mb1zcMnEw==} + /is-callable/1.2.4: + resolution: {integrity: sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==} engines: {node: '>= 0.4'} /is-ci/2.0.0: @@ -11879,7 +11973,7 @@ packages: resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} hasBin: true dependencies: - ci-info: 3.4.0 + ci-info: 3.3.2 /is-core-module/2.10.0: resolution: {integrity: sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==} @@ -12168,7 +12262,7 @@ packages: '@jest/expect': 29.0.3 '@jest/test-result': 29.0.3 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -12235,7 +12329,7 @@ packages: '@types/node': 14.18.29 babel-jest: 29.0.3_kjikgjp2fr4mpnbv4b667rjo7y chalk: 4.1.2 - ci-info: 3.4.0 + ci-info: 3.3.2 deepmerge: 4.2.2 glob: 7.2.3 graceful-fs: 4.2.10 @@ -12258,7 +12352,7 @@ packages: - supports-color dev: true - /jest-config/29.0.3_mwv7abiyjbee3otg3oy7ew4v44: + /jest-config/29.0.3_sqomacscyibqsibz3on6xu2nni: resolution: {integrity: sha512-U5qkc82HHVYe3fNu2CRXLN4g761Na26rWKf7CjM8LlZB3In1jadEkZdMwsE37rd9RSPV0NfYaCjHdk/gu3v+Ew==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -12273,10 +12367,10 @@ packages: '@babel/core': 7.19.1 '@jest/test-sequencer': 29.0.3 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 babel-jest: 29.0.3_kjikgjp2fr4mpnbv4b667rjo7y chalk: 4.1.2 - ci-info: 3.4.0 + ci-info: 3.3.2 deepmerge: 4.2.2 glob: 7.2.3 graceful-fs: 4.2.10 @@ -12334,7 +12428,7 @@ packages: '@jest/environment': 29.0.3 '@jest/fake-timers': 29.0.3 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 jest-mock: 29.0.3 jest-util: 29.0.3 dev: true @@ -12350,7 +12444,7 @@ packages: dependencies: '@jest/types': 29.0.3 '@types/graceful-fs': 4.1.5 - '@types/node': 18.7.18 + '@types/node': 18.7.14 anymatch: 3.1.2 fb-watchman: 2.0.1 graceful-fs: 4.2.10 @@ -12401,7 +12495,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 dev: true /jest-pnp-resolver/1.2.2_jest-resolve@29.0.3: @@ -12455,7 +12549,7 @@ packages: '@jest/test-result': 29.0.3 '@jest/transform': 29.0.3_@babel+types@7.19.0 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 emittery: 0.10.2 graceful-fs: 4.2.10 @@ -12487,7 +12581,7 @@ packages: '@jest/test-result': 29.0.3 '@jest/transform': 29.0.3_@babel+types@7.19.0 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -12544,9 +12638,9 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 chalk: 4.1.2 - ci-info: 3.4.0 + ci-info: 3.3.2 graceful-fs: 4.2.10 picomatch: 2.3.1 dev: true @@ -12569,7 +12663,7 @@ packages: dependencies: '@jest/test-result': 29.0.3 '@jest/types': 29.0.3 - '@types/node': 18.7.18 + '@types/node': 18.7.14 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -12581,7 +12675,7 @@ packages: resolution: {integrity: sha512-Tl/YWUugQOjoTYwjKdfJWkSOfhufJHO5LhXTSZC3TRoQKO+fuXnZAdoXXBlpLXKGODBL3OvdUasfDD4PcMe6ng==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 18.7.18 + '@types/node': 18.7.14 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -12777,9 +12871,10 @@ packages: dependencies: tsscmp: 1.0.6 - /keyv/4.5.0: - resolution: {integrity: sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==} + /keyv/4.4.1: + resolution: {integrity: sha512-PzByhNxfBLnSBW2MZi1DF+W5+qB/7BMpOokewqIvqS8GFtP7xHm2oeGU72Y1fhtfOv/FiEnI4+nyViYDmUChnw==} dependencies: + compress-brotli: 1.3.8 json-buffer: 3.0.1 /kind-of/6.0.3: @@ -13858,7 +13953,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 dev: false /on-finished/2.4.1: @@ -15170,7 +15265,7 @@ packages: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: call-bind: 1.0.2 - get-intrinsic: 1.1.3 + get-intrinsic: 1.1.2 object-inspect: 1.12.2 /signal-exit/3.0.7: @@ -15476,8 +15571,8 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 - get-intrinsic: 1.1.3 + es-abstract: 1.20.1 + get-intrinsic: 1.1.2 has-symbols: 1.0.3 internal-slot: 1.0.3 regexp.prototype.flags: 1.4.3 @@ -15490,7 +15585,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 dev: true /string.prototype.replaceall/1.0.6: @@ -15498,8 +15593,8 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 - get-intrinsic: 1.1.3 + es-abstract: 1.20.1 + get-intrinsic: 1.1.2 has-symbols: 1.0.3 is-regex: 1.1.4 @@ -15508,14 +15603,14 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 /string.prototype.trimstart/1.0.5: resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==} dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.2 + es-abstract: 1.20.1 /string_decoder/1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -15613,8 +15708,8 @@ packages: has-flag: 4.0.0 dev: true - /supports-hyperlinks/2.3.0: - resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} + /supports-hyperlinks/2.2.0: + resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==} engines: {node: '>=8'} dependencies: has-flag: 4.0.0 @@ -15717,7 +15812,7 @@ packages: engines: {node: '>=8'} dependencies: ansi-escapes: 4.3.2 - supports-hyperlinks: 2.3.0 + supports-hyperlinks: 2.2.0 dev: true /test-exclude/6.0.0: @@ -16020,8 +16115,8 @@ packages: /tweetnacl/0.14.5: resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} - /typanion/3.12.0: - resolution: {integrity: sha512-o59ZobUBsG+2dHnGVI2shscqqzHdzCOixCU0t8YXLxM2Su42J2ha7hY9V5+6SIBjVsw6aLqrlYznCgQGJN4Kag==} + /typanion/3.9.0: + resolution: {integrity: sha512-7yPk67IIquhKQcUXOBM27vDuGmZf6oJbEmzgVfDniHCkT6+z4JnKY85nKqbstoec8Kp7hD06TP3Kc98ij43PIg==} /type-check/0.3.2: resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} @@ -16227,8 +16322,8 @@ packages: engines: {node: '>=8'} dev: true - /update-browserslist-db/1.0.9_browserslist@4.21.3: - resolution: {integrity: sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==} + /update-browserslist-db/1.0.5_browserslist@4.21.3: + resolution: {integrity: sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -16339,7 +16434,62 @@ packages: http-errors: 2.0.0 unix-crypt-td-js: 1.1.4 - /verdaccio/5.15.3_typanion@3.12.0: + /verdaccio/5.15.1_typanion@3.9.0: + resolution: {integrity: sha512-CyBAEx+toPM7OLnXK5fljy9K0kD4KIxEHyTs7E6cC30ou7ivcU93BaqLaN/4fsrs9/X1LGlxtJfoj+8TQzbxvg==} + engines: {node: '>=12', npm: '>=6'} + hasBin: true + dependencies: + '@verdaccio/commons-api': 10.2.0 + '@verdaccio/local-storage': 10.3.1 + '@verdaccio/readme': 10.4.1 + '@verdaccio/streams': 10.2.0 + '@verdaccio/ui-theme': 6.0.0-6-next.28 + JSONStream: 1.3.5 + async: 3.2.4 + body-parser: 1.20.0 + clipanion: 3.2.0-rc.6_typanion@3.9.0 + compression: 1.7.4 + cookies: 0.8.0 + cors: 2.8.5 + dayjs: 1.11.5 + debug: 4.3.4 + envinfo: 7.8.1 + eslint-import-resolver-node: 0.3.6 + express: 4.18.1 + express-rate-limit: 5.5.1 + fast-safe-stringify: 2.1.1 + handlebars: 4.7.7 + http-errors: 2.0.0 + js-yaml: /@zkochan/js-yaml/0.0.6 + jsonwebtoken: 8.5.1 + kleur: 4.1.5 + lodash: 4.17.21 + lru-cache: 7.14.0 + lunr-mutable-indexes: 2.3.2 + marked: 4.1.0 + memoizee: 0.4.15 + mime: 3.0.0 + minimatch: 5.1.0 + mkdirp: 1.0.4 + mv: 2.1.1 + pino: 6.14.0 + pkginfo: 0.4.1 + prettier-bytes: 1.0.4 + pretty-ms: 7.0.1 + request: 2.88.0 + semver: 7.3.7 + validator: 13.7.0 + verdaccio-audit: 10.2.2 + verdaccio-htpasswd: 10.5.0 + transitivePeerDependencies: + - bufferutil + - canvas + - encoding + - supports-color + - typanion + - utf-8-validate + + /verdaccio/5.15.3_typanion@3.9.0: resolution: {integrity: sha512-8oEtepXF1oksGVYahi2HS1Yx9u6HD/4ukBDNDfwISmlNp7HVKJL2+kjzmDJWam88BpDNxOBU/LFXWSsEAFKFCQ==} engines: {node: '>=12', npm: '>=6'} hasBin: true @@ -16352,7 +16502,7 @@ packages: JSONStream: 1.3.5 async: 3.2.4 body-parser: 1.20.0 - clipanion: 3.2.0-rc.6_typanion@3.12.0 + clipanion: 3.2.0-rc.6_typanion@3.9.0 compression: 1.7.4 cookies: 0.8.0 cors: 2.8.5 @@ -16393,6 +16543,7 @@ packages: - supports-color - typanion - utf-8-validate + dev: true /verror/1.10.0: resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} From a496ea7b1cec6e4e7bdba77a06aa5eb3e129ef26 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 25 Sep 2022 22:52:34 +0300 Subject: [PATCH 8/8] docs: add changesets --- .changeset/breezy-weeks-rescue.md | 6 ++++++ .changeset/plenty-terms-count.md | 6 ++++++ .changeset/tender-radios-hug.md | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 .changeset/breezy-weeks-rescue.md create mode 100644 .changeset/plenty-terms-count.md create mode 100644 .changeset/tender-radios-hug.md diff --git a/.changeset/breezy-weeks-rescue.md b/.changeset/breezy-weeks-rescue.md new file mode 100644 index 00000000000..4812b2cb918 --- /dev/null +++ b/.changeset/breezy-weeks-rescue.md @@ -0,0 +1,6 @@ +--- +"@pnpm/plugin-commands-deploy": patch +"pnpm": patch +--- + +Hooks should be applied on `pnpm deploy` [#5306](https://github.com/pnpm/pnpm/issues/5306). diff --git a/.changeset/plenty-terms-count.md b/.changeset/plenty-terms-count.md new file mode 100644 index 00000000000..43286f17180 --- /dev/null +++ b/.changeset/plenty-terms-count.md @@ -0,0 +1,6 @@ +--- +"@pnpm/core": major +"@pnpm/default-reporter": major +--- + +Accept an array of hooks. diff --git a/.changeset/tender-radios-hug.md b/.changeset/tender-radios-hug.md new file mode 100644 index 00000000000..13e298dc01f --- /dev/null +++ b/.changeset/tender-radios-hug.md @@ -0,0 +1,5 @@ +--- +"@pnpm/get-context": major +--- + +Pass readPackageHook as a separate option not as a subproperty of `hooks`.