From fcf91a64d2e80a091778fbdbb819f919dd2b2ade Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Thu, 13 Jan 2022 14:12:18 +0200 Subject: [PATCH] fix: override symlinks in node modules when node-linker=hoisted (#4229) --- .changeset/serious-geese-suffer.md | 5 + packages/cafs/package.json | 2 +- .../core/test/hoistedNodeLinker/install.ts | 15 + packages/make-dedicated-lockfile/package.json | 2 +- packages/npm-resolver/package.json | 2 +- packages/package-requester/package.json | 2 +- packages/package-store/package.json | 2 +- packages/plugin-commands-env/package.json | 2 +- pnpm-lock.yaml | 271 +++++++++--------- 9 files changed, 162 insertions(+), 141 deletions(-) create mode 100644 .changeset/serious-geese-suffer.md diff --git a/.changeset/serious-geese-suffer.md b/.changeset/serious-geese-suffer.md new file mode 100644 index 0000000000..b1e1e4dac4 --- /dev/null +++ b/.changeset/serious-geese-suffer.md @@ -0,0 +1,5 @@ +--- +"pnpm": patch +--- + +During installation, override any symlinks in `node_modules`. This was an issue only with `node-linker=hoisted`. diff --git a/packages/cafs/package.json b/packages/cafs/package.json index eb99a66e8a..a39c825033 100644 --- a/packages/cafs/package.json +++ b/packages/cafs/package.json @@ -25,7 +25,7 @@ "get-stream": "^6.0.0", "p-limit": "^3.1.0", "path-temp": "^2.0.0", - "rename-overwrite": "^4.0.0", + "rename-overwrite": "^4.0.1", "ssri": "^8.0.1", "strip-bom": "^4.0.0", "tar-stream": "^2.2.0" diff --git a/packages/core/test/hoistedNodeLinker/install.ts b/packages/core/test/hoistedNodeLinker/install.ts index b0f50e9499..95ebef4124 100644 --- a/packages/core/test/hoistedNodeLinker/install.ts +++ b/packages/core/test/hoistedNodeLinker/install.ts @@ -4,6 +4,7 @@ import { addDependenciesToPackage, install, mutateModules } from '@pnpm/core' import { prepareEmpty } from '@pnpm/prepare' import { sync as loadJsonFile } from 'load-json-file' import { sync as readYamlFile } from 'read-yaml-file' +import symlinkDir from 'symlink-dir' import { addDistTag, testDefaults } from '../utils' test('installing with hoisted node-linker', async () => { @@ -64,6 +65,20 @@ test('overwriting (is-positive@3.0.0 with is-positive@latest)', async () => { expect(loadJsonFile<{ version: string }>('node_modules/is-positive/package.json').version).toBe('3.1.0') }) +test('overwriting existing files in node_modules', async () => { + prepareEmpty() + await symlinkDir(__dirname, path.resolve('node_modules/is-positive')) + + const manifest = await addDependenciesToPackage( + {}, + ['is-positive@3.0.0'], + await testDefaults({ nodeLinker: 'hoisted', save: true }) + ) + + expect(manifest.dependencies?.['is-positive']).toBe('3.0.0') + expect(loadJsonFile<{ version: string }>('node_modules/is-positive/package.json').version).toBe('3.0.0') +}) + test('preserve subdeps on update', async () => { prepareEmpty() diff --git a/packages/make-dedicated-lockfile/package.json b/packages/make-dedicated-lockfile/package.json index 98553a5669..9f606463b6 100644 --- a/packages/make-dedicated-lockfile/package.json +++ b/packages/make-dedicated-lockfile/package.json @@ -42,7 +42,7 @@ "@pnpm/read-project-manifest": "workspace:2.0.11", "@pnpm/types": "workspace:7.9.0", "ramda": "^0.27.1", - "rename-overwrite": "^4.0.0" + "rename-overwrite": "^4.0.1" }, "funding": "https://opencollective.com/pnpm", "devDependencies": { diff --git a/packages/npm-resolver/package.json b/packages/npm-resolver/package.json index 9f1c2dc156..86fdd54223 100644 --- a/packages/npm-resolver/package.json +++ b/packages/npm-resolver/package.json @@ -50,7 +50,7 @@ "p-memoize": "4.0.1", "parse-npm-tarball-url": "^3.0.0", "path-temp": "^2.0.0", - "rename-overwrite": "^4.0.0", + "rename-overwrite": "^4.0.1", "semver": "^7.3.4", "ssri": "^8.0.1", "version-selector-type": "^3.0.0" diff --git a/packages/package-requester/package.json b/packages/package-requester/package.json index 2e0733212c..195435da5f 100644 --- a/packages/package-requester/package.json +++ b/packages/package-requester/package.json @@ -56,7 +56,7 @@ "path-temp": "^2.0.0", "promise-share": "^1.0.0", "ramda": "^0.27.1", - "rename-overwrite": "^4.0.0", + "rename-overwrite": "^4.0.1", "semver": "^7.3.4", "ssri": "^8.0.1" }, diff --git a/packages/package-store/package.json b/packages/package-store/package.json index 13a0eafe3d..33778df2af 100644 --- a/packages/package-store/package.json +++ b/packages/package-store/package.json @@ -30,7 +30,7 @@ "path-exists": "^4.0.0", "path-temp": "^2.0.0", "ramda": "^0.27.1", - "rename-overwrite": "^4.0.0", + "rename-overwrite": "^4.0.1", "sanitize-filename": "^1.6.3", "ssri": "^8.0.1", "write-json-file": "^4.3.0" diff --git a/packages/plugin-commands-env/package.json b/packages/plugin-commands-env/package.json index 7800ed8bdd..f984232b76 100644 --- a/packages/plugin-commands-env/package.json +++ b/packages/plugin-commands-env/package.json @@ -41,7 +41,7 @@ "@zkochan/cmd-shim": "^5.2.1", "adm-zip": "^0.5.5", "load-json-file": "^6.2.0", - "rename-overwrite": "^4.0.0", + "rename-overwrite": "^4.0.1", "render-help": "^1.0.1", "semver": "^7.3.4", "tempy": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2265760eae..7e02a21831 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,7 +194,7 @@ importers: '@pnpm/store-controller-types': link:../store-controller-types '@pnpm/types': link:../types graph-sequencer: 2.0.0 - ramda: 0.27.1 + ramda: 0.27.2 run-groups: 3.0.1 devDependencies: '@pnpm/build-modules': 'link:' @@ -217,7 +217,7 @@ importers: get-stream: ^6.0.0 p-limit: ^3.1.0 path-temp: ^2.0.0 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 ssri: ^8.0.1 strip-bom: ^4.0.0 tar-stream: ^2.2.0 @@ -232,7 +232,7 @@ importers: get-stream: 6.0.1 p-limit: 3.1.0 path-temp: 2.0.0 - rename-overwrite: 4.0.0 + rename-overwrite: 4.0.1 ssri: 8.0.1 strip-bom: 4.0.0 tar-stream: 2.2.0 @@ -358,7 +358,7 @@ importers: can-write-to-dir: 1.1.1 is-subdir: 1.2.0 normalize-registry-url: 2.0.0 - ramda: 0.27.1 + ramda: 0.27.2 realpath-missing: 1.1.0 which: 2.0.2 devDependencies: @@ -501,7 +501,7 @@ importers: p-limit: 3.1.0 path-absolute: 1.0.1 path-exists: 4.0.0 - ramda: 0.27.1 + ramda: 0.27.2 run-groups: 3.0.1 semver: 7.3.5 version-selector-type: 3.0.0 @@ -588,7 +588,7 @@ importers: normalize-path: 3.0.0 pretty-bytes: 5.6.0 pretty-ms: 7.0.1 - ramda: 0.27.1 + ramda: 0.27.2 right-pad: 1.0.1 rxjs: 7.5.2 semver: 7.3.5 @@ -696,7 +696,7 @@ importers: '@pnpm/read-project-manifest': link:../read-project-manifest '@pnpm/resolver-base': link:../resolver-base npm-packlist: 3.0.0 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/directory-fetcher': 'link:' '@pnpm/test-fixtures': link:../../privatePackages/test-fixtures @@ -740,7 +740,7 @@ importers: '@pnpm/error': link:../error '@pnpm/read-project-manifest': link:../read-project-manifest '@pnpm/types': link:../types - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/exportable-manifest': 'link:' '@types/ramda': 0.27.39 @@ -833,7 +833,7 @@ importers: '@pnpm/package-is-installable': link:../package-is-installable '@pnpm/types': link:../types dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/filter-lockfile': 'link:' '@pnpm/logger': 4.0.0 @@ -872,7 +872,7 @@ importers: is-subdir: 1.2.0 micromatch: 4.0.4 pkgs-graph: link:../pkgs-graph - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/filter-workspace-packages': 'link:' '@types/is-ci': 3.0.0 @@ -956,7 +956,7 @@ importers: '@zkochan/rimraf': 2.1.1 is-ci: 3.0.1 path-absolute: 1.0.1 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/get-context': 'link:' '@pnpm/logger': 4.0.0 @@ -1115,7 +1115,7 @@ importers: p-limit: 3.1.0 path-absolute: 1.0.1 path-exists: 4.0.0 - ramda: 0.27.1 + ramda: 0.27.2 realpath-missing: 1.1.0 devDependencies: '@pnpm/assert-project': link:../../privatePackages/assert-project @@ -1165,7 +1165,7 @@ importers: '@pnpm/symlink-dependency': link:../symlink-dependency '@pnpm/types': link:../types dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/hoist': 'link:' '@pnpm/logger': 4.0.0 @@ -1244,7 +1244,7 @@ importers: is-windows: 1.0.2 normalize-path: 3.0.0 p-settle: 4.1.1 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/link-bins': 'link:' '@pnpm/logger': 4.0.0 @@ -1287,7 +1287,7 @@ importers: cli-columns: 4.0.0 dependencies-hierarchy: link:../dependencies-hierarchy p-limit: 3.1.0 - ramda: 0.27.1 + ramda: 0.27.2 semver: 7.3.5 devDependencies: '@pnpm/list': 'link:' @@ -1356,7 +1356,7 @@ importers: comver-to-semver: 1.0.0 js-yaml: /@zkochan/js-yaml/0.0.5 normalize-path: 3.0.0 - ramda: 0.27.1 + ramda: 0.27.2 semver: 7.3.5 sort-keys: 4.2.0 strip-bom: 4.0.0 @@ -1397,7 +1397,7 @@ importers: '@yarnpkg/pnp': 2.3.2 dependency-path: link:../dependency-path normalize-path: 3.0.0 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/lockfile-to-pnp': 'link:' '@pnpm/logger': 4.0.0 @@ -1434,7 +1434,7 @@ importers: '@pnpm/types': link:../types dependency-path: link:../dependency-path get-npm-tarball-url: 2.0.3 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/lockfile-utils': 'link:' '@types/js-yaml': 4.0.5 @@ -1456,7 +1456,7 @@ importers: '@pnpm/lockfile-types': link:../lockfile-types '@pnpm/types': link:../types dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/lockfile-walker': 'link:' '@types/ramda': 0.27.39 @@ -1477,7 +1477,7 @@ importers: '@pnpm/types': workspace:7.9.0 '@types/ramda': 0.27.39 ramda: ^0.27.1 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 dependencies: '@pnpm/error': link:../error '@pnpm/exec': 2.0.0 @@ -1488,8 +1488,8 @@ importers: '@pnpm/prune-lockfile': link:../prune-lockfile '@pnpm/read-project-manifest': link:../read-project-manifest '@pnpm/types': link:../types - ramda: 0.27.1 - rename-overwrite: 4.0.0 + ramda: 0.27.2 + rename-overwrite: 4.0.1 devDependencies: '@pnpm/make-dedicated-lockfile': 'link:' '@pnpm/test-fixtures': link:../../privatePackages/test-fixtures @@ -1529,7 +1529,7 @@ importers: dependencies: '@pnpm/lockfile-types': link:../lockfile-types comver-to-semver: 1.0.0 - ramda: 0.27.1 + ramda: 0.27.2 semver: 7.3.5 devDependencies: '@pnpm/merge-lockfile-changes': 'link:' @@ -1563,7 +1563,7 @@ importers: '@pnpm/types': link:../types '@zkochan/rimraf': 2.1.1 dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/logger': 4.0.0 '@pnpm/modules-cleaner': 'link:' @@ -1680,7 +1680,7 @@ importers: parse-npm-tarball-url: ^3.0.0 path-exists: ^4.0.0 path-temp: ^2.0.0 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 semver: ^7.3.4 ssri: ^8.0.1 tempy: ^1.0.0 @@ -1702,7 +1702,7 @@ importers: p-memoize: 4.0.1 parse-npm-tarball-url: 3.0.0 path-temp: 2.0.0 - rename-overwrite: 4.0.0 + rename-overwrite: 4.0.1 semver: 7.3.5 ssri: 8.0.1 version-selector-type: 3.0.0 @@ -1751,7 +1751,7 @@ importers: '@pnpm/pick-registry-for-package': link:../pick-registry-for-package '@pnpm/types': link:../types dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 semver: 7.3.5 devDependencies: '@pnpm/logger': 4.0.0 @@ -1830,7 +1830,7 @@ importers: path-temp: ^2.0.0 promise-share: ^1.0.0 ramda: ^0.27.1 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 semver: ^7.3.4 ssri: ^8.0.1 tempy: ^1.0.0 @@ -1852,8 +1852,8 @@ importers: p-queue: 6.6.2 path-temp: 2.0.0 promise-share: 1.0.0 - ramda: 0.27.1 - rename-overwrite: 4.0.0 + ramda: 0.27.2 + rename-overwrite: 4.0.1 semver: 7.3.5 ssri: 8.0.1 devDependencies: @@ -1894,7 +1894,7 @@ importers: path-exists: ^4.0.0 path-temp: ^2.0.0 ramda: ^0.27.1 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 sanitize-filename: ^1.6.3 ssri: ^8.0.1 tempy: ^1.0.0 @@ -1914,8 +1914,8 @@ importers: p-limit: 3.1.0 path-exists: 4.0.0 path-temp: 2.0.0 - ramda: 0.27.1 - rename-overwrite: 4.0.0 + ramda: 0.27.2 + rename-overwrite: 4.0.1 sanitize-filename: 1.6.3 ssri: 8.0.1 write-json-file: 4.3.0 @@ -1987,7 +1987,7 @@ importers: dependencies: '@pnpm/resolve-workspace-range': link:../resolve-workspace-range '@zkochan/npm-package-arg': 2.0.1 - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@types/ramda': 0.27.39 better-path-resolve: 1.0.0 @@ -2026,7 +2026,7 @@ importers: '@pnpm/types': link:../types '@zkochan/table': 1.0.0 chalk: 4.1.2 - ramda: 0.27.1 + ramda: 0.27.2 render-help: 1.0.2 devDependencies: '@pnpm/plugin-commands-audit': 'link:' @@ -2058,7 +2058,7 @@ importers: nock: 12.0.3 node-fetch: 3.0.0-beta.9 path-name: ^1.0.0 - rename-overwrite: ^4.0.0 + rename-overwrite: ^4.0.1 render-help: ^1.0.1 semver: ^7.3.4 tempy: ^1.0.0 @@ -2076,7 +2076,7 @@ importers: '@zkochan/cmd-shim': 5.2.1 adm-zip: 0.5.9 load-json-file: 6.2.0 - rename-overwrite: 4.0.0 + rename-overwrite: 4.0.1 render-help: 1.0.2 semver: 7.3.5 tempy: 1.0.1 @@ -2204,7 +2204,7 @@ importers: p-limit: 3.1.0 path-absolute: 1.0.1 path-exists: 4.0.0 - ramda: 0.27.1 + ramda: 0.27.2 read-ini-file: 3.1.0 render-help: 1.0.2 version-selector-type: 3.0.0 @@ -2260,7 +2260,7 @@ importers: '@pnpm/error': link:../error '@pnpm/list': link:../list '@pnpm/types': link:../types - ramda: 0.27.1 + ramda: 0.27.2 render-help: 1.0.2 devDependencies: '@pnpm/constants': link:../constants @@ -2326,7 +2326,7 @@ importers: '@zkochan/table': 1.0.0 chalk: 4.1.2 lru-cache: 6.0.0 - ramda: 0.27.1 + ramda: 0.27.2 render-help: 1.0.2 strip-ansi: 6.0.1 wrap-ansi: 7.0.0 @@ -2405,7 +2405,7 @@ importers: fast-glob: 3.2.10 npm-packlist: 3.0.0 p-filter: 2.1.0 - ramda: 0.27.1 + ramda: 0.27.2 realpath-missing: 1.1.0 render-help: 1.0.2 tar-stream: 2.2.0 @@ -2500,7 +2500,7 @@ importers: load-json-file: 6.2.0 mem: 8.1.1 p-limit: 3.1.0 - ramda: 0.27.1 + ramda: 0.27.2 read-ini-file: 3.1.0 render-help: 1.0.2 run-groups: 3.0.1 @@ -2564,7 +2564,7 @@ importers: p-limit: 3.1.0 path-exists: 4.0.0 path-name: 1.0.0 - ramda: 0.27.1 + ramda: 0.27.2 realpath-missing: 1.1.0 render-help: 1.0.2 devDependencies: @@ -2615,7 +2615,7 @@ importers: get-port: 5.1.1 is-windows: 1.0.2 process-exists: 4.1.0 - ramda: 0.27.1 + ramda: 0.27.2 render-help: 1.0.2 signal-exit: 3.0.6 tree-kill: 1.2.2 @@ -2698,7 +2698,7 @@ importers: dint: 5.1.0 load-json-file: 6.2.0 p-filter: 2.1.0 - ramda: 0.27.1 + ramda: 0.27.2 render-help: 1.0.2 devDependencies: '@pnpm/assert-store': link:../../privatePackages/assert-store @@ -2881,7 +2881,7 @@ importers: path-name: 1.0.0 pkgs-graph: link:../pkgs-graph ps-list: 7.2.0 - ramda: 0.27.1 + ramda: 0.27.2 read-yaml-file: 2.1.0 render-help: 1.0.2 semver: 7.3.5 @@ -2948,7 +2948,7 @@ importers: '@pnpm/lockfile-types': link:../lockfile-types '@pnpm/types': link:../types dependency-path: link:../dependency-path - ramda: 0.27.1 + ramda: 0.27.2 devDependencies: '@pnpm/prune-lockfile': 'link:' '@types/ramda': 0.27.39 @@ -3153,7 +3153,7 @@ importers: is-inner-link: 4.0.0 is-subdir: 1.2.0 path-exists: 4.0.0 - ramda: 0.27.1 + ramda: 0.27.2 replace-string: 3.1.0 semver: 7.3.5 semver-range-intersect: 0.3.1 @@ -3336,7 +3336,7 @@ importers: '@pnpm/graceful-fs': link:../graceful-fs '@pnpm/prepare-package': link:../prepare-package '@zkochan/retry': 0.2.0 - ramda: 0.27.1 + ramda: 0.27.2 ssri: 8.0.1 devDependencies: '@pnpm/fetch': link:../fetch @@ -3541,7 +3541,7 @@ importers: '@babel/register': ^7.13.16 '@pnpm/ts-execution-runtime': workspace:* devDependencies: - '@babel/register': 7.16.8_@babel+core@7.16.7 + '@babel/register': 7.16.9_@babel+core@7.16.7 '@pnpm/ts-execution-runtime': 'link:' utils/tsconfig: @@ -3968,8 +3968,8 @@ packages: - supports-color dev: true - /@babel/register/7.16.8_@babel+core@7.16.7: - resolution: {integrity: sha512-aoUj2ocH92k7qyyA59y07sUaCVxxS7VjNul/jR0mpAyYvpo6n5HELZmyUGtrgFm7/1b0UutT7I1w/4bAkXxCHA==} + /@babel/register/7.16.9_@babel+core@7.16.7: + resolution: {integrity: sha512-jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -4734,28 +4734,29 @@ packages: resolution: {integrity: sha512-61tmh+k7hnKK6b2XbF4GvxmiaF3l2a+xQlZyeoOGBs7mXU3Ie8iCAeAnM0+r70KiqTrgWvBCjMeM+W3JarJqaQ==} engines: {node: '>=12.17'} - /@pnpm/cli-meta/2.0.0: - resolution: {integrity: sha512-quVITr3ypKbmU0aEO7BJZJ6zPZNTTVofUE/Mdpr5B/ZG3QYPl66wsIRPY9stq3LoA5BqzYwWNaP55XLAuHJw1w==} + /@pnpm/cli-meta/2.0.1: + resolution: {integrity: sha512-EBIq/9WWjF8dp4OQyjsSXkTgHW2DHWTWm/uhyoYQXZlB3ZxPDxSLdteLo1KjKR0wVMeTR6hothfQnJH3FSYXoA==} engines: {node: '>=12.17'} dependencies: + '@pnpm/types': 7.9.0 load-json-file: 6.2.0 dev: true - /@pnpm/cli-utils/0.6.43_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-0A7r8tiEALOfboh1KQLqbEQ1Y4G+hMQF3lHgD4qBoMcNVJ/i/y4ZbZ/d+PsL1P+3Np4GGK6zym56aJVc8sqkLQ==} + /@pnpm/cli-utils/0.6.44_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-L/T7YDsqm5W3n+ysp3rncCQl+1XCQJLBY53l8RknCGHmpUF0zNss0aptBFJVaGsQcm2bh5dBNzAt3Vwn2mUN1w==} engines: {node: '>=12.17'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/cli-meta': 2.0.0 - '@pnpm/config': 13.9.0_@pnpm+logger@4.0.0 - '@pnpm/default-reporter': 8.5.6_@pnpm+logger@4.0.0 + '@pnpm/cli-meta': 2.0.1 + '@pnpm/config': 13.10.0_@pnpm+logger@4.0.0 + '@pnpm/default-reporter': 8.5.7_@pnpm+logger@4.0.0 '@pnpm/error': 2.0.0 '@pnpm/logger': 4.0.0 - '@pnpm/manifest-utils': 2.1.5_@pnpm+logger@4.0.0 - '@pnpm/package-is-installable': 5.0.10_@pnpm+logger@4.0.0 - '@pnpm/read-project-manifest': 2.0.10 - '@pnpm/types': 7.8.0 + '@pnpm/manifest-utils': 2.1.6_@pnpm+logger@4.0.0 + '@pnpm/package-is-installable': 5.0.11_@pnpm+logger@4.0.0 + '@pnpm/read-project-manifest': 2.0.11 + '@pnpm/types': 7.9.0 chalk: 4.1.2 load-json-file: 6.2.0 dev: true @@ -4767,22 +4768,22 @@ packages: chalk: 4.1.2 dev: false - /@pnpm/config/13.9.0_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-DQVxpM+QWRPLC4F62IMWLKK9ZU71Ik0crjHxSUBf6i1+7wg9AQfAV2S7b6y+BUXHbF3lrLPlddpEXoBznzupjA==} + /@pnpm/config/13.10.0_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-rLBzzSskXcWXtmLQgoq57AsAzkddJ/0suCftIJ2UX6cx0IASg6s4exxUTpfxWWVmIuKGhwUuESomwwJ/kT/TzQ==} engines: {node: '>=12.17'} dependencies: '@pnpm/constants': 5.0.0 '@pnpm/error': 2.0.0 '@pnpm/global-bin-dir': 3.0.0 - '@pnpm/pnpmfile': 1.2.3_@pnpm+logger@4.0.0 - '@pnpm/read-project-manifest': 2.0.10 - '@pnpm/types': 7.8.0 + '@pnpm/pnpmfile': 1.2.4_@pnpm+logger@4.0.0 + '@pnpm/read-project-manifest': 2.0.11 + '@pnpm/types': 7.9.0 '@zkochan/npm-conf': 2.0.2 camelcase: 6.3.0 can-write-to-dir: 1.1.1 is-subdir: 1.2.0 normalize-registry-url: 2.0.0 - ramda: 0.27.1 + ramda: 0.27.2 realpath-missing: 1.1.0 which: 2.0.2 transitivePeerDependencies: @@ -4794,35 +4795,35 @@ packages: engines: {node: '>=12.17'} dev: true - /@pnpm/core-loggers/6.1.2_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-cgjNERR/nH0N6CxkbEUdBZg9F2Okyr7poM2fPkpx3uGv3gMFRptdsQTMWRj206QZtUmuR/qT3y2/WQZOFwndNw==} + /@pnpm/core-loggers/6.1.3_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-X3mEhYz+8DKy4Xxbr24tGK9jPD+1AIhigGiJ9Fd0q+ywHXQ6ECSFyGGikKEAlBQIKVJxG788Mi0Zo13TU91fEQ==} engines: {node: '>=12.17'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: '@pnpm/logger': 4.0.0 - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 dev: true - /@pnpm/default-reporter/8.5.6_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-97qRLD13weaJyEHBzkAu4Zxd3z5g5VuUk6BBPmB0Ck0aAavzz15uorOFt63YhkE7gnQfXORe075RlN/Hn1bXJw==} + /@pnpm/default-reporter/8.5.7_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-r2Vpzwq3ulEgkNBCiZVKgOmXFVNCFZzudU1xCwvKmfuVu6n3BUn0ISZW16v9qfedf3XF+tJLs+KD2S8XCTQbYg==} engines: {node: '>=12.17'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/config': 13.9.0_@pnpm+logger@4.0.0 - '@pnpm/core-loggers': 6.1.2_@pnpm+logger@4.0.0 + '@pnpm/config': 13.10.0_@pnpm+logger@4.0.0 + '@pnpm/core-loggers': 6.1.3_@pnpm+logger@4.0.0 '@pnpm/error': 2.0.0 '@pnpm/logger': 4.0.0 - '@pnpm/render-peer-issues': 1.1.0 - '@pnpm/types': 7.8.0 + '@pnpm/render-peer-issues': 1.1.1 + '@pnpm/types': 7.9.0 ansi-diff: 1.1.1 boxen: 5.1.2 chalk: 4.1.2 normalize-path: 3.0.0 pretty-bytes: 5.6.0 pretty-ms: 7.0.1 - ramda: 0.27.1 + ramda: 0.27.2 right-pad: 1.0.1 rxjs: 7.5.2 semver: 7.3.5 @@ -4852,14 +4853,14 @@ packages: find-up: 5.0.0 dev: true - /@pnpm/find-workspace-packages/3.1.35_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-To9+BFr5xnZ6L6WSr2LqsD1A1F4AE86P4sztdr6AjOdNT5Ir1vqFVmKZrbmKb2677hxvUDZt3y2yPXi0vTxuPw==} + /@pnpm/find-workspace-packages/3.1.36_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-h0chXRjLubzDoYvgSKnZLrJSa7jkSfGfbrnxdIbBRqNuZYfkj5BqrrG9ku2/yTeWxRqRp+N6tv8AaGLBG9b7HA==} engines: {node: '>=12.17'} dependencies: - '@pnpm/cli-utils': 0.6.43_@pnpm+logger@4.0.0 + '@pnpm/cli-utils': 0.6.44_@pnpm+logger@4.0.0 '@pnpm/constants': 5.0.0 - '@pnpm/types': 7.8.0 - find-packages: 8.0.10 + '@pnpm/types': 7.9.0 + find-packages: 8.0.11 read-yaml-file: 2.1.0 transitivePeerDependencies: - '@pnpm/logger' @@ -4881,11 +4882,11 @@ packages: graceful-fs: 4.2.9 dev: true - /@pnpm/lockfile-types/3.1.4: - resolution: {integrity: sha512-THyEIEfGje5ey3PIPGZz9T3xbOAKGmFcX1fbK+QUJNT0fiP53FGUq93Q0nstHQZ8K5yNKiApp6hzQ+uxIa/F+w==} + /@pnpm/lockfile-types/3.1.5: + resolution: {integrity: sha512-/OAKTwvpuav0pVwyQ7PvhO48I9bt2p7v2KYiIw+jNTH85mrirfuElRCQvCAFqLyPbGaYv1wo2fWvJkS8IUOi4w==} engines: {node: '>=12.17'} dependencies: - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 dev: true /@pnpm/logger/4.0.0: @@ -4895,13 +4896,13 @@ packages: bole: 4.0.0 ndjson: 2.0.0 - /@pnpm/manifest-utils/2.1.5_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-ez3n87YxntuZNY4DEJow+Dd6h4ibaNIFhQiowKApq65BaYyDHOkY+Un0q9oychsbNuNV//NNu9Gc1vWBhGv6pg==} + /@pnpm/manifest-utils/2.1.6_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-Pwlj/3P0GtNnB5P9yfcmPUFxD9PQT4osZER21ARVIcho6kYFbqCL0vDyfXgAvosyOKt5M5ccbqoirQ5ucNS3xQ==} engines: {node: '>=12.17'} dependencies: - '@pnpm/core-loggers': 6.1.2_@pnpm+logger@4.0.0 + '@pnpm/core-loggers': 6.1.3_@pnpm+logger@4.0.0 '@pnpm/error': 2.0.0 - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 transitivePeerDependencies: - '@pnpm/logger' dev: true @@ -4912,13 +4913,13 @@ packages: hasBin: true dependencies: '@pnpm/find-workspace-dir': 3.0.1 - '@pnpm/find-workspace-packages': 3.1.35_@pnpm+logger@4.0.0 + '@pnpm/find-workspace-packages': 3.1.36_@pnpm+logger@4.0.0 '@pnpm/logger': 4.0.0 - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 load-json-file: 6.2.0 meow: 10.1.2 print-diff: 1.0.0 - ramda: 0.27.1 + ramda: 0.27.2 write-json-file: 4.3.0 dev: true @@ -4945,44 +4946,44 @@ packages: - supports-color dev: false - /@pnpm/package-is-installable/5.0.10_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-p5qYJvZY2PJSPjKKjBXeddpokxvOw5ybWij+VljB4Ms3Rkas/X9zn0IfPP1BuhVvyTNDda7s5RD4WDmEsXnCSA==} + /@pnpm/package-is-installable/5.0.11_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-vb5j1WbhuuZbm1hHhbCDGvMqLVVZ8/aSbIrofTl+bXFGAdWjKjBSNL3eXfp8ZANiME/iQLoeJ/kJ9uiHAMv0Iw==} engines: {node: '>=12.17'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/core-loggers': 6.1.2_@pnpm+logger@4.0.0 + '@pnpm/core-loggers': 6.1.3_@pnpm+logger@4.0.0 '@pnpm/error': 2.0.0 '@pnpm/logger': 4.0.0 - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 execa: /safe-execa/0.1.1 mem: 8.1.1 semver: 7.3.5 dev: true - /@pnpm/pnpmfile/1.2.3_@pnpm+logger@4.0.0: - resolution: {integrity: sha512-vo2ad88E7TqVfEz94SWdVddzPGG1SYA4sve5QYlGAkhPn5zAOvW8eRyspM3R1kFeDA3HNisFnS9Vp6xqrIOLlw==} + /@pnpm/pnpmfile/1.2.4_@pnpm+logger@4.0.0: + resolution: {integrity: sha512-x6o91SGiCsiJYa4MysX0SC68MacZzmuDGSAQpTFRANfunDP2/xcSlyFQzenZaK4qpJNGF3tXb8ofedhcuRQy7w==} engines: {node: '>=12.17'} peerDependencies: '@pnpm/logger': ^4.0.0 dependencies: - '@pnpm/core-loggers': 6.1.2_@pnpm+logger@4.0.0 + '@pnpm/core-loggers': 6.1.3_@pnpm+logger@4.0.0 '@pnpm/error': 2.0.0 - '@pnpm/lockfile-types': 3.1.4 + '@pnpm/lockfile-types': 3.1.5 '@pnpm/logger': 4.0.0 - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 chalk: 4.1.2 path-absolute: 1.0.1 dev: true - /@pnpm/read-project-manifest/2.0.10: - resolution: {integrity: sha512-iaie/zD+fTUR6ywd3ISvVuhxQwWeXXinWUz+0jg/zcVivU+k/Cjh6rYGzwiZP/okIYR6zdXt0dVLvIq68j70WQ==} + /@pnpm/read-project-manifest/2.0.11: + resolution: {integrity: sha512-S99jUoKVsorRIZr1n8o/HMr2qeC9H0g11AmQrojnO0WOv4lTgHvGz88vm69Ik08b4UqUCeZgKAdvj8HcZXrF7w==} engines: {node: '>=12.17'} dependencies: '@pnpm/error': 2.0.0 '@pnpm/graceful-fs': 1.0.0 - '@pnpm/types': 7.8.0 - '@pnpm/write-project-manifest': 2.0.9 + '@pnpm/types': 7.9.0 + '@pnpm/write-project-manifest': 2.0.10 detect-indent: 6.1.0 fast-deep-equal: 3.1.3 is-windows: 1.0.2 @@ -5012,11 +5013,11 @@ packages: - supports-color - utf-8-validate - /@pnpm/render-peer-issues/1.1.0: - resolution: {integrity: sha512-9SNbrWWg7NyjQGlldlT6zgfZiZxfTT2IblXriWKMvFqgcBpNbetJGXcZMcVcyx/H3EmwOq6C9z+9p4qoYmK+CA==} + /@pnpm/render-peer-issues/1.1.1: + resolution: {integrity: sha512-yet0bHob6S6nNbCAVijLYfm1x3RNKgIatt4cqVGIRN5MCv6BRPpVqMkkFRbnWzxP7PxMq2P3WKxwBZDhDIVn1A==} engines: {node: '>=12.17'} dependencies: - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 archy: 1.0.0 chalk: 4.1.2 cli-columns: 4.0.0 @@ -5056,16 +5057,16 @@ packages: - supports-color dev: true - /@pnpm/types/7.8.0: - resolution: {integrity: sha512-Duos47ZLz/1Uk3YMYyb8dMtS5JQmPhJpGWApbo7C0ftX1J3D7GaWvyYYoSodvfeGvRucEm4JwuqQyaWPuvXovg==} + /@pnpm/types/7.9.0: + resolution: {integrity: sha512-WJol7zZKMktP8bvoFEh/ANCrYsIDcfpGFgRZmAMeULuskFVND4NLXXIkBqNhtmv+ipt6mVUnsZTGHrVaXrlsNA==} engines: {node: '>=12.17'} dev: true - /@pnpm/write-project-manifest/2.0.9: - resolution: {integrity: sha512-PZwK6klJVJz3dKRXZBHSwIFMwhwUvES26vTu/DrXgY9GKzRsDH6c1iE/cFtS5xDo7C03Wy5JBbQigfRdwKM1TA==} + /@pnpm/write-project-manifest/2.0.10: + resolution: {integrity: sha512-39fH8i9BY84OuJhovKnC05DZiOEa3gnwhLpt/Gk2RhcD2CDj76NWjKqauyHeAYihpjDWJB92xuLR3gk9qTyzEQ==} engines: {node: '>=12.17'} dependencies: - '@pnpm/types': 7.8.0 + '@pnpm/types': 7.9.0 json5: 2.2.0 write-file-atomic: 3.0.3 write-yaml-file: 4.2.0 @@ -5375,8 +5376,8 @@ packages: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: true - /@types/prettier/2.4.2: - resolution: {integrity: sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==} + /@types/prettier/2.4.3: + resolution: {integrity: sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==} dev: true /@types/proxyquire/1.3.28: @@ -5743,7 +5744,7 @@ packages: '@yarnpkg/fslib': 2.6.1-rc.5 '@yarnpkg/json-proxy': 2.1.1 '@yarnpkg/libzip': 2.2.3-rc.5 - '@yarnpkg/parsers': 2.5.0-rc.7 + '@yarnpkg/parsers': 2.5.0-rc.8 '@yarnpkg/pnp': 3.1.1-rc.10 '@yarnpkg/shell': 3.2.0-rc.8 camelcase: 5.3.1 @@ -6630,8 +6631,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001298 - electron-to-chromium: 1.4.40 + caniuse-lite: 1.0.30001299 + electron-to-chromium: 1.4.44 escalade: 3.1.1 node-releases: 2.0.1 picocolors: 1.0.0 @@ -6825,8 +6826,8 @@ packages: dependencies: path-temp: 2.0.0 - /caniuse-lite/1.0.30001298: - resolution: {integrity: sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==} + /caniuse-lite/1.0.30001299: + resolution: {integrity: sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==} dev: true /caseless/0.12.0: @@ -7800,8 +7801,8 @@ packages: /ee-first/1.1.1: resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} - /electron-to-chromium/1.4.40: - resolution: {integrity: sha512-j+eVIyQGt2EU5xPWUblhpp5P5z5xyAdRgzogBgfe2F5JGV17gr9pfzWBua6DlPL00LavbOjxubWkWkbVQe9Wlw==} + /electron-to-chromium/1.4.44: + resolution: {integrity: sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==} dev: true /emittery/0.8.1: @@ -8737,12 +8738,12 @@ packages: pkg-dir: 3.0.0 dev: true - /find-packages/8.0.10: - resolution: {integrity: sha512-RUkm/e71ww9mHYVXkRWstX9azicDk2MfhbesheU3IQLuWxa1RaVPIEZQ2lQpmPp5XKmRu0Oe7cANqdRSelF2mg==} + /find-packages/8.0.11: + resolution: {integrity: sha512-hWq1DwxfoOxui12Q6wrDX9tVntU6/cjx+Hc6m/w3XsUf47Qmkrt6fkh1Q+xykc81jPXBrWHWHupPNTCzLcfK8g==} engines: {node: '>=12.17'} dependencies: - '@pnpm/read-project-manifest': 2.0.10 - '@pnpm/types': 7.8.0 + '@pnpm/read-project-manifest': 2.0.11 + '@pnpm/types': 7.9.0 fast-glob: 3.2.10 p-filter: 2.1.0 dev: true @@ -10442,7 +10443,7 @@ packages: '@jest/transform': 27.4.6_@babel+types@7.16.8 '@jest/types': 27.4.2 '@types/babel__traverse': 7.14.2 - '@types/prettier': 2.4.2 + '@types/prettier': 2.4.3 babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.7 chalk: 4.1.2 expect: 27.4.6 @@ -12599,7 +12600,7 @@ packages: getopts: 2.3.0 nm-prune: 5.0.0 read-pkg: 5.2.0 - rename-overwrite: 4.0.0 + rename-overwrite: 4.0.1 rimraf-then: 1.0.1 write-pkg: 4.0.0 dev: true @@ -12661,8 +12662,8 @@ packages: resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==} engines: {node: '>=10'} - /ramda/0.27.1: - resolution: {integrity: sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==} + /ramda/0.27.2: + resolution: {integrity: sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==} /range-parser/1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} @@ -12907,8 +12908,8 @@ packages: resolution: {integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8=} dev: true - /rename-overwrite/4.0.0: - resolution: {integrity: sha512-GZxPjarpxu2DGD6xHE8L4GdJhWz2+2i2x6N1I7VEof2p5M/x/LDNxNXA547k8xOpPmHnijXBE1ofmj7NDGP20g==} + /rename-overwrite/4.0.1: + resolution: {integrity: sha512-YVw/sYT9zqsTSC0aNZvwV7wwYLlnZDKtNBTVVRI4/iPLxlm+M+seD5aTIZ991mTryC9Gsvfr0xwtHvw8WP0HAw==} engines: {node: '>=12.10'} dependencies: '@zkochan/rimraf': 2.1.1 @@ -13877,7 +13878,7 @@ packages: hasBin: true dependencies: better-path-resolve: 1.0.0 - rename-overwrite: 4.0.0 + rename-overwrite: 4.0.1 /syncpack/6.2.0: resolution: {integrity: sha512-lvEAhA+oS67Bqj1/zzEpyNE4kLhL9sO7InP8GY6qXAbn6v+z4ZwZPx5NysrASeagNr5dcHjGUTtk/wnfWYvwEw==}