From 016c58baae7d02651f0ea52fa6f338aac689c1c3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Thu, 24 Oct 2024 21:39:56 +0200 Subject: [PATCH 1/4] chore: fix pd for local development (#8691) close #8656 --- pnpm-lock.yaml | 19 +++++++++++++++++++ pnpm-workspace.yaml | 1 + pnpm/dev/package.json | 15 ++++++++++++++- pnpm/dev/pd.js | 8 +++++--- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a78f9edcf..85aed08d7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5962,6 +5962,25 @@ importers: specifier: workspace:* version: 'link:' + pnpm/dev: + dependencies: + '@pnpm/find-workspace-dir': + specifier: workspace:* + version: link:../../workspace/find-workspace-dir + '@pnpm/workspace.find-packages': + specifier: workspace:* + version: link:../../workspace/find-packages + '@pnpm/workspace.read-manifest': + specifier: workspace:* + version: link:../../workspace/read-manifest + esbuild: + specifier: 'catalog:' + version: 0.19.12 + devDependencies: + pd: + specifier: workspace:* + version: 'link:' + releasing/plugin-commands-deploy: dependencies: '@pnpm/catalogs.resolver': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index bcfc72f39c..555b820ff8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -25,6 +25,7 @@ packages: - pkg-manifest/* - patching/* - pnpm + - pnpm/dev - tools/* - worker - pnpm/artifacts/* diff --git a/pnpm/dev/package.json b/pnpm/dev/package.json index bd4080553e..f61fe369fb 100644 --- a/pnpm/dev/package.json +++ b/pnpm/dev/package.json @@ -2,5 +2,18 @@ "name": "pd", "version": "1.0.0", "bin": "pd.js", - "private": true + "private": true, + "scripts": { + "test": "pnpm run _test", + "_test": "node pd.js --version" + }, + "dependencies": { + "@pnpm/find-workspace-dir": "workspace:*", + "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.find-packages": "workspace:*", + "esbuild": "catalog:" + }, + "devDependencies": { + "pd": "workspace:*" + } } diff --git a/pnpm/dev/pd.js b/pnpm/dev/pd.js index f928b80520..3f627ffdb5 100755 --- a/pnpm/dev/pd.js +++ b/pnpm/dev/pd.js @@ -6,15 +6,17 @@ const childProcess = require('child_process') const { createRequire } = require('module') const { findWorkspacePackagesNoCheck } = require('@pnpm/workspace.find-packages') const { findWorkspaceDir } = require('@pnpm/find-workspace-dir') +const { readWorkspaceManifest } = require('@pnpm/workspace.read-manifest') const pnpmPackageJson = JSON.parse(fs.readFileSync(pathLib.join(__dirname, 'package.json'), 'utf8')) ;(async () => { const workspaceDir = await findWorkspaceDir(__dirname) - const pkgs = await findWorkspacePackagesNoCheck(workspaceDir) + const workspaceManifest = await readWorkspaceManifest(workspaceDir) + const pkgs = await findWorkspacePackagesNoCheck(workspaceDir, { patterns: workspaceManifest.packages }) const localPackages = pkgs.map(pkg => pkg.manifest.name) - const dirByPackageName = pkgs.reduce((acc, pkg) => { - acc[pkg.manifest.name] = pkg.dir + const dirByPackageName = pkgs.reduce((acc, { manifest, rootDirRealPath }) => { + acc[manifest.name] = rootDirRealPath return acc }) From 74b6f73ffab8ae6f2f7eb4eaa3298109cdb24c0d Mon Sep 17 00:00:00 2001 From: chlorine Date: Fri, 25 Oct 2024 19:42:16 +0800 Subject: [PATCH 2/4] chore: fix esbuild external warning (#8692) --- pnpm/bundle.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pnpm/bundle.ts b/pnpm/bundle.ts index 51e11476a0..ad8181f5aa 100644 --- a/pnpm/bundle.ts +++ b/pnpm/bundle.ts @@ -12,7 +12,10 @@ import { build } from 'esbuild' bundle: true, platform: 'node', outfile: 'dist/pnpm.cjs', - external: ['node-gyp'], + external: [ + 'node-gyp', + './get-uid-gid.js', // traces back to: https://github.com/npm/uid-number/blob/6e9bdb302ae4799d05abf12e922ccdb4bd9ea023/uid-number.js#L31 + ], define: { 'process.env.npm_package_name': JSON.stringify( process.env.npm_package_name From 2aed76dbaffcd9302f7c16d2642a16a03fc8c528 Mon Sep 17 00:00:00 2001 From: Brandon Cheng Date: Fri, 25 Oct 2024 08:06:17 -0400 Subject: [PATCH 3/4] fix: fork bomb when pnpm self-manages its version (#8679) * fix: prevent fork bombing if .tools dir had an incomplete download * refactor: factor out reusable `VersionSwitchFail` class * fix: avoid swallowing errors from spawn.sync() * test: fix --- .changeset/great-onions-matter.md | 5 +++++ .changeset/swift-panthers-matter.md | 5 +++++ pnpm/src/switchCliVersion.ts | 34 +++++++++++++++++++++++++++-- pnpm/test/switchingVersions.test.ts | 26 ++++++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 .changeset/great-onions-matter.md create mode 100644 .changeset/swift-panthers-matter.md diff --git a/.changeset/great-onions-matter.md b/.changeset/great-onions-matter.md new file mode 100644 index 0000000000..b208cf7878 --- /dev/null +++ b/.changeset/great-onions-matter.md @@ -0,0 +1,5 @@ +--- +"pnpm": patch +--- + +Fix a bug causing pnpm to infinitely spawn itself when `manage-package-manager-versions=true` is set and the `.tools` directory is corrupt. diff --git a/.changeset/swift-panthers-matter.md b/.changeset/swift-panthers-matter.md new file mode 100644 index 0000000000..eea618593c --- /dev/null +++ b/.changeset/swift-panthers-matter.md @@ -0,0 +1,5 @@ +--- +"pnpm": patch +--- + +When `manage-package-manager-versions` is set to `true`, errors spawning a self-managed version of `pnpm` will now be shown (instead of being silent). diff --git a/pnpm/src/switchCliVersion.ts b/pnpm/src/switchCliVersion.ts index 05403849cd..4ab8042a4e 100644 --- a/pnpm/src/switchCliVersion.ts +++ b/pnpm/src/switchCliVersion.ts @@ -42,14 +42,44 @@ export async function switchCliVersion (config: Config): Promise { const pnpmEnv = prependDirsToPath([wantedPnpmBinDir]) if (!pnpmEnv.updated) { // We throw this error to prevent an infinite recursive call of the same pnpm version. - throw new PnpmError('VERSION_SWITCH_FAIL', `Failed to switch pnpm to v${pm.version}. Looks like pnpm CLI is missing at "${wantedPnpmBinDir}" or is incorrect`) + throw new VersionSwitchFail(pm.version, wantedPnpmBinDir) } - const { status } = spawn.sync('pnpm', process.argv.slice(2), { + + // Specify the exact pnpm file path that's expected to execute to spawn.sync() + // + // It's not safe spawn 'pnpm' (without specifying an absolute path) and expect + // it to resolve to the same file path computed above due to the $PATH + // environment variable. While that does happen in most cases, there's a + // scenario where the wanted pnpm bin dir exists, but no pnpm binary is + // present within that directory. If that's the case, a different pnpm bin can + // get executed, causing infinite spawn and fork bombing the user. See details + // at https://github.com/pnpm/pnpm/pull/8679. + const pnpmBinPath = path.join(wantedPnpmBinDir, 'pnpm') + + const { status, error } = spawn.sync(pnpmBinPath, process.argv.slice(2), { stdio: 'inherit', env: { ...process.env, [pnpmEnv.name]: pnpmEnv.value, }, }) + + if (error) { + throw new VersionSwitchFail(pm.version, wantedPnpmBinDir, error) + } + process.exit(status ?? 0) } + +class VersionSwitchFail extends PnpmError { + constructor (version: string, wantedPnpmBinDir: string, cause?: unknown) { + super( + 'VERSION_SWITCH_FAIL', + `Failed to switch pnpm to v${version}. Looks like pnpm CLI is missing at "${wantedPnpmBinDir}" or is incorrect`, + { hint: cause instanceof Error ? cause?.message : undefined }) + + if (cause != null) { + this.cause = cause + } + } +} diff --git a/pnpm/test/switchingVersions.test.ts b/pnpm/test/switchingVersions.test.ts index 783562d3ba..f4b7cef915 100644 --- a/pnpm/test/switchingVersions.test.ts +++ b/pnpm/test/switchingVersions.test.ts @@ -1,8 +1,10 @@ import path from 'path' import fs from 'fs' import { prepare } from '@pnpm/prepare' +import { getToolDirPath } from '@pnpm/tools.path' import { sync as writeJsonFile } from 'write-json-file' import { execPnpmSync } from './utils' +import isWindows from 'is-windows' test('switch to the pnpm version specified in the packageManager field of package.json, when manager-package-manager=versions is true', async () => { prepare() @@ -58,3 +60,27 @@ test('do not switch to pnpm version when a range is specified', async () => { expect(stdout.toString()).toContain('Cannot switch to pnpm@^9.3.0') }) + +test('throws error if pnpm tools dir is corrupt', () => { + prepare() + const pnpmHome = path.resolve('pnpm') + const env = { PNPM_HOME: pnpmHome } + const version = '9.3.0' + fs.writeFileSync('.npmrc', 'manage-package-manager-versions=true') + writeJsonFile('package.json', { + packageManager: `pnpm@${version}`, + }) + + // Run pnpm once to ensure the tools dir is created. + execPnpmSync(['help'], { env }) + + // Intentionally corrupt the tool dir. + const toolDir = getToolDirPath({ pnpmHomeDir: pnpmHome, tool: { name: 'pnpm', version } }) + fs.rmSync(path.join(toolDir, 'bin/pnpm')) + if (isWindows()) { + fs.rmSync(path.join(toolDir, 'bin/pnpm.cmd')) + } + + const { stderr } = execPnpmSync(['help'], { env }) + expect(stderr.toString()).toContain('Failed to switch pnpm to v9.3.0. Looks like pnpm CLI is missing') +}) From 1dd419cbb4a6f8a9edce7495b4bef0415a42447d Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 25 Oct 2024 21:24:08 +0200 Subject: [PATCH 4/4] test: fix killing the registry mock server on teardown (#8695) --- .meta-updater/src/index.ts | 7 +++++ __utils__/assert-project/jest.config.js | 1 - __utils__/assert-store/jest.config.js | 1 - .../jest-config/config.js | 5 ++-- .../jest-config/globalSetup.js | 4 ++- __utils__/jest-config/globalTeardown.js | 3 ++ __utils__/jest-config/jest-preset.js | 16 ++++++++++ __utils__/jest-config/package.json | 14 +++++++++ .../jest-config/setupFilesAfterEnv.js | 0 __utils__/test-ipc-server/jest.config.js | 1 - cache/api/package.json | 3 ++ cache/commands/jest.config.js | 2 -- cache/commands/package.json | 5 +++- catalogs/config/jest.config.js | 1 - catalogs/config/package.json | 3 ++ catalogs/protocol-parser/jest.config.js | 1 - catalogs/protocol-parser/package.json | 3 ++ catalogs/resolver/jest.config.js | 1 - catalogs/resolver/package.json | 3 ++ catalogs/types/package.json | 3 ++ cli/cli-meta/jest.config.js | 3 -- cli/cli-meta/package.json | 3 ++ cli/cli-utils/jest.config.js | 3 -- cli/cli-utils/package.json | 3 ++ cli/command/package.json | 3 ++ cli/common-cli-options-help/package.json | 3 ++ cli/default-reporter/jest.config.js | 1 - cli/default-reporter/package.json | 3 ++ cli/parse-cli-args/jest.config.js | 3 -- cli/parse-cli-args/package.json | 3 ++ .../plugin-commands-completion/jest.config.js | 1 - .../plugin-commands-completion/package.json | 5 +++- config/config/jest.config.js | 3 -- config/config/package.json | 3 ++ config/matcher/jest.config.js | 1 - config/matcher/package.json | 3 ++ config/normalize-registries/package.json | 3 ++ config/package-is-installable/jest.config.js | 1 - config/package-is-installable/package.json | 3 ++ config/parse-overrides/jest.config.js | 1 - config/parse-overrides/package.json | 3 ++ .../pick-registry-for-package/jest.config.js | 1 - config/pick-registry-for-package/package.json | 3 ++ config/plugin-commands-config/jest.config.js | 3 -- config/plugin-commands-config/package.json | 3 ++ crypto/object-hasher/jest.config.js | 3 -- crypto/object-hasher/package.json | 3 ++ crypto/polyfill/package.json | 3 ++ dedupe/check/jest.config.js | 1 - dedupe/check/package.json | 3 ++ dedupe/issues-renderer/jest.config.js | 1 - dedupe/issues-renderer/package.json | 3 ++ dedupe/types/package.json | 3 ++ deps/graph-builder/package.json | 3 ++ deps/graph-sequencer/jest.config.js | 1 - deps/graph-sequencer/package.json | 3 ++ env/node.fetcher/jest.config.js | 3 -- env/node.fetcher/package.json | 3 ++ env/node.resolver/jest.config.js | 3 -- env/node.resolver/package.json | 3 ++ env/path/jest.config.js | 3 -- env/path/package.json | 3 ++ env/plugin-commands-env/jest.config.js | 3 -- env/plugin-commands-env/package.json | 3 ++ env/system-node-version/jest.config.js | 3 -- env/system-node-version/package.json | 3 ++ exec/build-modules/jest.config.js | 1 - exec/build-modules/package.json | 3 ++ exec/lifecycle/jest.config.js | 1 - exec/lifecycle/package.json | 3 ++ exec/pkg-requires-build/package.json | 3 ++ exec/plugin-commands-rebuild/jest.config.js | 1 - exec/plugin-commands-rebuild/package.json | 3 ++ .../jest.config.js | 1 - .../package.json | 3 ++ exec/prepare-package/jest.config.js | 3 -- exec/prepare-package/package.json | 3 ++ exec/run-npm/package.json | 3 ++ fetching/directory-fetcher/jest.config.js | 1 - fetching/directory-fetcher/package.json | 3 ++ fetching/fetcher-base/package.json | 3 ++ fetching/git-fetcher/jest.config.js | 1 - fetching/git-fetcher/package.json | 3 ++ fetching/pick-fetcher/jest.config.js | 1 - fetching/pick-fetcher/package.json | 3 ++ fetching/tarball-fetcher/jest.config.js | 1 - fetching/tarball-fetcher/package.json | 3 ++ fs/find-packages/jest.config.js | 1 - fs/find-packages/package.json | 3 ++ fs/graceful-fs/jest.config.js | 3 -- fs/graceful-fs/package.json | 3 ++ fs/hard-link-dir/jest.config.js | 1 - fs/hard-link-dir/package.json | 3 ++ fs/indexed-pkg-importer/jest.config.js | 3 -- fs/indexed-pkg-importer/package.json | 3 ++ fs/is-empty-dir-or-nothing/jest.config.js | 3 -- fs/is-empty-dir-or-nothing/package.json | 3 ++ fs/packlist/package.json | 3 ++ fs/read-modules-dir/package.json | 3 ++ fs/symlink-dependency/jest.config.js | 1 - fs/symlink-dependency/package.json | 3 ++ hooks/pnpmfile/jest.config.js | 6 ---- hooks/pnpmfile/package.json | 3 ++ .../{pnpmfiles => __fixtures__}/filterLog.js | 0 .../globalFilterLog.js | 0 .../readPackageNoObject.js | 0 .../readPackageNoReturn.js | 0 .../{pnpmfiles => __fixtures__}/undefined.js | 0 hooks/pnpmfile/test/index.ts | 14 ++++----- hooks/read-package-hook/jest.config.js | 3 -- hooks/read-package-hook/package.json | 3 ++ hooks/types/package.json | 3 ++ jest-with-registry.config.js | 11 ------- jest.globalTeardown.js | 3 -- lockfile/audit/jest.config.js | 3 -- lockfile/audit/package.json | 5 +++- lockfile/detect-dep-types/package.json | 3 ++ lockfile/filtering/jest.config.js | 1 - lockfile/filtering/package.json | 3 ++ lockfile/fs/jest.config.js | 1 - lockfile/fs/package.json | 5 +++- lockfile/lockfile-to-pnp/jest.config.js | 3 -- lockfile/lockfile-to-pnp/package.json | 3 ++ lockfile/merger/jest.config.js | 1 - lockfile/merger/package.json | 3 ++ lockfile/plugin-commands-audit/jest.config.js | 4 --- lockfile/plugin-commands-audit/package.json | 3 ++ lockfile/preferred-versions/package.json | 3 ++ lockfile/pruner/jest.config.js | 3 -- lockfile/pruner/package.json | 3 ++ lockfile/settings-checker/jest.config.js | 3 -- lockfile/settings-checker/package.json | 3 ++ lockfile/utils/jest.config.js | 1 - lockfile/utils/package.json | 3 ++ lockfile/verification/jest.config.js | 3 -- lockfile/verification/package.json | 5 +++- lockfile/walker/package.json | 3 ++ modules-mounter/daemon/jest.config.js | 3 -- modules-mounter/daemon/package.json | 3 ++ network/auth-header/jest.config.js | 3 -- network/auth-header/package.json | 3 ++ network/fetch/jest.config.js | 3 -- network/fetch/package.json | 3 ++ network/fetching-types/package.json | 3 ++ package.json | 6 ++-- packages/calc-dep-state/jest.config.js | 1 - packages/calc-dep-state/package.json | 3 ++ packages/constants/package.json | 3 ++ packages/core-loggers/package.json | 3 ++ packages/crypto.base32-hash/jest.config.js | 3 -- packages/crypto.base32-hash/package.json | 3 ++ packages/dependency-path/jest.config.js | 3 -- packages/dependency-path/package.json | 3 ++ packages/error/jest.config.js | 3 -- packages/error/package.json | 3 ++ packages/git-utils/jest.config.js | 1 - packages/git-utils/package.json | 3 ++ packages/logger/jest.config.js | 4 --- packages/logger/package.json | 3 ++ .../make-dedicated-lockfile/jest.config.js | 6 ---- packages/make-dedicated-lockfile/package.json | 5 +++- packages/parse-wanted-dependency/package.json | 3 ++ .../plugin-commands-doctor/jest.config.js | 1 - packages/plugin-commands-doctor/package.json | 3 ++ packages/plugin-commands-init/jest.config.js | 4 --- packages/plugin-commands-init/package.json | 3 ++ packages/plugin-commands-setup/jest.config.js | 4 --- packages/plugin-commands-setup/package.json | 3 ++ packages/render-peer-issues/jest.config.js | 1 - packages/render-peer-issues/package.json | 3 ++ packages/types/package.json | 3 ++ .../which-version-is-pinned/jest.config.js | 1 - packages/which-version-is-pinned/package.json | 3 ++ patching/apply-patch/jest.config.js | 2 -- patching/apply-patch/package.json | 3 ++ patching/config/jest.config.js | 2 -- patching/config/package.json | 3 ++ .../plugin-commands-patching/jest.config.js | 2 -- .../plugin-commands-patching/package.json | 3 ++ patching/types/package.json | 3 ++ pkg-manager/client/jest.config.js | 3 -- pkg-manager/client/package.json | 3 ++ pkg-manager/core/jest.config.js | 1 - pkg-manager/core/package.json | 3 ++ pkg-manager/direct-dep-linker/package.json | 3 ++ pkg-manager/get-context/jest.config.js | 3 -- pkg-manager/get-context/package.json | 3 ++ pkg-manager/headless/jest.config.js | 1 - pkg-manager/headless/package.json | 3 ++ pkg-manager/hoist/package.json | 3 ++ pkg-manager/link-bins/jest.config.js | 5 ---- pkg-manager/link-bins/package.json | 3 ++ pkg-manager/modules-cleaner/package.json | 3 ++ pkg-manager/modules-yaml/jest.config.js | 1 - pkg-manager/modules-yaml/package.json | 3 ++ pkg-manager/package-bins/jest.config.js | 5 ---- pkg-manager/package-bins/package.json | 3 ++ pkg-manager/package-requester/jest.config.js | 1 - pkg-manager/package-requester/package.json | 3 ++ .../jest.config.js | 1 - .../plugin-commands-installation/package.json | 3 ++ .../read-projects-context/package.json | 3 ++ pkg-manager/real-hoist/jest.config.js | 6 ---- pkg-manager/real-hoist/package.json | 3 ++ pkg-manager/remove-bins/package.json | 3 ++ .../resolve-dependencies/jest.config.js | 1 - pkg-manager/resolve-dependencies/package.json | 7 +++-- .../exportable-manifest/jest.config.js | 1 - pkg-manifest/exportable-manifest/package.json | 5 +++- pkg-manifest/manifest-utils/jest.config.js | 1 - pkg-manifest/manifest-utils/package.json | 3 ++ pkg-manifest/read-package-json/jest.config.js | 1 - pkg-manifest/read-package-json/package.json | 3 ++ .../commented-package-json5/modified.json5 | 0 .../commented-package-json5/package.json5 | 0 .../invalid-package-json/package.json | 0 .../invalid-package-json5/package.json5 | 0 .../invalid-package-yaml/package.yaml | 0 .../package-json/package.json | 0 .../package-json5/package.json5 | 0 .../package-yaml/package.yaml | 0 .../read-project-manifest/jest.config.js | 6 ---- .../read-project-manifest/package.json | 3 ++ .../read-project-manifest/test/index.ts | 2 +- .../write-project-manifest/jest.config.js | 1 - .../write-project-manifest/package.json | 3 ++ pnpm-lock.yaml | 29 +++++++++++++------ pnpm/jest.config.js | 1 - pnpm/package.json | 3 ++ .../plugin-commands-deploy/jest.config.js | 1 - releasing/plugin-commands-deploy/package.json | 3 ++ .../plugin-commands-publishing/jest.config.js | 1 - .../plugin-commands-publishing/package.json | 3 ++ resolving/default-resolver/jest.config.js | 3 -- resolving/default-resolver/package.json | 3 ++ resolving/git-resolver/jest.config.js | 1 - resolving/git-resolver/package.json | 3 ++ resolving/local-resolver/jest.config.js | 1 - resolving/local-resolver/package.json | 3 ++ resolving/npm-resolver/jest.config.js | 1 - resolving/npm-resolver/package.json | 3 ++ resolving/resolver-base/package.json | 3 ++ resolving/tarball-resolver/jest.config.js | 1 - resolving/tarball-resolver/package.json | 3 ++ .../dependencies-hierarchy/jest.config.js | 3 -- reviewing/dependencies-hierarchy/package.json | 5 +++- reviewing/license-scanner/jest.config.js | 1 - reviewing/license-scanner/package.json | 5 +++- reviewing/list/jest.config.js | 3 -- reviewing/list/package.json | 3 ++ reviewing/outdated/jest.config.js | 1 - reviewing/outdated/package.json | 3 ++ .../plugin-commands-licenses/jest.config.js | 1 - .../plugin-commands-licenses/package.json | 3 ++ .../plugin-commands-listing/jest.config.js | 1 - .../plugin-commands-listing/package.json | 3 ++ .../plugin-commands-outdated/jest.config.js | 1 - .../plugin-commands-outdated/package.json | 3 ++ store/cafs-types/package.json | 3 ++ store/cafs/jest.config.js | 3 -- store/cafs/package.json | 3 ++ store/create-cafs-store/jest.config.js | 3 -- store/create-cafs-store/package.json | 3 ++ store/package-store/jest.config.js | 3 -- store/package-store/package.json | 3 ++ store/plugin-commands-server/package.json | 3 ++ .../jest.config.js | 1 - .../package.json | 3 ++ store/plugin-commands-store/jest.config.js | 2 -- store/plugin-commands-store/package.json | 3 ++ store/server/jest.config.js | 6 ---- store/server/package.json | 3 ++ .../side-effect-fake-dir/side-effect.js | 0 .../side-effect-fake-dir/side-effect.txt | 0 store/server/test/index.ts | 4 +-- store/store-connection-manager/package.json | 3 ++ store/store-controller-types/package.json | 3 ++ store/store-path/jest.config.js | 1 - store/store-path/package.json | 3 ++ text/comments-parser/jest.config.js | 1 - text/comments-parser/package.json | 3 ++ tools/path/package.json | 4 ++- .../jest.config.js | 3 -- .../plugin-commands-self-updater/package.json | 3 ++ worker/package.json | 3 ++ .../filter-packages-from-dir/package.json | 3 ++ .../filter-workspace-packages/jest.config.js | 3 -- .../filter-workspace-packages/package.json | 3 ++ workspace/find-packages/jest.config.js | 1 - workspace/find-packages/package.json | 3 ++ workspace/find-workspace-dir/jest.config.js | 1 - workspace/find-workspace-dir/package.json | 3 ++ workspace/pkgs-graph/jest.config.js | 3 -- workspace/pkgs-graph/package.json | 3 ++ workspace/read-manifest/jest.config.js | 1 - workspace/read-manifest/package.json | 3 ++ .../resolve-workspace-range/package.json | 3 ++ workspace/sort-packages/package.json | 3 ++ workspace/spec-parser/jest.config.js | 3 -- workspace/spec-parser/package.json | 3 ++ 300 files changed, 548 insertions(+), 298 deletions(-) delete mode 100644 __utils__/assert-project/jest.config.js delete mode 100644 __utils__/assert-store/jest.config.js rename jest.config.js => __utils__/jest-config/config.js (85%) rename jest.globalSetup.js => __utils__/jest-config/globalSetup.js (85%) create mode 100644 __utils__/jest-config/globalTeardown.js create mode 100644 __utils__/jest-config/jest-preset.js create mode 100644 __utils__/jest-config/package.json rename jest.setup.js => __utils__/jest-config/setupFilesAfterEnv.js (100%) delete mode 100644 __utils__/test-ipc-server/jest.config.js delete mode 100644 cache/commands/jest.config.js delete mode 100644 catalogs/config/jest.config.js delete mode 100644 catalogs/protocol-parser/jest.config.js delete mode 100644 catalogs/resolver/jest.config.js delete mode 100644 cli/cli-meta/jest.config.js delete mode 100644 cli/cli-utils/jest.config.js delete mode 100644 cli/default-reporter/jest.config.js delete mode 100644 cli/parse-cli-args/jest.config.js delete mode 100644 completion/plugin-commands-completion/jest.config.js delete mode 100644 config/config/jest.config.js delete mode 100644 config/matcher/jest.config.js delete mode 100644 config/package-is-installable/jest.config.js delete mode 100644 config/parse-overrides/jest.config.js delete mode 100644 config/pick-registry-for-package/jest.config.js delete mode 100644 config/plugin-commands-config/jest.config.js delete mode 100644 crypto/object-hasher/jest.config.js delete mode 100644 dedupe/check/jest.config.js delete mode 100644 dedupe/issues-renderer/jest.config.js delete mode 100644 deps/graph-sequencer/jest.config.js delete mode 100644 env/node.fetcher/jest.config.js delete mode 100644 env/node.resolver/jest.config.js delete mode 100644 env/path/jest.config.js delete mode 100644 env/plugin-commands-env/jest.config.js delete mode 100644 env/system-node-version/jest.config.js delete mode 100644 exec/build-modules/jest.config.js delete mode 100644 exec/lifecycle/jest.config.js delete mode 100644 exec/plugin-commands-rebuild/jest.config.js delete mode 100644 exec/plugin-commands-script-runners/jest.config.js delete mode 100644 exec/prepare-package/jest.config.js delete mode 100644 fetching/directory-fetcher/jest.config.js delete mode 100644 fetching/git-fetcher/jest.config.js delete mode 100644 fetching/pick-fetcher/jest.config.js delete mode 100644 fetching/tarball-fetcher/jest.config.js delete mode 100644 fs/find-packages/jest.config.js delete mode 100644 fs/graceful-fs/jest.config.js delete mode 100644 fs/hard-link-dir/jest.config.js delete mode 100644 fs/indexed-pkg-importer/jest.config.js delete mode 100644 fs/is-empty-dir-or-nothing/jest.config.js delete mode 100644 fs/symlink-dependency/jest.config.js delete mode 100644 hooks/pnpmfile/jest.config.js rename hooks/pnpmfile/test/{pnpmfiles => __fixtures__}/filterLog.js (100%) rename hooks/pnpmfile/test/{pnpmfiles => __fixtures__}/globalFilterLog.js (100%) rename hooks/pnpmfile/test/{pnpmfiles => __fixtures__}/readPackageNoObject.js (100%) rename hooks/pnpmfile/test/{pnpmfiles => __fixtures__}/readPackageNoReturn.js (100%) rename hooks/pnpmfile/test/{pnpmfiles => __fixtures__}/undefined.js (100%) delete mode 100644 hooks/read-package-hook/jest.config.js delete mode 100644 jest-with-registry.config.js delete mode 100644 jest.globalTeardown.js delete mode 100644 lockfile/audit/jest.config.js delete mode 100644 lockfile/filtering/jest.config.js delete mode 100644 lockfile/fs/jest.config.js delete mode 100644 lockfile/lockfile-to-pnp/jest.config.js delete mode 100644 lockfile/merger/jest.config.js delete mode 100644 lockfile/plugin-commands-audit/jest.config.js delete mode 100644 lockfile/pruner/jest.config.js delete mode 100644 lockfile/settings-checker/jest.config.js delete mode 100644 lockfile/utils/jest.config.js delete mode 100644 lockfile/verification/jest.config.js delete mode 100644 modules-mounter/daemon/jest.config.js delete mode 100644 network/auth-header/jest.config.js delete mode 100644 network/fetch/jest.config.js delete mode 100644 packages/calc-dep-state/jest.config.js delete mode 100644 packages/crypto.base32-hash/jest.config.js delete mode 100644 packages/dependency-path/jest.config.js delete mode 100644 packages/error/jest.config.js delete mode 100644 packages/git-utils/jest.config.js delete mode 100644 packages/logger/jest.config.js delete mode 100644 packages/make-dedicated-lockfile/jest.config.js delete mode 100644 packages/plugin-commands-doctor/jest.config.js delete mode 100644 packages/plugin-commands-init/jest.config.js delete mode 100644 packages/plugin-commands-setup/jest.config.js delete mode 100644 packages/render-peer-issues/jest.config.js delete mode 100644 packages/which-version-is-pinned/jest.config.js delete mode 100644 patching/apply-patch/jest.config.js delete mode 100644 patching/config/jest.config.js delete mode 100644 patching/plugin-commands-patching/jest.config.js delete mode 100644 pkg-manager/client/jest.config.js delete mode 100644 pkg-manager/core/jest.config.js delete mode 100644 pkg-manager/get-context/jest.config.js delete mode 100644 pkg-manager/headless/jest.config.js delete mode 100644 pkg-manager/link-bins/jest.config.js delete mode 100644 pkg-manager/modules-yaml/jest.config.js delete mode 100644 pkg-manager/package-bins/jest.config.js delete mode 100644 pkg-manager/package-requester/jest.config.js delete mode 100644 pkg-manager/plugin-commands-installation/jest.config.js delete mode 100644 pkg-manager/real-hoist/jest.config.js delete mode 100644 pkg-manager/resolve-dependencies/jest.config.js delete mode 100644 pkg-manifest/exportable-manifest/jest.config.js delete mode 100644 pkg-manifest/manifest-utils/jest.config.js delete mode 100644 pkg-manifest/read-package-json/jest.config.js rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/commented-package-json5/modified.json5 (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/commented-package-json5/package.json5 (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/invalid-package-json/package.json (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/invalid-package-json5/package.json5 (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/invalid-package-yaml/package.yaml (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/package-json/package.json (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/package-json5/package.json5 (100%) rename pkg-manifest/read-project-manifest/{fixtures => __fixtures__}/package-yaml/package.yaml (100%) delete mode 100644 pkg-manifest/read-project-manifest/jest.config.js delete mode 100644 pkg-manifest/write-project-manifest/jest.config.js delete mode 100644 pnpm/jest.config.js delete mode 100644 releasing/plugin-commands-deploy/jest.config.js delete mode 100644 releasing/plugin-commands-publishing/jest.config.js delete mode 100644 resolving/default-resolver/jest.config.js delete mode 100644 resolving/git-resolver/jest.config.js delete mode 100644 resolving/local-resolver/jest.config.js delete mode 100644 resolving/npm-resolver/jest.config.js delete mode 100644 resolving/tarball-resolver/jest.config.js delete mode 100644 reviewing/dependencies-hierarchy/jest.config.js delete mode 100644 reviewing/license-scanner/jest.config.js delete mode 100644 reviewing/list/jest.config.js delete mode 100644 reviewing/outdated/jest.config.js delete mode 100644 reviewing/plugin-commands-licenses/jest.config.js delete mode 100644 reviewing/plugin-commands-listing/jest.config.js delete mode 100644 reviewing/plugin-commands-outdated/jest.config.js delete mode 100644 store/cafs/jest.config.js delete mode 100644 store/create-cafs-store/jest.config.js delete mode 100644 store/package-store/jest.config.js delete mode 100644 store/plugin-commands-store-inspecting/jest.config.js delete mode 100644 store/plugin-commands-store/jest.config.js delete mode 100644 store/server/jest.config.js rename store/server/test/{ => __fixtures__}/side-effect-fake-dir/side-effect.js (100%) rename store/server/test/{ => __fixtures__}/side-effect-fake-dir/side-effect.txt (100%) delete mode 100644 store/store-path/jest.config.js delete mode 100644 text/comments-parser/jest.config.js delete mode 100644 tools/plugin-commands-self-updater/jest.config.js delete mode 100644 workspace/filter-workspace-packages/jest.config.js delete mode 100644 workspace/find-packages/jest.config.js delete mode 100644 workspace/find-workspace-dir/jest.config.js delete mode 100644 workspace/pkgs-graph/jest.config.js delete mode 100644 workspace/read-manifest/jest.config.js delete mode 100644 workspace/spec-parser/jest.config.js diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index 084fd85627..b25343ee49 100644 --- a/.meta-updater/src/index.ts +++ b/.meta-updater/src/index.ts @@ -319,6 +319,13 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest, } delete manifest.dependencies['@types/ramda'] } + if (scripts.test) { + Object.assign(manifest, { + jest: { + preset: '@pnpm/jest-config', + }, + }) + } return { ...manifest, bugs: { diff --git a/__utils__/assert-project/jest.config.js b/__utils__/assert-project/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/__utils__/assert-project/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/__utils__/assert-store/jest.config.js b/__utils__/assert-store/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/__utils__/assert-store/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/jest.config.js b/__utils__/jest-config/config.js similarity index 85% rename from jest.config.js rename to __utils__/jest-config/config.js index b93251325c..99d6e2f1d0 100644 --- a/jest.config.js +++ b/__utils__/jest-config/config.js @@ -1,4 +1,4 @@ -const path = require("path") +const path = require('path') const config = { preset: "ts-jest", @@ -15,8 +15,9 @@ const config = { collectCoverage: true, coveragePathIgnorePatterns: ["/node_modules/"], testPathIgnorePatterns: ["/fixtures/", "/__fixtures__/", "/test/utils/.+"], + modulePathIgnorePatterns: ['\/__fixtures__\/.*'], testTimeout: 4 * 60 * 1000, // 4 minutes - setupFilesAfterEnv: [path.join(__dirname, "jest.setup.js")], + setupFilesAfterEnv: [path.join(__dirname, "setupFilesAfterEnv.js")], maxWorkers: "50%", } diff --git a/jest.globalSetup.js b/__utils__/jest-config/globalSetup.js similarity index 85% rename from jest.globalSetup.js rename to __utils__/jest-config/globalSetup.js index f706f43a0e..6bc8f7f10b 100644 --- a/jest.globalSetup.js +++ b/__utils__/jest-config/globalSetup.js @@ -1,4 +1,6 @@ const { start, prepare } = require('@pnpm/registry-mock') +const { promisify } = require('util') +const kill = promisify(require('tree-kill')) module.exports = () => { if (process.env.PNPM_REGISTRY_MOCK_PORT == null) return @@ -22,6 +24,6 @@ module.exports = () => { }) global.killServer = () => { killed = true - server.kill() + return kill(server.pid) } } diff --git a/__utils__/jest-config/globalTeardown.js b/__utils__/jest-config/globalTeardown.js new file mode 100644 index 0000000000..f4c62b9c15 --- /dev/null +++ b/__utils__/jest-config/globalTeardown.js @@ -0,0 +1,3 @@ +module.exports = () => { + return global.killServer?.() +} diff --git a/__utils__/jest-config/jest-preset.js b/__utils__/jest-config/jest-preset.js new file mode 100644 index 0000000000..39ff631b92 --- /dev/null +++ b/__utils__/jest-config/jest-preset.js @@ -0,0 +1,16 @@ +const path = require('path') +const baseConfig = require('./config') + +if (process.env.PNPM_REGISTRY_MOCK_PORT != null) { + module.exports = { + ...baseConfig, + // Many tests change the dist tags of packages. + // Unfortunately, this means that if two such tests will run at the same time, + // they may break each other. + maxWorkers: 1, + globalSetup: path.join(__dirname, 'globalSetup.js'), + globalTeardown: path.join(__dirname, 'globalTeardown.js'), + } +} else { + module.exports = baseConfig +} diff --git a/__utils__/jest-config/package.json b/__utils__/jest-config/package.json new file mode 100644 index 0000000000..a87b79d6fc --- /dev/null +++ b/__utils__/jest-config/package.json @@ -0,0 +1,14 @@ +{ + "name": "@pnpm/jest-config", + "version": "1.0.0", + "private": true, + "main": "jest-preset.js", + "dependencies": { + "@pnpm/registry-mock": "catalog:", + "@pnpm/worker": "workspace:*", + "tree-kill": "catalog:" + }, + "devDependencies": { + "@pnpm/jest-config": "workspace:*" + } +} diff --git a/jest.setup.js b/__utils__/jest-config/setupFilesAfterEnv.js similarity index 100% rename from jest.setup.js rename to __utils__/jest-config/setupFilesAfterEnv.js diff --git a/__utils__/test-ipc-server/jest.config.js b/__utils__/test-ipc-server/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/__utils__/test-ipc-server/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/cache/api/package.json b/cache/api/package.json index 88275cc7d2..a5659c4a62 100644 --- a/cache/api/package.json +++ b/cache/api/package.json @@ -46,5 +46,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cache/commands/jest.config.js b/cache/commands/jest.config.js deleted file mode 100644 index 35ca5df3df..0000000000 --- a/cache/commands/jest.config.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') - diff --git a/cache/commands/package.json b/cache/commands/package.json index fce024fa55..c32c857e89 100644 --- a/cache/commands/package.json +++ b/cache/commands/package.json @@ -34,8 +34,8 @@ "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", - "@zkochan/rimraf": "catalog:", "@types/ramda": "catalog:", + "@zkochan/rimraf": "catalog:", "execa": "catalog:" }, "dependencies": { @@ -54,5 +54,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/catalogs/config/jest.config.js b/catalogs/config/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/catalogs/config/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/catalogs/config/package.json b/catalogs/config/package.json index 7a88529e12..0206b241d5 100644 --- a/catalogs/config/package.json +++ b/catalogs/config/package.json @@ -40,5 +40,8 @@ "@pnpm/catalogs.config": "workspace:*", "@pnpm/catalogs.types": "workspace:*", "@pnpm/workspace.read-manifest": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/catalogs/protocol-parser/jest.config.js b/catalogs/protocol-parser/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/catalogs/protocol-parser/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/catalogs/protocol-parser/package.json b/catalogs/protocol-parser/package.json index 75d2451f8b..22fa91a02f 100644 --- a/catalogs/protocol-parser/package.json +++ b/catalogs/protocol-parser/package.json @@ -35,5 +35,8 @@ }, "devDependencies": { "@pnpm/catalogs.protocol-parser": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/catalogs/resolver/jest.config.js b/catalogs/resolver/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/catalogs/resolver/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/catalogs/resolver/package.json b/catalogs/resolver/package.json index 1fdcc66b40..1b24a3ee01 100644 --- a/catalogs/resolver/package.json +++ b/catalogs/resolver/package.json @@ -40,5 +40,8 @@ "devDependencies": { "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/catalogs/types/package.json b/catalogs/types/package.json index 84d1379635..78d62917e4 100644 --- a/catalogs/types/package.json +++ b/catalogs/types/package.json @@ -34,5 +34,8 @@ }, "devDependencies": { "@pnpm/catalogs.types": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/cli-meta/jest.config.js b/cli/cli-meta/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/cli/cli-meta/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/cli/cli-meta/package.json b/cli/cli-meta/package.json index 4f1b7eb31a..03b15f3873 100644 --- a/cli/cli-meta/package.json +++ b/cli/cli-meta/package.json @@ -38,5 +38,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/cli-utils/jest.config.js b/cli/cli-utils/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/cli/cli-utils/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/cli/cli-utils/package.json b/cli/cli-utils/package.json index c326c7e0b5..5d0b2667c6 100644 --- a/cli/cli-utils/package.json +++ b/cli/cli-utils/package.json @@ -52,5 +52,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/command/package.json b/cli/command/package.json index 39561f0c71..ae8c43e728 100644 --- a/cli/command/package.json +++ b/cli/command/package.json @@ -36,5 +36,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/common-cli-options-help/package.json b/cli/common-cli-options-help/package.json index 00ad4cb70c..94331ccb53 100644 --- a/cli/common-cli-options-help/package.json +++ b/cli/common-cli-options-help/package.json @@ -33,5 +33,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/default-reporter/jest.config.js b/cli/default-reporter/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/cli/default-reporter/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/cli/default-reporter/package.json b/cli/default-reporter/package.json index ea43025cf4..bfc6359da3 100644 --- a/cli/default-reporter/package.json +++ b/cli/default-reporter/package.json @@ -69,5 +69,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/cli/parse-cli-args/jest.config.js b/cli/parse-cli-args/jest.config.js deleted file mode 100644 index 56786ef060..0000000000 --- a/cli/parse-cli-args/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = config diff --git a/cli/parse-cli-args/package.json b/cli/parse-cli-args/package.json index 304f10c294..98ed8da55d 100644 --- a/cli/parse-cli-args/package.json +++ b/cli/parse-cli-args/package.json @@ -42,5 +42,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/completion/plugin-commands-completion/jest.config.js b/completion/plugin-commands-completion/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/completion/plugin-commands-completion/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/completion/plugin-commands-completion/package.json b/completion/plugin-commands-completion/package.json index 105f0b11d0..b70cf14a26 100644 --- a/completion/plugin-commands-completion/package.json +++ b/completion/plugin-commands-completion/package.json @@ -49,5 +49,8 @@ "keywords": [ "pnpm9" ], - "homepage": "https://github.com/pnpm/pnpm/blob/main/completion/plugin-commands-completion#readme" + "homepage": "https://github.com/pnpm/pnpm/blob/main/completion/plugin-commands-completion#readme", + "jest": { + "preset": "@pnpm/jest-config" + } } diff --git a/config/config/jest.config.js b/config/config/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/config/config/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/config/config/package.json b/config/config/package.json index 51fefa59be..dcdbd38886 100644 --- a/config/config/package.json +++ b/config/config/package.json @@ -70,5 +70,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/matcher/jest.config.js b/config/matcher/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/config/matcher/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/config/matcher/package.json b/config/matcher/package.json index 8a81aadd3e..451bbd206c 100644 --- a/config/matcher/package.json +++ b/config/matcher/package.json @@ -40,5 +40,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/normalize-registries/package.json b/config/normalize-registries/package.json index 2cf57afba0..3e69f045eb 100644 --- a/config/normalize-registries/package.json +++ b/config/normalize-registries/package.json @@ -38,5 +38,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/package-is-installable/jest.config.js b/config/package-is-installable/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/config/package-is-installable/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/config/package-is-installable/package.json b/config/package-is-installable/package.json index e4c7fa4438..a494a29144 100644 --- a/config/package-is-installable/package.json +++ b/config/package-is-installable/package.json @@ -50,5 +50,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/parse-overrides/jest.config.js b/config/parse-overrides/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/config/parse-overrides/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/config/parse-overrides/package.json b/config/parse-overrides/package.json index af15284e44..31382d61a8 100644 --- a/config/parse-overrides/package.json +++ b/config/parse-overrides/package.json @@ -39,5 +39,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/pick-registry-for-package/jest.config.js b/config/pick-registry-for-package/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/config/pick-registry-for-package/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/config/pick-registry-for-package/package.json b/config/pick-registry-for-package/package.json index cd62063508..d236e043bc 100644 --- a/config/pick-registry-for-package/package.json +++ b/config/pick-registry-for-package/package.json @@ -36,5 +36,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/config/plugin-commands-config/jest.config.js b/config/plugin-commands-config/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/config/plugin-commands-config/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/config/plugin-commands-config/package.json b/config/plugin-commands-config/package.json index 726e992b5d..af20cba127 100644 --- a/config/plugin-commands-config/package.json +++ b/config/plugin-commands-config/package.json @@ -49,5 +49,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/crypto/object-hasher/jest.config.js b/crypto/object-hasher/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/crypto/object-hasher/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/crypto/object-hasher/package.json b/crypto/object-hasher/package.json index 04d7a515d5..ad86f75e96 100644 --- a/crypto/object-hasher/package.json +++ b/crypto/object-hasher/package.json @@ -39,5 +39,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/crypto/polyfill/package.json b/crypto/polyfill/package.json index 5d8bfa7ee2..574489e298 100644 --- a/crypto/polyfill/package.json +++ b/crypto/polyfill/package.json @@ -34,5 +34,8 @@ "homepage": "https://github.com/pnpm/pnpm/blob/main/crypto/polyfill#readme", "devDependencies": { "@pnpm/crypto.polyfill": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/dedupe/check/jest.config.js b/dedupe/check/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/dedupe/check/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/dedupe/check/package.json b/dedupe/check/package.json index a0066c79c6..6281a91ce9 100644 --- a/dedupe/check/package.json +++ b/dedupe/check/package.json @@ -39,5 +39,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/dedupe/issues-renderer/jest.config.js b/dedupe/issues-renderer/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/dedupe/issues-renderer/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/dedupe/issues-renderer/package.json b/dedupe/issues-renderer/package.json index 1a060ceb24..5d4a5e47ce 100644 --- a/dedupe/issues-renderer/package.json +++ b/dedupe/issues-renderer/package.json @@ -40,5 +40,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/dedupe/types/package.json b/dedupe/types/package.json index a9943c0bf1..09827c8695 100644 --- a/dedupe/types/package.json +++ b/dedupe/types/package.json @@ -32,5 +32,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/dedupe.types": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/deps/graph-builder/package.json b/deps/graph-builder/package.json index c65e05eaeb..e6f7b57551 100644 --- a/deps/graph-builder/package.json +++ b/deps/graph-builder/package.json @@ -53,5 +53,8 @@ "@pnpm/types": "workspace:*", "path-exists": "catalog:", "ramda": "catalog:" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/deps/graph-sequencer/jest.config.js b/deps/graph-sequencer/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/deps/graph-sequencer/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/deps/graph-sequencer/package.json b/deps/graph-sequencer/package.json index 57301c04ef..cec533c40e 100644 --- a/deps/graph-sequencer/package.json +++ b/deps/graph-sequencer/package.json @@ -35,5 +35,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/env/node.fetcher/jest.config.js b/env/node.fetcher/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/env/node.fetcher/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/env/node.fetcher/package.json b/env/node.fetcher/package.json index 9703904a0a..748671527a 100644 --- a/env/node.fetcher/package.json +++ b/env/node.fetcher/package.json @@ -52,5 +52,8 @@ "@pnpm/prepare": "workspace:*", "@types/adm-zip": "catalog:", "node-fetch": "catalog:" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/env/node.resolver/jest.config.js b/env/node.resolver/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/env/node.resolver/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/env/node.resolver/package.json b/env/node.resolver/package.json index b520031478..e77afbef5e 100644 --- a/env/node.resolver/package.json +++ b/env/node.resolver/package.json @@ -44,5 +44,8 @@ "@pnpm/fetch": "workspace:*", "@pnpm/node.resolver": "workspace:*", "@types/semver": "catalog:" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/env/path/jest.config.js b/env/path/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/env/path/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/env/path/package.json b/env/path/package.json index 47cc7d98f8..fc819e5cd9 100644 --- a/env/path/package.json +++ b/env/path/package.json @@ -38,5 +38,8 @@ }, "devDependencies": { "@pnpm/env.path": "workspace:*" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/env/plugin-commands-env/jest.config.js b/env/plugin-commands-env/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/env/plugin-commands-env/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/env/plugin-commands-env/package.json b/env/plugin-commands-env/package.json index 7629a8da07..059ff88627 100644 --- a/env/plugin-commands-env/package.json +++ b/env/plugin-commands-env/package.json @@ -72,5 +72,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/env/system-node-version/jest.config.js b/env/system-node-version/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/env/system-node-version/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/env/system-node-version/package.json b/env/system-node-version/package.json index 3482937991..23d70a1345 100644 --- a/env/system-node-version/package.json +++ b/env/system-node-version/package.json @@ -40,5 +40,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/build-modules/jest.config.js b/exec/build-modules/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/exec/build-modules/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/exec/build-modules/package.json b/exec/build-modules/package.json index 7d09e45dd1..4ece296970 100644 --- a/exec/build-modules/package.json +++ b/exec/build-modules/package.json @@ -58,5 +58,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/lifecycle/jest.config.js b/exec/lifecycle/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/exec/lifecycle/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/exec/lifecycle/package.json b/exec/lifecycle/package.json index dfa2646756..05d8657a36 100644 --- a/exec/lifecycle/package.json +++ b/exec/lifecycle/package.json @@ -61,5 +61,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/pkg-requires-build/package.json b/exec/pkg-requires-build/package.json index db81016550..57da1faf7a 100644 --- a/exec/pkg-requires-build/package.json +++ b/exec/pkg-requires-build/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/plugin-commands-rebuild/jest.config.js b/exec/plugin-commands-rebuild/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/exec/plugin-commands-rebuild/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/exec/plugin-commands-rebuild/package.json b/exec/plugin-commands-rebuild/package.json index 415fecc5d8..2804c2ba35 100644 --- a/exec/plugin-commands-rebuild/package.json +++ b/exec/plugin-commands-rebuild/package.json @@ -87,5 +87,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/plugin-commands-script-runners/jest.config.js b/exec/plugin-commands-script-runners/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/exec/plugin-commands-script-runners/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/exec/plugin-commands-script-runners/package.json b/exec/plugin-commands-script-runners/package.json index 32d940a59d..83f856eb81 100644 --- a/exec/plugin-commands-script-runners/package.json +++ b/exec/plugin-commands-script-runners/package.json @@ -80,5 +80,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/prepare-package/jest.config.js b/exec/prepare-package/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/exec/prepare-package/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/exec/prepare-package/package.json b/exec/prepare-package/package.json index 532afb9fe8..a756357842 100644 --- a/exec/prepare-package/package.json +++ b/exec/prepare-package/package.json @@ -49,5 +49,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/exec/run-npm/package.json b/exec/run-npm/package.json index 51dbaddc54..2a4e550591 100644 --- a/exec/run-npm/package.json +++ b/exec/run-npm/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fetching/directory-fetcher/jest.config.js b/fetching/directory-fetcher/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fetching/directory-fetcher/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fetching/directory-fetcher/package.json b/fetching/directory-fetcher/package.json index 3133f18eae..5834c6f790 100644 --- a/fetching/directory-fetcher/package.json +++ b/fetching/directory-fetcher/package.json @@ -49,5 +49,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fetching/fetcher-base/package.json b/fetching/fetcher-base/package.json index 84e00345ec..ee9097575a 100644 --- a/fetching/fetcher-base/package.json +++ b/fetching/fetcher-base/package.json @@ -41,5 +41,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fetching/git-fetcher/jest.config.js b/fetching/git-fetcher/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fetching/git-fetcher/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fetching/git-fetcher/package.json b/fetching/git-fetcher/package.json index 98be995a6e..5d51934b98 100644 --- a/fetching/git-fetcher/package.json +++ b/fetching/git-fetcher/package.json @@ -51,5 +51,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fetching/pick-fetcher/jest.config.js b/fetching/pick-fetcher/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fetching/pick-fetcher/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fetching/pick-fetcher/package.json b/fetching/pick-fetcher/package.json index cb11fd0a2f..668203f076 100644 --- a/fetching/pick-fetcher/package.json +++ b/fetching/pick-fetcher/package.json @@ -35,5 +35,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fetching/tarball-fetcher/jest.config.js b/fetching/tarball-fetcher/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/fetching/tarball-fetcher/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/fetching/tarball-fetcher/package.json b/fetching/tarball-fetcher/package.json index 9fc0895c05..89ed96faa4 100644 --- a/fetching/tarball-fetcher/package.json +++ b/fetching/tarball-fetcher/package.json @@ -68,5 +68,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/find-packages/jest.config.js b/fs/find-packages/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fs/find-packages/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fs/find-packages/package.json b/fs/find-packages/package.json index e94c05f0e7..4d80cf4dac 100644 --- a/fs/find-packages/package.json +++ b/fs/find-packages/package.json @@ -42,5 +42,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/graceful-fs/jest.config.js b/fs/graceful-fs/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/fs/graceful-fs/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/fs/graceful-fs/package.json b/fs/graceful-fs/package.json index 06bcdbaa53..9b95f74ac7 100644 --- a/fs/graceful-fs/package.json +++ b/fs/graceful-fs/package.json @@ -37,5 +37,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/hard-link-dir/jest.config.js b/fs/hard-link-dir/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fs/hard-link-dir/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fs/hard-link-dir/package.json b/fs/hard-link-dir/package.json index 8f924a0e24..fa69c780c1 100644 --- a/fs/hard-link-dir/package.json +++ b/fs/hard-link-dir/package.json @@ -40,5 +40,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/indexed-pkg-importer/jest.config.js b/fs/indexed-pkg-importer/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/fs/indexed-pkg-importer/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/fs/indexed-pkg-importer/package.json b/fs/indexed-pkg-importer/package.json index 0c954fb1dd..6f935b10f2 100644 --- a/fs/indexed-pkg-importer/package.json +++ b/fs/indexed-pkg-importer/package.json @@ -65,5 +65,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/is-empty-dir-or-nothing/jest.config.js b/fs/is-empty-dir-or-nothing/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/fs/is-empty-dir-or-nothing/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/fs/is-empty-dir-or-nothing/package.json b/fs/is-empty-dir-or-nothing/package.json index 6a309fb69f..f54c6e7c51 100644 --- a/fs/is-empty-dir-or-nothing/package.json +++ b/fs/is-empty-dir-or-nothing/package.json @@ -34,5 +34,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/packlist/package.json b/fs/packlist/package.json index fa5e3f9073..5cd6886d11 100644 --- a/fs/packlist/package.json +++ b/fs/packlist/package.json @@ -35,5 +35,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/read-modules-dir/package.json b/fs/read-modules-dir/package.json index ec01621845..b00a67de17 100644 --- a/fs/read-modules-dir/package.json +++ b/fs/read-modules-dir/package.json @@ -37,5 +37,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/fs/symlink-dependency/jest.config.js b/fs/symlink-dependency/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/fs/symlink-dependency/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/fs/symlink-dependency/package.json b/fs/symlink-dependency/package.json index 7ee8aa13f0..4887e24ec8 100644 --- a/fs/symlink-dependency/package.json +++ b/fs/symlink-dependency/package.json @@ -48,5 +48,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/hooks/pnpmfile/jest.config.js b/hooks/pnpmfile/jest.config.js deleted file mode 100644 index 94ec95d71c..0000000000 --- a/hooks/pnpmfile/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, { - // we ignore test/pnpmfiles helpers - testMatch: ["**/test/*.[jt]s?(x)"], -}); diff --git a/hooks/pnpmfile/package.json b/hooks/pnpmfile/package.json index 5e798e1824..a3b2ed8ddd 100644 --- a/hooks/pnpmfile/package.json +++ b/hooks/pnpmfile/package.json @@ -50,5 +50,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/hooks/pnpmfile/test/pnpmfiles/filterLog.js b/hooks/pnpmfile/test/__fixtures__/filterLog.js similarity index 100% rename from hooks/pnpmfile/test/pnpmfiles/filterLog.js rename to hooks/pnpmfile/test/__fixtures__/filterLog.js diff --git a/hooks/pnpmfile/test/pnpmfiles/globalFilterLog.js b/hooks/pnpmfile/test/__fixtures__/globalFilterLog.js similarity index 100% rename from hooks/pnpmfile/test/pnpmfiles/globalFilterLog.js rename to hooks/pnpmfile/test/__fixtures__/globalFilterLog.js diff --git a/hooks/pnpmfile/test/pnpmfiles/readPackageNoObject.js b/hooks/pnpmfile/test/__fixtures__/readPackageNoObject.js similarity index 100% rename from hooks/pnpmfile/test/pnpmfiles/readPackageNoObject.js rename to hooks/pnpmfile/test/__fixtures__/readPackageNoObject.js diff --git a/hooks/pnpmfile/test/pnpmfiles/readPackageNoReturn.js b/hooks/pnpmfile/test/__fixtures__/readPackageNoReturn.js similarity index 100% rename from hooks/pnpmfile/test/pnpmfiles/readPackageNoReturn.js rename to hooks/pnpmfile/test/__fixtures__/readPackageNoReturn.js diff --git a/hooks/pnpmfile/test/pnpmfiles/undefined.js b/hooks/pnpmfile/test/__fixtures__/undefined.js similarity index 100% rename from hooks/pnpmfile/test/pnpmfiles/undefined.js rename to hooks/pnpmfile/test/__fixtures__/undefined.js diff --git a/hooks/pnpmfile/test/index.ts b/hooks/pnpmfile/test/index.ts index 9c0bfd1d43..07564dc112 100644 --- a/hooks/pnpmfile/test/index.ts +++ b/hooks/pnpmfile/test/index.ts @@ -5,12 +5,12 @@ import { requireHooks, requirePnpmfile, BadReadPackageHookError, type HookContex const defaultHookContext: HookContext = { log () {} } test('ignoring a pnpmfile that exports undefined', () => { - const pnpmfile = requirePnpmfile(path.join(__dirname, 'pnpmfiles/undefined.js'), __dirname) + const pnpmfile = requirePnpmfile(path.join(__dirname, '__fixtures__/undefined.js'), __dirname) expect(pnpmfile).toBeUndefined() }) test('readPackage hook run fails when returns undefined ', () => { - const pnpmfilePath = path.join(__dirname, 'pnpmfiles/readPackageNoReturn.js') + const pnpmfilePath = path.join(__dirname, '__fixtures__/readPackageNoReturn.js') const pnpmfile = requirePnpmfile(pnpmfilePath, __dirname) return expect( @@ -19,7 +19,7 @@ test('readPackage hook run fails when returns undefined ', () => { }) test('readPackage hook run fails when returned dependencies is not an object ', () => { - const pnpmfilePath = path.join(__dirname, 'pnpmfiles/readPackageNoObject.js') + const pnpmfilePath = path.join(__dirname, '__fixtures__/readPackageNoObject.js') const pnpmfile = requirePnpmfile(pnpmfilePath, __dirname) return expect( pnpmfile!.hooks!.readPackage!({}, defaultHookContext) @@ -27,8 +27,8 @@ test('readPackage hook run fails when returned dependencies is not an object ', }) test('filterLog hook combines with the global hook', () => { - const globalPnpmfile = path.join(__dirname, 'pnpmfiles/globalFilterLog.js') - const pnpmfile = path.join(__dirname, 'pnpmfiles/filterLog.js') + const globalPnpmfile = path.join(__dirname, '__fixtures__/globalFilterLog.js') + const pnpmfile = path.join(__dirname, '__fixtures__/filterLog.js') const hooks = requireHooks(__dirname, { globalPnpmfile, pnpmfile }) expect(hooks.filterLog).toBeDefined() @@ -52,13 +52,13 @@ test('calculatePnpmfileChecksum is undefined when pnpmfile does not exist', asyn }) test('calculatePnpmfileChecksum resolves to hash string for existing pnpmfile', async () => { - const pnpmfile = path.join(__dirname, 'pnpmfiles/readPackageNoObject.js') + const pnpmfile = path.join(__dirname, '__fixtures__/readPackageNoObject.js') const hooks = requireHooks(__dirname, { pnpmfile }) expect(typeof await hooks.calculatePnpmfileChecksum?.()).toBe('string') }) test('calculatePnpmfileChecksum is undefined if pnpmfile even when it exports undefined', async () => { - const pnpmfile = path.join(__dirname, 'pnpmfiles/undefined.js') + const pnpmfile = path.join(__dirname, '__fixtures__/undefined.js') const hooks = requireHooks(__dirname, { pnpmfile }) expect(hooks.calculatePnpmfileChecksum).toBeUndefined() }) diff --git a/hooks/read-package-hook/jest.config.js b/hooks/read-package-hook/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/hooks/read-package-hook/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/hooks/read-package-hook/package.json b/hooks/read-package-hook/package.json index 605e639e73..85c059d736 100644 --- a/hooks/read-package-hook/package.json +++ b/hooks/read-package-hook/package.json @@ -48,5 +48,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/hooks/types/package.json b/hooks/types/package.json index 6d7c98f617..115ca17c14 100644 --- a/hooks/types/package.json +++ b/hooks/types/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/jest-with-registry.config.js b/jest-with-registry.config.js deleted file mode 100644 index df829776d4..0000000000 --- a/jest-with-registry.config.js +++ /dev/null @@ -1,11 +0,0 @@ -const path = require("path"); - -module.exports = { - ...require('./jest.config'), - // Many tests change the dist tags of packages. - // Unfortunately, this means that if two such tests will run at the same time, - // they may break each other. - maxWorkers: 1, - globalSetup: path.join(__dirname, 'jest.globalSetup.js'), - globalTeardown: path.join(__dirname, 'jest.globalTeardown.js'), -} diff --git a/jest.globalTeardown.js b/jest.globalTeardown.js deleted file mode 100644 index c715454ca5..0000000000 --- a/jest.globalTeardown.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = () => { - global.killServer?.() -} diff --git a/lockfile/audit/jest.config.js b/lockfile/audit/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/lockfile/audit/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/lockfile/audit/package.json b/lockfile/audit/package.json index 20eba48e0d..70f1b9fb65 100644 --- a/lockfile/audit/package.json +++ b/lockfile/audit/package.json @@ -46,10 +46,10 @@ "@pnpm/fetch": "workspace:*", "@pnpm/fetching-types": "workspace:*", "@pnpm/list": "workspace:*", + "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/read-project-manifest": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" @@ -57,5 +57,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/detect-dep-types/package.json b/lockfile/detect-dep-types/package.json index baea7ff9b4..6919d8af8d 100644 --- a/lockfile/detect-dep-types/package.json +++ b/lockfile/detect-dep-types/package.json @@ -41,5 +41,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/filtering/jest.config.js b/lockfile/filtering/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/lockfile/filtering/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/lockfile/filtering/package.json b/lockfile/filtering/package.json index ca363e218c..285bfed783 100644 --- a/lockfile/filtering/package.json +++ b/lockfile/filtering/package.json @@ -56,5 +56,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/fs/jest.config.js b/lockfile/fs/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/lockfile/fs/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/lockfile/fs/package.json b/lockfile/fs/package.json index 5838335f62..e090d7fbd6 100644 --- a/lockfile/fs/package.json +++ b/lockfile/fs/package.json @@ -52,9 +52,9 @@ "@pnpm/error": "workspace:*", "@pnpm/git-resolver": "workspace:*", "@pnpm/git-utils": "workspace:*", + "@pnpm/lockfile.merger": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/lockfile.merger": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "@zkochan/rimraf": "catalog:", @@ -70,5 +70,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/lockfile-to-pnp/jest.config.js b/lockfile/lockfile-to-pnp/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/lockfile/lockfile-to-pnp/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/lockfile/lockfile-to-pnp/package.json b/lockfile/lockfile-to-pnp/package.json index 92aeb4b09a..d2cb7d7551 100644 --- a/lockfile/lockfile-to-pnp/package.json +++ b/lockfile/lockfile-to-pnp/package.json @@ -51,5 +51,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/merger/jest.config.js b/lockfile/merger/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/lockfile/merger/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/lockfile/merger/package.json b/lockfile/merger/package.json index 6065c9216b..85176b9746 100644 --- a/lockfile/merger/package.json +++ b/lockfile/merger/package.json @@ -45,5 +45,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/plugin-commands-audit/jest.config.js b/lockfile/plugin-commands-audit/jest.config.js deleted file mode 100644 index 2ddfb5f739..0000000000 --- a/lockfile/plugin-commands-audit/jest.config.js +++ /dev/null @@ -1,4 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config - diff --git a/lockfile/plugin-commands-audit/package.json b/lockfile/plugin-commands-audit/package.json index e45a5ff7a4..6a7e1d4c90 100644 --- a/lockfile/plugin-commands-audit/package.json +++ b/lockfile/plugin-commands-audit/package.json @@ -60,5 +60,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/preferred-versions/package.json b/lockfile/preferred-versions/package.json index aa9314c9b0..b22812a3ca 100644 --- a/lockfile/preferred-versions/package.json +++ b/lockfile/preferred-versions/package.json @@ -42,5 +42,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/pruner/jest.config.js b/lockfile/pruner/jest.config.js deleted file mode 100644 index 95f86a2128..0000000000 --- a/lockfile/pruner/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config diff --git a/lockfile/pruner/package.json b/lockfile/pruner/package.json index 050ecfe133..c7cdb1067c 100644 --- a/lockfile/pruner/package.json +++ b/lockfile/pruner/package.json @@ -45,5 +45,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/settings-checker/jest.config.js b/lockfile/settings-checker/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/lockfile/settings-checker/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/lockfile/settings-checker/package.json b/lockfile/settings-checker/package.json index 5c31729415..1f86dff31a 100644 --- a/lockfile/settings-checker/package.json +++ b/lockfile/settings-checker/package.json @@ -45,5 +45,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/utils/jest.config.js b/lockfile/utils/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/lockfile/utils/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/lockfile/utils/package.json b/lockfile/utils/package.json index 6d17d4e15d..1166dd3f93 100644 --- a/lockfile/utils/package.json +++ b/lockfile/utils/package.json @@ -49,5 +49,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/verification/jest.config.js b/lockfile/verification/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/lockfile/verification/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/lockfile/verification/package.json b/lockfile/verification/package.json index 53c43b294e..ba4fad48ef 100644 --- a/lockfile/verification/package.json +++ b/lockfile/verification/package.json @@ -36,8 +36,8 @@ "@pnpm/catalogs.types": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/get-context": "workspace:*", - "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.types": "workspace:*", + "@pnpm/lockfile.utils": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/types": "workspace:*", @@ -57,5 +57,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/lockfile/walker/package.json b/lockfile/walker/package.json index eb07ce2db8..e1e5845dad 100644 --- a/lockfile/walker/package.json +++ b/lockfile/walker/package.json @@ -41,5 +41,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/modules-mounter/daemon/jest.config.js b/modules-mounter/daemon/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/modules-mounter/daemon/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/modules-mounter/daemon/package.json b/modules-mounter/daemon/package.json index 9538213e88..56d84d2e70 100644 --- a/modules-mounter/daemon/package.json +++ b/modules-mounter/daemon/package.json @@ -61,5 +61,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/network/auth-header/jest.config.js b/network/auth-header/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/network/auth-header/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/network/auth-header/package.json b/network/auth-header/package.json index cfb03b4961..dceabd9cee 100644 --- a/network/auth-header/package.json +++ b/network/auth-header/package.json @@ -40,5 +40,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/network/fetch/jest.config.js b/network/fetch/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/network/fetch/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/network/fetch/package.json b/network/fetch/package.json index 52ec2a2cbf..59dff4d189 100644 --- a/network/fetch/package.json +++ b/network/fetch/package.json @@ -49,5 +49,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/network/fetching-types/package.json b/network/fetching-types/package.json index c37867a394..87b217daf0 100644 --- a/network/fetching-types/package.json +++ b/network/fetching-types/package.json @@ -38,5 +38,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/package.json b/package.json index 54ac16de11..df2233e207 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,9 @@ "@commitlint/config-conventional": "^17.8.1", "@commitlint/prompt-cli": "^17.8.1", "@pnpm/eslint-config": "workspace:*", + "@pnpm/jest-config": "workspace:*", "@pnpm/meta-updater": "catalog:", - "@pnpm/registry-mock": "catalog:", "@pnpm/tsconfig": "workspace:*", - "@pnpm/worker": "workspace:*", "@types/jest": "^29.5.12", "@types/node": "catalog:", "c8": "^7.14.0", @@ -57,8 +56,7 @@ "shx": "^0.3.4", "ts-jest": "29.2.3", "ts-node": "^10.9.2", - "typescript": "5.5.4", - "verdaccio": "5.20.1" + "typescript": "5.5.4" }, "engines": { "pnpm": ">=9.6.0" diff --git a/packages/calc-dep-state/jest.config.js b/packages/calc-dep-state/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/packages/calc-dep-state/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/packages/calc-dep-state/package.json b/packages/calc-dep-state/package.json index 2bdced1f48..00eb99958d 100644 --- a/packages/calc-dep-state/package.json +++ b/packages/calc-dep-state/package.json @@ -43,5 +43,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/constants/package.json b/packages/constants/package.json index 26bd5efa60..bcb139d37d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -34,5 +34,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/core-loggers/package.json b/packages/core-loggers/package.json index c679ef8a13..2fa2fb2285 100644 --- a/packages/core-loggers/package.json +++ b/packages/core-loggers/package.json @@ -43,5 +43,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/crypto.base32-hash/jest.config.js b/packages/crypto.base32-hash/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/packages/crypto.base32-hash/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/packages/crypto.base32-hash/package.json b/packages/crypto.base32-hash/package.json index ab3d7ce9c7..47f9ab0762 100644 --- a/packages/crypto.base32-hash/package.json +++ b/packages/crypto.base32-hash/package.json @@ -41,5 +41,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/dependency-path/jest.config.js b/packages/dependency-path/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/packages/dependency-path/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/packages/dependency-path/package.json b/packages/dependency-path/package.json index d817408a4a..d0d9bb6c92 100644 --- a/packages/dependency-path/package.json +++ b/packages/dependency-path/package.json @@ -42,5 +42,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/error/jest.config.js b/packages/error/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/packages/error/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/packages/error/package.json b/packages/error/package.json index 79c3bad738..228fb7d477 100644 --- a/packages/error/package.json +++ b/packages/error/package.json @@ -38,5 +38,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/git-utils/jest.config.js b/packages/git-utils/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/packages/git-utils/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/packages/git-utils/package.json b/packages/git-utils/package.json index a5be8f9315..c394d65c16 100644 --- a/packages/git-utils/package.json +++ b/packages/git-utils/package.json @@ -42,5 +42,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/logger/jest.config.js b/packages/logger/jest.config.js deleted file mode 100644 index 2ddfb5f739..0000000000 --- a/packages/logger/jest.config.js +++ /dev/null @@ -1,4 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config - diff --git a/packages/logger/package.json b/packages/logger/package.json index ae1e1f809d..d990f73bca 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -39,5 +39,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/make-dedicated-lockfile/jest.config.js b/packages/make-dedicated-lockfile/jest.config.js deleted file mode 100644 index 68ba11b858..0000000000 --- a/packages/make-dedicated-lockfile/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../../jest.config') - -module.exports = { - ...config, - testMatch: ["**/test/index.ts"], -} diff --git a/packages/make-dedicated-lockfile/package.json b/packages/make-dedicated-lockfile/package.json index 8df0713cf2..695aec60e4 100644 --- a/packages/make-dedicated-lockfile/package.json +++ b/packages/make-dedicated-lockfile/package.json @@ -37,8 +37,8 @@ "@pnpm/exportable-manifest": "workspace:*", "@pnpm/find-workspace-dir": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/logger": "workspace:*", "@pnpm/lockfile.pruner": "workspace:*", + "@pnpm/logger": "workspace:*", "@pnpm/read-project-manifest": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:", @@ -54,5 +54,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/parse-wanted-dependency/package.json b/packages/parse-wanted-dependency/package.json index d229038843..f921bcb3dc 100644 --- a/packages/parse-wanted-dependency/package.json +++ b/packages/parse-wanted-dependency/package.json @@ -36,5 +36,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/plugin-commands-doctor/jest.config.js b/packages/plugin-commands-doctor/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/packages/plugin-commands-doctor/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/packages/plugin-commands-doctor/package.json b/packages/plugin-commands-doctor/package.json index 1277fe06f3..0928e25f80 100644 --- a/packages/plugin-commands-doctor/package.json +++ b/packages/plugin-commands-doctor/package.json @@ -44,5 +44,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/plugin-commands-init/jest.config.js b/packages/plugin-commands-init/jest.config.js deleted file mode 100644 index 2ddfb5f739..0000000000 --- a/packages/plugin-commands-init/jest.config.js +++ /dev/null @@ -1,4 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config - diff --git a/packages/plugin-commands-init/package.json b/packages/plugin-commands-init/package.json index d04bcd6749..ad95990766 100644 --- a/packages/plugin-commands-init/package.json +++ b/packages/plugin-commands-init/package.json @@ -47,5 +47,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/plugin-commands-setup/jest.config.js b/packages/plugin-commands-setup/jest.config.js deleted file mode 100644 index 2ddfb5f739..0000000000 --- a/packages/plugin-commands-setup/jest.config.js +++ /dev/null @@ -1,4 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = config - diff --git a/packages/plugin-commands-setup/package.json b/packages/plugin-commands-setup/package.json index 5e602a108c..f756cb83cc 100644 --- a/packages/plugin-commands-setup/package.json +++ b/packages/plugin-commands-setup/package.json @@ -47,5 +47,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/render-peer-issues/jest.config.js b/packages/render-peer-issues/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/packages/render-peer-issues/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/packages/render-peer-issues/package.json b/packages/render-peer-issues/package.json index 89c8948e44..a123efc943 100644 --- a/packages/render-peer-issues/package.json +++ b/packages/render-peer-issues/package.json @@ -46,5 +46,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/types/package.json b/packages/types/package.json index 60e2cd6002..87b25182b9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -34,5 +34,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/packages/which-version-is-pinned/jest.config.js b/packages/which-version-is-pinned/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/packages/which-version-is-pinned/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/packages/which-version-is-pinned/package.json b/packages/which-version-is-pinned/package.json index a642c93c87..04909321cf 100644 --- a/packages/which-version-is-pinned/package.json +++ b/packages/which-version-is-pinned/package.json @@ -36,5 +36,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/patching/apply-patch/jest.config.js b/patching/apply-patch/jest.config.js deleted file mode 100644 index b5de99c692..0000000000 --- a/patching/apply-patch/jest.config.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = require('../../jest.config.js') - diff --git a/patching/apply-patch/package.json b/patching/apply-patch/package.json index 5d257c6f23..afce3d96b7 100644 --- a/patching/apply-patch/package.json +++ b/patching/apply-patch/package.json @@ -45,5 +45,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/patching/config/jest.config.js b/patching/config/jest.config.js deleted file mode 100644 index b5de99c692..0000000000 --- a/patching/config/jest.config.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = require('../../jest.config.js') - diff --git a/patching/config/package.json b/patching/config/package.json index a620da6d54..27bfaf1917 100644 --- a/patching/config/package.json +++ b/patching/config/package.json @@ -38,5 +38,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/patching/plugin-commands-patching/jest.config.js b/patching/plugin-commands-patching/jest.config.js deleted file mode 100644 index 35ca5df3df..0000000000 --- a/patching/plugin-commands-patching/jest.config.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') - diff --git a/patching/plugin-commands-patching/package.json b/patching/plugin-commands-patching/package.json index c02429078a..3b20284021 100644 --- a/patching/plugin-commands-patching/package.json +++ b/patching/plugin-commands-patching/package.json @@ -80,5 +80,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/patching/types/package.json b/patching/types/package.json index 198ea4f791..a46f8461e7 100644 --- a/patching/types/package.json +++ b/patching/types/package.json @@ -34,5 +34,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/client/jest.config.js b/pkg-manager/client/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/pkg-manager/client/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/pkg-manager/client/package.json b/pkg-manager/client/package.json index a91e712dfc..898389ceec 100644 --- a/pkg-manager/client/package.json +++ b/pkg-manager/client/package.json @@ -50,5 +50,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/core/jest.config.js b/pkg-manager/core/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/pkg-manager/core/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/pkg-manager/core/package.json b/pkg-manager/core/package.json index ba0dfd8ae1..6b481c29c9 100644 --- a/pkg-manager/core/package.json +++ b/pkg-manager/core/package.json @@ -158,5 +158,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/direct-dep-linker/package.json b/pkg-manager/direct-dep-linker/package.json index d70abc911c..479de14af9 100644 --- a/pkg-manager/direct-dep-linker/package.json +++ b/pkg-manager/direct-dep-linker/package.json @@ -46,5 +46,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/get-context/jest.config.js b/pkg-manager/get-context/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/pkg-manager/get-context/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/pkg-manager/get-context/package.json b/pkg-manager/get-context/package.json index ae6621ff82..4a2f4cf11b 100644 --- a/pkg-manager/get-context/package.json +++ b/pkg-manager/get-context/package.json @@ -55,5 +55,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/headless/jest.config.js b/pkg-manager/headless/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/pkg-manager/headless/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/pkg-manager/headless/package.json b/pkg-manager/headless/package.json index dacdb8433c..c063168f6b 100644 --- a/pkg-manager/headless/package.json +++ b/pkg-manager/headless/package.json @@ -65,6 +65,9 @@ "prepareFixtures": "git clean -fdx test/fixtures && rm -rf \"test/fixtures/*/pnpm-lock.yaml\" && registry-mock prepare && concurrently --success=first --kill-others registry-mock \"pnpm run runPrepareFixtures\"", "compile": "tsc --build && pnpm run lint --fix" }, + "jest": { + "preset": "@pnpm/jest-config" + }, "dependencies": { "@pnpm/build-modules": "workspace:*", "@pnpm/builder.policy": "catalog:", diff --git a/pkg-manager/hoist/package.json b/pkg-manager/hoist/package.json index deeef6d703..30f79d8fbe 100644 --- a/pkg-manager/hoist/package.json +++ b/pkg-manager/hoist/package.json @@ -58,5 +58,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/link-bins/jest.config.js b/pkg-manager/link-bins/jest.config.js deleted file mode 100644 index ec5a0fc62e..0000000000 --- a/pkg-manager/link-bins/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../../jest.config.js') -module.exports = Object.assign({}, config, { - // Shallow so fixtures aren't matched - testMatch: ["**/test/*.[jt]s?(x)"] -}) \ No newline at end of file diff --git a/pkg-manager/link-bins/package.json b/pkg-manager/link-bins/package.json index 1f92d4a793..1680b2de80 100644 --- a/pkg-manager/link-bins/package.json +++ b/pkg-manager/link-bins/package.json @@ -67,5 +67,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/modules-cleaner/package.json b/pkg-manager/modules-cleaner/package.json index f385578f2b..58e52a8eb7 100644 --- a/pkg-manager/modules-cleaner/package.json +++ b/pkg-manager/modules-cleaner/package.json @@ -51,5 +51,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/modules-yaml/jest.config.js b/pkg-manager/modules-yaml/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/pkg-manager/modules-yaml/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/pkg-manager/modules-yaml/package.json b/pkg-manager/modules-yaml/package.json index c492525d4f..16c27c57a0 100644 --- a/pkg-manager/modules-yaml/package.json +++ b/pkg-manager/modules-yaml/package.json @@ -46,5 +46,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/package-bins/jest.config.js b/pkg-manager/package-bins/jest.config.js deleted file mode 100644 index 9f9f8710fd..0000000000 --- a/pkg-manager/package-bins/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const config = require('../../jest.config.js') -module.exports = Object.assign({}, config, { - // Shallow so fixtures aren't matched - testMatch: ["**/test/*.[jt]s?(x)"] -}) diff --git a/pkg-manager/package-bins/package.json b/pkg-manager/package-bins/package.json index 72c61247ad..4dd2691d22 100644 --- a/pkg-manager/package-bins/package.json +++ b/pkg-manager/package-bins/package.json @@ -42,5 +42,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/package-requester/jest.config.js b/pkg-manager/package-requester/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/pkg-manager/package-requester/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/pkg-manager/package-requester/package.json b/pkg-manager/package-requester/package.json index c14fec267d..234e5b2d11 100644 --- a/pkg-manager/package-requester/package.json +++ b/pkg-manager/package-requester/package.json @@ -77,5 +77,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/plugin-commands-installation/jest.config.js b/pkg-manager/plugin-commands-installation/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/pkg-manager/plugin-commands-installation/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/pkg-manager/plugin-commands-installation/package.json b/pkg-manager/plugin-commands-installation/package.json index 7f12cdd1da..60de749559 100644 --- a/pkg-manager/plugin-commands-installation/package.json +++ b/pkg-manager/plugin-commands-installation/package.json @@ -113,5 +113,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/read-projects-context/package.json b/pkg-manager/read-projects-context/package.json index 5289a2592e..769e56f43d 100644 --- a/pkg-manager/read-projects-context/package.json +++ b/pkg-manager/read-projects-context/package.json @@ -44,5 +44,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/real-hoist/jest.config.js b/pkg-manager/real-hoist/jest.config.js deleted file mode 100644 index 6a14d4d927..0000000000 --- a/pkg-manager/real-hoist/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../../jest.config.js') - -module.exports = { - ...config, - testMatch: ["**/test/index.ts"], -} diff --git a/pkg-manager/real-hoist/package.json b/pkg-manager/real-hoist/package.json index 2e292373d0..a569192689 100644 --- a/pkg-manager/real-hoist/package.json +++ b/pkg-manager/real-hoist/package.json @@ -44,5 +44,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/remove-bins/package.json b/pkg-manager/remove-bins/package.json index 4e0d5fa2c1..059e6f609d 100644 --- a/pkg-manager/remove-bins/package.json +++ b/pkg-manager/remove-bins/package.json @@ -48,5 +48,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manager/resolve-dependencies/jest.config.js b/pkg-manager/resolve-dependencies/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/pkg-manager/resolve-dependencies/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/pkg-manager/resolve-dependencies/package.json b/pkg-manager/resolve-dependencies/package.json index 932c928d22..35d9651a84 100644 --- a/pkg-manager/resolve-dependencies/package.json +++ b/pkg-manager/resolve-dependencies/package.json @@ -35,16 +35,16 @@ "@pnpm/core-loggers": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/lockfile.preferred-versions": "workspace:*", + "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/lockfile.preferred-versions": "workspace:*", "@pnpm/manifest-utils": "workspace:*", "@pnpm/npm-resolver": "workspace:*", "@pnpm/patching.config": "workspace:*", "@pnpm/patching.types": "workspace:*", "@pnpm/pick-fetcher": "workspace:*", "@pnpm/pick-registry-for-package": "workspace:*", - "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/store-controller-types": "workspace:*", @@ -81,5 +81,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manifest/exportable-manifest/jest.config.js b/pkg-manifest/exportable-manifest/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/pkg-manifest/exportable-manifest/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/pkg-manifest/exportable-manifest/package.json b/pkg-manifest/exportable-manifest/package.json index 1fc4bf61dd..83bea413e4 100644 --- a/pkg-manifest/exportable-manifest/package.json +++ b/pkg-manifest/exportable-manifest/package.json @@ -39,9 +39,9 @@ "write-yaml-file": "catalog:" }, "dependencies": { + "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/types": "workspace:*", "p-map-values": "catalog:", "ramda": "catalog:" @@ -49,5 +49,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manifest/manifest-utils/jest.config.js b/pkg-manifest/manifest-utils/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/pkg-manifest/manifest-utils/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/pkg-manifest/manifest-utils/package.json b/pkg-manifest/manifest-utils/package.json index 4c417ff4f9..19c79e54d8 100644 --- a/pkg-manifest/manifest-utils/package.json +++ b/pkg-manifest/manifest-utils/package.json @@ -39,5 +39,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manifest/read-package-json/jest.config.js b/pkg-manifest/read-package-json/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/pkg-manifest/read-package-json/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/pkg-manifest/read-package-json/package.json b/pkg-manifest/read-package-json/package.json index 0fcd912536..dc57b2124e 100644 --- a/pkg-manifest/read-package-json/package.json +++ b/pkg-manifest/read-package-json/package.json @@ -42,5 +42,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manifest/read-project-manifest/fixtures/commented-package-json5/modified.json5 b/pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/modified.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/commented-package-json5/modified.json5 rename to pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/modified.json5 diff --git a/pkg-manifest/read-project-manifest/fixtures/commented-package-json5/package.json5 b/pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/commented-package-json5/package.json5 rename to pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/fixtures/invalid-package-json/package.json b/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/invalid-package-json/package.json rename to pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json/package.json diff --git a/pkg-manifest/read-project-manifest/fixtures/invalid-package-json5/package.json5 b/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/invalid-package-json5/package.json5 rename to pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/fixtures/invalid-package-yaml/package.yaml b/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-yaml/package.yaml similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/invalid-package-yaml/package.yaml rename to pkg-manifest/read-project-manifest/__fixtures__/invalid-package-yaml/package.yaml diff --git a/pkg-manifest/read-project-manifest/fixtures/package-json/package.json b/pkg-manifest/read-project-manifest/__fixtures__/package-json/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/package-json/package.json rename to pkg-manifest/read-project-manifest/__fixtures__/package-json/package.json diff --git a/pkg-manifest/read-project-manifest/fixtures/package-json5/package.json5 b/pkg-manifest/read-project-manifest/__fixtures__/package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/package-json5/package.json5 rename to pkg-manifest/read-project-manifest/__fixtures__/package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/fixtures/package-yaml/package.yaml b/pkg-manifest/read-project-manifest/__fixtures__/package-yaml/package.yaml similarity index 100% rename from pkg-manifest/read-project-manifest/fixtures/package-yaml/package.yaml rename to pkg-manifest/read-project-manifest/__fixtures__/package-yaml/package.yaml diff --git a/pkg-manifest/read-project-manifest/jest.config.js b/pkg-manifest/read-project-manifest/jest.config.js deleted file mode 100644 index 4ed3681035..0000000000 --- a/pkg-manifest/read-project-manifest/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../../jest.config') - -module.exports = { - ...config, - modulePathIgnorePatterns: ['\/fixtures\/.*'], -} diff --git a/pkg-manifest/read-project-manifest/package.json b/pkg-manifest/read-project-manifest/package.json index 077e6b9316..b15b04881f 100644 --- a/pkg-manifest/read-project-manifest/package.json +++ b/pkg-manifest/read-project-manifest/package.json @@ -54,5 +54,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pkg-manifest/read-project-manifest/test/index.ts b/pkg-manifest/read-project-manifest/test/index.ts index 03e9ef1641..f484d3423f 100644 --- a/pkg-manifest/read-project-manifest/test/index.ts +++ b/pkg-manifest/read-project-manifest/test/index.ts @@ -4,7 +4,7 @@ import path from 'path' import { readProjectManifest, tryReadProjectManifest } from '@pnpm/read-project-manifest' import tempy from 'tempy' -const fixtures = path.join(__dirname, '../fixtures') +const fixtures = path.join(__dirname, '../__fixtures__') test('readProjectManifest()', async () => { expect( diff --git a/pkg-manifest/write-project-manifest/jest.config.js b/pkg-manifest/write-project-manifest/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/pkg-manifest/write-project-manifest/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/pkg-manifest/write-project-manifest/package.json b/pkg-manifest/write-project-manifest/package.json index d2b2001a82..71b2a2abbc 100644 --- a/pkg-manifest/write-project-manifest/package.json +++ b/pkg-manifest/write-project-manifest/package.json @@ -43,5 +43,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85aed08d7e..915d69f75b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -714,18 +714,15 @@ importers: '@pnpm/eslint-config': specifier: workspace:* version: link:__utils__/eslint-config + '@pnpm/jest-config': + specifier: workspace:* + version: link:__utils__/jest-config '@pnpm/meta-updater': specifier: 'catalog:' version: 2.0.3 - '@pnpm/registry-mock': - specifier: 'catalog:' - version: 3.43.0(encoding@0.1.13)(typanion@3.14.0) '@pnpm/tsconfig': specifier: workspace:* version: link:__utils__/tsconfig - '@pnpm/worker': - specifier: workspace:* - version: link:worker '@types/jest': specifier: ^29.5.12 version: 29.5.12 @@ -777,9 +774,6 @@ importers: typescript: specifier: 5.5.4 version: 5.5.4 - verdaccio: - specifier: 5.20.1 - version: 5.20.1(encoding@0.1.13)(typanion@3.14.0) .meta-updater: dependencies: @@ -945,6 +939,22 @@ importers: specifier: workspace:* version: 'link:' + __utils__/jest-config: + dependencies: + '@pnpm/registry-mock': + specifier: 'catalog:' + version: 3.43.0(encoding@0.1.13)(typanion@3.14.0) + '@pnpm/worker': + specifier: workspace:* + version: link:../../worker + tree-kill: + specifier: 'catalog:' + version: 1.2.2 + devDependencies: + '@pnpm/jest-config': + specifier: workspace:* + version: 'link:' + __utils__/prepare: dependencies: '@pnpm/assert-project': @@ -10692,6 +10702,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true esm@3.2.25: diff --git a/pnpm/jest.config.js b/pnpm/jest.config.js deleted file mode 100644 index b0cb265ff7..0000000000 --- a/pnpm/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../jest-with-registry.config.js') diff --git a/pnpm/package.json b/pnpm/package.json index bd048b0b0d..f3f2a29bd9 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -184,5 +184,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./package.json" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/releasing/plugin-commands-deploy/jest.config.js b/releasing/plugin-commands-deploy/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/releasing/plugin-commands-deploy/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/releasing/plugin-commands-deploy/package.json b/releasing/plugin-commands-deploy/package.json index 36aef7f727..823fa560ad 100644 --- a/releasing/plugin-commands-deploy/package.json +++ b/releasing/plugin-commands-deploy/package.json @@ -58,5 +58,8 @@ }, "peerDependencies": { "@pnpm/logger": "^5.1.0" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/releasing/plugin-commands-publishing/jest.config.js b/releasing/plugin-commands-publishing/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/releasing/plugin-commands-publishing/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/releasing/plugin-commands-publishing/package.json b/releasing/plugin-commands-publishing/package.json index 1769af6766..d2a0b78e8e 100644 --- a/releasing/plugin-commands-publishing/package.json +++ b/releasing/plugin-commands-publishing/package.json @@ -90,5 +90,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/default-resolver/jest.config.js b/resolving/default-resolver/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/resolving/default-resolver/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/resolving/default-resolver/package.json b/resolving/default-resolver/package.json index c4bb068648..f64d7529aa 100644 --- a/resolving/default-resolver/package.json +++ b/resolving/default-resolver/package.json @@ -46,5 +46,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/git-resolver/jest.config.js b/resolving/git-resolver/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/resolving/git-resolver/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/resolving/git-resolver/package.json b/resolving/git-resolver/package.json index df540b9be0..e46819b748 100644 --- a/resolving/git-resolver/package.json +++ b/resolving/git-resolver/package.json @@ -48,5 +48,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/local-resolver/jest.config.js b/resolving/local-resolver/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/resolving/local-resolver/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/resolving/local-resolver/package.json b/resolving/local-resolver/package.json index 2d54e69087..c5f5ef825d 100644 --- a/resolving/local-resolver/package.json +++ b/resolving/local-resolver/package.json @@ -52,5 +52,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/npm-resolver/jest.config.js b/resolving/npm-resolver/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/resolving/npm-resolver/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/resolving/npm-resolver/package.json b/resolving/npm-resolver/package.json index 24e957e3e3..9289553db6 100644 --- a/resolving/npm-resolver/package.json +++ b/resolving/npm-resolver/package.json @@ -74,5 +74,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/resolver-base/package.json b/resolving/resolver-base/package.json index b6700e76fa..34ceb710da 100644 --- a/resolving/resolver-base/package.json +++ b/resolving/resolver-base/package.json @@ -38,5 +38,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/resolving/tarball-resolver/jest.config.js b/resolving/tarball-resolver/jest.config.js deleted file mode 100644 index 50200e3d7c..0000000000 --- a/resolving/tarball-resolver/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config') diff --git a/resolving/tarball-resolver/package.json b/resolving/tarball-resolver/package.json index 9d92224d19..250257241f 100644 --- a/resolving/tarball-resolver/package.json +++ b/resolving/tarball-resolver/package.json @@ -37,5 +37,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/dependencies-hierarchy/jest.config.js b/reviewing/dependencies-hierarchy/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/reviewing/dependencies-hierarchy/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/reviewing/dependencies-hierarchy/package.json b/reviewing/dependencies-hierarchy/package.json index bf54d35506..a3df44591f 100644 --- a/reviewing/dependencies-hierarchy/package.json +++ b/reviewing/dependencies-hierarchy/package.json @@ -33,9 +33,9 @@ "homepage": "https://github.com/pnpm/pnpm/blob/main/reviewing/dependencies-hierarchy#readme", "dependencies": { "@pnpm/dependency-path": "workspace:*", + "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/matcher": "workspace:*", "@pnpm/modules-yaml": "workspace:*", "@pnpm/normalize-registries": "workspace:*", @@ -58,5 +58,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/license-scanner/jest.config.js b/reviewing/license-scanner/jest.config.js deleted file mode 100644 index 58141f076d..0000000000 --- a/reviewing/license-scanner/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js'); diff --git a/reviewing/license-scanner/package.json b/reviewing/license-scanner/package.json index 973cd3a532..c04f2ec095 100644 --- a/reviewing/license-scanner/package.json +++ b/reviewing/license-scanner/package.json @@ -36,11 +36,11 @@ "@pnpm/dependency-path": "workspace:*", "@pnpm/directory-fetcher": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/package-is-installable": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/store.cafs": "workspace:*", @@ -61,5 +61,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/list/jest.config.js b/reviewing/list/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/reviewing/list/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/reviewing/list/package.json b/reviewing/list/package.json index 7da79135f5..5facf09b11 100644 --- a/reviewing/list/package.json +++ b/reviewing/list/package.json @@ -54,5 +54,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/outdated/jest.config.js b/reviewing/outdated/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/reviewing/outdated/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/reviewing/outdated/package.json b/reviewing/outdated/package.json index adc7736930..cc2499ab0b 100644 --- a/reviewing/outdated/package.json +++ b/reviewing/outdated/package.json @@ -62,5 +62,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/plugin-commands-licenses/jest.config.js b/reviewing/plugin-commands-licenses/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/reviewing/plugin-commands-licenses/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/reviewing/plugin-commands-licenses/package.json b/reviewing/plugin-commands-licenses/package.json index e313110bba..0008bd5358 100644 --- a/reviewing/plugin-commands-licenses/package.json +++ b/reviewing/plugin-commands-licenses/package.json @@ -62,5 +62,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/plugin-commands-listing/jest.config.js b/reviewing/plugin-commands-listing/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/reviewing/plugin-commands-listing/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/reviewing/plugin-commands-listing/package.json b/reviewing/plugin-commands-listing/package.json index 7edac665af..a94e863705 100644 --- a/reviewing/plugin-commands-listing/package.json +++ b/reviewing/plugin-commands-listing/package.json @@ -58,5 +58,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/reviewing/plugin-commands-outdated/jest.config.js b/reviewing/plugin-commands-outdated/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/reviewing/plugin-commands-outdated/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/reviewing/plugin-commands-outdated/package.json b/reviewing/plugin-commands-outdated/package.json index 35faf058f4..8c6117ec6d 100644 --- a/reviewing/plugin-commands-outdated/package.json +++ b/reviewing/plugin-commands-outdated/package.json @@ -64,5 +64,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/cafs-types/package.json b/store/cafs-types/package.json index cdbdbed438..6fa0b1d510 100644 --- a/store/cafs-types/package.json +++ b/store/cafs-types/package.json @@ -36,5 +36,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/cafs/jest.config.js b/store/cafs/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/store/cafs/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/store/cafs/package.json b/store/cafs/package.json index 7e937b4a26..830a8a4ecf 100644 --- a/store/cafs/package.json +++ b/store/cafs/package.json @@ -51,5 +51,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/create-cafs-store/jest.config.js b/store/create-cafs-store/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/store/create-cafs-store/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/store/create-cafs-store/package.json b/store/create-cafs-store/package.json index 90b3835076..d7101c495f 100644 --- a/store/create-cafs-store/package.json +++ b/store/create-cafs-store/package.json @@ -61,5 +61,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/package-store/jest.config.js b/store/package-store/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/store/package-store/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/store/package-store/package.json b/store/package-store/package.json index 60fb07afe7..66486870d1 100644 --- a/store/package-store/package.json +++ b/store/package-store/package.json @@ -69,5 +69,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/plugin-commands-server/package.json b/store/plugin-commands-server/package.json index 60cf05cb87..ad514ef96c 100644 --- a/store/plugin-commands-server/package.json +++ b/store/plugin-commands-server/package.json @@ -60,5 +60,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/plugin-commands-store-inspecting/jest.config.js b/store/plugin-commands-store-inspecting/jest.config.js deleted file mode 100644 index 5a65d5f52d..0000000000 --- a/store/plugin-commands-store-inspecting/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') diff --git a/store/plugin-commands-store-inspecting/package.json b/store/plugin-commands-store-inspecting/package.json index 0277eb3b48..a5ab6e3223 100644 --- a/store/plugin-commands-store-inspecting/package.json +++ b/store/plugin-commands-store-inspecting/package.json @@ -53,5 +53,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/plugin-commands-store/jest.config.js b/store/plugin-commands-store/jest.config.js deleted file mode 100644 index 35ca5df3df..0000000000 --- a/store/plugin-commands-store/jest.config.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = require('../../jest-with-registry.config.js') - diff --git a/store/plugin-commands-store/package.json b/store/plugin-commands-store/package.json index f36223ae65..19bd8f5916 100644 --- a/store/plugin-commands-store/package.json +++ b/store/plugin-commands-store/package.json @@ -73,5 +73,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/server/jest.config.js b/store/server/jest.config.js deleted file mode 100644 index 68ba11b858..0000000000 --- a/store/server/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const config = require('../../jest.config') - -module.exports = { - ...config, - testMatch: ["**/test/index.ts"], -} diff --git a/store/server/package.json b/store/server/package.json index 4ca44e4cea..efa56e908b 100644 --- a/store/server/package.json +++ b/store/server/package.json @@ -57,5 +57,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/server/test/side-effect-fake-dir/side-effect.js b/store/server/test/__fixtures__/side-effect-fake-dir/side-effect.js similarity index 100% rename from store/server/test/side-effect-fake-dir/side-effect.js rename to store/server/test/__fixtures__/side-effect-fake-dir/side-effect.js diff --git a/store/server/test/side-effect-fake-dir/side-effect.txt b/store/server/test/__fixtures__/side-effect-fake-dir/side-effect.txt similarity index 100% rename from store/server/test/side-effect-fake-dir/side-effect.txt rename to store/server/test/__fixtures__/side-effect-fake-dir/side-effect.txt diff --git a/store/server/test/index.ts b/store/server/test/index.ts index f781bcb785..c146f97667 100644 --- a/store/server/test/index.ts +++ b/store/server/test/index.ts @@ -166,7 +166,7 @@ test('server upload', async () => { const fakeEngine = 'client-engine' const filesIndexFile = path.join(storeDir, 'test.example.com/fake-pkg/1.0.0.json') - await storeCtrl.upload(path.join(__dirname, 'side-effect-fake-dir'), { + await storeCtrl.upload(path.join(__dirname, '__fixtures__/side-effect-fake-dir'), { sideEffectsCacheKey: fakeEngine, filesIndexFile, }) @@ -198,7 +198,7 @@ test('disable server upload', async () => { let thrown = false try { - await storeCtrl.upload(path.join(__dirname, 'side-effect-fake-dir'), { + await storeCtrl.upload(path.join(__dirname, '__fixtures__/side-effect-fake-dir'), { sideEffectsCacheKey: fakeEngine, filesIndexFile, }) diff --git a/store/store-connection-manager/package.json b/store/store-connection-manager/package.json index 8260d3ea09..8acc376349 100644 --- a/store/store-connection-manager/package.json +++ b/store/store-connection-manager/package.json @@ -50,5 +50,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/store-controller-types/package.json b/store/store-controller-types/package.json index 6f2eeff115..4230e31a97 100644 --- a/store/store-controller-types/package.json +++ b/store/store-controller-types/package.json @@ -40,5 +40,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/store/store-path/jest.config.js b/store/store-path/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/store/store-path/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/store/store-path/package.json b/store/store-path/package.json index 067f865c1b..63d1e18af1 100644 --- a/store/store-path/package.json +++ b/store/store-path/package.json @@ -50,5 +50,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/text/comments-parser/jest.config.js b/text/comments-parser/jest.config.js deleted file mode 100644 index 45c039e43c..0000000000 --- a/text/comments-parser/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') \ No newline at end of file diff --git a/text/comments-parser/package.json b/text/comments-parser/package.json index 9fa5d8a229..191703b79c 100644 --- a/text/comments-parser/package.json +++ b/text/comments-parser/package.json @@ -37,5 +37,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/tools/path/package.json b/tools/path/package.json index 469aa632bd..81bb2a6559 100644 --- a/tools/path/package.json +++ b/tools/path/package.json @@ -27,12 +27,14 @@ "url": "https://github.com/pnpm/pnpm/issues" }, "homepage": "https://github.com/pnpm/pnpm/blob/main/tools/path#readme", - "dependencies": {}, "devDependencies": { "@pnpm/tools.path": "workspace:*" }, "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/tools/plugin-commands-self-updater/jest.config.js b/tools/plugin-commands-self-updater/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/tools/plugin-commands-self-updater/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/tools/plugin-commands-self-updater/package.json b/tools/plugin-commands-self-updater/package.json index 68e2ad09c8..2e18ba53af 100644 --- a/tools/plugin-commands-self-updater/package.json +++ b/tools/plugin-commands-self-updater/package.json @@ -57,5 +57,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/worker/package.json b/worker/package.json index 5c58ce719c..c167e89419 100644 --- a/worker/package.json +++ b/worker/package.json @@ -52,5 +52,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/filter-packages-from-dir/package.json b/workspace/filter-packages-from-dir/package.json index 0c13c0c682..cab835ed77 100644 --- a/workspace/filter-packages-from-dir/package.json +++ b/workspace/filter-packages-from-dir/package.json @@ -39,5 +39,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/filter-workspace-packages/jest.config.js b/workspace/filter-workspace-packages/jest.config.js deleted file mode 100644 index 9b65513eba..0000000000 --- a/workspace/filter-workspace-packages/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = Object.assign({}, config, {}); diff --git a/workspace/filter-workspace-packages/package.json b/workspace/filter-workspace-packages/package.json index 41f82ec89f..ead5061850 100644 --- a/workspace/filter-workspace-packages/package.json +++ b/workspace/filter-workspace-packages/package.json @@ -54,5 +54,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/find-packages/jest.config.js b/workspace/find-packages/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/workspace/find-packages/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/workspace/find-packages/package.json b/workspace/find-packages/package.json index 57af3ae87d..553cf39906 100644 --- a/workspace/find-packages/package.json +++ b/workspace/find-packages/package.json @@ -45,5 +45,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/find-workspace-dir/jest.config.js b/workspace/find-workspace-dir/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/workspace/find-workspace-dir/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/workspace/find-workspace-dir/package.json b/workspace/find-workspace-dir/package.json index 9446674bb6..ef648b28a5 100644 --- a/workspace/find-workspace-dir/package.json +++ b/workspace/find-workspace-dir/package.json @@ -38,5 +38,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/pkgs-graph/jest.config.js b/workspace/pkgs-graph/jest.config.js deleted file mode 100644 index 56786ef060..0000000000 --- a/workspace/pkgs-graph/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = config diff --git a/workspace/pkgs-graph/package.json b/workspace/pkgs-graph/package.json index 7373b3cddc..5cc5585e07 100644 --- a/workspace/pkgs-graph/package.json +++ b/workspace/pkgs-graph/package.json @@ -42,5 +42,8 @@ ], "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/read-manifest/jest.config.js b/workspace/read-manifest/jest.config.js deleted file mode 100644 index f697d83169..0000000000 --- a/workspace/read-manifest/jest.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../jest.config.js') diff --git a/workspace/read-manifest/package.json b/workspace/read-manifest/package.json index 3e3c013065..9198febe54 100644 --- a/workspace/read-manifest/package.json +++ b/workspace/read-manifest/package.json @@ -39,5 +39,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/resolve-workspace-range/package.json b/workspace/resolve-workspace-range/package.json index 5981f9c5f8..d34dbc5d02 100644 --- a/workspace/resolve-workspace-range/package.json +++ b/workspace/resolve-workspace-range/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } diff --git a/workspace/sort-packages/package.json b/workspace/sort-packages/package.json index 7e4169a073..eefc459730 100644 --- a/workspace/sort-packages/package.json +++ b/workspace/sort-packages/package.json @@ -37,5 +37,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } } \ No newline at end of file diff --git a/workspace/spec-parser/jest.config.js b/workspace/spec-parser/jest.config.js deleted file mode 100644 index 56786ef060..0000000000 --- a/workspace/spec-parser/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -const config = require('../../jest.config.js'); - -module.exports = config diff --git a/workspace/spec-parser/package.json b/workspace/spec-parser/package.json index 661b88772d..6b90bbe245 100644 --- a/workspace/spec-parser/package.json +++ b/workspace/spec-parser/package.json @@ -34,5 +34,8 @@ }, "exports": { ".": "./lib/index.js" + }, + "jest": { + "preset": "@pnpm/jest-config" } }