Merge branch 'main' into v10

.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.

.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).

.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: {

__utils__/assert-project/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

__utils__/assert-store/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

__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__/", "<rootDir>/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%",
 }
 

__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)
   }
 }

__utils__/jest-config/globalTeardown.js

@@ -0,0 +1,3 @@
+module.exports = () => {
+  return global.killServer?.()
+}

__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
+}

__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:*"
+  }
+}

__utils__/test-ipc-server/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

cache/api/package.json

@@ -46,5 +46,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cache/commands/jest.config.js

@@ -1,2 +0,0 @@
-module.exports = require('../../jest-with-registry.config.js')
-

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"
   }
 }

catalogs/config/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

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"
   }
 }

catalogs/protocol-parser/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

catalogs/protocol-parser/package.json

@@ -35,5 +35,8 @@
   },
   "devDependencies": {
     "@pnpm/catalogs.protocol-parser": "workspace:*"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

catalogs/resolver/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

catalogs/resolver/package.json

@@ -40,5 +40,8 @@
   "devDependencies": {
     "@pnpm/catalogs.resolver": "workspace:*",
     "@pnpm/catalogs.types": "workspace:*"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

catalogs/types/package.json

@@ -34,5 +34,8 @@
   },
   "devDependencies": {
     "@pnpm/catalogs.types": "workspace:*"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/cli-meta/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

cli/cli-meta/package.json

@@ -38,5 +38,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/cli-utils/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

cli/cli-utils/package.json

@@ -52,5 +52,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/command/package.json

@@ -36,5 +36,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/common-cli-options-help/package.json

@@ -33,5 +33,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/default-reporter/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

cli/default-reporter/package.json

@@ -69,5 +69,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

cli/parse-cli-args/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = config

cli/parse-cli-args/package.json

@@ -42,5 +42,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

completion/plugin-commands-completion/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest-with-registry.config.js')

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"
+  }
 }

config/config/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

config/config/package.json

@@ -70,5 +70,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/matcher/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

config/matcher/package.json

@@ -40,5 +40,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/normalize-registries/package.json

@@ -38,5 +38,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/package-is-installable/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

config/package-is-installable/package.json

@@ -50,5 +50,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/parse-overrides/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

config/parse-overrides/package.json

@@ -39,5 +39,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/pick-registry-for-package/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

config/pick-registry-for-package/package.json

@@ -36,5 +36,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

config/plugin-commands-config/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

config/plugin-commands-config/package.json

@@ -49,5 +49,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

crypto/hash/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

crypto/hash/package.json

@@ -39,5 +39,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

crypto/object-hasher/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

crypto/object-hasher/package.json

@@ -41,5 +41,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

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"
   }
 }

dedupe/check/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

dedupe/check/package.json

@@ -39,5 +39,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

dedupe/issues-renderer/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

dedupe/issues-renderer/package.json

@@ -40,5 +40,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

dedupe/types/package.json

@@ -32,5 +32,8 @@
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/dedupe.types": "workspace:*"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

deps/graph-builder/package.json

@@ -53,5 +53,8 @@
     "@pnpm/types": "workspace:*",
     "path-exists": "catalog:",
     "ramda": "catalog:"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

deps/graph-sequencer/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

deps/graph-sequencer/package.json

@@ -35,5 +35,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

env/node.fetcher/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

env/node.fetcher/package.json

@@ -52,5 +52,8 @@
     "@pnpm/prepare": "workspace:*",
     "@types/adm-zip": "catalog:",
     "node-fetch": "catalog:"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

env/node.resolver/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

env/node.resolver/package.json

@@ -44,5 +44,8 @@
     "@pnpm/fetch": "workspace:*",
     "@pnpm/node.resolver": "workspace:*",
     "@types/semver": "catalog:"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

env/path/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

env/path/package.json

@@ -38,5 +38,8 @@
   },
   "devDependencies": {
     "@pnpm/env.path": "workspace:*"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

env/plugin-commands-env/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

env/plugin-commands-env/package.json

@@ -72,5 +72,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

env/system-node-version/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js')
-
-module.exports = config

env/system-node-version/package.json

@@ -40,5 +40,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/build-modules/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

exec/build-modules/package.json

@@ -58,5 +58,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/lifecycle/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

exec/lifecycle/package.json

@@ -61,5 +61,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/pkg-requires-build/package.json

@@ -37,5 +37,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/plugin-commands-rebuild/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest-with-registry.config.js')

exec/plugin-commands-rebuild/package.json

@@ -87,5 +87,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/plugin-commands-script-runners/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest-with-registry.config.js')

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"
   }
 }

exec/prepare-package/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

exec/prepare-package/package.json

@@ -49,5 +49,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

exec/run-npm/package.json

@@ -37,5 +37,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fetching/directory-fetcher/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

fetching/directory-fetcher/package.json

@@ -49,5 +49,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fetching/fetcher-base/package.json

@@ -41,5 +41,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fetching/git-fetcher/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

fetching/git-fetcher/package.json

@@ -51,5 +51,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fetching/pick-fetcher/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

fetching/pick-fetcher/package.json

@@ -35,5 +35,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fetching/tarball-fetcher/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config')

fetching/tarball-fetcher/package.json

@@ -68,5 +68,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fs/find-packages/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

fs/find-packages/package.json

@@ -42,5 +42,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fs/graceful-fs/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

fs/graceful-fs/package.json

@@ -37,5 +37,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fs/hard-link-dir/jest.config.js

@@ -1 +0,0 @@
-module.exports = require('../../jest.config.js')

fs/hard-link-dir/package.json

@@ -40,5 +40,8 @@
   },
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fs/indexed-pkg-importer/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});

fs/indexed-pkg-importer/package.json

@@ -65,5 +65,8 @@
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
+  },
+  "jest": {
+    "preset": "@pnpm/jest-config"
   }
 }

fs/is-empty-dir-or-nothing/jest.config.js

@@ -1,3 +0,0 @@
-const config = require('../../jest.config.js');
-
-module.exports = Object.assign({}, config, {});