From 9cbe293876898c24cbcffa483c1c673552813a89 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 20 Nov 2022 02:29:28 +0200 Subject: [PATCH] refactor: put all non-public projects to directories that start with __ --- .meta-updater/src/index.ts | 7 +- .meta-updater/tsconfig.lint.json | 2 +- {patches => __patches__}/pkg@5.7.0.patch | 0 {typings => __typings__}/CHANGELOG.md | 0 {typings => __typings__}/index.d.ts | 0 {typings => __typings__}/local.d.ts | 0 {typings => __typings__}/package.json | 0 {typings => __typings__}/typed.d.ts | 0 .../assert-project/CHANGELOG.md | 0 .../assert-project/README.md | 0 .../assert-project/jest.config.js | 0 .../assert-project/package.json | 0 .../assert-project/src/index.ts | 0 .../assert-project/src/isExecutable.ts | 0 .../assert-project/test/fixture/.gitignore | 0 .../test/fixture/project/.npmrc | 0 .../test/fixture/project/package.json | 0 .../test/fixture/project/pnpm-lock.yaml | 0 .../test/fixture/project/pnpm-workspace.yaml | 0 .../assert-project/test/index.ts | 2 +- .../assert-project/tsconfig.json | 2 +- .../assert-project}/tsconfig.lint.json | 2 +- .../assert-store/CHANGELOG.md | 0 .../assert-store/README.md | 0 .../assert-store/jest.config.js | 0 .../assert-store/package.json | 0 .../assert-store/src/index.ts | 0 .../assert-store/test/fixture/.gitignore | 0 .../assert-store/test/fixture/project/.npmrc | 0 .../test/fixture/project/package.json | 0 .../test/fixture/project/pnpm-lock.yaml | 0 .../test/fixture/project/pnpm-workspace.yaml | 0 .../assert-store/test/index.ts | 2 +- .../assert-store/tsconfig.json | 2 +- .../assert-store/tsconfig.lint.json | 2 +- .../build-artifacts/README.md | 0 {utils => __utils__}/build-artifacts/main.mjs | 0 .../build-artifacts/package.json | 0 .../eslint-config/CHANGELOG.md | 0 {utils => __utils__}/eslint-config/README.md | 0 .../eslint-config/eslint.json | 0 {utils => __utils__}/eslint-config/index.js | 0 .../eslint-config/package.json | 0 .../get-release-text/CHANGELOG.md | 0 .../get-release-text/package.json | 0 .../get-release-text/src/main.ts | 2 +- .../get-release-text/tsconfig.json | 2 +- .../get-release-text}/tsconfig.lint.json | 2 +- .../prepare/CHANGELOG.md | 0 .../prepare/package.json | 0 .../prepare/src/index.ts | 0 .../prepare/tsconfig.json | 2 +- .../prepare/tsconfig.lint.json | 2 +- {utils => __utils__}/scripts/package.json | 0 .../scripts/src/copy-artifacts.ts | 0 .../test-fixtures/CHANGELOG.md | 0 .../test-fixtures/README.md | 0 .../test-fixtures/package.json | 0 .../test-fixtures/src/index.ts | 0 .../test-fixtures/tsconfig.json | 2 +- __utils__/test-fixtures/tsconfig.lint.json | 8 + {utils => __utils__}/tsconfig/CHANGELOG.md | 0 {utils => __utils__}/tsconfig/README.md | 0 __utils__/tsconfig/package.json | 39 ++ {utils => __utils__}/tsconfig/tsconfig.json | 0 cli/cli-meta/tsconfig.json | 2 +- cli/cli-meta/tsconfig.lint.json | 2 +- cli/cli-utils/tsconfig.json | 2 +- cli/cli-utils/tsconfig.lint.json | 2 +- cli/command/tsconfig.json | 2 +- cli/command/tsconfig.lint.json | 2 +- cli/common-cli-options-help/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- cli/default-reporter/test/index.ts | 2 +- cli/default-reporter/tsconfig.json | 2 +- cli/default-reporter/tsconfig.lint.json | 2 +- cli/parse-cli-args/tsconfig.json | 2 +- cli/parse-cli-args/tsconfig.lint.json | 2 +- config/config/test/globalBinDir.test.ts | 2 +- config/config/test/index.ts | 2 +- config/config/tsconfig.json | 14 +- config/config/tsconfig.lint.json | 2 +- config/matcher/tsconfig.json | 2 +- config/matcher/tsconfig.lint.json | 2 +- config/normalize-registries/tsconfig.json | 2 +- .../normalize-registries/tsconfig.lint.json | 2 +- config/package-is-installable/tsconfig.json | 2 +- .../package-is-installable/tsconfig.lint.json | 2 +- config/parse-overrides/tsconfig.json | 2 +- config/parse-overrides/tsconfig.lint.json | 2 +- .../pick-registry-for-package/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- env/node.fetcher/tsconfig.json | 8 +- env/node.fetcher/tsconfig.lint.json | 2 +- env/node.resolver/tsconfig.json | 2 +- env/node.resolver/tsconfig.lint.json | 2 +- env/plugin-commands-env/tsconfig.json | 8 +- env/plugin-commands-env/tsconfig.lint.json | 2 +- exec/build-modules/tsconfig.json | 2 +- exec/build-modules/tsconfig.lint.json | 2 +- exec/lifecycle/test/index.ts | 2 +- exec/lifecycle/tsconfig.json | 2 +- exec/lifecycle/tsconfig.lint.json | 2 +- exec/plugin-commands-rebuild/test/index.ts | 2 +- exec/plugin-commands-rebuild/tsconfig.json | 14 +- .../tsconfig.lint.json | 2 +- .../test/index.ts | 2 +- .../tsconfig.json | 8 +- .../tsconfig.lint.json | 2 +- exec/prepare-package/tsconfig.json | 2 +- exec/prepare-package/tsconfig.lint.json | 2 +- exec/run-npm/tsconfig.json | 2 +- exec/run-npm/tsconfig.lint.json | 2 +- fetching/directory-fetcher/test/index.ts | 2 +- fetching/directory-fetcher/tsconfig.json | 6 +- fetching/directory-fetcher/tsconfig.lint.json | 2 +- fetching/fetcher-base/tsconfig.json | 2 +- fetching/fetcher-base/tsconfig.lint.json | 2 +- fetching/git-fetcher/test/index.ts | 2 +- fetching/git-fetcher/tsconfig.json | 2 +- fetching/git-fetcher/tsconfig.lint.json | 2 +- fetching/pick-fetcher/tsconfig.json | 2 +- fetching/pick-fetcher/tsconfig.lint.json | 2 +- fetching/tarball-fetcher/test/fetch.ts | 2 +- fetching/tarball-fetcher/tsconfig.json | 8 +- fetching/tarball-fetcher/tsconfig.lint.json | 2 +- fs/find-packages/test/index.ts | 2 +- fs/find-packages/tsconfig.json | 2 +- fs/find-packages/tsconfig.lint.json | 2 +- fs/graceful-fs/tsconfig.json | 2 +- fs/graceful-fs/tsconfig.lint.json | 2 +- fs/indexed-pkg-importer/tsconfig.json | 6 +- fs/indexed-pkg-importer/tsconfig.lint.json | 2 +- fs/read-modules-dir/tsconfig.json | 2 +- fs/read-modules-dir/tsconfig.lint.json | 2 +- fs/symlink-dependency/tsconfig.json | 8 +- fs/symlink-dependency/tsconfig.lint.json | 2 +- hooks/pnpmfile/tsconfig.json | 2 +- hooks/pnpmfile/tsconfig.lint.json | 2 +- hooks/read-package-hook/tsconfig.json | 2 +- hooks/read-package-hook/tsconfig.lint.json | 2 +- lockfile/audit/tsconfig.json | 2 +- lockfile/audit/tsconfig.lint.json | 2 +- lockfile/filter-lockfile/tsconfig.json | 2 +- lockfile/filter-lockfile/tsconfig.lint.json | 2 +- lockfile/lockfile-file/tsconfig.json | 2 +- lockfile/lockfile-file/tsconfig.lint.json | 2 +- lockfile/lockfile-to-pnp/tsconfig.json | 2 +- lockfile/lockfile-to-pnp/tsconfig.lint.json | 2 +- lockfile/lockfile-types/tsconfig.json | 2 +- lockfile/lockfile-types/tsconfig.lint.json | 2 +- lockfile/lockfile-utils/test/index.ts | 2 +- lockfile/lockfile-utils/tsconfig.json | 2 +- lockfile/lockfile-utils/tsconfig.lint.json | 2 +- lockfile/lockfile-walker/tsconfig.json | 2 +- lockfile/lockfile-walker/tsconfig.lint.json | 2 +- lockfile/merge-lockfile-changes/tsconfig.json | 2 +- .../merge-lockfile-changes/tsconfig.lint.json | 2 +- lockfile/plugin-commands-audit/tsconfig.json | 8 +- .../plugin-commands-audit/tsconfig.lint.json | 2 +- lockfile/prune-lockfile/test/index.ts | 2 +- lockfile/prune-lockfile/tsconfig.json | 2 +- lockfile/prune-lockfile/tsconfig.lint.json | 2 +- network/auth-header/tsconfig.json | 2 +- network/auth-header/tsconfig.lint.json | 2 +- network/fetch/test/fetchFromRegistry.test.ts | 2 +- network/fetch/tsconfig.json | 2 +- network/fetch/tsconfig.lint.json | 2 +- network/fetching-types/tsconfig.json | 2 +- network/fetching-types/tsconfig.lint.json | 2 +- package.json | 2 +- packages/calc-dep-state/tsconfig.json | 2 +- packages/calc-dep-state/tsconfig.lint.json | 2 +- packages/constants/tsconfig.json | 2 +- packages/constants/tsconfig.lint.json | 2 +- packages/core-loggers/tsconfig.json | 2 +- packages/core-loggers/tsconfig.lint.json | 2 +- packages/crypto.base32-hash/test/index.ts | 2 +- packages/crypto.base32-hash/tsconfig.json | 4 +- .../crypto.base32-hash/tsconfig.lint.json | 2 +- packages/dependency-path/test/index.ts | 2 +- packages/dependency-path/tsconfig.json | 2 +- packages/dependency-path/tsconfig.lint.json | 2 +- packages/error/tsconfig.json | 2 +- packages/error/tsconfig.lint.json | 2 +- packages/git-utils/tsconfig.json | 2 +- packages/git-utils/tsconfig.lint.json | 2 +- .../make-dedicated-lockfile/tsconfig.json | 8 +- .../tsconfig.lint.json | 2 +- packages/mount-modules/tsconfig.json | 2 +- packages/mount-modules/tsconfig.lint.json | 2 +- .../parse-wanted-dependency/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- packages/plugin-commands-doctor/tsconfig.json | 2 +- .../plugin-commands-doctor/tsconfig.lint.json | 2 +- packages/plugin-commands-init/tsconfig.json | 14 +- .../plugin-commands-init/tsconfig.lint.json | 2 +- .../plugin-commands-patching/tsconfig.json | 8 +- .../tsconfig.lint.json | 2 +- packages/plugin-commands-setup/tsconfig.json | 6 +- .../plugin-commands-setup/tsconfig.lint.json | 2 +- packages/render-peer-issues/tsconfig.json | 2 +- .../render-peer-issues/tsconfig.lint.json | 2 +- packages/types/tsconfig.json | 2 +- packages/types/tsconfig.lint.json | 2 +- .../which-version-is-pinned/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- pkg-manager/client/test/index.ts | 2 +- pkg-manager/client/tsconfig.json | 2 +- pkg-manager/client/tsconfig.lint.json | 2 +- pkg-manager/core/test/lockfile.ts | 2 +- .../registry-mirror}/is-positive-3.1.0.tgz | Bin .../test/registry-mirror}/is-positive.json | 0 pkg-manager/core/tsconfig.json | 26 +- pkg-manager/core/tsconfig.lint.json | 2 +- pkg-manager/get-context/tsconfig.json | 2 +- pkg-manager/get-context/tsconfig.lint.json | 2 +- pkg-manager/headless/test/index.ts | 2 +- pkg-manager/headless/tsconfig.json | 20 +- pkg-manager/headless/tsconfig.lint.json | 2 +- pkg-manager/hoist/tsconfig.json | 2 +- pkg-manager/hoist/tsconfig.lint.json | 2 +- pkg-manager/link-bins/test/index.ts | 2 +- pkg-manager/link-bins/tsconfig.json | 8 +- pkg-manager/link-bins/tsconfig.lint.json | 2 +- pkg-manager/modules-cleaner/tsconfig.json | 2 +- .../modules-cleaner/tsconfig.lint.json | 2 +- pkg-manager/modules-yaml/test/index.ts | 2 +- pkg-manager/modules-yaml/tsconfig.json | 2 +- pkg-manager/modules-yaml/tsconfig.lint.json | 2 +- pkg-manager/package-bins/tsconfig.json | 2 +- pkg-manager/package-bins/tsconfig.lint.json | 2 +- pkg-manager/package-requester/test/index.ts | 2 +- pkg-manager/package-requester/tsconfig.json | 8 +- .../package-requester/tsconfig.lint.json | 2 +- .../test/import.ts | 2 +- .../test/importRecursive.ts | 2 +- .../tsconfig.json | 20 +- .../tsconfig.lint.json | 2 +- .../read-projects-context/tsconfig.json | 2 +- .../read-projects-context/tsconfig.lint.json | 2 +- pkg-manager/real-hoist/tsconfig.json | 2 +- pkg-manager/real-hoist/tsconfig.lint.json | 2 +- pkg-manager/remove-bins/tsconfig.json | 2 +- pkg-manager/remove-bins/tsconfig.lint.json | 2 +- .../test/relativeTarball.test.ts | 2 +- .../resolve-dependencies/test/resolvePeers.ts | 2 +- .../resolve-dependencies/tsconfig.json | 2 +- .../resolve-dependencies/tsconfig.lint.json | 2 +- .../exportable-manifest/test/index.test.ts | 2 +- .../exportable-manifest/tsconfig.json | 2 +- .../exportable-manifest/tsconfig.lint.json | 2 +- pkg-manifest/manifest-utils/test/index.ts | 2 +- pkg-manifest/manifest-utils/tsconfig.json | 2 +- .../manifest-utils/tsconfig.lint.json | 2 +- pkg-manifest/read-package-json/test/index.ts | 2 +- pkg-manifest/read-package-json/tsconfig.json | 2 +- .../read-package-json/tsconfig.lint.json | 2 +- .../read-project-manifest/test/index.ts | 2 +- .../read-project-manifest/tsconfig.json | 2 +- .../read-project-manifest/tsconfig.lint.json | 2 +- .../write-project-manifest/test/index.ts | 2 +- .../write-project-manifest/tsconfig.json | 2 +- .../write-project-manifest/tsconfig.lint.json | 2 +- pnpm-lock.yaml | 519 +++++++++--------- pnpm-workspace.yaml | 20 +- pnpm/tsconfig.json | 20 +- pnpm/tsconfig.lint.json | 2 +- .../plugin-commands-deploy/tsconfig.json | 14 +- .../plugin-commands-deploy/tsconfig.lint.json | 2 +- .../plugin-commands-publishing/tsconfig.json | 8 +- .../tsconfig.lint.json | 2 +- resolving/default-resolver/test/index.ts | 2 +- resolving/default-resolver/tsconfig.json | 2 +- resolving/default-resolver/tsconfig.lint.json | 2 +- resolving/git-resolver/test/index.ts | 2 +- resolving/git-resolver/tsconfig.json | 2 +- resolving/git-resolver/tsconfig.lint.json | 2 +- resolving/local-resolver/test/index.ts | 2 +- resolving/local-resolver/tsconfig.json | 2 +- resolving/local-resolver/tsconfig.lint.json | 2 +- resolving/npm-resolver/test/index.ts | 2 +- resolving/npm-resolver/tsconfig.json | 8 +- resolving/npm-resolver/tsconfig.lint.json | 2 +- resolving/resolver-base/tsconfig.json | 2 +- resolving/resolver-base/tsconfig.lint.json | 2 +- resolving/tarball-resolver/test/index.ts | 2 +- resolving/tarball-resolver/tsconfig.json | 2 +- resolving/tarball-resolver/tsconfig.lint.json | 2 +- .../dependencies-hierarchy/test/index.ts | 2 +- .../dependencies-hierarchy/tsconfig.json | 8 +- .../dependencies-hierarchy/tsconfig.lint.json | 2 +- reviewing/license-scanner/tsconfig.json | 2 +- reviewing/license-scanner/tsconfig.lint.json | 2 +- reviewing/list/test/index.ts | 2 +- reviewing/list/tsconfig.json | 8 +- reviewing/list/tsconfig.lint.json | 2 +- reviewing/outdated/tsconfig.json | 2 +- reviewing/outdated/tsconfig.lint.json | 2 +- .../plugin-commands-licenses/test/index.ts | 2 +- .../plugin-commands-licenses/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- .../plugin-commands-listing/test/index.ts | 2 +- .../plugin-commands-listing/tsconfig.json | 8 +- .../tsconfig.lint.json | 2 +- .../plugin-commands-outdated/test/index.ts | 2 +- .../plugin-commands-outdated/tsconfig.json | 14 +- .../tsconfig.lint.json | 2 +- store/cafs-types/tsconfig.json | 2 +- store/cafs-types/tsconfig.lint.json | 2 +- store/cafs/tsconfig.json | 2 +- store/cafs/tsconfig.lint.json | 2 +- store/create-cafs-store/tsconfig.json | 8 +- store/create-cafs-store/tsconfig.lint.json | 2 +- store/package-store/test/index.ts | 2 +- store/package-store/tsconfig.json | 8 +- store/package-store/tsconfig.lint.json | 2 +- store/plugin-commands-server/tsconfig.json | 2 +- .../plugin-commands-server/tsconfig.lint.json | 2 +- store/plugin-commands-store/tsconfig.json | 14 +- .../plugin-commands-store/tsconfig.lint.json | 2 +- store/server/test/index.ts | 2 +- store/server/tsconfig.json | 2 +- store/server/tsconfig.lint.json | 2 +- store/store-connection-manager/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- store/store-controller-types/tsconfig.json | 2 +- .../store-controller-types/tsconfig.lint.json | 2 +- store/store-path/tsconfig.json | 2 +- store/store-path/tsconfig.lint.json | 2 +- utils/get-release-text/tsconfig.lint.json | 8 - utils/tsconfig/package.json | 20 - .../filter-workspace-packages/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- workspace/find-workspace-dir/test/index.ts | 2 +- workspace/find-workspace-dir/tsconfig.json | 2 +- .../find-workspace-dir/tsconfig.lint.json | 2 +- .../find-workspace-packages/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- workspace/pkgs-graph/test/index.ts | 2 +- workspace/pkgs-graph/tsconfig.json | 2 +- workspace/pkgs-graph/tsconfig.lint.json | 2 +- .../resolve-workspace-range/tsconfig.json | 2 +- .../tsconfig.lint.json | 2 +- workspace/sort-packages/tsconfig.json | 2 +- workspace/sort-packages/tsconfig.lint.json | 2 +- 346 files changed, 731 insertions(+), 732 deletions(-) rename {patches => __patches__}/pkg@5.7.0.patch (100%) rename {typings => __typings__}/CHANGELOG.md (100%) rename {typings => __typings__}/index.d.ts (100%) rename {typings => __typings__}/local.d.ts (100%) rename {typings => __typings__}/package.json (100%) rename {typings => __typings__}/typed.d.ts (100%) rename {privatePackages => __utils__}/assert-project/CHANGELOG.md (100%) rename {privatePackages => __utils__}/assert-project/README.md (100%) rename {privatePackages => __utils__}/assert-project/jest.config.js (100%) rename {privatePackages => __utils__}/assert-project/package.json (100%) rename {privatePackages => __utils__}/assert-project/src/index.ts (100%) rename {privatePackages => __utils__}/assert-project/src/isExecutable.ts (100%) rename {privatePackages => __utils__}/assert-project/test/fixture/.gitignore (100%) rename {privatePackages => __utils__}/assert-project/test/fixture/project/.npmrc (100%) rename {privatePackages => __utils__}/assert-project/test/fixture/project/package.json (100%) rename {privatePackages => __utils__}/assert-project/test/fixture/project/pnpm-lock.yaml (100%) rename {privatePackages => __utils__}/assert-project/test/fixture/project/pnpm-workspace.yaml (100%) rename {privatePackages => __utils__}/assert-project/test/index.ts (94%) rename {privatePackages => __utils__}/assert-project/tsconfig.json (92%) rename {privatePackages/test-fixtures => __utils__/assert-project}/tsconfig.lint.json (73%) rename {privatePackages => __utils__}/assert-store/CHANGELOG.md (100%) rename {privatePackages => __utils__}/assert-store/README.md (100%) rename {privatePackages => __utils__}/assert-store/jest.config.js (100%) rename {privatePackages => __utils__}/assert-store/package.json (100%) rename {privatePackages => __utils__}/assert-store/src/index.ts (100%) rename {privatePackages => __utils__}/assert-store/test/fixture/.gitignore (100%) rename {privatePackages => __utils__}/assert-store/test/fixture/project/.npmrc (100%) rename {privatePackages => __utils__}/assert-store/test/fixture/project/package.json (100%) rename {privatePackages => __utils__}/assert-store/test/fixture/project/pnpm-lock.yaml (100%) rename {privatePackages => __utils__}/assert-store/test/fixture/project/pnpm-workspace.yaml (100%) rename {privatePackages => __utils__}/assert-store/test/index.ts (93%) rename {privatePackages => __utils__}/assert-store/tsconfig.json (86%) rename {privatePackages => __utils__}/assert-store/tsconfig.lint.json (73%) rename {utils => __utils__}/build-artifacts/README.md (100%) rename {utils => __utils__}/build-artifacts/main.mjs (100%) rename {utils => __utils__}/build-artifacts/package.json (100%) rename {utils => __utils__}/eslint-config/CHANGELOG.md (100%) rename {utils => __utils__}/eslint-config/README.md (100%) rename {utils => __utils__}/eslint-config/eslint.json (100%) rename {utils => __utils__}/eslint-config/index.js (100%) rename {utils => __utils__}/eslint-config/package.json (100%) rename {utils => __utils__}/get-release-text/CHANGELOG.md (100%) rename {utils => __utils__}/get-release-text/package.json (100%) rename {utils => __utils__}/get-release-text/src/main.ts (98%) rename {utils => __utils__}/get-release-text/tsconfig.json (84%) rename {privatePackages/assert-project => __utils__/get-release-text}/tsconfig.lint.json (73%) rename {privatePackages => __utils__}/prepare/CHANGELOG.md (100%) rename {privatePackages => __utils__}/prepare/package.json (100%) rename {privatePackages => __utils__}/prepare/src/index.ts (100%) rename {privatePackages => __utils__}/prepare/tsconfig.json (88%) rename {privatePackages => __utils__}/prepare/tsconfig.lint.json (73%) rename {utils => __utils__}/scripts/package.json (100%) rename {utils => __utils__}/scripts/src/copy-artifacts.ts (100%) rename {privatePackages => __utils__}/test-fixtures/CHANGELOG.md (100%) rename {privatePackages => __utils__}/test-fixtures/README.md (100%) rename {privatePackages => __utils__}/test-fixtures/package.json (100%) rename {privatePackages => __utils__}/test-fixtures/src/index.ts (100%) rename {privatePackages => __utils__}/test-fixtures/tsconfig.json (85%) create mode 100644 __utils__/test-fixtures/tsconfig.lint.json rename {utils => __utils__}/tsconfig/CHANGELOG.md (100%) rename {utils => __utils__}/tsconfig/README.md (100%) create mode 100644 __utils__/tsconfig/package.json rename {utils => __utils__}/tsconfig/tsconfig.json (100%) rename {registry-mirror => pkg-manager/core/test/registry-mirror}/is-positive-3.1.0.tgz (100%) rename {registry-mirror => pkg-manager/core/test/registry-mirror}/is-positive.json (100%) delete mode 100644 utils/get-release-text/tsconfig.lint.json delete mode 100644 utils/tsconfig/package.json diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index 7c78d63abf..b3ed6afee9 100644 --- a/.meta-updater/src/index.ts +++ b/.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 { diff --git a/.meta-updater/tsconfig.lint.json b/.meta-updater/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/.meta-updater/tsconfig.lint.json +++ b/.meta-updater/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/patches/pkg@5.7.0.patch b/__patches__/pkg@5.7.0.patch similarity index 100% rename from patches/pkg@5.7.0.patch rename to __patches__/pkg@5.7.0.patch diff --git a/typings/CHANGELOG.md b/__typings__/CHANGELOG.md similarity index 100% rename from typings/CHANGELOG.md rename to __typings__/CHANGELOG.md diff --git a/typings/index.d.ts b/__typings__/index.d.ts similarity index 100% rename from typings/index.d.ts rename to __typings__/index.d.ts diff --git a/typings/local.d.ts b/__typings__/local.d.ts similarity index 100% rename from typings/local.d.ts rename to __typings__/local.d.ts diff --git a/typings/package.json b/__typings__/package.json similarity index 100% rename from typings/package.json rename to __typings__/package.json diff --git a/typings/typed.d.ts b/__typings__/typed.d.ts similarity index 100% rename from typings/typed.d.ts rename to __typings__/typed.d.ts diff --git a/privatePackages/assert-project/CHANGELOG.md b/__utils__/assert-project/CHANGELOG.md similarity index 100% rename from privatePackages/assert-project/CHANGELOG.md rename to __utils__/assert-project/CHANGELOG.md diff --git a/privatePackages/assert-project/README.md b/__utils__/assert-project/README.md similarity index 100% rename from privatePackages/assert-project/README.md rename to __utils__/assert-project/README.md diff --git a/privatePackages/assert-project/jest.config.js b/__utils__/assert-project/jest.config.js similarity index 100% rename from privatePackages/assert-project/jest.config.js rename to __utils__/assert-project/jest.config.js diff --git a/privatePackages/assert-project/package.json b/__utils__/assert-project/package.json similarity index 100% rename from privatePackages/assert-project/package.json rename to __utils__/assert-project/package.json diff --git a/privatePackages/assert-project/src/index.ts b/__utils__/assert-project/src/index.ts similarity index 100% rename from privatePackages/assert-project/src/index.ts rename to __utils__/assert-project/src/index.ts diff --git a/privatePackages/assert-project/src/isExecutable.ts b/__utils__/assert-project/src/isExecutable.ts similarity index 100% rename from privatePackages/assert-project/src/isExecutable.ts rename to __utils__/assert-project/src/isExecutable.ts diff --git a/privatePackages/assert-project/test/fixture/.gitignore b/__utils__/assert-project/test/fixture/.gitignore similarity index 100% rename from privatePackages/assert-project/test/fixture/.gitignore rename to __utils__/assert-project/test/fixture/.gitignore diff --git a/privatePackages/assert-project/test/fixture/project/.npmrc b/__utils__/assert-project/test/fixture/project/.npmrc similarity index 100% rename from privatePackages/assert-project/test/fixture/project/.npmrc rename to __utils__/assert-project/test/fixture/project/.npmrc diff --git a/privatePackages/assert-project/test/fixture/project/package.json b/__utils__/assert-project/test/fixture/project/package.json similarity index 100% rename from privatePackages/assert-project/test/fixture/project/package.json rename to __utils__/assert-project/test/fixture/project/package.json diff --git a/privatePackages/assert-project/test/fixture/project/pnpm-lock.yaml b/__utils__/assert-project/test/fixture/project/pnpm-lock.yaml similarity index 100% rename from privatePackages/assert-project/test/fixture/project/pnpm-lock.yaml rename to __utils__/assert-project/test/fixture/project/pnpm-lock.yaml diff --git a/privatePackages/assert-project/test/fixture/project/pnpm-workspace.yaml b/__utils__/assert-project/test/fixture/project/pnpm-workspace.yaml similarity index 100% rename from privatePackages/assert-project/test/fixture/project/pnpm-workspace.yaml rename to __utils__/assert-project/test/fixture/project/pnpm-workspace.yaml diff --git a/privatePackages/assert-project/test/index.ts b/__utils__/assert-project/test/index.ts similarity index 94% rename from privatePackages/assert-project/test/index.ts rename to __utils__/assert-project/test/index.ts index 20166af185..ed5dce8a32 100644 --- a/privatePackages/assert-project/test/index.ts +++ b/__utils__/assert-project/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { assertProject } from '../src' diff --git a/privatePackages/assert-project/tsconfig.json b/__utils__/assert-project/tsconfig.json similarity index 92% rename from privatePackages/assert-project/tsconfig.json rename to __utils__/assert-project/tsconfig.json index 9d73509d97..40bb1baa25 100644 --- a/privatePackages/assert-project/tsconfig.json +++ b/__utils__/assert-project/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/privatePackages/test-fixtures/tsconfig.lint.json b/__utils__/assert-project/tsconfig.lint.json similarity index 73% rename from privatePackages/test-fixtures/tsconfig.lint.json rename to __utils__/assert-project/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/privatePackages/test-fixtures/tsconfig.lint.json +++ b/__utils__/assert-project/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/privatePackages/assert-store/CHANGELOG.md b/__utils__/assert-store/CHANGELOG.md similarity index 100% rename from privatePackages/assert-store/CHANGELOG.md rename to __utils__/assert-store/CHANGELOG.md diff --git a/privatePackages/assert-store/README.md b/__utils__/assert-store/README.md similarity index 100% rename from privatePackages/assert-store/README.md rename to __utils__/assert-store/README.md diff --git a/privatePackages/assert-store/jest.config.js b/__utils__/assert-store/jest.config.js similarity index 100% rename from privatePackages/assert-store/jest.config.js rename to __utils__/assert-store/jest.config.js diff --git a/privatePackages/assert-store/package.json b/__utils__/assert-store/package.json similarity index 100% rename from privatePackages/assert-store/package.json rename to __utils__/assert-store/package.json diff --git a/privatePackages/assert-store/src/index.ts b/__utils__/assert-store/src/index.ts similarity index 100% rename from privatePackages/assert-store/src/index.ts rename to __utils__/assert-store/src/index.ts diff --git a/privatePackages/assert-store/test/fixture/.gitignore b/__utils__/assert-store/test/fixture/.gitignore similarity index 100% rename from privatePackages/assert-store/test/fixture/.gitignore rename to __utils__/assert-store/test/fixture/.gitignore diff --git a/privatePackages/assert-store/test/fixture/project/.npmrc b/__utils__/assert-store/test/fixture/project/.npmrc similarity index 100% rename from privatePackages/assert-store/test/fixture/project/.npmrc rename to __utils__/assert-store/test/fixture/project/.npmrc diff --git a/privatePackages/assert-store/test/fixture/project/package.json b/__utils__/assert-store/test/fixture/project/package.json similarity index 100% rename from privatePackages/assert-store/test/fixture/project/package.json rename to __utils__/assert-store/test/fixture/project/package.json diff --git a/privatePackages/assert-store/test/fixture/project/pnpm-lock.yaml b/__utils__/assert-store/test/fixture/project/pnpm-lock.yaml similarity index 100% rename from privatePackages/assert-store/test/fixture/project/pnpm-lock.yaml rename to __utils__/assert-store/test/fixture/project/pnpm-lock.yaml diff --git a/privatePackages/assert-store/test/fixture/project/pnpm-workspace.yaml b/__utils__/assert-store/test/fixture/project/pnpm-workspace.yaml similarity index 100% rename from privatePackages/assert-store/test/fixture/project/pnpm-workspace.yaml rename to __utils__/assert-store/test/fixture/project/pnpm-workspace.yaml diff --git a/privatePackages/assert-store/test/index.ts b/__utils__/assert-store/test/index.ts similarity index 93% rename from privatePackages/assert-store/test/index.ts rename to __utils__/assert-store/test/index.ts index ba9b10b0c7..8069842781 100644 --- a/privatePackages/assert-store/test/index.ts +++ b/__utils__/assert-store/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { assertStore } from '@pnpm/assert-store' diff --git a/privatePackages/assert-store/tsconfig.json b/__utils__/assert-store/tsconfig.json similarity index 86% rename from privatePackages/assert-store/tsconfig.json rename to __utils__/assert-store/tsconfig.json index aa90180149..1987344781 100644 --- a/privatePackages/assert-store/tsconfig.json +++ b/__utils__/assert-store/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/privatePackages/assert-store/tsconfig.lint.json b/__utils__/assert-store/tsconfig.lint.json similarity index 73% rename from privatePackages/assert-store/tsconfig.lint.json rename to __utils__/assert-store/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/privatePackages/assert-store/tsconfig.lint.json +++ b/__utils__/assert-store/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/utils/build-artifacts/README.md b/__utils__/build-artifacts/README.md similarity index 100% rename from utils/build-artifacts/README.md rename to __utils__/build-artifacts/README.md diff --git a/utils/build-artifacts/main.mjs b/__utils__/build-artifacts/main.mjs similarity index 100% rename from utils/build-artifacts/main.mjs rename to __utils__/build-artifacts/main.mjs diff --git a/utils/build-artifacts/package.json b/__utils__/build-artifacts/package.json similarity index 100% rename from utils/build-artifacts/package.json rename to __utils__/build-artifacts/package.json diff --git a/utils/eslint-config/CHANGELOG.md b/__utils__/eslint-config/CHANGELOG.md similarity index 100% rename from utils/eslint-config/CHANGELOG.md rename to __utils__/eslint-config/CHANGELOG.md diff --git a/utils/eslint-config/README.md b/__utils__/eslint-config/README.md similarity index 100% rename from utils/eslint-config/README.md rename to __utils__/eslint-config/README.md diff --git a/utils/eslint-config/eslint.json b/__utils__/eslint-config/eslint.json similarity index 100% rename from utils/eslint-config/eslint.json rename to __utils__/eslint-config/eslint.json diff --git a/utils/eslint-config/index.js b/__utils__/eslint-config/index.js similarity index 100% rename from utils/eslint-config/index.js rename to __utils__/eslint-config/index.js diff --git a/utils/eslint-config/package.json b/__utils__/eslint-config/package.json similarity index 100% rename from utils/eslint-config/package.json rename to __utils__/eslint-config/package.json diff --git a/utils/get-release-text/CHANGELOG.md b/__utils__/get-release-text/CHANGELOG.md similarity index 100% rename from utils/get-release-text/CHANGELOG.md rename to __utils__/get-release-text/CHANGELOG.md diff --git a/utils/get-release-text/package.json b/__utils__/get-release-text/package.json similarity index 100% rename from utils/get-release-text/package.json rename to __utils__/get-release-text/package.json diff --git a/utils/get-release-text/src/main.ts b/__utils__/get-release-text/src/main.ts similarity index 98% rename from utils/get-release-text/src/main.ts rename to __utils__/get-release-text/src/main.ts index b74c5136c2..44f3ce8229 100644 --- a/utils/get-release-text/src/main.ts +++ b/__utils__/get-release-text/src/main.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import path from 'path' import { fileURLToPath } from 'url' diff --git a/utils/get-release-text/tsconfig.json b/__utils__/get-release-text/tsconfig.json similarity index 84% rename from utils/get-release-text/tsconfig.json rename to __utils__/get-release-text/tsconfig.json index 4582d8fa14..82729a5304 100644 --- a/utils/get-release-text/tsconfig.json +++ b/__utils__/get-release-text/tsconfig.json @@ -7,7 +7,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/privatePackages/assert-project/tsconfig.lint.json b/__utils__/get-release-text/tsconfig.lint.json similarity index 73% rename from privatePackages/assert-project/tsconfig.lint.json rename to __utils__/get-release-text/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/privatePackages/assert-project/tsconfig.lint.json +++ b/__utils__/get-release-text/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/privatePackages/prepare/CHANGELOG.md b/__utils__/prepare/CHANGELOG.md similarity index 100% rename from privatePackages/prepare/CHANGELOG.md rename to __utils__/prepare/CHANGELOG.md diff --git a/privatePackages/prepare/package.json b/__utils__/prepare/package.json similarity index 100% rename from privatePackages/prepare/package.json rename to __utils__/prepare/package.json diff --git a/privatePackages/prepare/src/index.ts b/__utils__/prepare/src/index.ts similarity index 100% rename from privatePackages/prepare/src/index.ts rename to __utils__/prepare/src/index.ts diff --git a/privatePackages/prepare/tsconfig.json b/__utils__/prepare/tsconfig.json similarity index 88% rename from privatePackages/prepare/tsconfig.json rename to __utils__/prepare/tsconfig.json index 4fa987c050..b6f10467f4 100644 --- a/privatePackages/prepare/tsconfig.json +++ b/__utils__/prepare/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/privatePackages/prepare/tsconfig.lint.json b/__utils__/prepare/tsconfig.lint.json similarity index 73% rename from privatePackages/prepare/tsconfig.lint.json rename to __utils__/prepare/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/privatePackages/prepare/tsconfig.lint.json +++ b/__utils__/prepare/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/utils/scripts/package.json b/__utils__/scripts/package.json similarity index 100% rename from utils/scripts/package.json rename to __utils__/scripts/package.json diff --git a/utils/scripts/src/copy-artifacts.ts b/__utils__/scripts/src/copy-artifacts.ts similarity index 100% rename from utils/scripts/src/copy-artifacts.ts rename to __utils__/scripts/src/copy-artifacts.ts diff --git a/privatePackages/test-fixtures/CHANGELOG.md b/__utils__/test-fixtures/CHANGELOG.md similarity index 100% rename from privatePackages/test-fixtures/CHANGELOG.md rename to __utils__/test-fixtures/CHANGELOG.md diff --git a/privatePackages/test-fixtures/README.md b/__utils__/test-fixtures/README.md similarity index 100% rename from privatePackages/test-fixtures/README.md rename to __utils__/test-fixtures/README.md diff --git a/privatePackages/test-fixtures/package.json b/__utils__/test-fixtures/package.json similarity index 100% rename from privatePackages/test-fixtures/package.json rename to __utils__/test-fixtures/package.json diff --git a/privatePackages/test-fixtures/src/index.ts b/__utils__/test-fixtures/src/index.ts similarity index 100% rename from privatePackages/test-fixtures/src/index.ts rename to __utils__/test-fixtures/src/index.ts diff --git a/privatePackages/test-fixtures/tsconfig.json b/__utils__/test-fixtures/tsconfig.json similarity index 85% rename from privatePackages/test-fixtures/tsconfig.json rename to __utils__/test-fixtures/tsconfig.json index 5dbc30b83a..7b1ede671a 100644 --- a/privatePackages/test-fixtures/tsconfig.json +++ b/__utils__/test-fixtures/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/__utils__/test-fixtures/tsconfig.lint.json b/__utils__/test-fixtures/tsconfig.lint.json new file mode 100644 index 0000000000..1bbe711971 --- /dev/null +++ b/__utils__/test-fixtures/tsconfig.lint.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src/**/*.ts", + "test/**/*.ts", + "../../__typings__/**/*.d.ts" + ] +} diff --git a/utils/tsconfig/CHANGELOG.md b/__utils__/tsconfig/CHANGELOG.md similarity index 100% rename from utils/tsconfig/CHANGELOG.md rename to __utils__/tsconfig/CHANGELOG.md diff --git a/utils/tsconfig/README.md b/__utils__/tsconfig/README.md similarity index 100% rename from utils/tsconfig/README.md rename to __utils__/tsconfig/README.md diff --git a/__utils__/tsconfig/package.json b/__utils__/tsconfig/package.json new file mode 100644 index 0000000000..9addf50fce --- /dev/null +++ b/__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" + } +} diff --git a/utils/tsconfig/tsconfig.json b/__utils__/tsconfig/tsconfig.json similarity index 100% rename from utils/tsconfig/tsconfig.json rename to __utils__/tsconfig/tsconfig.json diff --git a/cli/cli-meta/tsconfig.json b/cli/cli-meta/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/cli/cli-meta/tsconfig.json +++ b/cli/cli-meta/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/cli/cli-meta/tsconfig.lint.json b/cli/cli-meta/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/cli-meta/tsconfig.lint.json +++ b/cli/cli-meta/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/cli/cli-utils/tsconfig.json b/cli/cli-utils/tsconfig.json index f5630fc6a3..37b02db46a 100644 --- a/cli/cli-utils/tsconfig.json +++ b/cli/cli-utils/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/cli/cli-utils/tsconfig.lint.json b/cli/cli-utils/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/cli-utils/tsconfig.lint.json +++ b/cli/cli-utils/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/cli/command/tsconfig.json b/cli/command/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/cli/command/tsconfig.json +++ b/cli/command/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/cli/command/tsconfig.lint.json b/cli/command/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/command/tsconfig.lint.json +++ b/cli/command/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/cli/common-cli-options-help/tsconfig.json b/cli/common-cli-options-help/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/cli/common-cli-options-help/tsconfig.json +++ b/cli/common-cli-options-help/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/cli/common-cli-options-help/tsconfig.lint.json b/cli/common-cli-options-help/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/common-cli-options-help/tsconfig.lint.json +++ b/cli/common-cli-options-help/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/cli/default-reporter/test/index.ts b/cli/default-reporter/test/index.ts index a9a55c8288..cac578b138 100644 --- a/cli/default-reporter/test/index.ts +++ b/cli/default-reporter/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { Config } from '@pnpm/config' import { diff --git a/cli/default-reporter/tsconfig.json b/cli/default-reporter/tsconfig.json index 0c385db614..7ff4b840a8 100644 --- a/cli/default-reporter/tsconfig.json +++ b/cli/default-reporter/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/cli/default-reporter/tsconfig.lint.json b/cli/default-reporter/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/default-reporter/tsconfig.lint.json +++ b/cli/default-reporter/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/cli/parse-cli-args/tsconfig.json b/cli/parse-cli-args/tsconfig.json index 2f39803eef..0e4ad314c9 100644 --- a/cli/parse-cli-args/tsconfig.json +++ b/cli/parse-cli-args/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/cli/parse-cli-args/tsconfig.lint.json b/cli/parse-cli-args/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/cli/parse-cli-args/tsconfig.lint.json +++ b/cli/parse-cli-args/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/config/test/globalBinDir.test.ts b/config/config/test/globalBinDir.test.ts index 6ebe46388d..06eb477e6b 100644 --- a/config/config/test/globalBinDir.test.ts +++ b/config/config/test/globalBinDir.test.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import { tempDir } from '@pnpm/prepare' import path from 'path' diff --git a/config/config/test/index.ts b/config/config/test/index.ts index e193adafae..a269678276 100644 --- a/config/config/test/index.ts +++ b/config/config/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs } from 'fs' import path from 'path' import PATH from 'path-name' diff --git a/config/config/tsconfig.json b/config/config/tsconfig.json index 0e7ab5f005..1c04274cfc 100644 --- a/config/config/tsconfig.json +++ b/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" } diff --git a/config/config/tsconfig.lint.json b/config/config/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/config/tsconfig.lint.json +++ b/config/config/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/matcher/tsconfig.json b/config/matcher/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/config/matcher/tsconfig.json +++ b/config/matcher/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/config/matcher/tsconfig.lint.json b/config/matcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/matcher/tsconfig.lint.json +++ b/config/matcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/normalize-registries/tsconfig.json b/config/normalize-registries/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/config/normalize-registries/tsconfig.json +++ b/config/normalize-registries/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/config/normalize-registries/tsconfig.lint.json b/config/normalize-registries/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/normalize-registries/tsconfig.lint.json +++ b/config/normalize-registries/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/package-is-installable/tsconfig.json b/config/package-is-installable/tsconfig.json index 723f453bbd..3e087a40c5 100644 --- a/config/package-is-installable/tsconfig.json +++ b/config/package-is-installable/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/config/package-is-installable/tsconfig.lint.json b/config/package-is-installable/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/package-is-installable/tsconfig.lint.json +++ b/config/package-is-installable/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/parse-overrides/tsconfig.json b/config/parse-overrides/tsconfig.json index f77e67b26a..5872b8e958 100644 --- a/config/parse-overrides/tsconfig.json +++ b/config/parse-overrides/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/config/parse-overrides/tsconfig.lint.json b/config/parse-overrides/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/parse-overrides/tsconfig.lint.json +++ b/config/parse-overrides/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/config/pick-registry-for-package/tsconfig.json b/config/pick-registry-for-package/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/config/pick-registry-for-package/tsconfig.json +++ b/config/pick-registry-for-package/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/config/pick-registry-for-package/tsconfig.lint.json b/config/pick-registry-for-package/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/config/pick-registry-for-package/tsconfig.lint.json +++ b/config/pick-registry-for-package/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/env/node.fetcher/tsconfig.json b/env/node.fetcher/tsconfig.json index a8e3414abd..d1490551a2 100644 --- a/env/node.fetcher/tsconfig.json +++ b/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" }, diff --git a/env/node.fetcher/tsconfig.lint.json b/env/node.fetcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/env/node.fetcher/tsconfig.lint.json +++ b/env/node.fetcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/env/node.resolver/tsconfig.json b/env/node.resolver/tsconfig.json index e5ac6a056e..49cc36128f 100644 --- a/env/node.resolver/tsconfig.json +++ b/env/node.resolver/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/env/node.resolver/tsconfig.lint.json b/env/node.resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/env/node.resolver/tsconfig.lint.json +++ b/env/node.resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/env/plugin-commands-env/tsconfig.json b/env/plugin-commands-env/tsconfig.json index 7f7a8f2f44..5a909aea98 100644 --- a/env/plugin-commands-env/tsconfig.json +++ b/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" }, diff --git a/env/plugin-commands-env/tsconfig.lint.json b/env/plugin-commands-env/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/env/plugin-commands-env/tsconfig.lint.json +++ b/env/plugin-commands-env/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/build-modules/tsconfig.json b/exec/build-modules/tsconfig.json index 178209d2f3..34f9e45d8c 100644 --- a/exec/build-modules/tsconfig.json +++ b/exec/build-modules/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/exec/build-modules/tsconfig.lint.json b/exec/build-modules/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/build-modules/tsconfig.lint.json +++ b/exec/build-modules/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/lifecycle/test/index.ts b/exec/lifecycle/test/index.ts index 75f2c30b42..d407cfd0c4 100644 --- a/exec/lifecycle/test/index.ts +++ b/exec/lifecycle/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { runLifecycleHook, runPostinstallHooks } from '@pnpm/lifecycle' import loadJsonFile from 'load-json-file' diff --git a/exec/lifecycle/tsconfig.json b/exec/lifecycle/tsconfig.json index ed352ea11d..cc2eff73b4 100644 --- a/exec/lifecycle/tsconfig.json +++ b/exec/lifecycle/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/exec/lifecycle/tsconfig.lint.json b/exec/lifecycle/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/lifecycle/tsconfig.lint.json +++ b/exec/lifecycle/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/plugin-commands-rebuild/test/index.ts b/exec/plugin-commands-rebuild/test/index.ts index 73267df854..086d5055f6 100644 --- a/exec/plugin-commands-rebuild/test/index.ts +++ b/exec/plugin-commands-rebuild/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' import { rebuild } from '@pnpm/plugin-commands-rebuild' diff --git a/exec/plugin-commands-rebuild/tsconfig.json b/exec/plugin-commands-rebuild/tsconfig.json index e312b81b30..e371b88944 100644 --- a/exec/plugin-commands-rebuild/tsconfig.json +++ b/exec/plugin-commands-rebuild/tsconfig.json @@ -6,9 +6,15 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../cli/cli-utils" }, @@ -48,12 +54,6 @@ { "path": "../../pkg-manager/modules-yaml" }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../store/store-connection-manager" }, diff --git a/exec/plugin-commands-rebuild/tsconfig.lint.json b/exec/plugin-commands-rebuild/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/plugin-commands-rebuild/tsconfig.lint.json +++ b/exec/plugin-commands-rebuild/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/plugin-commands-script-runners/test/index.ts b/exec/plugin-commands-script-runners/test/index.ts index 49acf09faf..416b3dba05 100644 --- a/exec/plugin-commands-script-runners/test/index.ts +++ b/exec/plugin-commands-script-runners/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs } from 'fs' import path from 'path' import { PnpmError } from '@pnpm/error' diff --git a/exec/plugin-commands-script-runners/tsconfig.json b/exec/plugin-commands-script-runners/tsconfig.json index aa24321958..e755311198 100644 --- a/exec/plugin-commands-script-runners/tsconfig.json +++ b/exec/plugin-commands-script-runners/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -39,9 +42,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../store/store-path" }, diff --git a/exec/plugin-commands-script-runners/tsconfig.lint.json b/exec/plugin-commands-script-runners/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/plugin-commands-script-runners/tsconfig.lint.json +++ b/exec/plugin-commands-script-runners/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/prepare-package/tsconfig.json b/exec/prepare-package/tsconfig.json index 2acaf0bbdd..690769fe4f 100644 --- a/exec/prepare-package/tsconfig.json +++ b/exec/prepare-package/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/exec/prepare-package/tsconfig.lint.json b/exec/prepare-package/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/prepare-package/tsconfig.lint.json +++ b/exec/prepare-package/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/exec/run-npm/tsconfig.json b/exec/run-npm/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/exec/run-npm/tsconfig.json +++ b/exec/run-npm/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/exec/run-npm/tsconfig.lint.json b/exec/run-npm/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/exec/run-npm/tsconfig.lint.json +++ b/exec/run-npm/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fetching/directory-fetcher/test/index.ts b/fetching/directory-fetcher/test/index.ts index 52a3955ca6..440b06db85 100644 --- a/fetching/directory-fetcher/test/index.ts +++ b/fetching/directory-fetcher/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import path from 'path' import { createDirectoryFetcher } from '@pnpm/directory-fetcher' diff --git a/fetching/directory-fetcher/tsconfig.json b/fetching/directory-fetcher/tsconfig.json index c1bebc18f9..c92a4056a4 100644 --- a/fetching/directory-fetcher/tsconfig.json +++ b/fetching/directory-fetcher/tsconfig.json @@ -6,14 +6,14 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../__utils__/test-fixtures" }, { - "path": "../../privatePackages/test-fixtures" + "path": "../../pkg-manifest/read-project-manifest" }, { "path": "../../resolving/resolver-base" diff --git a/fetching/directory-fetcher/tsconfig.lint.json b/fetching/directory-fetcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fetching/directory-fetcher/tsconfig.lint.json +++ b/fetching/directory-fetcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fetching/fetcher-base/tsconfig.json b/fetching/fetcher-base/tsconfig.json index 6da70fd1d7..2d93b9bf18 100644 --- a/fetching/fetcher-base/tsconfig.json +++ b/fetching/fetcher-base/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/fetching/fetcher-base/tsconfig.lint.json b/fetching/fetcher-base/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fetching/fetcher-base/tsconfig.lint.json +++ b/fetching/fetcher-base/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fetching/git-fetcher/test/index.ts b/fetching/git-fetcher/test/index.ts index 0f274ea606..2b16131fe6 100644 --- a/fetching/git-fetcher/test/index.ts +++ b/fetching/git-fetcher/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { createCafsStore } from '@pnpm/create-cafs-store' import { createGitFetcher } from '@pnpm/git-fetcher' diff --git a/fetching/git-fetcher/tsconfig.json b/fetching/git-fetcher/tsconfig.json index 45c886fde6..f10b9513b6 100644 --- a/fetching/git-fetcher/tsconfig.json +++ b/fetching/git-fetcher/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/fetching/git-fetcher/tsconfig.lint.json b/fetching/git-fetcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fetching/git-fetcher/tsconfig.lint.json +++ b/fetching/git-fetcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fetching/pick-fetcher/tsconfig.json b/fetching/pick-fetcher/tsconfig.json index 32f7cec749..6ab0000b81 100644 --- a/fetching/pick-fetcher/tsconfig.json +++ b/fetching/pick-fetcher/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/fetching/pick-fetcher/tsconfig.lint.json b/fetching/pick-fetcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fetching/pick-fetcher/tsconfig.lint.json +++ b/fetching/pick-fetcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fetching/tarball-fetcher/test/fetch.ts b/fetching/tarball-fetcher/test/fetch.ts index f405b0cc25..24b6a157cb 100644 --- a/fetching/tarball-fetcher/test/fetch.ts +++ b/fetching/tarball-fetcher/test/fetch.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import path from 'path' import { FetchError, PnpmError } from '@pnpm/error' diff --git a/fetching/tarball-fetcher/tsconfig.json b/fetching/tarball-fetcher/tsconfig.json index b1195bdffe..2b72dc90b3 100644 --- a/fetching/tarball-fetcher/tsconfig.json +++ b/fetching/tarball-fetcher/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../exec/prepare-package" }, @@ -27,9 +30,6 @@ { "path": "../../packages/error" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../store/cafs-types" }, diff --git a/fetching/tarball-fetcher/tsconfig.lint.json b/fetching/tarball-fetcher/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fetching/tarball-fetcher/tsconfig.lint.json +++ b/fetching/tarball-fetcher/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fs/find-packages/test/index.ts b/fs/find-packages/test/index.ts index a12ed7ac4e..c7ae81904d 100644 --- a/fs/find-packages/test/index.ts +++ b/fs/find-packages/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { findPackages } from 'find-packages' diff --git a/fs/find-packages/tsconfig.json b/fs/find-packages/tsconfig.json index 211cb502ec..5892f86ac3 100644 --- a/fs/find-packages/tsconfig.json +++ b/fs/find-packages/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/fs/find-packages/tsconfig.lint.json b/fs/find-packages/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fs/find-packages/tsconfig.lint.json +++ b/fs/find-packages/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fs/graceful-fs/tsconfig.json b/fs/graceful-fs/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/fs/graceful-fs/tsconfig.json +++ b/fs/graceful-fs/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/fs/graceful-fs/tsconfig.lint.json b/fs/graceful-fs/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fs/graceful-fs/tsconfig.lint.json +++ b/fs/graceful-fs/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fs/indexed-pkg-importer/tsconfig.json b/fs/indexed-pkg-importer/tsconfig.json index 98943131b9..ad8c8bd764 100644 --- a/fs/indexed-pkg-importer/tsconfig.json +++ b/fs/indexed-pkg-importer/tsconfig.json @@ -6,14 +6,14 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { - "path": "../../packages/core-loggers" + "path": "../../__utils__/prepare" }, { - "path": "../../privatePackages/prepare" + "path": "../../packages/core-loggers" }, { "path": "../../store/store-controller-types" diff --git a/fs/indexed-pkg-importer/tsconfig.lint.json b/fs/indexed-pkg-importer/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fs/indexed-pkg-importer/tsconfig.lint.json +++ b/fs/indexed-pkg-importer/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fs/read-modules-dir/tsconfig.json b/fs/read-modules-dir/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/fs/read-modules-dir/tsconfig.json +++ b/fs/read-modules-dir/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/fs/read-modules-dir/tsconfig.lint.json b/fs/read-modules-dir/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fs/read-modules-dir/tsconfig.lint.json +++ b/fs/read-modules-dir/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/fs/symlink-dependency/tsconfig.json b/fs/symlink-dependency/tsconfig.json index da754b4e20..ee6a9a23d9 100644 --- a/fs/symlink-dependency/tsconfig.json +++ b/fs/symlink-dependency/tsconfig.json @@ -6,17 +6,17 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../packages/core-loggers" }, { "path": "../../packages/types" - }, - { - "path": "../../privatePackages/prepare" } ] } diff --git a/fs/symlink-dependency/tsconfig.lint.json b/fs/symlink-dependency/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/fs/symlink-dependency/tsconfig.lint.json +++ b/fs/symlink-dependency/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/hooks/pnpmfile/tsconfig.json b/hooks/pnpmfile/tsconfig.json index 8abbd80e28..4497b43b4f 100644 --- a/hooks/pnpmfile/tsconfig.json +++ b/hooks/pnpmfile/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/hooks/pnpmfile/tsconfig.lint.json b/hooks/pnpmfile/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/hooks/pnpmfile/tsconfig.lint.json +++ b/hooks/pnpmfile/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/hooks/read-package-hook/tsconfig.json b/hooks/read-package-hook/tsconfig.json index 13d8248f2f..2ca4d0c8fb 100644 --- a/hooks/read-package-hook/tsconfig.json +++ b/hooks/read-package-hook/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/hooks/read-package-hook/tsconfig.lint.json b/hooks/read-package-hook/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/hooks/read-package-hook/tsconfig.lint.json +++ b/hooks/read-package-hook/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/audit/tsconfig.json b/lockfile/audit/tsconfig.json index cbbbf82b71..912e9d52fb 100644 --- a/lockfile/audit/tsconfig.json +++ b/lockfile/audit/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/audit/tsconfig.lint.json b/lockfile/audit/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/audit/tsconfig.lint.json +++ b/lockfile/audit/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/filter-lockfile/tsconfig.json b/lockfile/filter-lockfile/tsconfig.json index df082ad6ac..47b7e27d72 100644 --- a/lockfile/filter-lockfile/tsconfig.json +++ b/lockfile/filter-lockfile/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/filter-lockfile/tsconfig.lint.json b/lockfile/filter-lockfile/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/filter-lockfile/tsconfig.lint.json +++ b/lockfile/filter-lockfile/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/lockfile-file/tsconfig.json b/lockfile/lockfile-file/tsconfig.json index 6628e0e6cd..1c2737064f 100644 --- a/lockfile/lockfile-file/tsconfig.json +++ b/lockfile/lockfile-file/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/lockfile-file/tsconfig.lint.json b/lockfile/lockfile-file/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/lockfile-file/tsconfig.lint.json +++ b/lockfile/lockfile-file/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/lockfile-to-pnp/tsconfig.json b/lockfile/lockfile-to-pnp/tsconfig.json index d79e9bd548..7571eae993 100644 --- a/lockfile/lockfile-to-pnp/tsconfig.json +++ b/lockfile/lockfile-to-pnp/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/lockfile-to-pnp/tsconfig.lint.json b/lockfile/lockfile-to-pnp/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/lockfile-to-pnp/tsconfig.lint.json +++ b/lockfile/lockfile-to-pnp/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/lockfile-types/tsconfig.json b/lockfile/lockfile-types/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/lockfile/lockfile-types/tsconfig.json +++ b/lockfile/lockfile-types/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/lockfile-types/tsconfig.lint.json b/lockfile/lockfile-types/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/lockfile-types/tsconfig.lint.json +++ b/lockfile/lockfile-types/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/lockfile-utils/test/index.ts b/lockfile/lockfile-utils/test/index.ts index 690e627648..aae3b17ba3 100644 --- a/lockfile/lockfile-utils/test/index.ts +++ b/lockfile/lockfile-utils/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import './nameVerFromPkgSnapshot' import './pkgSnapshotToResolution' import './satisfiesPackageManifest' diff --git a/lockfile/lockfile-utils/tsconfig.json b/lockfile/lockfile-utils/tsconfig.json index 274338fcf5..24f82f89dd 100644 --- a/lockfile/lockfile-utils/tsconfig.json +++ b/lockfile/lockfile-utils/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/lockfile-utils/tsconfig.lint.json b/lockfile/lockfile-utils/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/lockfile-utils/tsconfig.lint.json +++ b/lockfile/lockfile-utils/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/lockfile-walker/tsconfig.json b/lockfile/lockfile-walker/tsconfig.json index 543aecfa11..6b302513ff 100644 --- a/lockfile/lockfile-walker/tsconfig.json +++ b/lockfile/lockfile-walker/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/lockfile-walker/tsconfig.lint.json b/lockfile/lockfile-walker/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/lockfile-walker/tsconfig.lint.json +++ b/lockfile/lockfile-walker/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/merge-lockfile-changes/tsconfig.json b/lockfile/merge-lockfile-changes/tsconfig.json index f13bd20803..114148dcb8 100644 --- a/lockfile/merge-lockfile-changes/tsconfig.json +++ b/lockfile/merge-lockfile-changes/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/merge-lockfile-changes/tsconfig.lint.json b/lockfile/merge-lockfile-changes/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/merge-lockfile-changes/tsconfig.lint.json +++ b/lockfile/merge-lockfile-changes/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/plugin-commands-audit/tsconfig.json b/lockfile/plugin-commands-audit/tsconfig.json index cf77939312..e3c2121eb1 100644 --- a/lockfile/plugin-commands-audit/tsconfig.json +++ b/lockfile/plugin-commands-audit/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../cli/cli-utils" }, @@ -30,9 +33,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../audit" }, diff --git a/lockfile/plugin-commands-audit/tsconfig.lint.json b/lockfile/plugin-commands-audit/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/plugin-commands-audit/tsconfig.lint.json +++ b/lockfile/plugin-commands-audit/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/lockfile/prune-lockfile/test/index.ts b/lockfile/prune-lockfile/test/index.ts index 4d7eb1e760..e4d58ee112 100644 --- a/lockfile/prune-lockfile/test/index.ts +++ b/lockfile/prune-lockfile/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' import { pruneLockfile, diff --git a/lockfile/prune-lockfile/tsconfig.json b/lockfile/prune-lockfile/tsconfig.json index b76dc1b363..68cac12635 100644 --- a/lockfile/prune-lockfile/tsconfig.json +++ b/lockfile/prune-lockfile/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/lockfile/prune-lockfile/tsconfig.lint.json b/lockfile/prune-lockfile/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/lockfile/prune-lockfile/tsconfig.lint.json +++ b/lockfile/prune-lockfile/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/network/auth-header/tsconfig.json b/network/auth-header/tsconfig.json index 3c87944f95..019cba19e7 100644 --- a/network/auth-header/tsconfig.json +++ b/network/auth-header/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/network/auth-header/tsconfig.lint.json b/network/auth-header/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/network/auth-header/tsconfig.lint.json +++ b/network/auth-header/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/network/fetch/test/fetchFromRegistry.test.ts b/network/fetch/test/fetchFromRegistry.test.ts index 61aa7fba42..f7efca4677 100644 --- a/network/fetch/test/fetchFromRegistry.test.ts +++ b/network/fetch/test/fetchFromRegistry.test.ts @@ -1,4 +1,4 @@ -/// +/// import { createFetchFromRegistry } from '@pnpm/fetch' import nock from 'nock' diff --git a/network/fetch/tsconfig.json b/network/fetch/tsconfig.json index 796c76fd90..f7b2fd19f3 100644 --- a/network/fetch/tsconfig.json +++ b/network/fetch/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/network/fetch/tsconfig.lint.json b/network/fetch/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/network/fetch/tsconfig.lint.json +++ b/network/fetch/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/network/fetching-types/tsconfig.json b/network/fetching-types/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/network/fetching-types/tsconfig.json +++ b/network/fetching-types/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/network/fetching-types/tsconfig.lint.json b/network/fetching-types/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/network/fetching-types/tsconfig.lint.json +++ b/network/fetching-types/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/package.json b/package.json index 95e3148638..80addacda7 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ ] }, "patchedDependencies": { - "pkg@5.7.0": "patches/pkg@5.7.0.patch" + "pkg@5.7.0": "__patches__/pkg@5.7.0.patch" }, "updateConfig": { "ignoreDependencies": [ diff --git a/packages/calc-dep-state/tsconfig.json b/packages/calc-dep-state/tsconfig.json index fd4fa7b1c2..f5069582b7 100644 --- a/packages/calc-dep-state/tsconfig.json +++ b/packages/calc-dep-state/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/calc-dep-state/tsconfig.lint.json b/packages/calc-dep-state/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/calc-dep-state/tsconfig.lint.json +++ b/packages/calc-dep-state/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/constants/tsconfig.json b/packages/constants/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/packages/constants/tsconfig.json +++ b/packages/constants/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/packages/constants/tsconfig.lint.json b/packages/constants/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/constants/tsconfig.lint.json +++ b/packages/constants/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/core-loggers/tsconfig.json b/packages/core-loggers/tsconfig.json index 7fa294a1eb..64c25a32e3 100644 --- a/packages/core-loggers/tsconfig.json +++ b/packages/core-loggers/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/core-loggers/tsconfig.lint.json b/packages/core-loggers/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/core-loggers/tsconfig.lint.json +++ b/packages/core-loggers/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/crypto.base32-hash/test/index.ts b/packages/crypto.base32-hash/test/index.ts index 44ff7236b9..0dfd3c8cf6 100644 --- a/packages/crypto.base32-hash/test/index.ts +++ b/packages/crypto.base32-hash/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import { createBase32Hash, createBase32HashFromFile } from '@pnpm/crypto.base32-hash' import { tempDir } from '@pnpm/prepare' diff --git a/packages/crypto.base32-hash/tsconfig.json b/packages/crypto.base32-hash/tsconfig.json index 90cf5d087b..af17a88f3e 100644 --- a/packages/crypto.base32-hash/tsconfig.json +++ b/packages/crypto.base32-hash/tsconfig.json @@ -6,11 +6,11 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { - "path": "../../privatePackages/prepare" + "path": "../../__utils__/prepare" } ] } diff --git a/packages/crypto.base32-hash/tsconfig.lint.json b/packages/crypto.base32-hash/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/crypto.base32-hash/tsconfig.lint.json +++ b/packages/crypto.base32-hash/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/dependency-path/test/index.ts b/packages/dependency-path/test/index.ts index 61b9d8a286..8a2ba402ce 100644 --- a/packages/dependency-path/test/index.ts +++ b/packages/dependency-path/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { depPathToFilename, isAbsolute, diff --git a/packages/dependency-path/tsconfig.json b/packages/dependency-path/tsconfig.json index b0ff7d9678..6e13e37d33 100644 --- a/packages/dependency-path/tsconfig.json +++ b/packages/dependency-path/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/dependency-path/tsconfig.lint.json b/packages/dependency-path/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/dependency-path/tsconfig.lint.json +++ b/packages/dependency-path/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/error/tsconfig.json b/packages/error/tsconfig.json index fd4fa7b1c2..f5069582b7 100644 --- a/packages/error/tsconfig.json +++ b/packages/error/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/error/tsconfig.lint.json b/packages/error/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/error/tsconfig.lint.json +++ b/packages/error/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/git-utils/tsconfig.json b/packages/git-utils/tsconfig.json index f798b65d3a..6c62e9dd3b 100644 --- a/packages/git-utils/tsconfig.json +++ b/packages/git-utils/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ ] diff --git a/packages/git-utils/tsconfig.lint.json b/packages/git-utils/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/git-utils/tsconfig.lint.json +++ b/packages/git-utils/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/make-dedicated-lockfile/tsconfig.json b/packages/make-dedicated-lockfile/tsconfig.json index 2ef2f87992..8113a6a5d0 100644 --- a/packages/make-dedicated-lockfile/tsconfig.json +++ b/packages/make-dedicated-lockfile/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../lockfile/lockfile-file" }, @@ -21,9 +24,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../workspace/find-workspace-dir" }, diff --git a/packages/make-dedicated-lockfile/tsconfig.lint.json b/packages/make-dedicated-lockfile/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/make-dedicated-lockfile/tsconfig.lint.json +++ b/packages/make-dedicated-lockfile/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/mount-modules/tsconfig.json b/packages/mount-modules/tsconfig.json index 67679140b6..b0d9f8e9f4 100644 --- a/packages/mount-modules/tsconfig.json +++ b/packages/mount-modules/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/mount-modules/tsconfig.lint.json b/packages/mount-modules/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/mount-modules/tsconfig.lint.json +++ b/packages/mount-modules/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/parse-wanted-dependency/tsconfig.json b/packages/parse-wanted-dependency/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/packages/parse-wanted-dependency/tsconfig.json +++ b/packages/parse-wanted-dependency/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/packages/parse-wanted-dependency/tsconfig.lint.json b/packages/parse-wanted-dependency/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/parse-wanted-dependency/tsconfig.lint.json +++ b/packages/parse-wanted-dependency/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/plugin-commands-doctor/tsconfig.json b/packages/plugin-commands-doctor/tsconfig.json index b4622792ac..a7ad6d2a50 100644 --- a/packages/plugin-commands-doctor/tsconfig.json +++ b/packages/plugin-commands-doctor/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/plugin-commands-doctor/tsconfig.lint.json b/packages/plugin-commands-doctor/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/plugin-commands-doctor/tsconfig.lint.json +++ b/packages/plugin-commands-doctor/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/plugin-commands-init/tsconfig.json b/packages/plugin-commands-init/tsconfig.json index f1f5c313f2..e15badd158 100644 --- a/packages/plugin-commands-init/tsconfig.json +++ b/packages/plugin-commands-init/tsconfig.json @@ -6,9 +6,15 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../cli/cli-utils" }, @@ -18,12 +24,6 @@ { "path": "../../pkg-manifest/write-project-manifest" }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../error" } diff --git a/packages/plugin-commands-init/tsconfig.lint.json b/packages/plugin-commands-init/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/plugin-commands-init/tsconfig.lint.json +++ b/packages/plugin-commands-init/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/plugin-commands-patching/tsconfig.json b/packages/plugin-commands-patching/tsconfig.json index 45d8da35cd..07ed6bf6c0 100644 --- a/packages/plugin-commands-patching/tsconfig.json +++ b/packages/plugin-commands-patching/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -27,9 +30,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../store/store-connection-manager" }, diff --git a/packages/plugin-commands-patching/tsconfig.lint.json b/packages/plugin-commands-patching/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/plugin-commands-patching/tsconfig.lint.json +++ b/packages/plugin-commands-patching/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/plugin-commands-setup/tsconfig.json b/packages/plugin-commands-setup/tsconfig.json index ca4f3db0ad..f8e64f1ae3 100644 --- a/packages/plugin-commands-setup/tsconfig.json +++ b/packages/plugin-commands-setup/tsconfig.json @@ -7,14 +7,14 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { - "path": "../../cli/cli-utils" + "path": "../../__utils__/prepare" }, { - "path": "../../privatePackages/prepare" + "path": "../../cli/cli-utils" }, { "path": "../error" diff --git a/packages/plugin-commands-setup/tsconfig.lint.json b/packages/plugin-commands-setup/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/plugin-commands-setup/tsconfig.lint.json +++ b/packages/plugin-commands-setup/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/render-peer-issues/tsconfig.json b/packages/render-peer-issues/tsconfig.json index 7fa294a1eb..64c25a32e3 100644 --- a/packages/render-peer-issues/tsconfig.json +++ b/packages/render-peer-issues/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/packages/render-peer-issues/tsconfig.lint.json b/packages/render-peer-issues/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/render-peer-issues/tsconfig.lint.json +++ b/packages/render-peer-issues/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/packages/types/tsconfig.lint.json b/packages/types/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/types/tsconfig.lint.json +++ b/packages/types/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/packages/which-version-is-pinned/tsconfig.json b/packages/which-version-is-pinned/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/packages/which-version-is-pinned/tsconfig.json +++ b/packages/which-version-is-pinned/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/packages/which-version-is-pinned/tsconfig.lint.json b/packages/which-version-is-pinned/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/packages/which-version-is-pinned/tsconfig.lint.json +++ b/packages/which-version-is-pinned/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/client/test/index.ts b/pkg-manager/client/test/index.ts index 53ada2017c..773b4b7623 100644 --- a/pkg-manager/client/test/index.ts +++ b/pkg-manager/client/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { createClient, createResolver } from '@pnpm/client' test('createClient()', () => { diff --git a/pkg-manager/client/tsconfig.json b/pkg-manager/client/tsconfig.json index 4317ece776..2e02d35725 100644 --- a/pkg-manager/client/tsconfig.json +++ b/pkg-manager/client/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/client/tsconfig.lint.json b/pkg-manager/client/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/client/tsconfig.lint.json +++ b/pkg-manager/client/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/core/test/lockfile.ts b/pkg-manager/core/test/lockfile.ts index b9c8dbaf2f..21880d6c1d 100644 --- a/pkg-manager/core/test/lockfile.ts +++ b/pkg-manager/core/test/lockfile.ts @@ -1070,7 +1070,7 @@ test('broken lockfile is fixed even if it seems like up to date at first. Unless expect(lockfile.packages).toHaveProperty(['/@pnpm.e2e/dep-of-pkg-with-1-dep/100.0.0']) }) -const REGISTRY_MIRROR_DIR = path.join(__dirname, '../../../registry-mirror') +const REGISTRY_MIRROR_DIR = path.join(__dirname, './registry-mirror') /* eslint-disable @typescript-eslint/no-explicit-any */ const isPositiveMeta = loadJsonFile.sync(path.join(REGISTRY_MIRROR_DIR, 'is-positive.json')) diff --git a/registry-mirror/is-positive-3.1.0.tgz b/pkg-manager/core/test/registry-mirror/is-positive-3.1.0.tgz similarity index 100% rename from registry-mirror/is-positive-3.1.0.tgz rename to pkg-manager/core/test/registry-mirror/is-positive-3.1.0.tgz diff --git a/registry-mirror/is-positive.json b/pkg-manager/core/test/registry-mirror/is-positive.json similarity index 100% rename from registry-mirror/is-positive.json rename to pkg-manager/core/test/registry-mirror/is-positive.json diff --git a/pkg-manager/core/tsconfig.json b/pkg-manager/core/tsconfig.json index 2c685724b7..728eb65aff 100644 --- a/pkg-manager/core/tsconfig.json +++ b/pkg-manager/core/tsconfig.json @@ -6,9 +6,21 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/assert-project" + }, + { + "path": "../../__utils__/assert-store" + }, + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../config/matcher" }, @@ -87,18 +99,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/assert-project" - }, - { - "path": "../../privatePackages/assert-store" - }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../resolving/resolver-base" }, diff --git a/pkg-manager/core/tsconfig.lint.json b/pkg-manager/core/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/core/tsconfig.lint.json +++ b/pkg-manager/core/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/get-context/tsconfig.json b/pkg-manager/get-context/tsconfig.json index 5fe60d64c3..973dd949da 100644 --- a/pkg-manager/get-context/tsconfig.json +++ b/pkg-manager/get-context/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/get-context/tsconfig.lint.json b/pkg-manager/get-context/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/get-context/tsconfig.lint.json +++ b/pkg-manager/get-context/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/headless/test/index.ts b/pkg-manager/headless/test/index.ts index 8bd086f273..3eb28c3f03 100644 --- a/pkg-manager/headless/test/index.ts +++ b/pkg-manager/headless/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs, existsSync, realpathSync, writeFileSync } from 'fs' import path from 'path' import { assertProject } from '@pnpm/assert-project' diff --git a/pkg-manager/headless/tsconfig.json b/pkg-manager/headless/tsconfig.json index 90625f2387..ae88546019 100644 --- a/pkg-manager/headless/tsconfig.json +++ b/pkg-manager/headless/tsconfig.json @@ -6,9 +6,18 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/assert-project" + }, + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../config/package-is-installable" }, @@ -57,15 +66,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/assert-project" - }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../store/cafs" }, diff --git a/pkg-manager/headless/tsconfig.lint.json b/pkg-manager/headless/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/headless/tsconfig.lint.json +++ b/pkg-manager/headless/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/hoist/tsconfig.json b/pkg-manager/hoist/tsconfig.json index a19a55bd03..fbe1f3e514 100644 --- a/pkg-manager/hoist/tsconfig.json +++ b/pkg-manager/hoist/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/hoist/tsconfig.lint.json b/pkg-manager/hoist/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/hoist/tsconfig.lint.json +++ b/pkg-manager/hoist/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/link-bins/test/index.ts b/pkg-manager/link-bins/test/index.ts index 480b522d97..c2b4332ebc 100644 --- a/pkg-manager/link-bins/test/index.ts +++ b/pkg-manager/link-bins/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs, writeFileSync } from 'fs' import path from 'path' import { logger, globalWarn } from '@pnpm/logger' diff --git a/pkg-manager/link-bins/tsconfig.json b/pkg-manager/link-bins/tsconfig.json index b95d1801fe..1016332274 100644 --- a/pkg-manager/link-bins/tsconfig.json +++ b/pkg-manager/link-bins/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../fs/read-modules-dir" }, @@ -27,9 +30,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../package-bins" } diff --git a/pkg-manager/link-bins/tsconfig.lint.json b/pkg-manager/link-bins/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/link-bins/tsconfig.lint.json +++ b/pkg-manager/link-bins/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/modules-cleaner/tsconfig.json b/pkg-manager/modules-cleaner/tsconfig.json index 9d0d9e6375..16063c4b02 100644 --- a/pkg-manager/modules-cleaner/tsconfig.json +++ b/pkg-manager/modules-cleaner/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/modules-cleaner/tsconfig.lint.json b/pkg-manager/modules-cleaner/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/modules-cleaner/tsconfig.lint.json +++ b/pkg-manager/modules-cleaner/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/modules-yaml/test/index.ts b/pkg-manager/modules-yaml/test/index.ts index a38a895662..30e9695d6d 100644 --- a/pkg-manager/modules-yaml/test/index.ts +++ b/pkg-manager/modules-yaml/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { readModulesManifest, writeModulesManifest } from '@pnpm/modules-yaml' import readYamlFile from 'read-yaml-file' diff --git a/pkg-manager/modules-yaml/tsconfig.json b/pkg-manager/modules-yaml/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/pkg-manager/modules-yaml/tsconfig.json +++ b/pkg-manager/modules-yaml/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/modules-yaml/tsconfig.lint.json b/pkg-manager/modules-yaml/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/modules-yaml/tsconfig.lint.json +++ b/pkg-manager/modules-yaml/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/package-bins/tsconfig.json b/pkg-manager/package-bins/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/pkg-manager/package-bins/tsconfig.json +++ b/pkg-manager/package-bins/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/package-bins/tsconfig.lint.json b/pkg-manager/package-bins/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/package-bins/tsconfig.lint.json +++ b/pkg-manager/package-bins/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/package-requester/test/index.ts b/pkg-manager/package-requester/test/index.ts index d5ec08479a..7529996fdd 100644 --- a/pkg-manager/package-requester/test/index.ts +++ b/pkg-manager/package-requester/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs, statSync } from 'fs' import path from 'path' import { getFilePathInCafs, PackageFilesIndex } from '@pnpm/cafs' diff --git a/pkg-manager/package-requester/tsconfig.json b/pkg-manager/package-requester/tsconfig.json index df04441127..094bb62652 100644 --- a/pkg-manager/package-requester/tsconfig.json +++ b/pkg-manager/package-requester/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../config/package-is-installable" }, @@ -36,9 +39,6 @@ { "path": "../../pkg-manifest/read-package-json" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../resolving/resolver-base" }, diff --git a/pkg-manager/package-requester/tsconfig.lint.json b/pkg-manager/package-requester/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/package-requester/tsconfig.lint.json +++ b/pkg-manager/package-requester/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/plugin-commands-installation/test/import.ts b/pkg-manager/plugin-commands-installation/test/import.ts index c80ec897ba..e2f1e10e15 100644 --- a/pkg-manager/plugin-commands-installation/test/import.ts +++ b/pkg-manager/plugin-commands-installation/test/import.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { assertProject } from '@pnpm/assert-project' import { PnpmError } from '@pnpm/error' diff --git a/pkg-manager/plugin-commands-installation/test/importRecursive.ts b/pkg-manager/plugin-commands-installation/test/importRecursive.ts index c64320fb55..5e66e78a10 100644 --- a/pkg-manager/plugin-commands-installation/test/importRecursive.ts +++ b/pkg-manager/plugin-commands-installation/test/importRecursive.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { assertProject } from '@pnpm/assert-project' import { importCommand } from '@pnpm/plugin-commands-installation' diff --git a/pkg-manager/plugin-commands-installation/tsconfig.json b/pkg-manager/plugin-commands-installation/tsconfig.json index 1fdea07c2a..9cefe9ee30 100644 --- a/pkg-manager/plugin-commands-installation/tsconfig.json +++ b/pkg-manager/plugin-commands-installation/tsconfig.json @@ -6,9 +6,18 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/assert-project" + }, + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../cli/cli-utils" }, @@ -54,15 +63,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/assert-project" - }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../resolving/resolver-base" }, diff --git a/pkg-manager/plugin-commands-installation/tsconfig.lint.json b/pkg-manager/plugin-commands-installation/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/plugin-commands-installation/tsconfig.lint.json +++ b/pkg-manager/plugin-commands-installation/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/read-projects-context/tsconfig.json b/pkg-manager/read-projects-context/tsconfig.json index fb3d33a266..8c72c99f2e 100644 --- a/pkg-manager/read-projects-context/tsconfig.json +++ b/pkg-manager/read-projects-context/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/read-projects-context/tsconfig.lint.json b/pkg-manager/read-projects-context/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/read-projects-context/tsconfig.lint.json +++ b/pkg-manager/read-projects-context/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/real-hoist/tsconfig.json b/pkg-manager/real-hoist/tsconfig.json index 517f0493c3..dee3d688af 100644 --- a/pkg-manager/real-hoist/tsconfig.json +++ b/pkg-manager/real-hoist/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/real-hoist/tsconfig.lint.json b/pkg-manager/real-hoist/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/real-hoist/tsconfig.lint.json +++ b/pkg-manager/real-hoist/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/remove-bins/tsconfig.json b/pkg-manager/remove-bins/tsconfig.json index d34f1605d4..e87d2bcf8c 100644 --- a/pkg-manager/remove-bins/tsconfig.json +++ b/pkg-manager/remove-bins/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/remove-bins/tsconfig.lint.json b/pkg-manager/remove-bins/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/remove-bins/tsconfig.lint.json +++ b/pkg-manager/remove-bins/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manager/resolve-dependencies/test/relativeTarball.test.ts b/pkg-manager/resolve-dependencies/test/relativeTarball.test.ts index e7e26c0dd6..cac9507e5f 100644 --- a/pkg-manager/resolve-dependencies/test/relativeTarball.test.ts +++ b/pkg-manager/resolve-dependencies/test/relativeTarball.test.ts @@ -1,4 +1,4 @@ -/// +/// import { relativeTarball } from '../lib/updateLockfile' test('relativeTarball()', () => { diff --git a/pkg-manager/resolve-dependencies/test/resolvePeers.ts b/pkg-manager/resolve-dependencies/test/resolvePeers.ts index a50e769c6e..a8dae68edf 100644 --- a/pkg-manager/resolve-dependencies/test/resolvePeers.ts +++ b/pkg-manager/resolve-dependencies/test/resolvePeers.ts @@ -1,4 +1,4 @@ -/// +/// import { resolvePeers } from '../lib/resolvePeers' test('resolve peer dependencies of cyclic dependencies', () => { diff --git a/pkg-manager/resolve-dependencies/tsconfig.json b/pkg-manager/resolve-dependencies/tsconfig.json index b4e30e6dcc..5b10dd4d6f 100644 --- a/pkg-manager/resolve-dependencies/tsconfig.json +++ b/pkg-manager/resolve-dependencies/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manager/resolve-dependencies/tsconfig.lint.json b/pkg-manager/resolve-dependencies/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manager/resolve-dependencies/tsconfig.lint.json +++ b/pkg-manager/resolve-dependencies/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manifest/exportable-manifest/test/index.test.ts b/pkg-manifest/exportable-manifest/test/index.test.ts index 13ec7d074f..e76ff58671 100644 --- a/pkg-manifest/exportable-manifest/test/index.test.ts +++ b/pkg-manifest/exportable-manifest/test/index.test.ts @@ -1,4 +1,4 @@ -/// +/// import { createExportableManifest } from '@pnpm/exportable-manifest' test('the pnpm options are removed', async () => { diff --git a/pkg-manifest/exportable-manifest/tsconfig.json b/pkg-manifest/exportable-manifest/tsconfig.json index bdeb6edf19..f714f7a81a 100644 --- a/pkg-manifest/exportable-manifest/tsconfig.json +++ b/pkg-manifest/exportable-manifest/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manifest/exportable-manifest/tsconfig.lint.json b/pkg-manifest/exportable-manifest/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manifest/exportable-manifest/tsconfig.lint.json +++ b/pkg-manifest/exportable-manifest/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manifest/manifest-utils/test/index.ts b/pkg-manifest/manifest-utils/test/index.ts index 7feb6098da..00836d0bbd 100644 --- a/pkg-manifest/manifest-utils/test/index.ts +++ b/pkg-manifest/manifest-utils/test/index.ts @@ -1,2 +1,2 @@ -/// +/// import './getSpecFromPackageManifest.test' diff --git a/pkg-manifest/manifest-utils/tsconfig.json b/pkg-manifest/manifest-utils/tsconfig.json index 723f453bbd..3e087a40c5 100644 --- a/pkg-manifest/manifest-utils/tsconfig.json +++ b/pkg-manifest/manifest-utils/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manifest/manifest-utils/tsconfig.lint.json b/pkg-manifest/manifest-utils/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manifest/manifest-utils/tsconfig.lint.json +++ b/pkg-manifest/manifest-utils/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manifest/read-package-json/test/index.ts b/pkg-manifest/read-package-json/test/index.ts index e4681b9def..effabb8b68 100644 --- a/pkg-manifest/read-package-json/test/index.ts +++ b/pkg-manifest/read-package-json/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { readPackageJson, readPackageJsonFromDir } from '@pnpm/read-package-json' diff --git a/pkg-manifest/read-package-json/tsconfig.json b/pkg-manifest/read-package-json/tsconfig.json index 0a5f637a32..2df79e0976 100644 --- a/pkg-manifest/read-package-json/tsconfig.json +++ b/pkg-manifest/read-package-json/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manifest/read-package-json/tsconfig.lint.json b/pkg-manifest/read-package-json/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manifest/read-package-json/tsconfig.lint.json +++ b/pkg-manifest/read-package-json/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manifest/read-project-manifest/test/index.ts b/pkg-manifest/read-project-manifest/test/index.ts index 1c4a0ad00f..0017702625 100644 --- a/pkg-manifest/read-project-manifest/test/index.ts +++ b/pkg-manifest/read-project-manifest/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs } from 'fs' import path from 'path' import { readProjectManifest, tryReadProjectManifest } from '@pnpm/read-project-manifest' diff --git a/pkg-manifest/read-project-manifest/tsconfig.json b/pkg-manifest/read-project-manifest/tsconfig.json index 754bd4b8fa..8a40c8f49c 100644 --- a/pkg-manifest/read-project-manifest/tsconfig.json +++ b/pkg-manifest/read-project-manifest/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manifest/read-project-manifest/tsconfig.lint.json b/pkg-manifest/read-project-manifest/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manifest/read-project-manifest/tsconfig.lint.json +++ b/pkg-manifest/read-project-manifest/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pkg-manifest/write-project-manifest/test/index.ts b/pkg-manifest/write-project-manifest/test/index.ts index 15ff03ae31..a9a3c60c89 100644 --- a/pkg-manifest/write-project-manifest/test/index.ts +++ b/pkg-manifest/write-project-manifest/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promisify } from 'util' import fs from 'fs' import path from 'path' diff --git a/pkg-manifest/write-project-manifest/tsconfig.json b/pkg-manifest/write-project-manifest/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/pkg-manifest/write-project-manifest/tsconfig.json +++ b/pkg-manifest/write-project-manifest/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/pkg-manifest/write-project-manifest/tsconfig.lint.json b/pkg-manifest/write-project-manifest/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pkg-manifest/write-project-manifest/tsconfig.lint.json +++ b/pkg-manifest/write-project-manifest/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c2e8c20f8f..f9aabf44b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ packageExtensionsChecksum: 66c6aa53b7057053eae6c4a5ea9612f3 patchedDependencies: pkg@5.7.0: hash: pp6fkuhwkrqq7cjcj7uqpf37e4 - path: patches/pkg@5.7.0.patch + path: __patches__/pkg@5.7.0.patch importers: @@ -54,7 +54,7 @@ importers: version: 17.2.0 '@pnpm/eslint-config': specifier: workspace:* - version: link:utils/eslint-config + version: link:__utils__/eslint-config '@pnpm/meta-updater': specifier: 0.2.2 version: 0.2.2_typanion@3.12.1 @@ -63,7 +63,7 @@ importers: version: 3.1.0_typanion@3.12.1 '@pnpm/tsconfig': specifier: workspace:* - version: link:utils/tsconfig + version: link:__utils__/tsconfig '@types/jest': specifier: ^29.2.3 version: 29.2.3 @@ -150,6 +150,206 @@ importers: specifier: workspace:* version: 'link:' + __typings__: + devDependencies: + '@pnpm-private/typings': + specifier: workspace:* + version: 'link:' + + __utils__/assert-project: + dependencies: + '@pnpm/assert-store': + specifier: workspace:* + version: link:../assert-store + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/lockfile-types': + specifier: workspace:* + version: link:../../lockfile/lockfile-types + '@pnpm/modules-yaml': + specifier: workspace:* + version: link:../../pkg-manager/modules-yaml + '@pnpm/registry-mock': + specifier: 3.1.0 + version: 3.1.0_typanion@3.12.1 + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + is-windows: + specifier: ^1.0.2 + version: 1.0.2 + isexe: + specifier: 2.0.0 + version: 2.0.0 + path-exists: + specifier: ^4.0.0 + version: 4.0.0 + read-yaml-file: + specifier: ^2.1.0 + version: 2.1.0 + write-pkg: + specifier: 4.0.0 + version: 4.0.0 + devDependencies: + '@pnpm/assert-project': + specifier: workspace:* + version: 'link:' + '@types/is-windows': + specifier: ^1.0.0 + version: 1.0.0 + '@types/isexe': + specifier: 2.0.1 + version: 2.0.1 + '@types/node': + specifier: ^14.18.33 + version: 14.18.33 + + __utils__/assert-store: + dependencies: + '@pnpm/cafs': + specifier: workspace:* + version: link:../../store/cafs + '@pnpm/registry-mock': + specifier: 3.1.0 + version: 3.1.0_typanion@3.12.1 + path-exists: + specifier: ^4.0.0 + version: 4.0.0 + devDependencies: + '@pnpm/assert-store': + specifier: workspace:* + version: 'link:' + + __utils__/build-artifacts: + dependencies: + pkg-deb: + specifier: ^1.1.2 + version: 1.1.2 + pkg-rpm: + specifier: ^1.0.3 + version: 1.0.3 + devDependencies: + '@pnpm/build-artifacts': + specifier: workspace:* + version: 'link:' + + __utils__/eslint-config: + dependencies: + '@typescript-eslint/eslint-plugin': + specifier: ^5.43.0 + version: 5.43.0_wze2rj5tow7zwqpgbdx2buoy3m + '@typescript-eslint/parser': + specifier: ^5.43.0 + version: 5.43.0_e3uo4sehh4zr4i6m57mkkxxv7y + eslint: + specifier: ^8.27.0 + version: 8.27.0 + eslint-config-standard-with-typescript: + specifier: ^23.0.0 + version: 23.0.0_7cxqyvay3bhndwpjpjrmrfdxlm + eslint-plugin-import: + specifier: ^2.26.0 + version: 2.26.0_wbsj7pk5g7hogwvhsif6xntns4 + eslint-plugin-n: + specifier: ^15.5.1 + version: 15.5.1_eslint@8.27.0 + eslint-plugin-node: + specifier: ^11.1.0 + version: 11.1.0_eslint@8.27.0 + eslint-plugin-promise: + specifier: ^6.1.1 + version: 6.1.1_eslint@8.27.0 + typescript: + specifier: 4.9.3 + version: 4.9.3 + devDependencies: + '@pnpm/eslint-config': + specifier: workspace:* + version: 'link:' + + __utils__/get-release-text: + dependencies: + mdast-util-to-string: + specifier: ^2.0.0 + version: 2.0.0 + remark-parse: + specifier: ^9.0.0 + version: 9.0.0_unified@9.2.2 + remark-stringify: + specifier: ^9.0.1 + version: 9.0.1_unified@9.2.2 + unified: + specifier: ^9.2.2 + version: 9.2.2 + devDependencies: + '@pnpm/get-release-text': + specifier: workspace:* + version: 'link:' + + __utils__/prepare: + dependencies: + '@pnpm/assert-project': + specifier: workspace:* + version: link:../assert-project + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + unique-string: + specifier: ^2.0.0 + version: 2.0.0 + write-json5-file: + specifier: ^3.1.0 + version: 3.1.0 + write-pkg: + specifier: 4.0.0 + version: 4.0.0 + write-yaml-file: + specifier: ^4.2.0 + version: 4.2.0 + devDependencies: + '@pnpm/prepare': + specifier: workspace:* + version: 'link:' + '@types/node': + specifier: ^14.18.33 + version: 14.18.33 + + __utils__/scripts: + dependencies: + execa: + specifier: npm:safe-execa@^0.1.2 + version: /safe-execa/0.1.2 + make-empty-dir: + specifier: ^2.0.0 + version: 2.0.0 + devDependencies: + '@pnpm/scripts': + specifier: workspace:* + version: 'link:' + + __utils__/test-fixtures: + dependencies: + '@pnpm/prepare': + specifier: workspace:* + version: link:../prepare + fs-extra: + specifier: ^10.1.0 + version: 10.1.0 + devDependencies: + '@pnpm/test-fixtures': + specifier: workspace:* + version: 'link:' + '@types/fs-extra': + specifier: ^9.0.13 + version: 9.0.13 + + __utils__/tsconfig: + devDependencies: + '@pnpm/tsconfig': + specifier: workspace:* + version: 'link:' + cli/cli-meta: dependencies: '@pnpm/types': @@ -393,10 +593,10 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/is-windows': specifier: ^1.0.0 version: 1.0.0 @@ -537,7 +737,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@types/adm-zip': specifier: ^0.4.34 version: 0.4.34 @@ -623,7 +823,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@types/adm-zip': specifier: ^0.4.34 version: 0.4.34 @@ -836,13 +1036,13 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -942,7 +1142,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -1023,7 +1223,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/npm-packlist': specifier: ^3.0.0 version: 3.0.0 @@ -1149,7 +1349,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -1239,7 +1439,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare fs/read-modules-dir: dependencies: @@ -1271,7 +1471,7 @@ importers: devDependencies: '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/symlink-dependency': specifier: workspace:* version: 'link:' @@ -1726,7 +1926,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -1874,7 +2074,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare packages/dependency-path: dependencies: @@ -1962,7 +2162,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -2075,10 +2275,10 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures load-json-file: specifier: ^6.2.0 version: 6.2.0 @@ -2136,7 +2336,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -2167,7 +2367,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare packages/render-peer-issues: dependencies: @@ -2411,10 +2611,10 @@ importers: devDependencies: '@pnpm/assert-project': specifier: workspace:* - version: link:../../privatePackages/assert-project + version: link:../../__utils__/assert-project '@pnpm/assert-store': specifier: workspace:* - version: link:../../privatePackages/assert-store + version: link:../../__utils__/assert-store '@pnpm/cafs': specifier: workspace:* version: link:../../store/cafs @@ -2432,7 +2632,7 @@ importers: version: link:../../store/package-store '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -2441,7 +2641,7 @@ importers: version: link:../../store/store-path '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/fs-extra': specifier: ^9.0.13 version: 9.0.13 @@ -2650,7 +2850,7 @@ importers: devDependencies: '@pnpm/assert-project': specifier: workspace:* - version: link:../../privatePackages/assert-project + version: link:../../__utils__/assert-project '@pnpm/cafs': specifier: workspace:* version: link:../../store/cafs @@ -2665,7 +2865,7 @@ importers: version: link:../../store/package-store '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/read-projects-context': specifier: workspace:* version: link:../read-projects-context @@ -2677,7 +2877,7 @@ importers: version: link:../../store/store-path '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/fs-extra': specifier: ^9.0.13 version: 9.0.13 @@ -2814,7 +3014,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/is-windows': specifier: ^1.0.0 version: 1.0.0 @@ -3028,7 +3228,7 @@ importers: version: 3.1.0_typanion@3.12.1 '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/normalize-path': specifier: ^3.0.0 version: 3.0.0 @@ -3194,7 +3394,7 @@ importers: devDependencies: '@pnpm/assert-project': specifier: workspace:* - version: link:../../privatePackages/assert-project + version: link:../../__utils__/assert-project '@pnpm/lockfile-types': specifier: workspace:* version: link:../../lockfile/lockfile-types @@ -3206,13 +3406,13 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/is-ci': specifier: ^3.0.0 version: 3.0.0 @@ -3609,7 +3809,7 @@ importers: devDependencies: '@pnpm/assert-project': specifier: workspace:* - version: link:../privatePackages/assert-project + version: link:../__utils__/assert-project '@pnpm/byline': specifier: ^1.0.0 version: 1.0.0 @@ -3717,7 +3917,7 @@ importers: version: link:../store/plugin-commands-store '@pnpm/prepare': specifier: workspace:* - version: link:../privatePackages/prepare + version: link:../__utils__/prepare '@pnpm/read-package-json': specifier: workspace:* version: link:../pkg-manifest/read-package-json @@ -3735,7 +3935,7 @@ importers: version: 0.1.2 '@pnpm/test-fixtures': specifier: workspace:* - version: link:../privatePackages/test-fixtures + version: link:../__utils__/test-fixtures '@pnpm/types': specifier: workspace:* version: link:../packages/types @@ -3933,115 +4133,6 @@ importers: specifier: workspace:* version: 'link:' - privatePackages/assert-project: - dependencies: - '@pnpm/assert-store': - specifier: workspace:* - version: link:../assert-store - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../pkg-manager/modules-yaml - '@pnpm/registry-mock': - specifier: 3.1.0 - version: 3.1.0_typanion@3.12.1 - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - is-windows: - specifier: ^1.0.2 - version: 1.0.2 - isexe: - specifier: 2.0.0 - version: 2.0.0 - path-exists: - specifier: ^4.0.0 - version: 4.0.0 - read-yaml-file: - specifier: ^2.1.0 - version: 2.1.0 - write-pkg: - specifier: 4.0.0 - version: 4.0.0 - devDependencies: - '@pnpm/assert-project': - specifier: workspace:* - version: 'link:' - '@types/is-windows': - specifier: ^1.0.0 - version: 1.0.0 - '@types/isexe': - specifier: 2.0.1 - version: 2.0.1 - '@types/node': - specifier: ^14.18.33 - version: 14.18.33 - - privatePackages/assert-store: - dependencies: - '@pnpm/cafs': - specifier: workspace:* - version: link:../../store/cafs - '@pnpm/registry-mock': - specifier: 3.1.0 - version: 3.1.0_typanion@3.12.1 - path-exists: - specifier: ^4.0.0 - version: 4.0.0 - devDependencies: - '@pnpm/assert-store': - specifier: workspace:* - version: 'link:' - - privatePackages/prepare: - dependencies: - '@pnpm/assert-project': - specifier: workspace:* - version: link:../assert-project - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - unique-string: - specifier: ^2.0.0 - version: 2.0.0 - write-json5-file: - specifier: ^3.1.0 - version: 3.1.0 - write-pkg: - specifier: 4.0.0 - version: 4.0.0 - write-yaml-file: - specifier: ^4.2.0 - version: 4.2.0 - devDependencies: - '@pnpm/prepare': - specifier: workspace:* - version: 'link:' - '@types/node': - specifier: ^14.18.33 - version: 14.18.33 - - privatePackages/test-fixtures: - dependencies: - '@pnpm/prepare': - specifier: workspace:* - version: link:../prepare - fs-extra: - specifier: ^10.1.0 - version: 10.1.0 - devDependencies: - '@pnpm/test-fixtures': - specifier: workspace:* - version: 'link:' - '@types/fs-extra': - specifier: ^9.0.13 - version: 9.0.13 - releasing/plugin-commands-deploy: dependencies: '@pnpm/cli-utils': @@ -4074,7 +4165,7 @@ importers: devDependencies: '@pnpm/assert-project': specifier: workspace:* - version: link:../../privatePackages/assert-project + version: link:../../__utils__/assert-project '@pnpm/filter-workspace-packages': specifier: workspace:* version: link:../../workspace/filter-workspace-packages @@ -4086,7 +4177,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -4183,7 +4274,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -4412,7 +4503,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/normalize-path': specifier: ^3.0.0 version: 3.0.0 @@ -4496,7 +4587,7 @@ importers: version: link:../../packages/constants '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/normalize-path': specifier: ^3.0.0 version: 3.0.0 @@ -4609,7 +4700,7 @@ importers: version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/archy': specifier: 0.0.32 version: 0.0.32 @@ -4798,7 +4889,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -4895,13 +4986,13 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 '@pnpm/test-fixtures': specifier: workspace:* - version: link:../../privatePackages/test-fixtures + version: link:../../__utils__/test-fixtures '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -5029,7 +5120,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -5084,7 +5175,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@types/ramda': specifier: 0.28.15 version: 0.28.15 @@ -5233,7 +5324,7 @@ importers: devDependencies: '@pnpm/assert-store': specifier: workspace:* - version: link:../../privatePackages/assert-store + version: link:../../__utils__/assert-store '@pnpm/lockfile-file': specifier: workspace:* version: link:../../lockfile/lockfile-file @@ -5242,7 +5333,7 @@ importers: version: 'link:' '@pnpm/prepare': specifier: workspace:* - version: link:../../privatePackages/prepare + version: link:../../__utils__/prepare '@pnpm/registry-mock': specifier: 3.1.0 version: 3.1.0_typanion@3.12.1 @@ -5434,97 +5525,6 @@ importers: specifier: ^3.0.2 version: 3.0.2 - typings: - devDependencies: - '@pnpm-private/typings': - specifier: workspace:* - version: 'link:' - - utils/build-artifacts: - dependencies: - pkg-deb: - specifier: ^1.1.2 - version: 1.1.2 - pkg-rpm: - specifier: ^1.0.3 - version: 1.0.3 - devDependencies: - '@pnpm/build-artifacts': - specifier: workspace:* - version: 'link:' - - utils/eslint-config: - dependencies: - '@typescript-eslint/eslint-plugin': - specifier: ^5.43.0 - version: 5.43.0_wze2rj5tow7zwqpgbdx2buoy3m - '@typescript-eslint/parser': - specifier: ^5.43.0 - version: 5.43.0_e3uo4sehh4zr4i6m57mkkxxv7y - eslint: - specifier: ^8.27.0 - version: 8.27.0 - eslint-config-standard-with-typescript: - specifier: ^23.0.0 - version: 23.0.0_7cxqyvay3bhndwpjpjrmrfdxlm - eslint-plugin-import: - specifier: ^2.26.0 - version: 2.26.0_wbsj7pk5g7hogwvhsif6xntns4 - eslint-plugin-n: - specifier: ^15.5.1 - version: 15.5.1_eslint@8.27.0 - eslint-plugin-node: - specifier: ^11.1.0 - version: 11.1.0_eslint@8.27.0 - eslint-plugin-promise: - specifier: ^6.1.1 - version: 6.1.1_eslint@8.27.0 - typescript: - specifier: 4.9.3 - version: 4.9.3 - devDependencies: - '@pnpm/eslint-config': - specifier: workspace:* - version: 'link:' - - utils/get-release-text: - dependencies: - mdast-util-to-string: - specifier: ^2.0.0 - version: 2.0.0 - remark-parse: - specifier: ^9.0.0 - version: 9.0.0_unified@9.2.2 - remark-stringify: - specifier: ^9.0.1 - version: 9.0.1_unified@9.2.2 - unified: - specifier: ^9.2.2 - version: 9.2.2 - devDependencies: - '@pnpm/get-release-text': - specifier: workspace:* - version: 'link:' - - utils/scripts: - dependencies: - execa: - specifier: npm:safe-execa@^0.1.2 - version: /safe-execa/0.1.2 - make-empty-dir: - specifier: ^2.0.0 - version: 2.0.0 - devDependencies: - '@pnpm/scripts': - specifier: workspace:* - version: 'link:' - - utils/tsconfig: - devDependencies: - '@pnpm/tsconfig': - specifier: workspace:* - version: 'link:' - workspace/filter-workspace-packages: dependencies: '@pnpm/error': @@ -9252,16 +9252,6 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - /array.prototype.flat/1.3.0: - resolution: {integrity: sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.4 - es-shim-unscopables: 1.0.0 - dev: false - /array.prototype.flat/1.3.1: resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} engines: {node: '>= 0.4'} @@ -9270,7 +9260,6 @@ packages: define-properties: 1.1.4 es-abstract: 1.20.4 es-shim-unscopables: 1.0.0 - dev: true /arrify/1.0.1: resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} @@ -11035,14 +11024,14 @@ packages: dependencies: '@typescript-eslint/parser': 5.43.0_e3uo4sehh4zr4i6m57mkkxxv7y array-includes: 3.1.5 - array.prototype.flat: 1.3.0 + array.prototype.flat: 1.3.1 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.27.0 eslint-import-resolver-node: 0.3.6 eslint-module-utils: 2.7.4_7n62batgpjg7oa6ssbsyzoyo34 has: 1.0.3 - is-core-module: 2.10.0 + is-core-module: 2.11.0 is-glob: 4.0.3 minimatch: 3.1.2 object.values: 1.1.5 @@ -12317,12 +12306,6 @@ packages: dependencies: ci-info: 3.6.1 - /is-core-module/2.10.0: - resolution: {integrity: sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==} - dependencies: - has: 1.0.3 - dev: false - /is-core-module/2.11.0: resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==} dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index bc7bed605c..0dc2fad804 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,28 +1,26 @@ packages: + - .meta-updater + - __typings__ + - __utils__/* - cli/* - config/* - env/* - exec/* - fetching/* - fs/* + - hooks/* - lockfile/* - network/* - - hooks/* - - pnpm - - pnpm/artifacts/* + - packages/* - pkg-manager/* - pkg-manifest/* - - resolving/* + - pnpm + - pnpm/artifacts/* - releasing/* + - resolving/* - reviewing/* - store/* - workspace/* - - packages/* - - privatePackages/* - - typings - - .meta-updater - - utils/* - - "!**/__package_previews__/**" - "!**/example/**" - "!**/test/**" - - "!packages/local-resolver/example-package/**" + - "!resolving/local-resolver/example-package/**" diff --git a/pnpm/tsconfig.json b/pnpm/tsconfig.json index 25c2bff193..01d07a5433 100644 --- a/pnpm/tsconfig.json +++ b/pnpm/tsconfig.json @@ -9,9 +9,18 @@ }, "include": [ "src/**/*.ts", - "../typings/**/*.d.ts" + "../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../__utils__/assert-project" + }, + { + "path": "../__utils__/prepare" + }, + { + "path": "../__utils__/test-fixtures" + }, { "path": "../cli/cli-meta" }, @@ -96,15 +105,6 @@ { "path": "../pkg-manifest/write-project-manifest" }, - { - "path": "../privatePackages/assert-project" - }, - { - "path": "../privatePackages/prepare" - }, - { - "path": "../privatePackages/test-fixtures" - }, { "path": "../releasing/plugin-commands-deploy" }, diff --git a/pnpm/tsconfig.lint.json b/pnpm/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/pnpm/tsconfig.lint.json +++ b/pnpm/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/releasing/plugin-commands-deploy/tsconfig.json b/releasing/plugin-commands-deploy/tsconfig.json index b2c53e32c7..749b19ee9b 100644 --- a/releasing/plugin-commands-deploy/tsconfig.json +++ b/releasing/plugin-commands-deploy/tsconfig.json @@ -6,9 +6,15 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/assert-project" + }, + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -30,12 +36,6 @@ { "path": "../../pkg-manager/plugin-commands-installation" }, - { - "path": "../../privatePackages/assert-project" - }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../workspace/filter-workspace-packages" } diff --git a/releasing/plugin-commands-deploy/tsconfig.lint.json b/releasing/plugin-commands-deploy/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/releasing/plugin-commands-deploy/tsconfig.lint.json +++ b/releasing/plugin-commands-deploy/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/releasing/plugin-commands-publishing/tsconfig.json b/releasing/plugin-commands-publishing/tsconfig.json index 3a6fc8dc7d..abaf040fd2 100644 --- a/releasing/plugin-commands-publishing/tsconfig.json +++ b/releasing/plugin-commands-publishing/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -45,9 +48,6 @@ { "path": "../../pkg-manifest/exportable-manifest" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../resolving/resolver-base" }, diff --git a/releasing/plugin-commands-publishing/tsconfig.lint.json b/releasing/plugin-commands-publishing/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/releasing/plugin-commands-publishing/tsconfig.lint.json +++ b/releasing/plugin-commands-publishing/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/default-resolver/test/index.ts b/resolving/default-resolver/test/index.ts index 3b71591af2..f7a7d3c599 100644 --- a/resolving/default-resolver/test/index.ts +++ b/resolving/default-resolver/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { createResolver } from '@pnpm/default-resolver' import { createFetchFromRegistry } from '@pnpm/fetch' diff --git a/resolving/default-resolver/tsconfig.json b/resolving/default-resolver/tsconfig.json index 7e961a398a..d944ed6314 100644 --- a/resolving/default-resolver/tsconfig.json +++ b/resolving/default-resolver/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/resolving/default-resolver/tsconfig.lint.json b/resolving/default-resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/default-resolver/tsconfig.lint.json +++ b/resolving/default-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/git-resolver/test/index.ts b/resolving/git-resolver/test/index.ts index 79ddbedefd..50913f4e8f 100644 --- a/resolving/git-resolver/test/index.ts +++ b/resolving/git-resolver/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { createGitResolver } from '@pnpm/git-resolver' import git from 'graceful-git' diff --git a/resolving/git-resolver/tsconfig.json b/resolving/git-resolver/tsconfig.json index 15fb900895..aa41c8b8b2 100644 --- a/resolving/git-resolver/tsconfig.json +++ b/resolving/git-resolver/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/resolving/git-resolver/tsconfig.lint.json b/resolving/git-resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/git-resolver/tsconfig.lint.json +++ b/resolving/git-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/local-resolver/test/index.ts b/resolving/local-resolver/test/index.ts index d12098659a..0cb31ed6b9 100644 --- a/resolving/local-resolver/test/index.ts +++ b/resolving/local-resolver/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { resolveFromLocal } from '@pnpm/local-resolver' import normalize from 'normalize-path' diff --git a/resolving/local-resolver/tsconfig.json b/resolving/local-resolver/tsconfig.json index 4d26e64dd2..8eb65cd947 100644 --- a/resolving/local-resolver/tsconfig.json +++ b/resolving/local-resolver/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/resolving/local-resolver/tsconfig.lint.json b/resolving/local-resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/local-resolver/tsconfig.lint.json +++ b/resolving/local-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/npm-resolver/test/index.ts b/resolving/npm-resolver/test/index.ts index 672f1122a1..baa483e9c0 100644 --- a/resolving/npm-resolver/test/index.ts +++ b/resolving/npm-resolver/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { PnpmError } from '@pnpm/error' import { createFetchFromRegistry } from '@pnpm/fetch' diff --git a/resolving/npm-resolver/tsconfig.json b/resolving/npm-resolver/tsconfig.json index dc487b9b56..520494c855 100644 --- a/resolving/npm-resolver/tsconfig.json +++ b/resolving/npm-resolver/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../fs/graceful-fs" }, @@ -27,9 +30,6 @@ { "path": "../../packages/types" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../workspace/resolve-workspace-range" }, diff --git a/resolving/npm-resolver/tsconfig.lint.json b/resolving/npm-resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/npm-resolver/tsconfig.lint.json +++ b/resolving/npm-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/resolver-base/tsconfig.json b/resolving/resolver-base/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/resolving/resolver-base/tsconfig.json +++ b/resolving/resolver-base/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/resolving/resolver-base/tsconfig.lint.json b/resolving/resolver-base/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/resolver-base/tsconfig.lint.json +++ b/resolving/resolver-base/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/resolving/tarball-resolver/test/index.ts b/resolving/tarball-resolver/test/index.ts index a3500081cb..8bf96a7331 100644 --- a/resolving/tarball-resolver/test/index.ts +++ b/resolving/tarball-resolver/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { resolveFromTarball } from '@pnpm/tarball-resolver' test('tarball from npm registry', async () => { diff --git a/resolving/tarball-resolver/tsconfig.json b/resolving/tarball-resolver/tsconfig.json index f10a8fad7f..f24e79a0aa 100644 --- a/resolving/tarball-resolver/tsconfig.json +++ b/resolving/tarball-resolver/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/resolving/tarball-resolver/tsconfig.lint.json b/resolving/tarball-resolver/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/resolving/tarball-resolver/tsconfig.lint.json +++ b/resolving/tarball-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/dependencies-hierarchy/test/index.ts b/reviewing/dependencies-hierarchy/test/index.ts index 161a98c8de..1a6ba082f1 100644 --- a/reviewing/dependencies-hierarchy/test/index.ts +++ b/reviewing/dependencies-hierarchy/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' import { fixtures } from '@pnpm/test-fixtures' diff --git a/reviewing/dependencies-hierarchy/tsconfig.json b/reviewing/dependencies-hierarchy/tsconfig.json index 5833065f59..f2871dbac4 100644 --- a/reviewing/dependencies-hierarchy/tsconfig.json +++ b/reviewing/dependencies-hierarchy/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../config/normalize-registries" }, @@ -35,9 +38,6 @@ }, { "path": "../../pkg-manifest/read-package-json" - }, - { - "path": "../../privatePackages/test-fixtures" } ] } diff --git a/reviewing/dependencies-hierarchy/tsconfig.lint.json b/reviewing/dependencies-hierarchy/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/dependencies-hierarchy/tsconfig.lint.json +++ b/reviewing/dependencies-hierarchy/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/license-scanner/tsconfig.json b/reviewing/license-scanner/tsconfig.json index 6fc1167378..c7145fe39f 100644 --- a/reviewing/license-scanner/tsconfig.json +++ b/reviewing/license-scanner/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/reviewing/license-scanner/tsconfig.lint.json b/reviewing/license-scanner/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/license-scanner/tsconfig.lint.json +++ b/reviewing/license-scanner/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/list/test/index.ts b/reviewing/list/test/index.ts index 1ff7041ff6..383bc9047c 100644 --- a/reviewing/list/test/index.ts +++ b/reviewing/list/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { list, listForPackages } from '@pnpm/list' import { fixtures } from '@pnpm/test-fixtures' diff --git a/reviewing/list/tsconfig.json b/reviewing/list/tsconfig.json index 9b60b975b6..1e9dae5259 100644 --- a/reviewing/list/tsconfig.json +++ b/reviewing/list/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../config/matcher" }, @@ -21,9 +24,6 @@ { "path": "../../pkg-manifest/read-project-manifest" }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../dependencies-hierarchy" } diff --git a/reviewing/list/tsconfig.lint.json b/reviewing/list/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/list/tsconfig.lint.json +++ b/reviewing/list/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/outdated/tsconfig.json b/reviewing/outdated/tsconfig.json index 46b1ac55ba..8b050e8f59 100644 --- a/reviewing/outdated/tsconfig.json +++ b/reviewing/outdated/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/reviewing/outdated/tsconfig.lint.json b/reviewing/outdated/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/outdated/tsconfig.lint.json +++ b/reviewing/outdated/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/plugin-commands-licenses/test/index.ts b/reviewing/plugin-commands-licenses/test/index.ts index ad382686ca..47fda9820e 100644 --- a/reviewing/plugin-commands-licenses/test/index.ts +++ b/reviewing/plugin-commands-licenses/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { licenses } from '@pnpm/plugin-commands-licenses' import { install } from '@pnpm/plugin-commands-installation' diff --git a/reviewing/plugin-commands-licenses/tsconfig.json b/reviewing/plugin-commands-licenses/tsconfig.json index ffcaa41c54..22115d48cc 100644 --- a/reviewing/plugin-commands-licenses/tsconfig.json +++ b/reviewing/plugin-commands-licenses/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/reviewing/plugin-commands-licenses/tsconfig.lint.json b/reviewing/plugin-commands-licenses/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/plugin-commands-licenses/tsconfig.lint.json +++ b/reviewing/plugin-commands-licenses/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/plugin-commands-listing/test/index.ts b/reviewing/plugin-commands-listing/test/index.ts index 00b5322ed0..c61a57dea6 100644 --- a/reviewing/plugin-commands-listing/test/index.ts +++ b/reviewing/plugin-commands-listing/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs } from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' diff --git a/reviewing/plugin-commands-listing/tsconfig.json b/reviewing/plugin-commands-listing/tsconfig.json index 52088eaff4..15b9608471 100644 --- a/reviewing/plugin-commands-listing/tsconfig.json +++ b/reviewing/plugin-commands-listing/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -30,9 +33,6 @@ { "path": "../../pkg-manager/plugin-commands-installation" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../workspace/filter-workspace-packages" }, diff --git a/reviewing/plugin-commands-listing/tsconfig.lint.json b/reviewing/plugin-commands-listing/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/plugin-commands-listing/tsconfig.lint.json +++ b/reviewing/plugin-commands-listing/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/reviewing/plugin-commands-outdated/test/index.ts b/reviewing/plugin-commands-outdated/test/index.ts index 05384237c7..4225757fdf 100644 --- a/reviewing/plugin-commands-outdated/test/index.ts +++ b/reviewing/plugin-commands-outdated/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { promises as fs } from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' diff --git a/reviewing/plugin-commands-outdated/tsconfig.json b/reviewing/plugin-commands-outdated/tsconfig.json index 2b638def05..cdc10b473b 100644 --- a/reviewing/plugin-commands-outdated/tsconfig.json +++ b/reviewing/plugin-commands-outdated/tsconfig.json @@ -6,9 +6,15 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, + { + "path": "../../__utils__/test-fixtures" + }, { "path": "../../cli/cli-utils" }, @@ -42,12 +48,6 @@ { "path": "../../pkg-manager/plugin-commands-installation" }, - { - "path": "../../privatePackages/prepare" - }, - { - "path": "../../privatePackages/test-fixtures" - }, { "path": "../../resolving/default-resolver" }, diff --git a/reviewing/plugin-commands-outdated/tsconfig.lint.json b/reviewing/plugin-commands-outdated/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/reviewing/plugin-commands-outdated/tsconfig.lint.json +++ b/reviewing/plugin-commands-outdated/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/cafs-types/tsconfig.json b/store/cafs-types/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/store/cafs-types/tsconfig.json +++ b/store/cafs-types/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/cafs-types/tsconfig.lint.json b/store/cafs-types/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/cafs-types/tsconfig.lint.json +++ b/store/cafs-types/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/cafs/tsconfig.json b/store/cafs/tsconfig.json index 7af3f5b773..9444b8a138 100644 --- a/store/cafs/tsconfig.json +++ b/store/cafs/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/cafs/tsconfig.lint.json b/store/cafs/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/cafs/tsconfig.lint.json +++ b/store/cafs/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/create-cafs-store/tsconfig.json b/store/create-cafs-store/tsconfig.json index 748a6318a1..7b79eca81e 100644 --- a/store/create-cafs-store/tsconfig.json +++ b/store/create-cafs-store/tsconfig.json @@ -6,18 +6,18 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../fetching/fetcher-base" }, { "path": "../../fs/indexed-pkg-importer" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../cafs" }, diff --git a/store/create-cafs-store/tsconfig.lint.json b/store/create-cafs-store/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/create-cafs-store/tsconfig.lint.json +++ b/store/create-cafs-store/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/package-store/test/index.ts b/store/package-store/test/index.ts index bda2453f44..67412f8e38 100644 --- a/store/package-store/test/index.ts +++ b/store/package-store/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import { createClient } from '@pnpm/client' import { createPackageStore } from '@pnpm/package-store' diff --git a/store/package-store/tsconfig.json b/store/package-store/tsconfig.json index b083fc0f0e..90ea66a0b1 100644 --- a/store/package-store/tsconfig.json +++ b/store/package-store/tsconfig.json @@ -6,9 +6,12 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/prepare" + }, { "path": "../../fetching/fetcher-base" }, @@ -21,9 +24,6 @@ { "path": "../../pkg-manager/package-requester" }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../../resolving/resolver-base" }, diff --git a/store/package-store/tsconfig.lint.json b/store/package-store/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/package-store/tsconfig.lint.json +++ b/store/package-store/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/plugin-commands-server/tsconfig.json b/store/plugin-commands-server/tsconfig.json index d3318efc4b..b6afa608d2 100644 --- a/store/plugin-commands-server/tsconfig.json +++ b/store/plugin-commands-server/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/plugin-commands-server/tsconfig.lint.json b/store/plugin-commands-server/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/plugin-commands-server/tsconfig.lint.json +++ b/store/plugin-commands-server/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/plugin-commands-store/tsconfig.json b/store/plugin-commands-store/tsconfig.json index 2e07d2f9e6..aef7c48f77 100644 --- a/store/plugin-commands-store/tsconfig.json +++ b/store/plugin-commands-store/tsconfig.json @@ -6,9 +6,15 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../__utils__/assert-store" + }, + { + "path": "../../__utils__/prepare" + }, { "path": "../../cli/cli-utils" }, @@ -42,12 +48,6 @@ { "path": "../../pkg-manager/get-context" }, - { - "path": "../../privatePackages/assert-store" - }, - { - "path": "../../privatePackages/prepare" - }, { "path": "../cafs" }, diff --git a/store/plugin-commands-store/tsconfig.lint.json b/store/plugin-commands-store/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/plugin-commands-store/tsconfig.lint.json +++ b/store/plugin-commands-store/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/server/test/index.ts b/store/server/test/index.ts index 57d6b85d2a..af92fccdfe 100644 --- a/store/server/test/index.ts +++ b/store/server/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import fs from 'fs' import path from 'path' import getPort from 'get-port' diff --git a/store/server/tsconfig.json b/store/server/tsconfig.json index e40baeebd1..4b2e5cd54e 100644 --- a/store/server/tsconfig.json +++ b/store/server/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/server/tsconfig.lint.json b/store/server/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/server/tsconfig.lint.json +++ b/store/server/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/store-connection-manager/tsconfig.json b/store/store-connection-manager/tsconfig.json index 89cbb0e4ab..4b184c881d 100644 --- a/store/store-connection-manager/tsconfig.json +++ b/store/store-connection-manager/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/store-connection-manager/tsconfig.lint.json b/store/store-connection-manager/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/store-connection-manager/tsconfig.lint.json +++ b/store/store-connection-manager/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/store-controller-types/tsconfig.json b/store/store-controller-types/tsconfig.json index 50559ae997..f4837c7312 100644 --- a/store/store-controller-types/tsconfig.json +++ b/store/store-controller-types/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/store/store-controller-types/tsconfig.lint.json b/store/store-controller-types/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/store-controller-types/tsconfig.lint.json +++ b/store/store-controller-types/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/store/store-path/tsconfig.json b/store/store-path/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/store/store-path/tsconfig.json +++ b/store/store-path/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/store/store-path/tsconfig.lint.json b/store/store-path/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/store/store-path/tsconfig.lint.json +++ b/store/store-path/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/utils/get-release-text/tsconfig.lint.json b/utils/get-release-text/tsconfig.lint.json deleted file mode 100644 index 0dc5add6b7..0000000000 --- a/utils/get-release-text/tsconfig.lint.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": [ - "src/**/*.ts", - "test/**/*.ts", - "../../typings/**/*.d.ts" - ] -} diff --git a/utils/tsconfig/package.json b/utils/tsconfig/package.json deleted file mode 100644 index c207f8434b..0000000000 --- a/utils/tsconfig/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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://pnpm.io", - "repository": "https://github.com/pnpm/pnpm/blob/master/utils/tsconfig", - "bugs": { - "url": "https://github.com/pnpm/pnpm/issues" - }, - "devDependencies": { - "@pnpm/tsconfig": "workspace:*" - } -} diff --git a/workspace/filter-workspace-packages/tsconfig.json b/workspace/filter-workspace-packages/tsconfig.json index 712c3560ba..fabb0d2995 100644 --- a/workspace/filter-workspace-packages/tsconfig.json +++ b/workspace/filter-workspace-packages/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/workspace/filter-workspace-packages/tsconfig.lint.json b/workspace/filter-workspace-packages/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/filter-workspace-packages/tsconfig.lint.json +++ b/workspace/filter-workspace-packages/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/workspace/find-workspace-dir/test/index.ts b/workspace/find-workspace-dir/test/index.ts index 8e342df1ff..8fa61f5a0f 100644 --- a/workspace/find-workspace-dir/test/index.ts +++ b/workspace/find-workspace-dir/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import path from 'path' import fs from 'fs' import { findWorkspaceDir } from '@pnpm/find-workspace-dir' diff --git a/workspace/find-workspace-dir/tsconfig.json b/workspace/find-workspace-dir/tsconfig.json index 3c87944f95..019cba19e7 100644 --- a/workspace/find-workspace-dir/tsconfig.json +++ b/workspace/find-workspace-dir/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/workspace/find-workspace-dir/tsconfig.lint.json b/workspace/find-workspace-dir/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/find-workspace-dir/tsconfig.lint.json +++ b/workspace/find-workspace-dir/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/workspace/find-workspace-packages/tsconfig.json b/workspace/find-workspace-packages/tsconfig.json index f0a25baa4a..16f278f0ce 100644 --- a/workspace/find-workspace-packages/tsconfig.json +++ b/workspace/find-workspace-packages/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/workspace/find-workspace-packages/tsconfig.lint.json b/workspace/find-workspace-packages/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/find-workspace-packages/tsconfig.lint.json +++ b/workspace/find-workspace-packages/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/workspace/pkgs-graph/test/index.ts b/workspace/pkgs-graph/test/index.ts index af35d679d0..bb87832b83 100644 --- a/workspace/pkgs-graph/test/index.ts +++ b/workspace/pkgs-graph/test/index.ts @@ -1,4 +1,4 @@ -/// +/// import { createPkgGraph } from 'pkgs-graph' import pathResolve from 'better-path-resolve' diff --git a/workspace/pkgs-graph/tsconfig.json b/workspace/pkgs-graph/tsconfig.json index 7d43a9e03b..2ec81e6d6e 100644 --- a/workspace/pkgs-graph/tsconfig.json +++ b/workspace/pkgs-graph/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/workspace/pkgs-graph/tsconfig.lint.json b/workspace/pkgs-graph/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/pkgs-graph/tsconfig.lint.json +++ b/workspace/pkgs-graph/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/workspace/resolve-workspace-range/tsconfig.json b/workspace/resolve-workspace-range/tsconfig.json index 41aa731a88..c6f0399f60 100644 --- a/workspace/resolve-workspace-range/tsconfig.json +++ b/workspace/resolve-workspace-range/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [] } diff --git a/workspace/resolve-workspace-range/tsconfig.lint.json b/workspace/resolve-workspace-range/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/resolve-workspace-range/tsconfig.lint.json +++ b/workspace/resolve-workspace-range/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] } diff --git a/workspace/sort-packages/tsconfig.json b/workspace/sort-packages/tsconfig.json index 4934a75de4..d37dd6eefe 100644 --- a/workspace/sort-packages/tsconfig.json +++ b/workspace/sort-packages/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ "src/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ], "references": [ { diff --git a/workspace/sort-packages/tsconfig.lint.json b/workspace/sort-packages/tsconfig.lint.json index 0dc5add6b7..1bbe711971 100644 --- a/workspace/sort-packages/tsconfig.lint.json +++ b/workspace/sort-packages/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../typings/**/*.d.ts" + "../../__typings__/**/*.d.ts" ] }