Merge branch 'main' into fix-loglevel-deprecation-warnings

.changeset/eighty-shoes-grow.md

@@ -0,0 +1,8 @@
+---
+"@pnpm/build-modules": patch
+"@pnpm/core": patch
+"@pnpm/plugin-commands-rebuild": patch
+"@pnpm/sort-packages": patch
+---
+
+Use `@pnpm/graph-sequencer` instead of `graph-sequencer`.

.changeset/large-dragons-guess.md

@@ -0,0 +1,6 @@
+---
+"@pnpm/plugin-commands-installation": patch
+"pnpm": patch
+---
+
+`pnpm fetch` should allow the same CLI options as `pnpm install` [#4453](https://github.com/pnpm/pnpm/issues/4453).

.changeset/mean-zoos-move.md

@@ -0,0 +1,5 @@
+---
+"@pnpm/plugin-commands-publishing": patch
+---
+
+Show friendly error message when get current git branch name error.

.changeset/nice-geese-press.md

@@ -0,0 +1,5 @@
+---
+"@pnpm/lockfile-utils": patch
+---
+
+When checking if the lockfile is up-to-date, an empty dependenciesMeta field in the manifest should be satisfied by a not set field in the lockfile.

.changeset/rude-rats-smell.md

@@ -0,0 +1,6 @@
+---
+"@pnpm/config": major
+"pnpm": major
+---
+
+Don't hoist types by default to the root of node_modules.

.changeset/wet-rabbits-talk.md

@@ -0,0 +1,5 @@
+---
+"@pnpm/manifest-utils": patch
+---
+
+Handle undefined version spec.

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 github: pnpm
 open_collective: pnpm
-patreon: pnpm
 custom: "https://pnpm.io/crypto-donations"

.github/config.yml

@@ -0,0 +1,7 @@
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: |
+  💖 Thanks for opening this pull request! 💖
+  Please be patient and we will get back to you as soon as we can.
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! 🎉🎉🎉

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - '12.17'
+          - '14.19'
           - '16'
           - '17'
         platform:
@@ -27,20 +27,31 @@ jobs:
     - name: Checkout Commit
       uses: actions/checkout@v1
     - name: Install pnpm
-      uses: pnpm/action-setup@v2.0.1
-      with: 
-        version: next
+      uses: pnpm/action-setup@v2.2.0
+      with:
+        version: next-7
     - name: Setup Node
       uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node }}
         cache: 'pnpm'
     - name: Install npm@7
-      run: pnpm add --global npm@7
+      run: npm add --global npm@7
     - name: pnpm install
       run: pnpm install
     - name: Audit
       run: pnpm audit
+    - name: Cache TypeScript and Jest
+      uses: actions/cache@v2
+      with:
+        path: |
+          packages/*/lib
+          packages/*/tsconfig.tsbuildinfo
+          privatePackages/*/lib
+          privatePackages/*/tsconfig.tsbuildinfo
+          .jest-cache
+        key: ts-jest-${{ matrix.platform }}-${{ matrix.node }}-${{ github.run_id }}
+        restore-keys: ts-jest-${{ matrix.platform }}-${{ matrix.node }}-
     - name: run tests (main)
       if: github.ref == 'refs/heads/main'
       run: pnpm run test-main

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
           sudo mv ldid /usr/local/bin
       - name: install pnpm and npm
         run: |
-          curl -L https://get.pnpm.io/v6.16.js | node - add --global pnpm@next npm@7
+          curl -L https://get.pnpm.io/v6.16.js | node - add --global pnpm@next-7 npm@7
       - name: pnpm install
         run: pnpm install
       - name: Publish Packages

.gitignore

@@ -40,3 +40,5 @@ storage
 yarn.lock
 
 RELEASE.md
+
+.jest-cache

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm run lint -- --quiet
+pnpm run lint --quiet

.meta-updater/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @pnpm-private/updater
 
+## 0.3.0
+
+### Minor Changes
+
+- 542014839: Node.js 12 is not supported.
+
+### Patch Changes
+
+- Updated dependencies [d504dc380]
+- Updated dependencies [542014839]
+  - @pnpm/types@8.0.0
+  - @pnpm/lockfile-file@5.0.0
+
+## 0.2.9
+
+### Patch Changes
+
+- @pnpm/lockfile-file@4.3.1
+
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies [b138d048c]
+  - @pnpm/lockfile-file@4.3.0
+  - @pnpm/types@7.10.0
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies [26cd01b88]
+  - @pnpm/types@7.9.0
+  - @pnpm/lockfile-file@4.2.6
+
 ## 0.2.6
 
 ### Patch Changes

.meta-updater/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@pnpm-private/updater",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "private": true,
   "type": "module",
   "scripts": {
     "compile": "tsc --build"
   },
   "dependencies": {
-    "@pnpm/lockfile-file": "workspace:4.2.5",
-    "@pnpm/types": "workspace:7.8.0",
+    "@pnpm/lockfile-file": "workspace:5.0.0",
+    "@pnpm/types": "workspace:8.0.0",
     "@types/normalize-path": "^3.0.0",
     "is-subdir": "^1.1.1",
     "load-json-file": "^6.2.0",
     "normalize-path": "^3.0.0",
     "path-exists": "^4.0.0",
     "write-json-file": "^4.3.0"
+  },
+  "devDependencies": {
+    "@pnpm-private/updater": "workspace:*"
   }
 }

