fix(add): respect project registry configuration

Author: danielroe

packages/nuxt-cli/src/commands/module/add.ts

@@ -427,7 +427,7 @@ async function resolveModule(moduleName: string, cwd: string, modulesDB: NuxtMod
 // Fetch package on npm
 letversion=pkgVersion||'latest'
 constpkgScope=pkgName.startsWith('@') ? pkgName.split('/')[0]! : null
-constmeta: RegistryMeta=awaitdetectNpmRegistry(pkgScope)
+constmeta: RegistryMeta=awaitdetectNpmRegistry(pkgScope,cwd)
 constheaders: HeadersInit={}
 
 if(meta.authToken){

packages/nuxt-cli/src/utils/registry.ts

@@ -37,11 +37,8 @@ export function getRegistryFromContent(content: string, scope: string | null): s
 }
 }
 
-functiongetNpmrcPaths(): string[]{
-constuserNpmrcPath=join(homedir(),'.npmrc')
-constcwdNpmrcPath=join(process.cwd(),'.npmrc')
-
-return[cwdNpmrcPath,userNpmrcPath]
+functiongetNpmrcPaths(cwd: string): string[]{
+return[join(cwd,'.npmrc'),join(homedir(),'.npmrc')]
 }
 
 asyncfunctiongetRegistryFromFile(paths: string[],scope: string|null){
@@ -68,21 +65,15 @@ async function getRegistryFromFile(paths: string[], scope: string | null) {
 returnnull
 }
 
-asyncfunctiongetRegistry(scope: string|null): Promise<string>{
+asyncfunctiongetRegistry(scope: string|null,cwd: string): Promise<string>{
 if(process.env.COREPACK_NPM_REGISTRY){
 returnprocess.env.COREPACK_NPM_REGISTRY
 }
-constregistry=awaitgetRegistryFromFile(getNpmrcPaths(),scope)
-
-if(registry){
-process.env.COREPACK_NPM_REGISTRY=registry
-}
-
-returnregistry||'https://registry.npmjs.org'
+returnawaitgetRegistryFromFile(getNpmrcPaths(cwd),scope)||'https://registry.npmjs.org'
 }
 
-asyncfunctiongetAuthToken(registry: RegistryMeta['registry']): Promise<RegistryMeta['authToken']>{
-constpaths=getNpmrcPaths()
+asyncfunctiongetAuthToken(registry: RegistryMeta['registry'],cwd: string): Promise<RegistryMeta['authToken']>{
+constpaths=getNpmrcPaths(cwd)
 constregistryHost=registry.replace(PROTOCOL_RE,'').replace(TRAILING_SLASH_RE,'')
 constauthTokenKey=`//${registryHost}/:_authToken`
 
@@ -111,9 +102,9 @@ async function getAuthToken(registry: RegistryMeta['registry']): Promise<Registr
 returnnull
 }
 
-exportasyncfunctiondetectNpmRegistry(scope: string|null): Promise<RegistryMeta>{
-constregistry=awaitgetRegistry(scope)
-constauthToken=awaitgetAuthToken(registry)
+exportasyncfunctiondetectNpmRegistry(scope: string|null,cwd=process.cwd()): Promise<RegistryMeta>{
+constregistry=awaitgetRegistry(scope,cwd)
+constauthToken=awaitgetAuthToken(registry,cwd)
 
 return{
  registry,

packages/nuxt-cli/test/unit/commands/add.spec.ts

@@ -193,7 +193,7 @@ describe('nuxt add command', () => {
 )
 })
 
-it('should install multiple modules',async()=>{
+it('should install multiple modules with one modules database request',async()=>{
 constaddCommand=await(commandsasCommandsType).subCommands.add()
 
 awaitaddCommand.setup({
@@ -203,6 +203,7 @@ describe('nuxt add command', () => {
 },
 })
 
+expect(utils.fetchModules).toHaveBeenCalledTimes(1)
 expect(runInstall).toHaveBeenCalledWith(
 expect.objectContaining({
 cwd: '/fake-dir',
@@ -214,6 +215,17 @@ describe('nuxt add command', () => {
 )
 })
 
+it('should resolve duplicate modules once',async()=>{
+constaddCommand=await(commandsasCommandsType).subCommands.add()
+
+awaitaddCommand.setup({args: {cwd: '/fake-dir',_: ['ui','ui']}})
+
+expect(mock$fetch).toHaveBeenCalledTimes(1)
+expect(runInstall).toHaveBeenCalledWith(expect.objectContaining({
+dependencies: ['@nuxt/ui@3.0.0'],
+}))
+})
+
 it('should skip installation when skipInstall is true',async()=>{
 constaddCommand=await(commandsasCommandsType).subCommands.add()
 

packages/nuxt-cli/test/unit/utils/registry.spec.ts

@@ -1,5 +1,15 @@
-import{describe,expect,it}from'vitest'
-import{getRegistryFromContent}from'../../../src/utils/registry'
+import{mkdtemp,rm,writeFile}from'node:fs/promises'
+import{tmpdir}from'node:os'
+import{join}from'node:path'
+importprocessfrom'node:process'
+import{afterEach,describe,expect,it}from'vitest'
+import{detectNpmRegistry,getRegistryFromContent}from'../../../src/utils/registry'
+
+constdirectories: string[]=[]
+
+afterEach(async()=>{
+awaitPromise.all(directories.splice(0).map(directory=>rm(directory,{recursive: true,force: true})))
+})
 
 describe('getRegistryFromContent',()=>{
 it('extracts scoped registry when scope is provided',()=>{
@@ -56,3 +66,20 @@ registry=https://registry.npmjs.org/ # with comment
 expect(getRegistryFromContent(content,'@myorg')).toBe('https://my-registry.org/')
 })
 })
+
+describe('detectNpmRegistry',()=>{
+it('reads registry and credentials from the project directory',async()=>{
+constdirectory=awaitmkdtemp(join(tmpdir(),'nuxt-registry-'))
+directories.push(directory)
+awaitwriteFile(join(directory,'.npmrc'),[
+'registry=https://registry.example.com/',
+'//registry.example.com/:_authToken=secret',
+].join('\n'))
+
+awaitexpect(detectNpmRegistry(null,directory)).resolves.toEqual({
+registry: 'https://registry.example.com/',
+authToken: 'secret',
+})
+expect(process.env.COREPACK_NPM_REGISTRY).toBeUndefined()
+})
+})