Merge branch 'npm:latest' into 7530

npm · Sep 30, 2024 · e187491 · e187491
2 parents 2cb3c9e + 6ca609e
commit e187491
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 34 deletions.
diff --git a/docs/lib/content/commands/npm-install.md b/docs/lib/content/commands/npm-install.md
@@ -174,10 +174,6 @@ into a tarball (b).
     npm install ansi-regex --save-bundle
     ```
 
-    **Note**: If there is a file or folder named `<name>` in the current
-    working directory, then it will try to install that, and only try to
-    fetch the package by name if it is not valid.
-
 * `npm install <alias>@npm:<name>`:
 
     Install a package under a custom alias. Allows multiple versions of

diff --git a/docs/lib/content/configuring-npm/package-json.md b/docs/lib/content/configuring-npm/package-json.md
@@ -337,6 +337,10 @@ the `files` globs.  Exceptions to this are:
 
 These can not be included.
 
+### exports
+
+The "exports" provides a modern alternative to "main" allowing multiple entry points to be defined, conditional entry resolution support between environments, and preventing any other entry points besides those defined in "exports". This encapsulation allows module authors to clearly define the public interface for their package. For more details see the [node.js documentation on package entry points](https://nodejs.org/api/packages.html#package-entry-points)
+
 ### main
 
 The main field is a module ID that is the primary entry point to your

diff --git a/lib/utils/ping.js b/lib/utils/ping.js
@@ -2,6 +2,6 @@
 // used by the ping and doctor commands
 const fetch = require('npm-registry-fetch')
 module.exports = async (flatOptions) => {
-  const res = await fetch('/-/ping?write=true', flatOptions)
+  const res = await fetch('/-/ping', { ...flatOptions, cache: false })
   return res.json().catch(() => ({}))
 }
diff --git a/mock-registry/lib/index.js b/mock-registry/lib/index.js
@@ -320,7 +320,7 @@ class MockRegistry {
   }
 
   ping ({ body = {}, responseCode = 200 } = {}) {
-    this.nock = this.nock.get(this.fullPath('/-/ping?write=true')).reply(responseCode, body)
+    this.nock = this.nock.get(this.fullPath('/-/ping')).reply(responseCode, body)
   }
 
   // full unpublish of an entire package

diff --git a/tap-snapshots/test/lib/commands/doctor.js.test.cjs b/tap-snapshots/test/lib/commands/doctor.js.test.cjs
@@ -1166,7 +1166,7 @@ Object {
 exports[`test/lib/commands/doctor.js TAP ping 404 > ping 404 1`] = `
 Connecting to the registry
 Not ok
-404 404 Not Found - GET https://registry.npmjs.org/-/ping?write=true
+404 404 Not Found - GET https://registry.npmjs.org/-/ping
 Checking npm version
 Ok
 current: v1.0.0, latest: v1.0.0