.meta-updater/src/index.ts

@@ -8,6 +8,8 @@ import normalizePath from 'normalize-path'
 import exists from 'path-exists'
 import writeJsonFile from 'write-json-file'
 
+const NEXT_TAG = 'next-7'
+
 export default async (workspaceDir: string) => {
   const pnpmManifest = loadJsonFile.sync(path.join(workspaceDir, 'packages/pnpm/package.json'))
   const pnpmVersion = pnpmManifest!['version'] // eslint-disable-line
@@ -19,9 +21,25 @@ export default async (workspaceDir: string) => {
   }
   return {
     'package.json': (manifest: ProjectManifest & { keywords?: string[] }, dir: string) => {
+      if (manifest.name === 'monorepo-root') {
+        manifest.scripts!['release'] = `pnpm --filter=@pnpm/exe publish --tag=${NEXT_TAG} --access=public && pnpm publish --filter=!pnpm --filter=!@pnpm/exe --access=public && pnpm publish --filter=pnpm --tag=${NEXT_TAG} --access=public`
+        return manifest
+      }
       if (!isSubdir(pkgsDir, dir)) {
+        if (manifest.name) {
+          manifest.devDependencies = {
+            ...manifest.devDependencies,
+            [manifest.name]: `workspace:*`,
+          }
+        }
         return manifest
       }
+      if (manifest.name && manifest.name !== 'pnpm') {
+        manifest.devDependencies = {
+          ...manifest.devDependencies,
+          [manifest.name]: `workspace:${manifest.version}`,
+        }
+      }
       manifest.keywords = [
         pnpmMajorKeyword,
         ...(manifest.keywords ?? []).filter((keyword) => !/^pnpm[0-9]+$/.test(keyword)),
@@ -65,7 +83,7 @@ async function updateTSConfig (
   const references = [] as Array<{ path: string }>
   for (const [depName, spec] of Object.entries(deps)) {
     if (!spec.startsWith('link:') || spec.length === 5) continue
-    const relativePath = spec.substr(5)
+    const relativePath = spec.slice(5)
     if (!await exists(path.join(dir, relativePath, 'tsconfig.json'))) continue
     if (
       depName === '@pnpm/package-store' && (
@@ -148,15 +166,21 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest,
     }
     break
   }
+  if (manifest.name === 'pnpm') {
+    manifest.publishConfig!.tag = NEXT_TAG
+  }
   if (scripts._test) {
     if (scripts.pretest) {
       scripts._test = `pnpm pretest && ${scripts._test}`
     }
     if (scripts.posttest) {
       scripts._test = `${scripts._test} && pnpm posttest`
     }
+    if (manifest.name === '@pnpm/server') {
+      scripts._test += ' --detectOpenHandles'
+    }
   }
-  scripts.compile = 'rimraf lib tsconfig.tsbuildinfo && tsc --build && pnpm run lint -- --fix'
+  scripts.compile = 'tsc --build && pnpm run lint --fix'
   delete scripts.tsc
   let homepage: string
   let repository: string | { type: 'git', url: string }
@@ -173,8 +197,8 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest,
 && shx cp pnpmrc dist/pnpmrc'
   } else {
     scripts.prepublishOnly = 'pnpm run compile'
-    homepage = `https://github.com/pnpm/pnpm/blob/master/${relative}#readme`
-    repository = `https://github.com/pnpm/pnpm/blob/master/${relative}`
+    homepage = `https://github.com/pnpm/pnpm/blob/main/${relative}#readme`
+    repository = `https://github.com/pnpm/pnpm/blob/main/${relative}`
   }
   if (scripts.lint) {
     if (fs.existsSync(path.join(dir, 'test'))) {
@@ -201,13 +225,16 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest,
       url: 'https://github.com/pnpm/pnpm/issues',
     },
     engines: {
-      node: '>=12.17',
+      node: '>=14.19',
     },
     files,
     funding: 'https://opencollective.com/pnpm',
     homepage,
     license: 'MIT',
     repository,
     scripts,
+    exports: {
+      '.': manifest.name === 'pnpm' ? './package.json' : './lib/index.js',
+    },
   }
 }

.npmrc

@@ -7,4 +7,6 @@ shared-workspace-lockfile = true
 use-beta-cli = true
 publish-branch = main
 pnpmfile = .pnpmfile.cjs
+side-effects-cache = true
 strict-peer-dependencies = true
+extend-node-path = false

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at zoltankochan@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at coc@pnpm.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015-2016 Rico Sta. Cruz and other contributors
-Copyright (c) 2016-2021 Zoltan Kochan and other contributors
+Copyright (c) 2016-2022 Zoltan Kochan and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal