fix: add missing scope on flat options

lib/npm.js

@@ -60,7 +60,6 @@ const which = require('which')
 const deref = require('./utils/deref-command.js')
 const setupLog = require('./utils/setup-log.js')
 const cleanUpLogFiles = require('./utils/cleanup-log-files.js')
-const getProjectScope = require('./utils/get-project-scope.js')
 
 let warnedNonDashArg = false
 const _runCmd = Symbol('_runCmd')
@@ -247,11 +246,6 @@ const npm = module.exports = new class extends EventEmitter {
     if (configScope && !/^@/.test(configScope))
       this.config.set('scope', `@${configScope}`, this.config.find('scope'))
     process.emit('timeEnd', 'npm:load:configScope')
-
-    process.emit('time', 'npm:load:projectScope')
-    this.projectScope = this.config.get('scope') ||
-      getProjectScope(this.prefix)
-    process.emit('timeEnd', 'npm:load:projectScope')
   }
 
   get flatOptions () {

lib/utils/config/definitions.js

@@ -1716,7 +1716,10 @@ define('scope', {
   `,
   flatten (key, obj, flatOptions) {
     const value = obj[key]
-    flatOptions.projectScope = value && !/^@/.test(value) ? `@${value}` : value
+    const scope = value && !/^@/.test(value) ? `@${value}` : value
+    flatOptions.scope = scope
+    // projectScope is kept for compatibility with npm-registry-fetch
+    flatOptions.projectScope = scope
   },
 })
 

test/lib/utils/config/definitions.js

@@ -487,15 +487,15 @@ t.test('maxSockets', t => {
   t.end()
 })
 
-t.test('projectScope', t => {
+t.test('scope', t => {
   const obj = { scope: 'asdf' }
   const flat = {}
   definitions.scope.flatten('scope', obj, flat)
-  t.strictSame(flat, { projectScope: '@asdf' }, 'prepend @ if needed')
+  t.strictSame(flat, { scope: '@asdf', projectScope: '@asdf' }, 'prepend @ if needed')
 
   obj.scope = '@asdf'
   definitions.scope.flatten('scope', obj, flat)
-  t.strictSame(flat, { projectScope: '@asdf' }, 'leave untouched if has @')
+  t.strictSame(flat, { scope: '@asdf', projectScope: '@asdf' }, 'leave untouched if has @')
 
   t.end()
 })