update to referer-less npm-registry-fetch

Depends on npm/npm-registry-fetch#25 Land that PR before merging this commit.
npm · Feb 24, 2020 · 094623e · 094623e
1 parent 4545243
commit 094623e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/lib/remote.js b/lib/remote.js
@@ -51,6 +51,7 @@ class RemoteFetcher extends Fetcher {
       'pacote-pkg-id': this.pkgid,
       ...(this.integrity ? { 'pacote-integrity': String(this.integrity) }
         : {}),
+      ...(this.opts.headers || {}),
     }
   }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "npm-package-arg": "^8.0.0",
     "npm-packlist": "^2.1.0",
     "npm-pick-manifest": "^6.0.0",
-    "npm-registry-fetch": "^7.0.1",
+    "npm-registry-fetch": "github:npm/npm-registry-fetch#isaacs/no-referer",
     "osenv": "^0.1.5",
     "promise-inflight": "^1.0.1",
     "promise-retry": "^1.1.1",

diff --git a/test/remote.js b/test/remote.js
@@ -52,14 +52,21 @@ t.test('start server', t => {
 t.test('packument', t => {
   //const url = 'https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz'
   const url = `${server}/abbrev.tgz`
-  const f = new RemoteFetcher(url, { cache })
+  const f = new RemoteFetcher(url, {
+    cache,
+    preferOffline: true,
+    headers: {
+      'not-referer': 'http://example.com',
+    },
+    projectScope: '@npmcli',
+    npmSession: 'foobarbaz',
+  })
   // run twice to pull from cache the second time
   return t.resolveMatchSnapshot(f.packument(), 'packument')
     .then(() => {
       const f2 = new RemoteFetcher(`abbrev@${url}`, {
-        cache,
         pkgid: `remote:abbrev@${url}`,
-        preferOffline: true,
+        cache,
       })
       return t.resolveMatchSnapshot(f2.packument(), 'packument 2')
     })
@@ -72,15 +79,16 @@ t.test('packument', t => {
           {
             connection: 'keep-alive',
             'user-agent': `pacote/${version} node/${process.version}`,
-            'npm-scope': 'undefined',
-            'npm-session': 'undefined',
-            referer: 'undefined',
             'pacote-version': version,
             'pacote-req-type': 'tarball',
             'pacote-pkg-id': `remote:${server}/abbrev.tgz`,
             accept: '*/*',
             'accept-encoding': 'gzip,deflate',
             host: require('url').parse(server).host,
+            'npm-session': 'foobarbaz',
+            'npm-scope': '@npmcli',
+            'npm-in-ci': String,
+            'not-referer': 'http://example.com',
           }
         ]
       ])