refactor: group projects in different subdirectories (#5659)

pnpm · Nov 19, 2022 · 4ca53b0 · 4ca53b0
1 parent d81599b
commit 4ca53b0
Show file tree

Hide file tree

Showing 1,835 changed files with 5,802 additions and 12,650 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 fixtures
+__fixtures__
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,8 +43,8 @@ jobs:
       run: npm add --global npm@7
     - name: pnpm install
       run: pnpm install
-    - name: Audit
-      run: pnpm audit
+    # - name: Audit
+      # run: pnpm audit
     - name: Cache TypeScript and Jest
       uses: actions/cache@v3
       with:

diff --git a/.meta-updater/package.json b/.meta-updater/package.json
@@ -7,8 +7,8 @@
     "compile": "tsc --build"
   },
   "dependencies": {
-    "@pnpm/lockfile-file": "workspace:*",
-    "@pnpm/types": "workspace:*",
+    "@pnpm/lockfile-file": "6.0.2",
+    "@pnpm/types": "8.9.0",
     "@types/normalize-path": "^3.0.0",
     "is-subdir": "^1.2.0",
     "load-json-file": "^6.2.0",

diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts
@@ -13,10 +13,11 @@ const NEXT_TAG = 'next-7'
 const CLI_PKG_NAME = 'pnpm'
 
 export default async (workspaceDir: string) => {
-  const pnpmManifest = loadJsonFile.sync(path.join(workspaceDir, 'packages/pnpm/package.json'))
+  const pnpmManifest = loadJsonFile.sync(path.join(workspaceDir, 'pnpm/package.json'))
   const pnpmVersion = pnpmManifest!['version'] // eslint-disable-line
   const pnpmMajorKeyword = `pnpm${pnpmVersion.split('.')[0]}`
-  const pkgsDir = path.join(workspaceDir, 'packages')
+  const privatePkgsDir = path.join(workspaceDir, 'privatePackages')
+  const utilsDir = path.join(workspaceDir, 'utils')
   const lockfile = await readWantedLockfile(workspaceDir, { ignoreIncompatible: false })
   if (lockfile == null) {
     throw new Error('no lockfile found')
@@ -30,21 +31,15 @@ export default async (workspaceDir: string) => {
         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 !== CLI_PKG_NAME) {
         manifest.devDependencies = {
           ...manifest.devDependencies,
           [manifest.name]: `workspace:*`,
         }
+      } else if (manifest.name === CLI_PKG_NAME && manifest.devDependencies) {
+        delete manifest.devDependencies[manifest.name]
       }
+      if (manifest.private || isSubdir(privatePkgsDir, dir) || isSubdir(utilsDir, dir)) return manifest
       manifest.keywords = [
         pnpmMajorKeyword,
         ...(manifest.keywords ?? []).filter((keyword) => !/^pnpm[0-9]+$/.test(keyword)),

diff --git a/.meta-updater/tsconfig.json b/.meta-updater/tsconfig.json
@@ -9,12 +9,5 @@
     "src/**/*.ts",
     "../typings/**/*.d.ts"
   ],
-  "references": [
-    {
-      "path": "../packages/lockfile-file"
-    },
-    {
-      "path": "../packages/types"
-    }
-  ]
+  "references": []
 }
diff --git a/.npmrc b/.npmrc
@@ -2,7 +2,7 @@
 git-checks = false
 
 hoist-pattern[] = jest-runner
-link-workspace-packages = true
+link-workspace-packages = false
 shared-workspace-lockfile = true
 publish-branch = main
 pnpmfile = .pnpmfile.cjs

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@
 ## Setting Up the Environment
 
 1. Run `pnpm install` in the root of the repository to install all dependencies.
-1. Run `cd packages/pnpm/dev && pnpm link -g` to make pnpm from the repository available in the command line via the `pd` command.
+1. Run `cd pnpm/dev && pnpm link -g` to make pnpm from the repository available in the command line via the `pd` command.
 1. Return to the root of the repository and run `pnpm run compile` to create an initial build of pnpm from the source in the repository.
 1. Now you can change any source code file and run `pd [command] [flags]` to run `pnpm` directly from the source code by compiling all the files without typechecking in memory.
 1. Alternatively, for recompiling all the projects with typechecking after your changes, again run `pnpm run compile` in the root of the repository. To run a task that will recompile the projects on change, run `pnpm run watch`.

diff --git a/fixtures/.gitignore → __fixtures__/.gitignore b/fixtures/.gitignore → __fixtures__/.gitignore
diff --git a/fixtures/.npmrc → __fixtures__/.npmrc b/fixtures/.npmrc → __fixtures__/.npmrc
diff --git a/fixtures/circular/package.json → __fixtures__/circular/package.json b/fixtures/circular/package.json → __fixtures__/circular/package.json
diff --git a/fixtures/circular/pnpm-lock.yaml → __fixtures__/circular/pnpm-lock.yaml b/fixtures/circular/pnpm-lock.yaml → __fixtures__/circular/pnpm-lock.yaml
diff --git a/fixtures/empty/package.json → __fixtures__/empty/package.json b/fixtures/empty/package.json → __fixtures__/empty/package.json
diff --git a/...xture-with-external-shrinkwrap/pkg/.npmrc → ...xture-with-external-shrinkwrap/pkg/.npmrc b/...xture-with-external-shrinkwrap/pkg/.npmrc → ...xture-with-external-shrinkwrap/pkg/.npmrc
diff --git a/...with-external-shrinkwrap/pkg/package.json → ...with-external-shrinkwrap/pkg/package.json b/...with-external-shrinkwrap/pkg/package.json → ...with-external-shrinkwrap/pkg/package.json
diff --git a/...e-with-external-shrinkwrap/pnpm-lock.yaml → ...e-with-external-shrinkwrap/pnpm-lock.yaml b/...e-with-external-shrinkwrap/pnpm-lock.yaml → ...e-with-external-shrinkwrap/pnpm-lock.yaml
diff --git a/...h-external-shrinkwrap/pnpm-workspace.yaml → ...h-external-shrinkwrap/pnpm-workspace.yaml b/...h-external-shrinkwrap/pnpm-workspace.yaml → ...h-external-shrinkwrap/pnpm-workspace.yaml
diff --git a/...h-no-pkg-name-and-no-version/package.json → ...h-no-pkg-name-and-no-version/package.json b/...h-no-pkg-name-and-no-version/package.json → ...h-no-pkg-name-and-no-version/package.json
diff --git a/...no-pkg-name-and-no-version/pnpm-lock.yaml → ...no-pkg-name-and-no-version/pnpm-lock.yaml b/...no-pkg-name-and-no-version/pnpm-lock.yaml → ...no-pkg-name-and-no-version/pnpm-lock.yaml
diff --git a/.../fixture-with-no-pkg-version/package.json → .../fixture-with-no-pkg-version/package.json b/.../fixture-with-no-pkg-version/package.json → .../fixture-with-no-pkg-version/package.json
diff --git a/...ixture-with-no-pkg-version/pnpm-lock.yaml → ...ixture-with-no-pkg-version/pnpm-lock.yaml b/...ixture-with-no-pkg-version/pnpm-lock.yaml → ...ixture-with-no-pkg-version/pnpm-lock.yaml
diff --git a/fixtures/fixture/package.json → __fixtures__/fixture/package.json b/fixtures/fixture/package.json → __fixtures__/fixture/package.json
diff --git a/fixtures/fixture/pnpm-lock.yaml → __fixtures__/fixture/pnpm-lock.yaml b/fixtures/fixture/pnpm-lock.yaml → __fixtures__/fixture/pnpm-lock.yaml
diff --git a/fixtures/fixtureWithLinks/.npmrc → __fixtures__/fixtureWithLinks/.npmrc b/fixtures/fixtureWithLinks/.npmrc → __fixtures__/fixtureWithLinks/.npmrc
diff --git a/...res/fixtureWithLinks/general/package.json → ...s__/fixtureWithLinks/general/package.json b/...res/fixtureWithLinks/general/package.json → ...s__/fixtureWithLinks/general/package.json
diff --git a/...s/fixtureWithLinks/general/pnpm-lock.yaml → ..._/fixtureWithLinks/general/pnpm-lock.yaml b/...s/fixtureWithLinks/general/pnpm-lock.yaml → ..._/fixtureWithLinks/general/pnpm-lock.yaml
diff --git a/...ures/fixtureWithLinks/pnpm-workspace.yaml → ...es__/fixtureWithLinks/pnpm-workspace.yaml b/...ures/fixtureWithLinks/pnpm-workspace.yaml → ...es__/fixtureWithLinks/pnpm-workspace.yaml
diff --git a/...ureWithLinks/with-links-only/package.json → ...ureWithLinks/with-links-only/package.json b/...ureWithLinks/with-links-only/package.json → ...ureWithLinks/with-links-only/package.json
diff --git a/...eWithLinks/with-links-only/pnpm-lock.yaml → ...eWithLinks/with-links-only/pnpm-lock.yaml b/...eWithLinks/with-links-only/pnpm-lock.yaml → ...eWithLinks/with-links-only/pnpm-lock.yaml
diff --git a/fixtures/general/package.json → __fixtures__/general/package.json b/fixtures/general/package.json → __fixtures__/general/package.json
diff --git a/fixtures/general/pnpm-lock.yaml → __fixtures__/general/pnpm-lock.yaml b/fixtures/general/pnpm-lock.yaml → __fixtures__/general/pnpm-lock.yaml
diff --git a/fixtures/has-2-outdated-deps/.gitignore → __fixtures__/has-2-outdated-deps/.gitignore b/fixtures/has-2-outdated-deps/.gitignore → __fixtures__/has-2-outdated-deps/.gitignore
diff --git a/fixtures/has-2-outdated-deps/.npmrc → __fixtures__/has-2-outdated-deps/.npmrc b/fixtures/has-2-outdated-deps/.npmrc → __fixtures__/has-2-outdated-deps/.npmrc
diff --git a/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml b/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml
diff --git a/fixtures/has-2-outdated-deps/package.json → ...xtures__/has-2-outdated-deps/package.json b/fixtures/has-2-outdated-deps/package.json → ...xtures__/has-2-outdated-deps/package.json
diff --git a/fixtures/has-2-outdated-deps/pnpm-lock.yaml → ...ures__/has-2-outdated-deps/pnpm-lock.yaml b/fixtures/has-2-outdated-deps/pnpm-lock.yaml → ...ures__/has-2-outdated-deps/pnpm-lock.yaml
diff --git a/...-broken-symlink/has-broken-symlink.tar.gz → ...-broken-symlink/has-broken-symlink.tar.gz b/...-broken-symlink/has-broken-symlink.tar.gz → ...-broken-symlink/has-broken-symlink.tar.gz
diff --git a/__fixtures__/has-major-outdated-deps/.gitignore b/__fixtures__/has-major-outdated-deps/.gitignore
@@ -0,0 +1,2 @@
+!**/node_modules/**/*
+!/node_modules/
diff --git a/fixtures/has-major-outdated-deps/.npmrc → __fixtures__/has-major-outdated-deps/.npmrc b/fixtures/has-major-outdated-deps/.npmrc → __fixtures__/has-major-outdated-deps/.npmrc
diff --git a/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml b/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml
diff --git a/...ures/has-major-outdated-deps/package.json → ...es__/has-major-outdated-deps/package.json b/...ures/has-major-outdated-deps/package.json → ...es__/has-major-outdated-deps/package.json
diff --git a/...es/has-major-outdated-deps/pnpm-lock.yaml → ...__/has-major-outdated-deps/pnpm-lock.yaml b/...es/has-major-outdated-deps/pnpm-lock.yaml → ...__/has-major-outdated-deps/pnpm-lock.yaml
diff --git a/fixtures/has-no-lockfile/.npmrc → __fixtures__/has-no-lockfile/.npmrc b/fixtures/has-no-lockfile/.npmrc → __fixtures__/has-no-lockfile/.npmrc
diff --git a/fixtures/has-no-lockfile/package.json → __fixtures__/has-no-lockfile/package.json b/fixtures/has-no-lockfile/package.json → __fixtures__/has-no-lockfile/package.json
diff --git a/__fixtures__/has-not-outdated-deps/.gitignore b/__fixtures__/has-not-outdated-deps/.gitignore
@@ -0,0 +1,2 @@
+!**/node_modules/**/*
+!/node_modules/
diff --git a/fixtures/has-not-outdated-deps/.npmrc → __fixtures__/has-not-outdated-deps/.npmrc b/fixtures/has-not-outdated-deps/.npmrc → __fixtures__/has-not-outdated-deps/.npmrc
diff --git a/...-outdated-deps/node_modules/.modules.yaml → ...-outdated-deps/node_modules/.modules.yaml b/...-outdated-deps/node_modules/.modules.yaml → ...-outdated-deps/node_modules/.modules.yaml
diff --git a/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml b/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml
diff --git a/...ot-outdated-deps/node_modules/is-negative → ...ot-outdated-deps/node_modules/is-negative b/...ot-outdated-deps/node_modules/is-negative → ...ot-outdated-deps/node_modules/is-negative
diff --git a/...ot-outdated-deps/node_modules/is-positive → ...ot-outdated-deps/node_modules/is-positive b/...ot-outdated-deps/node_modules/is-positive → ...ot-outdated-deps/node_modules/is-positive
diff --git a/fixtures/has-not-outdated-deps/package.json → ...ures__/has-not-outdated-deps/package.json b/fixtures/has-not-outdated-deps/package.json → ...ures__/has-not-outdated-deps/package.json
diff --git a/...ures/has-not-outdated-deps/pnpm-lock.yaml → ...es__/has-not-outdated-deps/pnpm-lock.yaml b/...ures/has-not-outdated-deps/pnpm-lock.yaml → ...es__/has-not-outdated-deps/pnpm-lock.yaml
diff --git a/fixtures/has-npm-shrinkwrap-json/.gitignore → ...ures__/has-npm-shrinkwrap-json/.gitignore b/fixtures/has-npm-shrinkwrap-json/.gitignore → ...ures__/has-npm-shrinkwrap-json/.gitignore
diff --git a/...s-npm-shrinkwrap-json/npm-shrinkwrap.json → ...s-npm-shrinkwrap-json/npm-shrinkwrap.json b/...s-npm-shrinkwrap-json/npm-shrinkwrap.json → ...s-npm-shrinkwrap-json/npm-shrinkwrap.json
diff --git a/...ures/has-npm-shrinkwrap-json/package.json → ...es__/has-npm-shrinkwrap-json/package.json b/...ures/has-npm-shrinkwrap-json/package.json → ...es__/has-npm-shrinkwrap-json/package.json
diff --git a/__fixtures__/has-outdated-deps-and-external-shrinkwrap/.gitignore b/__fixtures__/has-outdated-deps-and-external-shrinkwrap/.gitignore
@@ -0,0 +1,2 @@
+!**/node_modules/**/*
+!/node_modules/
diff --git a/...dated-deps-and-external-shrinkwrap/.npmrc → ...dated-deps-and-external-shrinkwrap/.npmrc b/...dated-deps-and-external-shrinkwrap/.npmrc → ...dated-deps-and-external-shrinkwrap/.npmrc
diff --git a/...l-shrinkwrap/node_modules/.pnpm/lock.yaml → ...l-shrinkwrap/node_modules/.pnpm/lock.yaml b/...l-shrinkwrap/node_modules/.pnpm/lock.yaml → ...l-shrinkwrap/node_modules/.pnpm/lock.yaml
diff --git a/...-and-external-shrinkwrap/pkg/package.json → ...-and-external-shrinkwrap/pkg/package.json b/...-and-external-shrinkwrap/pkg/package.json → ...-and-external-shrinkwrap/pkg/package.json
diff --git a/...ps-and-external-shrinkwrap/pnpm-lock.yaml → ...ps-and-external-shrinkwrap/pnpm-lock.yaml b/...ps-and-external-shrinkwrap/pnpm-lock.yaml → ...ps-and-external-shrinkwrap/pnpm-lock.yaml
diff --git a/...d-external-shrinkwrap/pnpm-workspace.yaml → ...d-external-shrinkwrap/pnpm-workspace.yaml b/...d-external-shrinkwrap/pnpm-workspace.yaml → ...d-external-shrinkwrap/pnpm-workspace.yaml
diff --git a/__fixtures__/has-outdated-deps/.gitignore b/__fixtures__/has-outdated-deps/.gitignore
@@ -0,0 +1,2 @@
+!**/node_modules/**/*
+!/node_modules/
diff --git a/fixtures/has-outdated-deps/.npmrc → __fixtures__/has-outdated-deps/.npmrc b/fixtures/has-outdated-deps/.npmrc → __fixtures__/has-outdated-deps/.npmrc
diff --git a/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml b/...utdated-deps/node_modules/.pnpm/lock.yaml → ...utdated-deps/node_modules/.pnpm/lock.yaml
diff --git a/fixtures/has-outdated-deps/package.json → __fixtures__/has-outdated-deps/package.json b/fixtures/has-outdated-deps/package.json → __fixtures__/has-outdated-deps/package.json
diff --git a/fixtures/has-outdated-deps/pnpm-lock.yaml → ...xtures__/has-outdated-deps/pnpm-lock.yaml b/fixtures/has-outdated-deps/pnpm-lock.yaml → ...xtures__/has-outdated-deps/pnpm-lock.yaml
diff --git a/fixtures/has-package-lock-json/.gitignore → ...xtures__/has-package-lock-json/.gitignore b/fixtures/has-package-lock-json/.gitignore → ...xtures__/has-package-lock-json/.gitignore
diff --git a/...s/has-package-lock-json/package-lock.json → ..._/has-package-lock-json/package-lock.json b/...s/has-package-lock-json/package-lock.json → ..._/has-package-lock-json/package-lock.json
diff --git a/fixtures/has-package-lock-json/package.json → ...ures__/has-package-lock-json/package.json b/fixtures/has-package-lock-json/package.json → ...ures__/has-package-lock-json/package.json
diff --git a/fixtures/has-yarn-lock/.gitignore → __fixtures__/has-yarn-lock/.gitignore b/fixtures/has-yarn-lock/.gitignore → __fixtures__/has-yarn-lock/.gitignore
diff --git a/fixtures/has-yarn-lock/.npmrc → __fixtures__/has-yarn-lock/.npmrc b/fixtures/has-yarn-lock/.npmrc → __fixtures__/has-yarn-lock/.npmrc
diff --git a/fixtures/has-yarn-lock/package.json → __fixtures__/has-yarn-lock/package.json b/fixtures/has-yarn-lock/package.json → __fixtures__/has-yarn-lock/package.json
diff --git a/fixtures/has-yarn-lock/yarn.lock → __fixtures__/has-yarn-lock/yarn.lock b/fixtures/has-yarn-lock/yarn.lock → __fixtures__/has-yarn-lock/yarn.lock
diff --git a/fixtures/has-yarn2-lock/.gitignore → __fixtures__/has-yarn2-lock/.gitignore b/fixtures/has-yarn2-lock/.gitignore → __fixtures__/has-yarn2-lock/.gitignore
diff --git a/fixtures/has-yarn2-lock/package.json → __fixtures__/has-yarn2-lock/package.json b/fixtures/has-yarn2-lock/package.json → __fixtures__/has-yarn2-lock/package.json
diff --git a/fixtures/has-yarn2-lock/yarn.lock → __fixtures__/has-yarn2-lock/yarn.lock b/fixtures/has-yarn2-lock/yarn.lock → __fixtures__/has-yarn2-lock/yarn.lock
diff --git a/fixtures/hello-world-js-bin/index.js → __fixtures__/hello-world-js-bin/index.js b/fixtures/hello-world-js-bin/index.js → __fixtures__/hello-world-js-bin/index.js
diff --git a/fixtures/hello-world-js-bin/package.json → __fixtures__/hello-world-js-bin/package.json b/fixtures/hello-world-js-bin/package.json → __fixtures__/hello-world-js-bin/package.json
diff --git a/fixtures/local-pkg/index.js → __fixtures__/local-pkg/index.js b/fixtures/local-pkg/index.js → __fixtures__/local-pkg/index.js
diff --git a/fixtures/local-pkg/package.json → __fixtures__/local-pkg/package.json b/fixtures/local-pkg/package.json → __fixtures__/local-pkg/package.json
diff --git a/fixtures/local-scoped-pkg/index.js → __fixtures__/local-scoped-pkg/index.js b/fixtures/local-scoped-pkg/index.js → __fixtures__/local-scoped-pkg/index.js
diff --git a/fixtures/local-scoped-pkg/package.json → __fixtures__/local-scoped-pkg/package.json b/fixtures/local-scoped-pkg/package.json → __fixtures__/local-scoped-pkg/package.json
diff --git a/fixtures/monorepo/.npmrc → __fixtures__/monorepo/.npmrc b/fixtures/monorepo/.npmrc → __fixtures__/monorepo/.npmrc
diff --git a/fixtures/monorepo/package/package.json → __fixtures__/monorepo/package/package.json b/fixtures/monorepo/package/package.json → __fixtures__/monorepo/package/package.json
diff --git a/fixtures/monorepo/pnpm-lock.yaml → __fixtures__/monorepo/pnpm-lock.yaml b/fixtures/monorepo/pnpm-lock.yaml → __fixtures__/monorepo/pnpm-lock.yaml
diff --git a/fixtures/monorepo/pnpm-workspace.yaml → __fixtures__/monorepo/pnpm-workspace.yaml b/fixtures/monorepo/pnpm-workspace.yaml → __fixtures__/monorepo/pnpm-workspace.yaml
diff --git a/__fixtures__/package.yaml b/__fixtures__/package.yaml
@@ -0,0 +1,5 @@
+scripts:
+  prepareFixtures: >
+    node ../pnpm/dist/pnpm.cjs install -rf --frozen-lockfile --no-shared-workspace-lockfile --no-link-workspace-packages &&
+    node ../pnpm/dist/pnpm.cjs install -rf -C fixtureWithLinks --frozen-lockfile --link-workspace-packages --no-shared-workspace-lockfile &&
+    cd ./fixture-with-external-shrinkwrap/pkg && node ../../../pnpm/dist/pnpm.cjs install -f --frozen-lockfile
diff --git a/...res/pkg-with-external-lockfile/pkg/.npmrc → ...s__/pkg-with-external-lockfile/pkg/.npmrc b/...res/pkg-with-external-lockfile/pkg/.npmrc → ...s__/pkg-with-external-lockfile/pkg/.npmrc
diff --git a/...g-with-external-lockfile/pkg/package.json → ...g-with-external-lockfile/pkg/package.json b/...g-with-external-lockfile/pkg/package.json → ...g-with-external-lockfile/pkg/package.json
diff --git a/...pkg-with-external-lockfile/pnpm-lock.yaml → ...pkg-with-external-lockfile/pnpm-lock.yaml b/...pkg-with-external-lockfile/pnpm-lock.yaml → ...pkg-with-external-lockfile/pnpm-lock.yaml
diff --git a/...ith-external-lockfile/pnpm-workspace.yaml → ...ith-external-lockfile/pnpm-workspace.yaml b/...ith-external-lockfile/pnpm-workspace.yaml → ...ith-external-lockfile/pnpm-workspace.yaml
diff --git a/fixtures/pnpm-workspace.yaml → __fixtures__/pnpm-workspace.yaml b/fixtures/pnpm-workspace.yaml → __fixtures__/pnpm-workspace.yaml
diff --git a/fixtures/tar-pkg/index.js → __fixtures__/tar-pkg/index.js b/fixtures/tar-pkg/index.js → __fixtures__/tar-pkg/index.js
diff --git a/fixtures/tar-pkg/package.json → __fixtures__/tar-pkg/package.json b/fixtures/tar-pkg/package.json → __fixtures__/tar-pkg/package.json
diff --git a/fixtures/tar-pkg/tar-pkg-1.0.0.tgz → __fixtures__/tar-pkg/tar-pkg-1.0.0.tgz b/fixtures/tar-pkg/tar-pkg-1.0.0.tgz → __fixtures__/tar-pkg/tar-pkg-1.0.0.tgz
diff --git a/fixtures/with-aliased-dep/package.json → __fixtures__/with-aliased-dep/package.json b/fixtures/with-aliased-dep/package.json → __fixtures__/with-aliased-dep/package.json
diff --git a/fixtures/with-aliased-dep/pnpm-lock.yaml → __fixtures__/with-aliased-dep/pnpm-lock.yaml b/fixtures/with-aliased-dep/pnpm-lock.yaml → __fixtures__/with-aliased-dep/pnpm-lock.yaml
diff --git a/fixtures/with-file-dep/package.json → __fixtures__/with-file-dep/package.json b/fixtures/with-file-dep/package.json → __fixtures__/with-file-dep/package.json
diff --git a/fixtures/with-file-dep/pnpm-lock.yaml → __fixtures__/with-file-dep/pnpm-lock.yaml b/fixtures/with-file-dep/pnpm-lock.yaml → __fixtures__/with-file-dep/pnpm-lock.yaml
diff --git a/fixtures/with-non-package-dep/package.json → ...tures__/with-non-package-dep/package.json b/fixtures/with-non-package-dep/package.json → ...tures__/with-non-package-dep/package.json
diff --git a/fixtures/with-non-package-dep/pnpm-lock.yaml → ...res__/with-non-package-dep/pnpm-lock.yaml b/fixtures/with-non-package-dep/pnpm-lock.yaml → ...res__/with-non-package-dep/pnpm-lock.yaml
diff --git a/fixtures/with-peer/package.json → __fixtures__/with-peer/package.json b/fixtures/with-peer/package.json → __fixtures__/with-peer/package.json
diff --git a/fixtures/with-peer/pnpm-lock.yaml → __fixtures__/with-peer/pnpm-lock.yaml b/fixtures/with-peer/pnpm-lock.yaml → __fixtures__/with-peer/pnpm-lock.yaml
diff --git a/...ures/with-pnpm-update-ignore/package.json → ...es__/with-pnpm-update-ignore/package.json b/...ures/with-pnpm-update-ignore/package.json → ...es__/with-pnpm-update-ignore/package.json
diff --git a/...es/with-pnpm-update-ignore/pnpm-lock.yaml → ...__/with-pnpm-update-ignore/pnpm-lock.yaml b/...es/with-pnpm-update-ignore/pnpm-lock.yaml → ...__/with-pnpm-update-ignore/pnpm-lock.yaml
diff --git a/fixtures/with-unsaved-deps/.npmrc → __fixtures__/with-unsaved-deps/.npmrc b/fixtures/with-unsaved-deps/.npmrc → __fixtures__/with-unsaved-deps/.npmrc
diff --git a/fixtures/with-unsaved-deps/package.json → __fixtures__/with-unsaved-deps/package.json b/fixtures/with-unsaved-deps/package.json → __fixtures__/with-unsaved-deps/package.json
diff --git a/fixtures/with-unsaved-deps/pnpm-lock.yaml → ...xtures__/with-unsaved-deps/pnpm-lock.yaml b/fixtures/with-unsaved-deps/pnpm-lock.yaml → ...xtures__/with-unsaved-deps/pnpm-lock.yaml
diff --git a/...es/workspace-external-depends-deep/.npmrc → ...__/workspace-external-depends-deep/.npmrc b/...es/workspace-external-depends-deep/.npmrc → ...__/workspace-external-depends-deep/.npmrc
diff --git a/...kspace-external-depends-deep/package.json → ...kspace-external-depends-deep/package.json b/...kspace-external-depends-deep/package.json → ...kspace-external-depends-deep/package.json
diff --git a/...rnal-depends-deep/packages/f/package.json → ...rnal-depends-deep/packages/f/package.json b/...rnal-depends-deep/packages/f/package.json → ...rnal-depends-deep/packages/f/package.json
diff --git a/...rnal-depends-deep/packages/g/package.json → ...rnal-depends-deep/packages/g/package.json b/...rnal-depends-deep/packages/g/package.json → ...rnal-depends-deep/packages/g/package.json
diff --git a/...pace-external-depends-deep/pnpm-lock.yaml → ...pace-external-depends-deep/pnpm-lock.yaml b/...pace-external-depends-deep/pnpm-lock.yaml → ...pace-external-depends-deep/pnpm-lock.yaml
diff --git a/...external-depends-deep/pnpm-workspace.yaml → ...external-depends-deep/pnpm-workspace.yaml b/...external-depends-deep/pnpm-workspace.yaml → ...external-depends-deep/pnpm-workspace.yaml
diff --git a/...has-shared-npm-shrinkwrap-json/.gitignore → ...has-shared-npm-shrinkwrap-json/.gitignore b/...has-shared-npm-shrinkwrap-json/.gitignore → ...has-shared-npm-shrinkwrap-json/.gitignore
diff --git a/...d-npm-shrinkwrap-json/npm-shrinkwrap.json → ...d-npm-shrinkwrap-json/npm-shrinkwrap.json b/...d-npm-shrinkwrap-json/npm-shrinkwrap.json → ...d-npm-shrinkwrap-json/npm-shrinkwrap.json
diff --git a/...s-shared-npm-shrinkwrap-json/package.json → ...s-shared-npm-shrinkwrap-json/package.json b/...s-shared-npm-shrinkwrap-json/package.json → ...s-shared-npm-shrinkwrap-json/package.json
diff --git a/...shrinkwrap-json/packages/bar/package.json → ...shrinkwrap-json/packages/bar/package.json b/...shrinkwrap-json/packages/bar/package.json → ...shrinkwrap-json/packages/bar/package.json
diff --git a/...shrinkwrap-json/packages/foo/package.json → ...shrinkwrap-json/packages/foo/package.json b/...shrinkwrap-json/packages/foo/package.json → ...shrinkwrap-json/packages/foo/package.json
diff --git a/...d-npm-shrinkwrap-json/pnpm-worksapce.yaml → ...d-npm-shrinkwrap-json/pnpm-worksapce.yaml b/...d-npm-shrinkwrap-json/pnpm-worksapce.yaml → ...d-npm-shrinkwrap-json/pnpm-worksapce.yaml
diff --git a/...e-has-shared-package-lock-json/.gitignore → ...e-has-shared-package-lock-json/.gitignore b/...e-has-shared-package-lock-json/.gitignore → ...e-has-shared-package-lock-json/.gitignore
diff --git a/...hared-package-lock-json/package-lock.json → ...hared-package-lock-json/package-lock.json b/...hared-package-lock-json/package-lock.json → ...hared-package-lock-json/package-lock.json
diff --git a/...has-shared-package-lock-json/package.json → ...has-shared-package-lock-json/package.json b/...has-shared-package-lock-json/package.json → ...has-shared-package-lock-json/package.json
diff --git a/...ckage-lock-json/packages/bar/package.json → ...ckage-lock-json/packages/bar/package.json b/...ckage-lock-json/packages/bar/package.json → ...ckage-lock-json/packages/bar/package.json
diff --git a/...ckage-lock-json/packages/foo/package.json → ...ckage-lock-json/packages/foo/package.json b/...ckage-lock-json/packages/foo/package.json → ...ckage-lock-json/packages/foo/package.json
diff --git a/...red-package-lock-json/pnpm-worksapce.yaml → ...red-package-lock-json/pnpm-worksapce.yaml b/...red-package-lock-json/pnpm-worksapce.yaml → ...red-package-lock-json/pnpm-worksapce.yaml
diff --git a/...workspace-has-shared-yarn-lock/.gitignore → ...workspace-has-shared-yarn-lock/.gitignore b/...workspace-has-shared-yarn-lock/.gitignore → ...workspace-has-shared-yarn-lock/.gitignore
diff --git a/...rkspace-has-shared-yarn-lock/package.json → ...rkspace-has-shared-yarn-lock/package.json b/...rkspace-has-shared-yarn-lock/package.json → ...rkspace-has-shared-yarn-lock/package.json
diff --git a/...hared-yarn-lock/packages/bar/package.json → ...hared-yarn-lock/packages/bar/package.json b/...hared-yarn-lock/packages/bar/package.json → ...hared-yarn-lock/packages/bar/package.json
diff --git a/...hared-yarn-lock/packages/foo/package.json → ...hared-yarn-lock/packages/foo/package.json b/...hared-yarn-lock/packages/foo/package.json → ...hared-yarn-lock/packages/foo/package.json
diff --git a/...-has-shared-yarn-lock/pnpm-worksapce.yaml → ...-has-shared-yarn-lock/pnpm-worksapce.yaml b/...-has-shared-yarn-lock/pnpm-worksapce.yaml → ...-has-shared-yarn-lock/pnpm-worksapce.yaml
diff --git a/.../workspace-has-shared-yarn-lock/yarn.lock → .../workspace-has-shared-yarn-lock/yarn.lock b/.../workspace-has-shared-yarn-lock/yarn.lock → .../workspace-has-shared-yarn-lock/yarn.lock
diff --git a/fixtures/workspace-with-2-pkgs/package.json → ...ures__/workspace-with-2-pkgs/package.json b/fixtures/workspace-with-2-pkgs/package.json → ...ures__/workspace-with-2-pkgs/package.json
diff --git a/...ace-with-2-pkgs/packages/bar/package.json → ...ace-with-2-pkgs/packages/bar/package.json b/...ace-with-2-pkgs/packages/bar/package.json → ...ace-with-2-pkgs/packages/bar/package.json
diff --git a/...ace-with-2-pkgs/packages/foo/package.json → ...ace-with-2-pkgs/packages/foo/package.json b/...ace-with-2-pkgs/packages/foo/package.json → ...ace-with-2-pkgs/packages/foo/package.json
diff --git a/...ures/workspace-with-2-pkgs/pnpm-lock.yaml → ...es__/workspace-with-2-pkgs/pnpm-lock.yaml b/...ures/workspace-with-2-pkgs/pnpm-lock.yaml → ...es__/workspace-with-2-pkgs/pnpm-lock.yaml
diff --git a/...workspace-with-2-pkgs/pnpm-workspace.yaml → ...workspace-with-2-pkgs/pnpm-workspace.yaml b/...workspace-with-2-pkgs/pnpm-workspace.yaml → ...workspace-with-2-pkgs/pnpm-workspace.yaml
diff --git a/...orkspace-with-different-deps/package.json → ...orkspace-with-different-deps/package.json b/...orkspace-with-different-deps/package.json → ...orkspace-with-different-deps/package.json
diff --git a/...-different-deps/packages/bar/package.json → ...-different-deps/packages/bar/package.json b/...-different-deps/packages/bar/package.json → ...-different-deps/packages/bar/package.json
diff --git a/...-different-deps/packages/foo/package.json → ...-different-deps/packages/foo/package.json b/...-different-deps/packages/foo/package.json → ...-different-deps/packages/foo/package.json
diff --git a/...kspace-with-different-deps/pnpm-lock.yaml → ...kspace-with-different-deps/pnpm-lock.yaml b/...kspace-with-different-deps/pnpm-lock.yaml → ...kspace-with-different-deps/pnpm-lock.yaml
diff --git a/...e-with-different-deps/pnpm-workspace.yaml → ...e-with-different-deps/pnpm-workspace.yaml b/...e-with-different-deps/pnpm-workspace.yaml → ...e-with-different-deps/pnpm-workspace.yaml
diff --git a/.../workspace-with-private-pkgs/package.json → .../workspace-with-private-pkgs/package.json b/.../workspace-with-private-pkgs/package.json → .../workspace-with-private-pkgs/package.json
diff --git a/...rivate-pkgs/packages/private/package.json → ...rivate-pkgs/packages/private/package.json b/...rivate-pkgs/packages/private/package.json → ...rivate-pkgs/packages/private/package.json
diff --git a/...private-pkgs/packages/public/package.json → ...private-pkgs/packages/public/package.json b/...private-pkgs/packages/public/package.json → ...private-pkgs/packages/public/package.json
diff --git a/...orkspace-with-private-pkgs/pnpm-lock.yaml → ...orkspace-with-private-pkgs/pnpm-lock.yaml b/...orkspace-with-private-pkgs/pnpm-lock.yaml → ...orkspace-with-private-pkgs/pnpm-lock.yaml
diff --git a/...ace-with-private-pkgs/pnpm-workspace.yaml → ...ace-with-private-pkgs/pnpm-workspace.yaml b/...ace-with-private-pkgs/pnpm-workspace.yaml → ...ace-with-private-pkgs/pnpm-workspace.yaml
diff --git a/packages/cli-meta/CHANGELOG.md → cli/cli-meta/CHANGELOG.md b/packages/cli-meta/CHANGELOG.md → cli/cli-meta/CHANGELOG.md
diff --git a/packages/cli-meta/README.md → cli/cli-meta/README.md b/packages/cli-meta/README.md → cli/cli-meta/README.md
diff --git a/packages/cli-meta/package.json → cli/cli-meta/package.json b/packages/cli-meta/package.json → cli/cli-meta/package.json
@@ -17,7 +17,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/cli-meta",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/cli-meta",
   "keywords": [
     "pnpm7",
     "pnpm"
@@ -26,7 +26,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/cli-meta#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/cli-meta#readme",
   "devDependencies": {
     "@pnpm/cli-meta": "workspace:*"
   },

diff --git a/packages/cli-meta/src/index.ts → cli/cli-meta/src/index.ts b/packages/cli-meta/src/index.ts → cli/cli-meta/src/index.ts
diff --git a/packages/cli-meta/tsconfig.json → cli/cli-meta/tsconfig.json b/packages/cli-meta/tsconfig.json → cli/cli-meta/tsconfig.json
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../types"
+      "path": "../../packages/types"
     }
   ]
 }
