From e7d9cd187a868d81f3c45799cf914b791f8fd822 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 1 Jun 2021 23:44:02 +0300 Subject: [PATCH] fix: remove out-of-date dependency (#3488) --- .changeset/brown-pens-complain.md | 5 +++++ packages/beta/pnpm | 0 packages/fetch/package.json | 3 +-- packages/fetch/src/fetch.ts | 3 +-- packages/plugin-commands-server/src/server.ts | 2 ++ packages/pnpm/test/server.ts | 2 +- pnpm-lock.yaml | 7 ------- 7 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 .changeset/brown-pens-complain.md mode change 100644 => 100755 packages/beta/pnpm diff --git a/.changeset/brown-pens-complain.md b/.changeset/brown-pens-complain.md new file mode 100644 index 0000000000..72eb43953f --- /dev/null +++ b/.changeset/brown-pens-complain.md @@ -0,0 +1,5 @@ +--- +"@pnpm/fetch": major +--- + +Do not use fetch does not support unix requests. diff --git a/packages/beta/pnpm b/packages/beta/pnpm old mode 100644 new mode 100755 diff --git a/packages/fetch/package.json b/packages/fetch/package.json index 7d6fc3ba9b..e92989485d 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -36,8 +36,7 @@ "@pnpm/fetching-types": "workspace:2.1.0", "@pnpm/npm-registry-agent": "workspace:4.0.0", "@zkochan/retry": "^0.2.0", - "node-fetch": "^2.6.1", - "node-fetch-unix": "2.3.0" + "node-fetch": "^2.6.1" }, "devDependencies": { "@pnpm/logger": "^4.0.0", diff --git a/packages/fetch/src/fetch.ts b/packages/fetch/src/fetch.ts index a8391b70f5..a9b67daf47 100644 --- a/packages/fetch/src/fetch.ts +++ b/packages/fetch/src/fetch.ts @@ -1,7 +1,6 @@ import { requestRetryLogger } from '@pnpm/core-loggers' import { operation, RetryTimeoutOptions } from '@zkochan/retry' -import { Request, RequestInit as NodeRequestInit, Response } from 'node-fetch' -import fetch from 'node-fetch-unix' +import fetch, { Request, RequestInit as NodeRequestInit, Response } from 'node-fetch' // retry settings const MIN_TIMEOUT = 10 diff --git a/packages/plugin-commands-server/src/server.ts b/packages/plugin-commands-server/src/server.ts index 59cdb0ed6c..c5d7d6c000 100644 --- a/packages/plugin-commands-server/src/server.ts +++ b/packages/plugin-commands-server/src/server.ts @@ -104,6 +104,8 @@ export function handler ( }, params: string[] ) { + // We can only support TCP at the moment because node-fetch does not support IPC + opts.protocol = 'tcp' switch (params[0]) { case 'start': return start(opts) diff --git a/packages/pnpm/test/server.ts b/packages/pnpm/test/server.ts index 3b507840fc..5ad7b2c0c3 100644 --- a/packages/pnpm/test/server.ts +++ b/packages/pnpm/test/server.ts @@ -131,7 +131,7 @@ skipOnWindows('pnpm server uses TCP when port specified', async () => { expect(await pathExists(serverJsonPath)).toBeFalsy() }) -test('pnpm server fails when trying to set --port for IPC protocol', async () => { +test.skip('pnpm server fails when trying to set --port for IPC protocol', async () => { prepare() expect(execPnpmSync(['server', 'start', '--protocol', 'ipc', '--port', '7856']).status).toBe(1) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e2dfe8a913..9b809f09a3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -503,14 +503,12 @@ importers: cpy-cli: ^3.1.1 nock: 12.0.3 node-fetch: ^2.6.1 - node-fetch-unix: 2.3.0 dependencies: '@pnpm/core-loggers': link:../core-loggers '@pnpm/fetching-types': link:../fetching-types '@pnpm/npm-registry-agent': link:../npm-registry-agent '@zkochan/retry': 0.2.0 node-fetch: 2.6.1 - node-fetch-unix: 2.3.0 devDependencies: '@pnpm/fetch': 'link:' '@pnpm/logger': 4.0.0 @@ -10922,11 +10920,6 @@ packages: semver: 5.7.1 dev: true - /node-fetch-unix/2.3.0: - resolution: {integrity: sha512-ngVgjZl1n1dZRR8BIX/UKU3Q0cfkQ4byUVcV132xW/+zPF79sVo2td2576mzIGJibi7E0Azcx2gpy66BoV2hrg==} - engines: {node: 4.x || >=6.0.0} - dev: false - /node-fetch/2.6.1: resolution: {integrity: sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==} engines: {node: 4.x || >=6.0.0}