@@ -1226,7 +1226,7 @@ Object {
 exports[`test/lib/commands/doctor.js TAP ping 404 in color > ping 404 in color 1`] = `
 Connecting to the registry
 [31mNot ok[39m
-[36m404 404 Not Found - GET https://registry.npmjs.org/-/ping?write=true[39m
+[36m404 404 Not Found - GET https://registry.npmjs.org/-/ping[39m
 Checking npm version
 [32mOk[39m
 current: v1.0.0, latest: v1.0.0
@@ -1286,7 +1286,7 @@ Object {
 exports[`test/lib/commands/doctor.js TAP ping exception with code > ping failure 1`] = `
 Connecting to the registry
 Not ok
-request to https://registry.npmjs.org/-/ping?write=true failed, reason: Test Error
+request to https://registry.npmjs.org/-/ping failed, reason: Test Error
 Checking npm version
 Ok
 current: v1.0.0, latest: v1.0.0
@@ -1346,7 +1346,7 @@ Object {
 exports[`test/lib/commands/doctor.js TAP ping exception without code > ping failure 1`] = `
 Connecting to the registry
 Not ok
-request to https://registry.npmjs.org/-/ping?write=true failed, reason: Test Error
+request to https://registry.npmjs.org/-/ping failed, reason: Test Error
 Checking npm version
 Ok
 current: v1.0.0, latest: v1.0.0

diff --git a/test/lib/commands/doctor.js b/test/lib/commands/doctor.js
@@ -89,7 +89,7 @@ t.test('all clear', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -108,7 +108,7 @@ t.test('all clear in color', async t => {
     },
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -127,7 +127,7 @@ t.test('silent success', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -146,7 +146,7 @@ t.test('silent errors', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(404, '{}')
+    .get('/-/ping').reply(404, '{}')
   await t.rejects(npm.exec('doctor', ['ping']), {
     message: /Check logs/,
   })
@@ -161,7 +161,7 @@ t.test('ping 404', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(404, '{}')
+    .get('/-/ping').reply(404, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -182,7 +182,7 @@ t.test('ping 404 in color', async t => {
     },
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(404, '{}')
+    .get('/-/ping').reply(404, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -198,7 +198,7 @@ t.test('ping exception with code', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').replyWithError({ message: 'Test Error', code: 'TEST' })
+    .get('/-/ping').replyWithError({ message: 'Test Error', code: 'TEST' })
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -214,7 +214,7 @@ t.test('ping exception without code', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').replyWithError({ message: 'Test Error', code: false })
+    .get('/-/ping').replyWithError({ message: 'Test Error', code: false })
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -230,7 +230,7 @@ t.test('npm out of date', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest('2.0.0'))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -255,7 +255,7 @@ t.test('node out of date - lts', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -280,7 +280,7 @@ t.test('node out of date - current', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -297,7 +297,7 @@ t.test('non-default registry', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -318,7 +318,7 @@ t.test('missing git', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -344,7 +344,7 @@ t.test('windows skips permissions checks', async t => {
     globalPrefixDir: {},
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -361,7 +361,7 @@ t.test('missing global directories', async t => {
     globalPrefixDir: {},
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -377,7 +377,7 @@ t.test('missing local node_modules', async t => {
     globalPrefixDir: dirs.globalPrefixDir,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -406,7 +406,7 @@ t.test('incorrect owner', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -430,7 +430,7 @@ t.test('incorrect permissions', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -458,7 +458,7 @@ t.test('error reading directory', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -481,7 +481,7 @@ t.test('cacache badContent', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -504,7 +504,7 @@ t.test('cacache reclaimedCount', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -527,7 +527,7 @@ t.test('cacache missingContent', async t => {
     ...dirs,
   })
   tnock(t, npm.config.get('registry'))
-    .get('/-/ping?write=true').reply(200, '{}')
+    .get('/-/ping').reply(200, '{}')
     .get('/npm').reply(200, npmManifest(npm.version))
   tnock(t, 'https://nodejs.org')
     .get('/dist/index.json').reply(200, nodeVersions)
@@ -558,7 +558,7 @@ t.test('discrete checks', t => {
       ...dirs,
     })
     tnock(t, npm.config.get('registry'))
-      .get('/-/ping?write=true').reply(200, '{}')
+      .get('/-/ping').reply(200, '{}')
     await npm.exec('doctor', ['ping'])
     t.matchSnapshot(joinedOutput(), 'output')
     t.matchSnapshot({ info: logs.info, warn: logs.warn, error: logs.error }, 'logs')
@@ -586,7 +586,7 @@ t.test('discrete checks', t => {
       ...dirs,
     })
     tnock(t, npm.config.get('registry'))
-      .get('/-/ping?write=true').reply(200, '{}')
+      .get('/-/ping').reply(200, '{}')
     await npm.exec('doctor', ['registry'])
     t.matchSnapshot(joinedOutput(), 'output')
     t.matchSnapshot({ info: logs.info, warn: logs.warn, error: logs.error }, 'logs')

diff --git a/test/lib/commands/ping.js b/test/lib/commands/ping.js
@@ -1,6 +1,8 @@
 const t = require('tap')
 const { load: loadMockNpm } = require('../../fixtures/mock-npm.js')
 const MockRegistry = require('@npmcli/mock-registry')
+const cacache = require('cacache')
+const path = require('node:path')
 
 t.test('no details', async t => {
   const { npm, logs, joinedOutput } = await loadMockNpm(t)
@@ -74,3 +76,19 @@ t.test('invalid json', async t => {
     details: {},
   })
 })
+t.test('fail when registry is unreachable even if request is cached', async t => {
+  const { npm } = await loadMockNpm(t, {
+    config: { registry: 'https://ur.npmlocal.npmtest/' },
+    cacheDir: { _cacache: {} },
+  })
+  const url = `${npm.config.get('registry')}-/ping`
+  const cache = path.join(npm.cache, '_cacache')
+  await cacache.put(cache,
+    `make-fetch-happen:request-cache:${url}`,
+    '{}', { metadata: { url } }
+  )
+  t.rejects(npm.exec('ping', []), {
+    code: 'ENOTFOUND',
+  },
+  'throws ENOTFOUND error')
+})