From e7fd8a84c1591ae82a33b23dca94f8291b30cc14 Mon Sep 17 00:00:00 2001 From: chlorine Date: Thu, 20 Oct 2022 06:12:00 +0800 Subject: [PATCH] fix: downgrade @pnpm/npm-conf to remove annoying builtin warning (#5521) close #5518 --- .changeset/flat-kings-tell.md | 5 +++++ packages/config/package.json | 2 +- packages/config/test/index.ts | 8 +------- pnpm-lock.yaml | 15 ++++++++++++--- 4 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 .changeset/flat-kings-tell.md diff --git a/.changeset/flat-kings-tell.md b/.changeset/flat-kings-tell.md new file mode 100644 index 00000000000..9dc10b6b965 --- /dev/null +++ b/.changeset/flat-kings-tell.md @@ -0,0 +1,5 @@ +--- +"@pnpm/config": patch +--- + +Downgrade @pnpm/npm-conf to remove annoying builtin warning diff --git a/packages/config/package.json b/packages/config/package.json index 7191b61b697..c192c4eab92 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -36,7 +36,7 @@ "@pnpm/error": "workspace:*", "@pnpm/git-utils": "workspace:*", "@pnpm/matcher": "workspace:*", - "@pnpm/npm-conf": "2.0.1", + "@pnpm/npm-conf": "2.0.0", "@pnpm/pnpmfile": "workspace:*", "@pnpm/read-project-manifest": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/packages/config/test/index.ts b/packages/config/test/index.ts index 3cb28e19ad9..43b3ccd9810 100644 --- a/packages/config/test/index.ts +++ b/packages/config/test/index.ts @@ -27,8 +27,6 @@ const env = { [PATH]: __dirname, } -const defaultWarning = expect.stringMatching(/Load npm builtin configs failed/) - test('getConfig()', async () => { const { config } = await getConfig({ cliOptions: {}, @@ -372,7 +370,6 @@ test('convert shamefully-flatten to hoist-pattern=* and warn', async () => { expect(config.hoistPattern).toStrictEqual(['*']) expect(config.shamefullyHoist).toBeTruthy() expect(warnings).toStrictEqual([ - defaultWarning, 'The "shamefully-flatten" setting has been renamed to "shamefully-hoist". ' + 'Also, in most cases you won\'t need "shamefully-hoist". ' + 'Since v4, a semistrict node_modules structure is on by default (via hoist-pattern=[*]).', @@ -723,7 +720,6 @@ test('warn user unknown settings in npmrc', async () => { }) expect(warnings).toStrictEqual([ - defaultWarning, 'Your .npmrc file contains unknown setting: typo-setting, mistake-setting', ]) @@ -735,9 +731,7 @@ test('warn user unknown settings in npmrc', async () => { }, }) - expect(noWarnings).toStrictEqual([ - defaultWarning, - ]) + expect(noWarnings).toStrictEqual([]) }) test('getConfig() converts noproxy to noProxy', async () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 16bba28136f..62aa53364a0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -478,8 +478,8 @@ importers: specifier: workspace:* version: link:../matcher '@pnpm/npm-conf': - specifier: 2.0.1 - version: 2.0.1 + specifier: 2.0.0 + version: 2.0.0 '@pnpm/pnpmfile': specifier: workspace:* version: link:../pnpmfile @@ -7429,12 +7429,21 @@ packages: normalize-registry-url: 2.0.0 dev: true + /@pnpm/npm-conf/2.0.0: + resolution: {integrity: sha512-Ot3xJvdbRQ3fwtDeRYMik/97BbCKij9ZupSgY1tJLCzPPgYRTIIjwdOBHQX2qGbwqNeKd6EneMyKAAsUMO09Bw==} + engines: {node: '>=12'} + dependencies: + '@pnpm/network.ca-file': 1.0.1 + config-chain: 1.1.13 + dev: false + /@pnpm/npm-conf/2.0.1: resolution: {integrity: sha512-3+0d2togeuHF4WNfjMLK0MPiM2nqX31dYoaQhLTl5fNmFzn2iciB/MGs1LNMM34bcty6PYoSq0sFI77GfJ1D8g==} engines: {node: '>=12'} dependencies: '@pnpm/network.ca-file': 1.0.1 config-chain: 1.1.13 + dev: true /@pnpm/npm-lifecycle/2.0.0-1_typanion@3.12.0: resolution: {integrity: sha512-eUeRVUxnr9xP50ESMuRDrWYN/AQmaV2g/Wvs3ckHBx7XFJw8ljix66L7R1S1FoUqxNn0BeyPeIE9ANwn/syIAQ==} @@ -17125,7 +17134,7 @@ time: /@pnpm/meta-updater/0.2.1: '2022-10-17T23:32:30.921Z' /@pnpm/network.agent/0.0.3: '2022-06-12T19:51:53.044Z' /@pnpm/nopt/0.2.1: '2021-06-01T19:45:54.552Z' - /@pnpm/npm-conf/2.0.1: '2022-10-13T22:29:40.601Z' + /@pnpm/npm-conf/2.0.0: '2022-07-31T00:06:52.248Z' /@pnpm/npm-lifecycle/2.0.0-1: '2022-02-21T22:36:47.308Z' /@pnpm/npm-package-arg/1.0.0: '2022-06-28T12:48:31.287Z' /@pnpm/os.env.path-extender/0.2.7: '2022-10-17T23:03:23.674Z'