Skip to content

Commit

Permalink
deps: @npmcli/config@2.3.2
Browse files Browse the repository at this point in the history
  * fix: always load localPrefix

PR-URL: #4102
Credit: @wraithgar
Close: #4102
Reviewed-by: @lukekarrys
  • Loading branch information
wraithgar committed Nov 30, 2021
1 parent a8bc95f commit 0e63df6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
8 changes: 5 additions & 3 deletions node_modules/@npmcli/config/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -497,15 +497,17 @@ class Config {
}

async loadProjectConfig () {
// the localPrefix can be set by the CLI config, but otherwise is
// found by walking up the folder tree. either way, we load it before
// we return to make sure localPrefix is set
await this.loadLocalPrefix()

if (this[_get]('global') === true || this[_get]('location') === 'global') {
this.data.get('project').source = '(global mode enabled, ignored)'
this.sources.set(this.data.get('project').source, 'project')
return
}

// the localPrefix can be set by the CLI config, but otherwise is
// found by walking up the folder tree
await this.loadLocalPrefix()
const projectFile = resolve(this.localPrefix, '.npmrc')
// if we're in the ~ directory, and there happens to be a node_modules
// folder (which is not TOO uncommon, it turns out), then we can end
Expand Down
2 changes: 1 addition & 1 deletion node_modules/@npmcli/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/config",
"version": "2.3.1",
"version": "2.3.2",
"files": [
"lib"
],
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/arborist": "^4.0.5",
"@npmcli/ci-detect": "^1.4.0",
"@npmcli/config": "^2.3.0",
"@npmcli/config": "^2.3.2",
"@npmcli/map-workspaces": "^2.0.0",
"@npmcli/package-json": "^1.0.1",
"@npmcli/run-script": "^2.0.0",
Expand Down Expand Up @@ -851,9 +851,9 @@
"inBundle": true
},
"node_modules/@npmcli/config": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@npmcli/config/-/config-2.3.1.tgz",
"integrity": "sha512-F/8R/Zqun8682TgaCILUNoaVfd1LVaYZ/jcVt9KWzfKpzcPus1zEApAl54PqVqVJbNq6f01QTDQHD6L/n56BXw==",
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@npmcli/config/-/config-2.3.2.tgz",
"integrity": "sha512-2/9dj143BFgQR8qxJbYptd8k+4+Po2uHYq3H6498ynZcRu4LrsDlngov5HGrvo2+f0pe0fBJwDEP2rRtaW8bkw==",
"inBundle": true,
"dependencies": {
"ini": "^2.0.0",
Expand Down Expand Up @@ -10727,9 +10727,9 @@
"integrity": "sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="
},
"@npmcli/config": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@npmcli/config/-/config-2.3.1.tgz",
"integrity": "sha512-F/8R/Zqun8682TgaCILUNoaVfd1LVaYZ/jcVt9KWzfKpzcPus1zEApAl54PqVqVJbNq6f01QTDQHD6L/n56BXw==",
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@npmcli/config/-/config-2.3.2.tgz",
"integrity": "sha512-2/9dj143BFgQR8qxJbYptd8k+4+Po2uHYq3H6498ynZcRu4LrsDlngov5HGrvo2+f0pe0fBJwDEP2rRtaW8bkw==",
"requires": {
"ini": "^2.0.0",
"mkdirp-infer-owner": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/arborist": "^4.0.5",
"@npmcli/ci-detect": "^1.4.0",
"@npmcli/config": "^2.3.0",
"@npmcli/config": "^2.3.2",
"@npmcli/map-workspaces": "^2.0.0",
"@npmcli/package-json": "^1.0.1",
"@npmcli/run-script": "^2.0.0",
Expand Down

0 comments on commit 0e63df6

Please sign in to comment.