refactor: put all non-public projects to directories that start with __

.meta-updater/src/index.ts

@@ -16,8 +16,7 @@ export default async (workspaceDir: string) => {
   const pnpmManifest = loadJsonFile.sync(path.join(workspaceDir, 'pnpm/package.json'))
   const pnpmVersion = pnpmManifest!['version'] // eslint-disable-line
   const pnpmMajorKeyword = `pnpm${pnpmVersion.split('.')[0]}`
-  const privatePkgsDir = path.join(workspaceDir, 'privatePackages')
-  const utilsDir = path.join(workspaceDir, 'utils')
+  const utilsDir = path.join(workspaceDir, '__utils__')
   const lockfile = await readWantedLockfile(workspaceDir, { ignoreIncompatible: false })
   if (lockfile == null) {
     throw new Error('no lockfile found')
@@ -39,7 +38,7 @@ export default async (workspaceDir: string) => {
       } 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
+      if (manifest.private || isSubdir(utilsDir, dir)) return manifest
       manifest.keywords = [
         pnpmMajorKeyword,
         ...(manifest.keywords ?? []).filter((keyword) => !/^pnpm[0-9]+$/.test(keyword)),
@@ -104,7 +103,7 @@ async function updateTSConfig (
     include: [
       'src/**/*.ts',
       'test/**/*.ts',
-      '../../typings/**/*.d.ts',
+      '../../__typings__/**/*.d.ts',
     ],
   }, { indent: 2 })
   return {

.meta-updater/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

__utils__/assert-project/test/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/index.d.ts"/>
+/// <reference path="../../../__typings__/index.d.ts"/>
 import path from 'path'
 import { assertProject } from '../src'
 

__utils__/assert-project/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

__utils__/assert-project/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

__utils__/assert-store/test/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/index.d.ts"/>
+/// <reference path="../../../__typings__/index.d.ts"/>
 import path from 'path'
 import { assertStore } from '@pnpm/assert-store'
 

__utils__/assert-store/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

__utils__/assert-store/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

__utils__/get-release-text/src/main.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/local.d.ts" />
+/// <reference path="../../../__typings__/local.d.ts" />
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'

__utils__/get-release-text/tsconfig.json

@@ -7,7 +7,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": []
 }

__utils__/get-release-text/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

__utils__/prepare/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

__utils__/prepare/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

__utils__/test-fixtures/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

__utils__/test-fixtures/tsconfig.lint.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts",
+    "../../__typings__/**/*.d.ts"
+  ]
+}

__utils__/tsconfig/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@pnpm/tsconfig",
+  "description": "pnpm's TypeScript configuration",
+  "version": "2.0.0",
+  "author": {
+    "name": "Zoltan Kochan",
+    "email": "z@kochan.io",
+    "url": "https://www.kochan.io/"
+  },
+  "license": "MIT",
+  "main": "tsconfig.json",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/__utils__/tsconfig#readme",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/__utils__/tsconfig",
+  "bugs": {
+    "url": "https://github.com/pnpm/pnpm/issues"
+  },
+  "devDependencies": {
+    "@pnpm/tsconfig": "workspace:*"
+  },
+  "keywords": [
+    "pnpm7"
+  ],
+  "engines": {
+    "node": ">=14.6"
+  },
+  "files": [
+    "lib",
+    "!*.map"
+  ],
+  "funding": "https://opencollective.com/pnpm",
+  "scripts": {
+    "test": "pnpm run compile",
+    "compile": "tsc --build && pnpm run lint --fix",
+    "prepublishOnly": "pnpm run compile"
+  },
+  "exports": {
+    ".": "./lib/index.js"
+  }
+}

cli/cli-meta/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

cli/cli-meta/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

cli/cli-utils/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

cli/cli-utils/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

cli/command/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": []
 }

cli/command/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

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

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": []
 }

cli/common-cli-options-help/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

cli/default-reporter/test/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/index.d.ts"/>
+/// <reference path="../../../__typings__/index.d.ts"/>
 import path from 'path'
 import { Config } from '@pnpm/config'
 import {

cli/default-reporter/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

cli/default-reporter/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

cli/parse-cli-args/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

cli/parse-cli-args/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

config/config/test/globalBinDir.test.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/index.d.ts"/>
+/// <reference path="../../../__typings__/index.d.ts"/>
 import fs from 'fs'
 import { tempDir } from '@pnpm/prepare'
 import path from 'path'

config/config/test/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/index.d.ts"/>
+/// <reference path="../../../__typings__/index.d.ts"/>
 import { promises as fs } from 'fs'
 import path from 'path'
 import PATH from 'path-name'

config/config/tsconfig.json

@@ -6,9 +6,15 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
+    {
+      "path": "../../__utils__/prepare"
+    },
+    {
+      "path": "../../__utils__/test-fixtures"
+    },
     {
       "path": "../../hooks/pnpmfile"
     },
@@ -27,12 +33,6 @@
     {
       "path": "../../pkg-manifest/read-project-manifest"
     },
-    {
-      "path": "../../privatePackages/prepare"
-    },
-    {
-      "path": "../../privatePackages/test-fixtures"
-    },
     {
       "path": "../matcher"
     }

config/config/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

config/matcher/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": []
 }

config/matcher/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

config/normalize-registries/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

config/normalize-registries/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

config/package-is-installable/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

config/package-is-installable/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

config/parse-overrides/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

config/parse-overrides/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

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

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

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

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

env/node.fetcher/tsconfig.json

@@ -6,9 +6,12 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
+    {
+      "path": "../../__utils__/prepare"
+    },
     {
       "path": "../../fetching/fetcher-base"
     },
@@ -24,9 +27,6 @@
     {
       "path": "../../packages/error"
     },
-    {
-      "path": "../../privatePackages/prepare"
-    },
     {
       "path": "../../store/cafs-types"
     },

env/node.fetcher/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

env/node.resolver/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

env/node.resolver/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

env/plugin-commands-env/tsconfig.json

@@ -6,9 +6,12 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
+    {
+      "path": "../../__utils__/prepare"
+    },
     {
       "path": "../../cli/cli-utils"
     },
@@ -24,9 +27,6 @@
     {
       "path": "../../pkg-manager/remove-bins"
     },
-    {
-      "path": "../../privatePackages/prepare"
-    },
     {
       "path": "../../store/store-path"
     },

env/plugin-commands-env/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }

exec/build-modules/tsconfig.json

@@ -6,7 +6,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ],
   "references": [
     {

exec/build-modules/tsconfig.lint.json

@@ -3,6 +3,6 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts",
-    "../../typings/**/*.d.ts"
+    "../../__typings__/**/*.d.ts"
   ]
 }