From c8a6ea8ae962ed61a8f19dfbdc6dc4d72eb9a51f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 26 Aug 2023 17:18:06 +0300 Subject: [PATCH] refactor: rename tarball-worker to worker --- .changeset/poor-pets-yawn.md | 2 +- fetching/git-fetcher/package.json | 2 +- fetching/git-fetcher/src/index.ts | 2 +- fetching/git-fetcher/tsconfig.json | 4 +- fetching/tarball-fetcher/package.json | 2 +- .../src/gitHostedTarballFetcher.ts | 2 +- fetching/tarball-fetcher/src/index.ts | 2 +- .../src/localTarballFetcher.ts | 2 +- .../src/remoteTarballFetcher.ts | 2 +- fetching/tarball-fetcher/tsconfig.json | 4 +- fetching/tarball-worker/README.md | 15 --- package.json | 1 + pkg-manager/core/package.json | 2 +- pkg-manager/core/src/install/index.ts | 2 +- pkg-manager/core/tsconfig.json | 6 +- pnpm-lock.yaml | 101 +++++++++--------- pnpm-workspace.yaml | 1 + pnpm/package-linux-arm64.json | 2 +- pnpm/package-linux-x64.json | 2 +- pnpm/package-linuxstatic-arm64.json | 2 +- pnpm/package-linuxstatic-x64.json | 2 +- pnpm/package-macos-arm64.json | 2 +- pnpm/package-macos-x64.json | 2 +- pnpm/package-win-x64.json | 2 +- pnpm/package.json | 2 +- store/package-store/package.json | 2 +- .../src/storeController/index.ts | 2 +- store/package-store/tsconfig.json | 6 +- worker/README.md | 15 +++ .../tarball-worker => worker}/package.json | 10 +- .../tarball-worker => worker}/src/index.ts | 6 +- .../tarball-worker => worker}/src/types.ts | 0 .../tarballWorker.ts => worker/src/worker.ts | 0 .../tarball-worker => worker}/tsconfig.json | 12 +-- .../tsconfig.lint.json | 0 35 files changed, 113 insertions(+), 108 deletions(-) delete mode 100644 fetching/tarball-worker/README.md create mode 100644 worker/README.md rename {fetching/tarball-worker => worker}/package.json (78%) rename {fetching/tarball-worker => worker}/src/index.ts (96%) rename {fetching/tarball-worker => worker}/src/types.ts (100%) rename fetching/tarball-worker/src/tarballWorker.ts => worker/src/worker.ts (100%) rename {fetching/tarball-worker => worker}/tsconfig.json (56%) rename {fetching/tarball-worker => worker}/tsconfig.lint.json (100%) diff --git a/.changeset/poor-pets-yawn.md b/.changeset/poor-pets-yawn.md index 98056a6c95..748ee1bcf2 100644 --- a/.changeset/poor-pets-yawn.md +++ b/.changeset/poor-pets-yawn.md @@ -1,5 +1,5 @@ --- -"@pnpm/fetching.tarball-worker": minor +"@pnpm/worker": minor --- Initial release. diff --git a/fetching/git-fetcher/package.json b/fetching/git-fetcher/package.json index 7a5128b700..90bec955e1 100644 --- a/fetching/git-fetcher/package.json +++ b/fetching/git-fetcher/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching.tarball-worker": "workspace:*", + "@pnpm/worker": "workspace:*", "@pnpm/prepare-package": "workspace:*", "@zkochan/rimraf": "^2.1.3", "execa": "npm:safe-execa@0.1.2" diff --git a/fetching/git-fetcher/src/index.ts b/fetching/git-fetcher/src/index.ts index 0eacfa2371..02884a24a0 100644 --- a/fetching/git-fetcher/src/index.ts +++ b/fetching/git-fetcher/src/index.ts @@ -2,7 +2,7 @@ import path from 'path' import type { GitFetcher } from '@pnpm/fetcher-base' import { globalWarn } from '@pnpm/logger' import { preparePackage } from '@pnpm/prepare-package' -import { addFilesFromDir } from '@pnpm/fetching.tarball-worker' +import { addFilesFromDir } from '@pnpm/worker' import rimraf from '@zkochan/rimraf' import execa from 'execa' import { URL } from 'url' diff --git a/fetching/git-fetcher/tsconfig.json b/fetching/git-fetcher/tsconfig.json index 04f0733e6e..82587214f5 100644 --- a/fetching/git-fetcher/tsconfig.json +++ b/fetching/git-fetcher/tsconfig.json @@ -22,10 +22,10 @@ "path": "../../store/create-cafs-store" }, { - "path": "../fetcher-base" + "path": "../../worker" }, { - "path": "../tarball-worker" + "path": "../fetcher-base" } ], "composite": true diff --git a/fetching/tarball-fetcher/package.json b/fetching/tarball-fetcher/package.json index e3cdaf96ae..49529e4b00 100644 --- a/fetching/tarball-fetcher/package.json +++ b/fetching/tarball-fetcher/package.json @@ -38,7 +38,7 @@ "@pnpm/error": "workspace:*", "@pnpm/fetcher-base": "workspace:*", "@pnpm/fetching-types": "workspace:*", - "@pnpm/fetching.tarball-worker": "workspace:*", + "@pnpm/worker": "workspace:*", "@pnpm/graceful-fs": "workspace:*", "@pnpm/prepare-package": "workspace:*", "@zkochan/retry": "^0.2.0", diff --git a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts index fce176c288..56478a8f7e 100644 --- a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts @@ -2,7 +2,7 @@ import { type FetchFunction, type FetchOptions } from '@pnpm/fetcher-base' import type { Cafs } from '@pnpm/cafs-types' import { globalWarn } from '@pnpm/logger' import { preparePackage } from '@pnpm/prepare-package' -import { addFilesFromDir } from '@pnpm/fetching.tarball-worker' +import { addFilesFromDir } from '@pnpm/worker' interface Resolution { integrity?: string diff --git a/fetching/tarball-fetcher/src/index.ts b/fetching/tarball-fetcher/src/index.ts index cf58c4ade9..e9bd5da23b 100644 --- a/fetching/tarball-fetcher/src/index.ts +++ b/fetching/tarball-fetcher/src/index.ts @@ -9,7 +9,7 @@ import { type GetAuthHeader, type RetryTimeoutOptions, } from '@pnpm/fetching-types' -import { TarballIntegrityError } from '@pnpm/fetching.tarball-worker' +import { TarballIntegrityError } from '@pnpm/worker' import { createDownloader, type DownloadFunction, diff --git a/fetching/tarball-fetcher/src/localTarballFetcher.ts b/fetching/tarball-fetcher/src/localTarballFetcher.ts index 5955ea4498..e0605d6b07 100644 --- a/fetching/tarball-fetcher/src/localTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/localTarballFetcher.ts @@ -2,7 +2,7 @@ import path from 'path' import { type FetchFunction, type FetchOptions } from '@pnpm/fetcher-base' import type { Cafs } from '@pnpm/cafs-types' import gfs from '@pnpm/graceful-fs' -import { addFilesFromTarball } from '@pnpm/fetching.tarball-worker' +import { addFilesFromTarball } from '@pnpm/worker' const isAbsolutePath = /^[/]|^[A-Za-z]:/ diff --git a/fetching/tarball-fetcher/src/remoteTarballFetcher.ts b/fetching/tarball-fetcher/src/remoteTarballFetcher.ts index 5065406ca9..0f1458cfc6 100644 --- a/fetching/tarball-fetcher/src/remoteTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/remoteTarballFetcher.ts @@ -4,7 +4,7 @@ import { FetchError } from '@pnpm/error' import { type FetchResult } from '@pnpm/fetcher-base' import type { Cafs, DeferredManifestPromise } from '@pnpm/cafs-types' import { type FetchFromRegistry } from '@pnpm/fetching-types' -import { addFilesFromTarball } from '@pnpm/fetching.tarball-worker' +import { addFilesFromTarball } from '@pnpm/worker' import * as retry from '@zkochan/retry' import throttle from 'lodash.throttle' import { BadTarballError } from './errorTypes' diff --git a/fetching/tarball-fetcher/tsconfig.json b/fetching/tarball-fetcher/tsconfig.json index 45d2b318b4..98b3fbc717 100644 --- a/fetching/tarball-fetcher/tsconfig.json +++ b/fetching/tarball-fetcher/tsconfig.json @@ -40,10 +40,10 @@ "path": "../../store/create-cafs-store" }, { - "path": "../fetcher-base" + "path": "../../worker" }, { - "path": "../tarball-worker" + "path": "../fetcher-base" } ], "composite": true diff --git a/fetching/tarball-worker/README.md b/fetching/tarball-worker/README.md deleted file mode 100644 index d87962ad2f..0000000000 --- a/fetching/tarball-worker/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# @pnpm/fetching.tarball-worker - -> A worker for extracting package taralls to the store - -[![npm version](https://img.shields.io/npm/v/@pnpm/fetching.tarball-worker.svg)](https://www.npmjs.com/package/@pnpm/fetching.tarball-worker) - -## Installation - -``` -pnpm add @pnpm/fetching.tarball-worker -``` - -## License - -MIT diff --git a/package.json b/package.json index 7a7d32b8c9..ec1e194bfa 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@commitlint/config-conventional": "^17.7.0", "@commitlint/prompt-cli": "^17.7.1", "@pnpm/eslint-config": "workspace:*", + "@pnpm/worker": "workspace:*", "@pnpm/meta-updater": "1.0.0", "@pnpm/registry-mock": "3.11.0", "@pnpm/tsconfig": "workspace:*", diff --git a/pkg-manager/core/package.json b/pkg-manager/core/package.json index 630852fe06..1a424b7c9c 100644 --- a/pkg-manager/core/package.json +++ b/pkg-manager/core/package.json @@ -53,7 +53,7 @@ "@pnpm/resolver-base": "workspace:*", "@pnpm/store-controller-types": "workspace:*", "@pnpm/symlink-dependency": "workspace:*", - "@pnpm/fetching.tarball-worker": "workspace:*", + "@pnpm/worker": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/which-version-is-pinned": "workspace:*", "@zkochan/rimraf": "^2.1.3", diff --git a/pkg-manager/core/src/install/index.ts b/pkg-manager/core/src/install/index.ts index 192548cecd..679b2efa91 100644 --- a/pkg-manager/core/src/install/index.ts +++ b/pkg-manager/core/src/install/index.ts @@ -14,7 +14,7 @@ import { import { createBase32HashFromFile } from '@pnpm/crypto.base32-hash' import { PnpmError } from '@pnpm/error' import { getContext, type PnpmContext } from '@pnpm/get-context' -import { workerPool } from '@pnpm/fetching.tarball-worker' +import { workerPool } from '@pnpm/worker' import { headlessInstall, type InstallationResultStats } from '@pnpm/headless' import { makeNodeRequireOption, diff --git a/pkg-manager/core/tsconfig.json b/pkg-manager/core/tsconfig.json index 54af492907..75ab61a4e7 100644 --- a/pkg-manager/core/tsconfig.json +++ b/pkg-manager/core/tsconfig.json @@ -33,9 +33,6 @@ { "path": "../../exec/lifecycle" }, - { - "path": "../../fetching/tarball-worker" - }, { "path": "../../fs/read-modules-dir" }, @@ -123,6 +120,9 @@ { "path": "../../store/store-path" }, + { + "path": "../../worker" + }, { "path": "../client" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 612db436c2..5e6fcaa920 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,6 +114,9 @@ importers: '@pnpm/tsconfig': specifier: workspace:* version: link:__utils__/tsconfig + '@pnpm/worker': + specifier: workspace:* + version: link:worker '@types/jest': specifier: ^29.5.3 version: 29.5.3 @@ -1524,15 +1527,15 @@ importers: '@pnpm/fetcher-base': specifier: workspace:* version: link:../fetcher-base - '@pnpm/fetching.tarball-worker': - specifier: workspace:* - version: link:../tarball-worker '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 '@pnpm/prepare-package': specifier: workspace:* version: link:../../exec/prepare-package + '@pnpm/worker': + specifier: workspace:* + version: link:../../worker '@zkochan/rimraf': specifier: ^2.1.3 version: 2.1.3 @@ -1585,9 +1588,6 @@ importers: '@pnpm/fetching-types': specifier: workspace:* version: link:../../network/fetching-types - '@pnpm/fetching.tarball-worker': - specifier: workspace:* - version: link:../tarball-worker '@pnpm/graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs @@ -1597,6 +1597,9 @@ importers: '@pnpm/prepare-package': specifier: workspace:* version: link:../../exec/prepare-package + '@pnpm/worker': + specifier: workspace:* + version: link:../../worker '@zkochan/retry': specifier: ^0.2.0 version: 0.2.0 @@ -1653,43 +1656,6 @@ importers: specifier: ^1.0.1 version: 1.0.1 - fetching/tarball-worker: - dependencies: - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../store/create-cafs-store - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/graceful-fs': - specifier: workspace:* - version: link:../../fs/graceful-fs - '@pnpm/logger': - specifier: ^5.0.0 - version: 5.0.0 - '@pnpm/store.cafs': - specifier: workspace:* - version: link:../../store/cafs - '@rushstack/worker-pool': - specifier: 0.3.34 - version: 0.3.34(@types/node@16.18.41) - load-json-file: - specifier: ^6.2.0 - version: 6.2.0 - safe-promise-defer: - specifier: ^1.0.1 - version: 1.0.1 - devDependencies: - '@pnpm/fetching.tarball-worker': - specifier: workspace:* - version: 'link:' - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - fs/find-packages: dependencies: '@pnpm/read-project-manifest': @@ -2926,9 +2892,6 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetching.tarball-worker': - specifier: workspace:* - version: link:../../fetching/tarball-worker '@pnpm/filter-lockfile': specifier: workspace:* version: link:../../lockfile/filter-lockfile @@ -3031,6 +2994,9 @@ importers: '@pnpm/which-version-is-pinned': specifier: workspace:* version: link:../../packages/which-version-is-pinned + '@pnpm/worker': + specifier: workspace:* + version: link:../../worker '@zkochan/rimraf': specifier: ^2.1.3 version: 2.1.3 @@ -5656,9 +5622,6 @@ importers: '@pnpm/fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base - '@pnpm/fetching.tarball-worker': - specifier: workspace:* - version: link:../../fetching/tarball-worker '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -5677,6 +5640,9 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/worker': + specifier: workspace:* + version: link:../../worker '@zkochan/rimraf': specifier: ^2.1.3 version: 2.1.3 @@ -6058,6 +6024,43 @@ importers: specifier: workspace:* version: 'link:' + worker: + dependencies: + '@pnpm/cafs-types': + specifier: workspace:* + version: link:../store/cafs-types + '@pnpm/create-cafs-store': + specifier: workspace:* + version: link:../store/create-cafs-store + '@pnpm/error': + specifier: workspace:* + version: link:../packages/error + '@pnpm/graceful-fs': + specifier: workspace:* + version: link:../fs/graceful-fs + '@pnpm/logger': + specifier: ^5.0.0 + version: 5.0.0 + '@pnpm/store.cafs': + specifier: workspace:* + version: link:../store/cafs + '@rushstack/worker-pool': + specifier: 0.3.34 + version: 0.3.34(@types/node@16.18.41) + load-json-file: + specifier: ^6.2.0 + version: 6.2.0 + safe-promise-defer: + specifier: ^1.0.1 + version: 1.0.1 + devDependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../packages/types + '@pnpm/worker': + specifier: workspace:* + version: 'link:' + workspace/filter-workspace-packages: dependencies: '@pnpm/error': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index a7a370a159..35f433ba62 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -20,6 +20,7 @@ packages: - pkg-manifest/* - patching/* - pnpm + - worker - pnpm/artifacts/* - releasing/* - resolving/* diff --git a/pnpm/package-linux-arm64.json b/pnpm/package-linux-arm64.json index f180aff6e7..133e3c9d58 100644 --- a/pnpm/package-linux-arm64.json +++ b/pnpm/package-linux-arm64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-linux-arm64"], "outputPath": "../linux-arm64" } diff --git a/pnpm/package-linux-x64.json b/pnpm/package-linux-x64.json index ea46cd7a02..90f5082093 100644 --- a/pnpm/package-linux-x64.json +++ b/pnpm/package-linux-x64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-linux-x64"], "outputPath": "../linux-x64" } diff --git a/pnpm/package-linuxstatic-arm64.json b/pnpm/package-linuxstatic-arm64.json index 054a7fc185..278dcddfb3 100644 --- a/pnpm/package-linuxstatic-arm64.json +++ b/pnpm/package-linuxstatic-arm64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-linuxstatic-arm64"], "outputPath": "../linuxstatic-arm64" } diff --git a/pnpm/package-linuxstatic-x64.json b/pnpm/package-linuxstatic-x64.json index 568e5f976d..54db4ce9b8 100644 --- a/pnpm/package-linuxstatic-x64.json +++ b/pnpm/package-linuxstatic-x64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-linuxstatic-x64"], "outputPath": "../linuxstatic-x64" } diff --git a/pnpm/package-macos-arm64.json b/pnpm/package-macos-arm64.json index 9459b93fb6..819801b33c 100644 --- a/pnpm/package-macos-arm64.json +++ b/pnpm/package-macos-arm64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-macos-arm64"], "outputPath": "../macos-arm64" } diff --git a/pnpm/package-macos-x64.json b/pnpm/package-macos-x64.json index a3f64eb651..27887bdc59 100644 --- a/pnpm/package-macos-x64.json +++ b/pnpm/package-macos-x64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-macos-x64"], "outputPath": "../macos-x64" } diff --git a/pnpm/package-win-x64.json b/pnpm/package-win-x64.json index 3ee6d63a7b..f0bc7f2143 100644 --- a/pnpm/package-win-x64.json +++ b/pnpm/package-win-x64.json @@ -1,6 +1,6 @@ { "pkg": { - "assets": ["dist/tarballWorker.js", "dist/pnpmrc", "dist/scripts/*"], + "assets": ["dist/worker.js", "dist/pnpmrc", "dist/scripts/*"], "targets": ["node18-win-x64"], "outputPath": "../win-x64" } diff --git a/pnpm/package.json b/pnpm/package.json index 5ee8abda0e..9a598ace3a 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -149,7 +149,7 @@ "url": "git+https://github.com/pnpm/pnpm.git" }, "scripts": { - "bundle": "cross-var esbuild lib/pnpm.js --bundle --platform=node --outfile=dist/pnpm.cjs --external:node-gyp --define:process.env.npm_package_name=\\\"$npm_package_name\\\" --define:process.env.npm_package_version=\\\"$npm_package_version\\\" && esbuild ../fetching/tarball-worker/lib/tarballWorker.js --bundle --platform=node --outfile=dist/tarballWorker.js", + "bundle": "cross-var esbuild lib/pnpm.js --bundle --platform=node --outfile=dist/pnpm.cjs --external:node-gyp --define:process.env.npm_package_name=\\\"$npm_package_name\\\" --define:process.env.npm_package_version=\\\"$npm_package_version\\\" && esbuild ../worker/lib/worker.js --bundle --platform=node --outfile=dist/worker.js", "start": "tsc --watch", "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"", "pretest:e2e": "rimraf node_modules/.bin/pnpm", diff --git a/store/package-store/package.json b/store/package-store/package.json index bf6dd8e39d..a00d4b2cfb 100644 --- a/store/package-store/package.json +++ b/store/package-store/package.json @@ -18,7 +18,7 @@ "@pnpm/create-cafs-store": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching.tarball-worker": "workspace:*", + "@pnpm/worker": "workspace:*", "@pnpm/package-requester": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/store-controller-types": "workspace:*", diff --git a/store/package-store/src/storeController/index.ts b/store/package-store/src/storeController/index.ts index c884129a6f..212b028aa6 100644 --- a/store/package-store/src/storeController/index.ts +++ b/store/package-store/src/storeController/index.ts @@ -7,7 +7,7 @@ import { type ImportIndexedPackageAsync, type StoreController, } from '@pnpm/store-controller-types' -import { addFilesFromDir, workerPool as pool } from '@pnpm/fetching.tarball-worker' +import { addFilesFromDir, workerPool as pool } from '@pnpm/worker' import { prune } from './prune' export { type CafsLocker } diff --git a/store/package-store/tsconfig.json b/store/package-store/tsconfig.json index 00b37a72aa..43cfca8406 100644 --- a/store/package-store/tsconfig.json +++ b/store/package-store/tsconfig.json @@ -15,9 +15,6 @@ { "path": "../../fetching/fetcher-base" }, - { - "path": "../../fetching/tarball-worker" - }, { "path": "../../packages/error" }, @@ -33,6 +30,9 @@ { "path": "../../resolving/resolver-base" }, + { + "path": "../../worker" + }, { "path": "../cafs" }, diff --git a/worker/README.md b/worker/README.md new file mode 100644 index 0000000000..b20f552352 --- /dev/null +++ b/worker/README.md @@ -0,0 +1,15 @@ +# @pnpm/worker + +> A worker for extracting package taralls to the store + +[![npm version](https://img.shields.io/npm/v/@pnpm/worker.svg)](https://www.npmjs.com/package/@pnpm/worker) + +## Installation + +``` +pnpm add @pnpm/worker +``` + +## License + +MIT diff --git a/fetching/tarball-worker/package.json b/worker/package.json similarity index 78% rename from fetching/tarball-worker/package.json rename to worker/package.json index 1e7b73616a..92392f4691 100644 --- a/fetching/tarball-worker/package.json +++ b/worker/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/fetching.tarball-worker", + "name": "@pnpm/worker", "version": "0.0.0", "description": "A worker for extracting package taralls to the store", "main": "lib/index.js", @@ -14,7 +14,7 @@ "test": "pnpm run compile", "compile": "tsc --build && pnpm run lint --fix" }, - "repository": "https://github.com/pnpm/pnpm/blob/main/fetching/tarball-worker", + "repository": "https://github.com/pnpm/pnpm/blob/main/worker", "keywords": [ "pnpm8", "pnpm", @@ -27,7 +27,7 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "homepage": "https://github.com/pnpm/pnpm/blob/main/fetching/tarball-worker#readme", + "homepage": "https://github.com/pnpm/pnpm/blob/main/worker#readme", "peerDependencies": { "@pnpm/logger": "^5.0.0" }, @@ -42,8 +42,8 @@ "safe-promise-defer": "^1.0.1" }, "devDependencies": { - "@pnpm/fetching.tarball-worker": "workspace:*", - "@pnpm/types": "workspace:*" + "@pnpm/types": "workspace:*", + "@pnpm/worker": "workspace:*" }, "funding": "https://opencollective.com/pnpm", "exports": { diff --git a/fetching/tarball-worker/src/index.ts b/worker/src/index.ts similarity index 96% rename from fetching/tarball-worker/src/index.ts rename to worker/src/index.ts index 3662366f41..05eb2a66cd 100644 --- a/fetching/tarball-worker/src/index.ts +++ b/worker/src/index.ts @@ -11,12 +11,12 @@ const workerPool = createTarballWorkerPool() export { workerPool } -export function createTarballWorkerPool () { +function createTarballWorkerPool () { const maxWorkers = Math.max(2, os.cpus().length - Math.abs(process.env.PNPM_WORKERS ? parseInt(process.env.PNPM_WORKERS) : 0)) - 1 const workerPool = new WorkerPool({ - id: 'tarball', + id: 'pnpm', maxWorkers, - workerScriptPath: path.join(__dirname, 'tarballWorker.js'), + workerScriptPath: path.join(__dirname, 'worker.js'), }) // @ts-expect-error if (global.finishWorkers) { diff --git a/fetching/tarball-worker/src/types.ts b/worker/src/types.ts similarity index 100% rename from fetching/tarball-worker/src/types.ts rename to worker/src/types.ts diff --git a/fetching/tarball-worker/src/tarballWorker.ts b/worker/src/worker.ts similarity index 100% rename from fetching/tarball-worker/src/tarballWorker.ts rename to worker/src/worker.ts diff --git a/fetching/tarball-worker/tsconfig.json b/worker/tsconfig.json similarity index 56% rename from fetching/tarball-worker/tsconfig.json rename to worker/tsconfig.json index 9ddd073a79..750472c240 100644 --- a/fetching/tarball-worker/tsconfig.json +++ b/worker/tsconfig.json @@ -10,22 +10,22 @@ ], "references": [ { - "path": "../../fs/graceful-fs" + "path": "../fs/graceful-fs" }, { - "path": "../../packages/error" + "path": "../packages/error" }, { - "path": "../../packages/types" + "path": "../packages/types" }, { - "path": "../../store/cafs" + "path": "../store/cafs" }, { - "path": "../../store/cafs-types" + "path": "../store/cafs-types" }, { - "path": "../../store/create-cafs-store" + "path": "../store/create-cafs-store" } ], "composite": true diff --git a/fetching/tarball-worker/tsconfig.lint.json b/worker/tsconfig.lint.json similarity index 100% rename from fetching/tarball-worker/tsconfig.lint.json rename to worker/tsconfig.lint.json