diff --git a/packages/audit/tsconfig.lint.json → cli/cli-meta/tsconfig.lint.json b/packages/audit/tsconfig.lint.json → cli/cli-meta/tsconfig.lint.json
diff --git a/packages/cli-utils/CHANGELOG.md → cli/cli-utils/CHANGELOG.md b/packages/cli-utils/CHANGELOG.md → cli/cli-utils/CHANGELOG.md
diff --git a/packages/cli-utils/README.md → cli/cli-utils/README.md b/packages/cli-utils/README.md → cli/cli-utils/README.md
diff --git a/packages/cli-utils/package.json → cli/cli-utils/package.json b/packages/cli-utils/package.json → cli/cli-utils/package.json
@@ -17,7 +17,7 @@
     "compile": "tsc --build && pnpm run lint --fix",
     "test": "pnpm run compile"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/cli-utils",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/cli-utils",
   "keywords": [
     "pnpm7",
     "pnpm"
@@ -26,7 +26,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/cli-utils#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/cli-utils#readme",
   "devDependencies": {
     "@pnpm/cli-utils": "workspace:*",
     "@types/ramda": "0.28.15"

diff --git a/packages/cli-utils/src/getConfig.ts → cli/cli-utils/src/getConfig.ts b/packages/cli-utils/src/getConfig.ts → cli/cli-utils/src/getConfig.ts
diff --git a/packages/cli-utils/src/index.ts → cli/cli-utils/src/index.ts b/packages/cli-utils/src/index.ts → cli/cli-utils/src/index.ts
diff --git a/...ges/cli-utils/src/packageIsInstallable.ts → cli/cli-utils/src/packageIsInstallable.ts b/...ges/cli-utils/src/packageIsInstallable.ts → cli/cli-utils/src/packageIsInstallable.ts
diff --git a/...s/cli-utils/src/readDepNameCompletions.ts → cli/cli-utils/src/readDepNameCompletions.ts b/...s/cli-utils/src/readDepNameCompletions.ts → cli/cli-utils/src/readDepNameCompletions.ts
diff --git a/...ages/cli-utils/src/readProjectManifest.ts → cli/cli-utils/src/readProjectManifest.ts b/...ages/cli-utils/src/readProjectManifest.ts → cli/cli-utils/src/readProjectManifest.ts
diff --git a/packages/cli-utils/src/recursiveSummary.ts → cli/cli-utils/src/recursiveSummary.ts b/packages/cli-utils/src/recursiveSummary.ts → cli/cli-utils/src/recursiveSummary.ts
diff --git a/packages/cli-utils/src/style.ts → cli/cli-utils/src/style.ts b/packages/cli-utils/src/style.ts → cli/cli-utils/src/style.ts
diff --git a/packages/cli-utils/tsconfig.json → cli/cli-utils/tsconfig.json b/packages/cli-utils/tsconfig.json → cli/cli-utils/tsconfig.json
@@ -10,28 +10,28 @@
   ],
   "references": [
     {
-      "path": "../cli-meta"
+      "path": "../../config/config"
     },
     {
-      "path": "../config"
+      "path": "../../config/package-is-installable"
     },
     {
-      "path": "../default-reporter"
+      "path": "../../packages/error"
     },
     {
-      "path": "../error"
+      "path": "../../packages/types"
     },
     {
-      "path": "../manifest-utils"
+      "path": "../../pkg-manifest/manifest-utils"
     },
     {
-      "path": "../package-is-installable"
+      "path": "../../pkg-manifest/read-project-manifest"
     },
     {
-      "path": "../read-project-manifest"
+      "path": "../cli-meta"
     },
     {
-      "path": "../types"
+      "path": "../default-reporter"
     }
   ]
 }
diff --git a/packages/build-modules/tsconfig.lint.json → cli/cli-utils/tsconfig.lint.json b/packages/build-modules/tsconfig.lint.json → cli/cli-utils/tsconfig.lint.json
diff --git a/packages/command/CHANGELOG.md → cli/command/CHANGELOG.md b/packages/command/CHANGELOG.md → cli/command/CHANGELOG.md
diff --git a/packages/command/README.md → cli/command/README.md b/packages/command/README.md → cli/command/README.md
diff --git a/packages/command/package.json → cli/command/package.json b/packages/command/package.json → cli/command/package.json
@@ -17,7 +17,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/command",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/command",
   "keywords": [
     "pnpm7",
     "pnpm"
@@ -26,7 +26,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/command#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/command#readme",
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/command": "workspace:*"

diff --git a/packages/command/src/index.ts → cli/command/src/index.ts b/packages/command/src/index.ts → cli/command/src/index.ts
diff --git a/packages/command/tsconfig.json → cli/command/tsconfig.json b/packages/command/tsconfig.json → cli/command/tsconfig.json
diff --git a/packages/cafs-types/tsconfig.lint.json → cli/command/tsconfig.lint.json b/packages/cafs-types/tsconfig.lint.json → cli/command/tsconfig.lint.json
diff --git a/...ages/common-cli-options-help/CHANGELOG.md → cli/common-cli-options-help/CHANGELOG.md b/...ages/common-cli-options-help/CHANGELOG.md → cli/common-cli-options-help/CHANGELOG.md
diff --git a/packages/common-cli-options-help/README.md → cli/common-cli-options-help/README.md b/packages/common-cli-options-help/README.md → cli/common-cli-options-help/README.md
diff --git a/...ages/common-cli-options-help/package.json → cli/common-cli-options-help/package.json b/...ages/common-cli-options-help/package.json → cli/common-cli-options-help/package.json
@@ -17,7 +17,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/common-cli-options-help",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/common-cli-options-help",
   "keywords": [
     "pnpm7",
     "pnpm"
@@ -26,7 +26,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/common-cli-options-help#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/common-cli-options-help#readme",
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/common-cli-options-help": "workspace:*"

diff --git a/...ages/common-cli-options-help/src/index.ts → cli/common-cli-options-help/src/index.ts b/...ages/common-cli-options-help/src/index.ts → cli/common-cli-options-help/src/index.ts
diff --git a/...ges/common-cli-options-help/tsconfig.json → cli/common-cli-options-help/tsconfig.json b/...ges/common-cli-options-help/tsconfig.json → cli/common-cli-options-help/tsconfig.json
diff --git a/packages/cafs/tsconfig.lint.json → ...ommon-cli-options-help/tsconfig.lint.json b/packages/cafs/tsconfig.lint.json → ...ommon-cli-options-help/tsconfig.lint.json
diff --git a/packages/default-reporter/CHANGELOG.md → cli/default-reporter/CHANGELOG.md b/packages/default-reporter/CHANGELOG.md → cli/default-reporter/CHANGELOG.md
diff --git a/packages/default-reporter/README.md → cli/default-reporter/README.md b/packages/default-reporter/README.md → cli/default-reporter/README.md
diff --git a/packages/build-modules/jest.config.js → cli/default-reporter/jest.config.js b/packages/build-modules/jest.config.js → cli/default-reporter/jest.config.js
diff --git a/packages/default-reporter/package.json → cli/default-reporter/package.json b/packages/default-reporter/package.json → cli/default-reporter/package.json
@@ -17,7 +17,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/default-reporter",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter",
   "keywords": [
     "pnpm7",
     "pnpm-reporter"
@@ -61,7 +61,7 @@
     "load-json-file": "^6.2.0",
     "normalize-newline": "3.0.0"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/default-reporter#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter#readme",
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"

diff --git a/packages/default-reporter/src/constants.ts → cli/default-reporter/src/constants.ts b/packages/default-reporter/src/constants.ts → cli/default-reporter/src/constants.ts
diff --git a/packages/default-reporter/src/index.ts → cli/default-reporter/src/index.ts b/packages/default-reporter/src/index.ts → cli/default-reporter/src/index.ts
diff --git a/...ages/default-reporter/src/mergeOutputs.ts → cli/default-reporter/src/mergeOutputs.ts b/...ages/default-reporter/src/mergeOutputs.ts → cli/default-reporter/src/mergeOutputs.ts
diff --git a/packages/default-reporter/src/reportError.ts → cli/default-reporter/src/reportError.ts b/packages/default-reporter/src/reportError.ts → cli/default-reporter/src/reportError.ts
diff --git a/...t-reporter/src/reporterForClient/index.ts → ...t-reporter/src/reporterForClient/index.ts b/...t-reporter/src/reporterForClient/index.ts → ...t-reporter/src/reporterForClient/index.ts
diff --git a/.../src/reporterForClient/outputConstants.ts → .../src/reporterForClient/outputConstants.ts b/.../src/reporterForClient/outputConstants.ts → .../src/reporterForClient/outputConstants.ts
diff --git a/...eporter/src/reporterForClient/pkgsDiff.ts → ...eporter/src/reporterForClient/pkgsDiff.ts b/...eporter/src/reporterForClient/pkgsDiff.ts → ...eporter/src/reporterForClient/pkgsDiff.ts
diff --git a/...terForClient/reportBigTarballsProgress.ts → ...terForClient/reportBigTarballsProgress.ts b/...terForClient/reportBigTarballsProgress.ts → ...terForClient/reportBigTarballsProgress.ts
diff --git a/...er/src/reporterForClient/reportContext.ts → ...er/src/reporterForClient/reportContext.ts b/...er/src/reporterForClient/reportContext.ts → ...er/src/reporterForClient/reportContext.ts
diff --git a/...c/reporterForClient/reportDeprecations.ts → ...c/reporterForClient/reportDeprecations.ts b/...c/reporterForClient/reportDeprecations.ts → ...c/reporterForClient/reportDeprecations.ts
diff --git a/.../reporterForClient/reportExecutionTime.ts → .../reporterForClient/reportExecutionTime.ts b/.../reporterForClient/reportExecutionTime.ts → .../reporterForClient/reportExecutionTime.ts
diff --git a/...rter/src/reporterForClient/reportHooks.ts → ...rter/src/reporterForClient/reportHooks.ts b/...rter/src/reporterForClient/reportHooks.ts → ...rter/src/reporterForClient/reportHooks.ts
diff --git a/.../reporterForClient/reportInstallChecks.ts → .../reporterForClient/reportInstallChecks.ts b/.../reporterForClient/reportInstallChecks.ts → .../reporterForClient/reportInstallChecks.ts
diff --git a/...porterForClient/reportLifecycleScripts.ts → ...porterForClient/reportLifecycleScripts.ts b/...porterForClient/reportLifecycleScripts.ts → ...porterForClient/reportLifecycleScripts.ts
diff --git a/...orter/src/reporterForClient/reportMisc.ts → ...orter/src/reporterForClient/reportMisc.ts b/...orter/src/reporterForClient/reportMisc.ts → ...orter/src/reporterForClient/reportMisc.ts
diff --git a/...erForClient/reportPeerDependencyIssues.ts → ...erForClient/reportPeerDependencyIssues.ts b/...erForClient/reportPeerDependencyIssues.ts → ...erForClient/reportPeerDependencyIssues.ts
diff --git a/...r/src/reporterForClient/reportProgress.ts → ...r/src/reporterForClient/reportProgress.ts b/...r/src/reporterForClient/reportProgress.ts → ...r/src/reporterForClient/reportProgress.ts
diff --git a/...c/reporterForClient/reportRequestRetry.ts → ...c/reporterForClient/reportRequestRetry.ts b/...c/reporterForClient/reportRequestRetry.ts → ...c/reporterForClient/reportRequestRetry.ts
diff --git a/...rter/src/reporterForClient/reportScope.ts → ...rter/src/reporterForClient/reportScope.ts b/...rter/src/reporterForClient/reportScope.ts → ...rter/src/reporterForClient/reportScope.ts
diff --git a/...ient/reportSkippedOptionalDependencies.ts → ...ient/reportSkippedOptionalDependencies.ts b/...ient/reportSkippedOptionalDependencies.ts → ...ient/reportSkippedOptionalDependencies.ts
diff --git a/...rter/src/reporterForClient/reportStats.ts → ...rter/src/reporterForClient/reportStats.ts b/...rter/src/reporterForClient/reportStats.ts → ...rter/src/reporterForClient/reportStats.ts
diff --git a/...er/src/reporterForClient/reportSummary.ts → ...er/src/reporterForClient/reportSummary.ts b/...er/src/reporterForClient/reportSummary.ts → ...er/src/reporterForClient/reportSummary.ts
diff --git a/...rc/reporterForClient/reportUpdateCheck.ts → ...rc/reporterForClient/reportUpdateCheck.ts b/...rc/reporterForClient/reportUpdateCheck.ts → ...rc/reporterForClient/reportUpdateCheck.ts
diff --git a/...c/reporterForClient/utils/formatPrefix.ts → ...c/reporterForClient/utils/formatPrefix.ts b/...c/reporterForClient/utils/formatPrefix.ts → ...c/reporterForClient/utils/formatPrefix.ts
diff --git a/...src/reporterForClient/utils/formatWarn.ts → ...src/reporterForClient/utils/formatWarn.ts b/...src/reporterForClient/utils/formatWarn.ts → ...src/reporterForClient/utils/formatWarn.ts
diff --git a/...er/src/reporterForClient/utils/zooming.ts → ...er/src/reporterForClient/utils/zooming.ts b/...er/src/reporterForClient/utils/zooming.ts → ...er/src/reporterForClient/utils/zooming.ts
diff --git a/...default-reporter/src/reporterForServer.ts → ...default-reporter/src/reporterForServer.ts b/...default-reporter/src/reporterForServer.ts → ...default-reporter/src/reporterForServer.ts
diff --git a/..._snapshots__/reportingUpdateCheck.ts.snap → ..._snapshots__/reportingUpdateCheck.ts.snap b/..._snapshots__/reportingUpdateCheck.ts.snap → ..._snapshots__/reportingUpdateCheck.ts.snap
diff --git a/...es/default-reporter/test/filterLogHook.ts → cli/default-reporter/test/filterLogHook.ts b/...es/default-reporter/test/filterLogHook.ts → cli/default-reporter/test/filterLogHook.ts
diff --git a/packages/default-reporter/test/index.ts → cli/default-reporter/test/index.ts b/packages/default-reporter/test/index.ts → cli/default-reporter/test/index.ts
diff --git a/...fault-reporter/test/is-positive-meta.json → ...fault-reporter/test/is-positive-meta.json b/...fault-reporter/test/is-positive-meta.json → ...fault-reporter/test/is-positive-meta.json
diff --git a/...ages/default-reporter/test/pnpm-meta.json → cli/default-reporter/test/pnpm-meta.json b/...ages/default-reporter/test/pnpm-meta.json → cli/default-reporter/test/pnpm-meta.json
diff --git a/...default-reporter/test/reportingContext.ts → ...default-reporter/test/reportingContext.ts b/...default-reporter/test/reportingContext.ts → ...default-reporter/test/reportingContext.ts
diff --git a/.../default-reporter/test/reportingErrors.ts → cli/default-reporter/test/reportingErrors.ts b/.../default-reporter/test/reportingErrors.ts → cli/default-reporter/test/reportingErrors.ts
diff --git a/...t-reporter/test/reportingExecutionTime.ts → ...t-reporter/test/reportingExecutionTime.ts b/...t-reporter/test/reportingExecutionTime.ts → ...t-reporter/test/reportingExecutionTime.ts
diff --git a/...eporter/test/reportingLifecycleScripts.ts → ...eporter/test/reportingLifecycleScripts.ts b/...eporter/test/reportingLifecycleScripts.ts → ...eporter/test/reportingLifecycleScripts.ts
diff --git a/...ter/test/reportingPeerDependencyIssues.ts → ...ter/test/reportingPeerDependencyIssues.ts b/...ter/test/reportingPeerDependencyIssues.ts → ...ter/test/reportingPeerDependencyIssues.ts
diff --git a/...efault-reporter/test/reportingProgress.ts → ...efault-reporter/test/reportingProgress.ts b/...efault-reporter/test/reportingProgress.ts → ...efault-reporter/test/reportingProgress.ts
diff --git a/...lt-reporter/test/reportingRequestRetry.ts → ...lt-reporter/test/reportingRequestRetry.ts b/...lt-reporter/test/reportingRequestRetry.ts → ...lt-reporter/test/reportingRequestRetry.ts
diff --git a/...s/default-reporter/test/reportingScope.ts → cli/default-reporter/test/reportingScope.ts b/...s/default-reporter/test/reportingScope.ts → cli/default-reporter/test/reportingScope.ts
diff --git a/...ult-reporter/test/reportingUpdateCheck.ts → ...ult-reporter/test/reportingUpdateCheck.ts b/...ult-reporter/test/reportingUpdateCheck.ts → ...ult-reporter/test/reportingUpdateCheck.ts
diff --git a/packages/lifecycle/tsconfig.json → cli/default-reporter/tsconfig.json b/packages/lifecycle/tsconfig.json → cli/default-reporter/tsconfig.json
@@ -10,19 +10,19 @@
   ],
   "references": [
     {
-      "path": "../core-loggers"
+      "path": "../../config/config"
     },
     {
-      "path": "../directory-fetcher"
+      "path": "../../packages/core-loggers"
     },
     {
-      "path": "../read-package-json"
+      "path": "../../packages/error"
     },
     {
-      "path": "../store-controller-types"
+      "path": "../../packages/render-peer-issues"
     },
     {
-      "path": "../types"
+      "path": "../../packages/types"
     }
   ]
 }
diff --git a/packages/cli-meta/tsconfig.lint.json → cli/default-reporter/tsconfig.lint.json b/packages/cli-meta/tsconfig.lint.json → cli/default-reporter/tsconfig.lint.json
diff --git a/packages/parse-cli-args/CHANGELOG.md → cli/parse-cli-args/CHANGELOG.md b/packages/parse-cli-args/CHANGELOG.md → cli/parse-cli-args/CHANGELOG.md
diff --git a/packages/parse-cli-args/README.md → cli/parse-cli-args/README.md b/packages/parse-cli-args/README.md → cli/parse-cli-args/README.md
diff --git a/packages/parse-cli-args/jest.config.js → cli/parse-cli-args/jest.config.js b/packages/parse-cli-args/jest.config.js → cli/parse-cli-args/jest.config.js
diff --git a/packages/parse-cli-args/package.json → cli/parse-cli-args/package.json b/packages/parse-cli-args/package.json → cli/parse-cli-args/package.json
@@ -19,7 +19,7 @@
     "start": "tsc --watch",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/parse-cli-args",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/cli/parse-cli-args",
   "keywords": [
     "pnpm7",
     "pnpm"
@@ -28,7 +28,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/parse-cli-args#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/cli/parse-cli-args#readme",
   "devDependencies": {
     "@pnpm/parse-cli-args": "workspace:*",
     "tempy": "^1.0.1"

diff --git a/packages/parse-cli-args/src/index.ts → cli/parse-cli-args/src/index.ts b/packages/parse-cli-args/src/index.ts → cli/parse-cli-args/src/index.ts
diff --git a/packages/parse-cli-args/test/index.ts → cli/parse-cli-args/test/index.ts b/packages/parse-cli-args/test/index.ts → cli/parse-cli-args/test/index.ts
diff --git a/packages/find-packages/tsconfig.json → cli/parse-cli-args/tsconfig.json b/packages/find-packages/tsconfig.json → cli/parse-cli-args/tsconfig.json
@@ -10,10 +10,10 @@
   ],
   "references": [
     {
-      "path": "../read-project-manifest"
+      "path": "../../packages/error"
     },
     {
-      "path": "../types"
+      "path": "../../workspace/find-workspace-dir"
     }
   ]
 }
diff --git a/packages/cli-utils/tsconfig.lint.json → cli/parse-cli-args/tsconfig.lint.json b/packages/cli-utils/tsconfig.lint.json → cli/parse-cli-args/tsconfig.lint.json
diff --git a/packages/config/CHANGELOG.md → config/config/CHANGELOG.md b/packages/config/CHANGELOG.md → config/config/CHANGELOG.md
diff --git a/packages/config/README.md → config/config/README.md b/packages/config/README.md → config/config/README.md
diff --git a/packages/audit/jest.config.js → config/config/jest.config.js b/packages/audit/jest.config.js → config/config/jest.config.js
diff --git a/packages/config/package.json → config/config/package.json b/packages/config/package.json → config/config/package.json
@@ -17,7 +17,7 @@
     "start": "tsc --watch",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/config",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/config/config",
   "keywords": [
     "pnpm7",
     "pnpm",
@@ -30,7 +30,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/config#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/config/config#readme",
   "dependencies": {
     "@pnpm/config.env-replace": "1.0.0",
     "@pnpm/constants": "workspace:*",

diff --git a/packages/config/src/Config.ts → config/config/src/Config.ts b/packages/config/src/Config.ts → config/config/src/Config.ts
diff --git a/packages/config/src/checkGlobalBinDir.ts → config/config/src/checkGlobalBinDir.ts b/packages/config/src/checkGlobalBinDir.ts → config/config/src/checkGlobalBinDir.ts
diff --git a/packages/config/src/concurrency.ts → config/config/src/concurrency.ts b/packages/config/src/concurrency.ts → config/config/src/concurrency.ts
diff --git a/packages/config/src/dirs.ts → config/config/src/dirs.ts b/packages/config/src/dirs.ts → config/config/src/dirs.ts
diff --git a/packages/config/src/getScopeRegistries.ts → config/config/src/getScopeRegistries.ts b/packages/config/src/getScopeRegistries.ts → config/config/src/getScopeRegistries.ts
diff --git a/packages/config/src/index.ts → config/config/src/index.ts b/packages/config/src/index.ts → config/config/src/index.ts
diff --git a/packages/config/src/readLocalConfig.ts → config/config/src/readLocalConfig.ts b/packages/config/src/readLocalConfig.ts → config/config/src/readLocalConfig.ts
diff --git a/packages/config/test/cafile.txt → config/config/test/cafile.txt b/packages/config/test/cafile.txt → config/config/test/cafile.txt
diff --git a/packages/config/test/concurrency.test.ts → config/config/test/concurrency.test.ts b/packages/config/test/concurrency.test.ts → config/config/test/concurrency.test.ts
diff --git a/packages/config/test/dirs.test.ts → config/config/test/dirs.test.ts b/packages/config/test/dirs.test.ts → config/config/test/dirs.test.ts
diff --git a/...ixtures/pkg-using-workspaces/package.json → ...ixtures/pkg-using-workspaces/package.json b/...ixtures/pkg-using-workspaces/package.json → ...ixtures/pkg-using-workspaces/package.json
diff --git a/...fig/test/global-bin-dir-windows/etc/npmrc → ...fig/test/global-bin-dir-windows/etc/npmrc b/...fig/test/global-bin-dir-windows/etc/npmrc → ...fig/test/global-bin-dir-windows/etc/npmrc
diff --git a/...ages/config/test/global-bin-dir/etc/npmrc → config/config/test/global-bin-dir/etc/npmrc b/...ages/config/test/global-bin-dir/etc/npmrc → config/config/test/global-bin-dir/etc/npmrc
diff --git a/packages/config/test/globalBinDir.test.ts → config/config/test/globalBinDir.test.ts b/packages/config/test/globalBinDir.test.ts → config/config/test/globalBinDir.test.ts
diff --git a/...st/has-workspace-yaml/pnpm-workspace.yaml → ...st/has-workspace-yaml/pnpm-workspace.yaml b/...st/has-workspace-yaml/pnpm-workspace.yaml → ...st/has-workspace-yaml/pnpm-workspace.yaml
diff --git a/packages/config/test/index.ts → config/config/test/index.ts b/packages/config/test/index.ts → config/config/test/index.ts
diff --git a/packages/config/test/scoped-registries.ini → config/config/test/scoped-registries.ini b/packages/config/test/scoped-registries.ini → config/config/test/scoped-registries.ini
diff --git a/...ges/config/test/using-test-pattern/.npmrc → config/config/test/using-test-pattern/.npmrc b/...ges/config/test/using-test-pattern/.npmrc → config/config/test/using-test-pattern/.npmrc
diff --git a/packages/config/tsconfig.json → config/config/tsconfig.json b/packages/config/tsconfig.json → config/config/tsconfig.json
@@ -10,31 +10,31 @@
   ],
   "references": [
     {
-      "path": "../../privatePackages/prepare"
+      "path": "../../hooks/pnpmfile"
     },
     {
-      "path": "../../privatePackages/test-fixtures"
+      "path": "../../packages/constants"
     },
     {
-      "path": "../constants"
+      "path": "../../packages/error"
     },
     {
-      "path": "../error"
+      "path": "../../packages/git-utils"
     },
     {
-      "path": "../git-utils"
+      "path": "../../packages/types"
     },
     {
-      "path": "../matcher"
+      "path": "../../pkg-manifest/read-project-manifest"
     },
     {
-      "path": "../pnpmfile"
+      "path": "../../privatePackages/prepare"
     },
     {
-      "path": "../read-project-manifest"
+      "path": "../../privatePackages/test-fixtures"
     },
     {
-      "path": "../types"
+      "path": "../matcher"
     }
   ]
 }
diff --git a/packages/client/tsconfig.lint.json → config/config/tsconfig.lint.json b/packages/client/tsconfig.lint.json → config/config/tsconfig.lint.json
diff --git a/packages/matcher/CHANGELOG.md → config/matcher/CHANGELOG.md b/packages/matcher/CHANGELOG.md → config/matcher/CHANGELOG.md
diff --git a/packages/matcher/README.md → config/matcher/README.md b/packages/matcher/README.md → config/matcher/README.md
diff --git a/packages/lifecycle/jest.config.js → config/matcher/jest.config.js b/packages/lifecycle/jest.config.js → config/matcher/jest.config.js
diff --git a/packages/matcher/package.json → config/matcher/package.json b/packages/matcher/package.json → config/matcher/package.json
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/matcher",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/config/matcher",
   "keywords": [
     "pnpm7",
     "pnpm",
@@ -30,7 +30,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/matcher#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/config/matcher#readme",
   "dependencies": {
     "escape-string-regexp": "^4.0.0"
   },

diff --git a/packages/matcher/src/index.ts → config/matcher/src/index.ts b/packages/matcher/src/index.ts → config/matcher/src/index.ts
diff --git a/packages/matcher/test/index.ts → config/matcher/test/index.ts b/packages/matcher/test/index.ts → config/matcher/test/index.ts
diff --git a/packages/fetching-types/tsconfig.json → config/matcher/tsconfig.json b/packages/fetching-types/tsconfig.json → config/matcher/tsconfig.json
diff --git a/packages/command/tsconfig.lint.json → config/matcher/tsconfig.lint.json b/packages/command/tsconfig.lint.json → config/matcher/tsconfig.lint.json
diff --git a/packages/normalize-registries/CHANGELOG.md → config/normalize-registries/CHANGELOG.md b/packages/normalize-registries/CHANGELOG.md → config/normalize-registries/CHANGELOG.md
diff --git a/packages/normalize-registries/README.md → config/normalize-registries/README.md b/packages/normalize-registries/README.md → config/normalize-registries/README.md