-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow token replacement of .npmrc configuration with env vars #1207
Merged
Merged
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
29e9ad4
test IGNORE ME
Daniel15 2614029
Update npm-registry to inject env vars into npm configuration the sam…
darthtrevino d0e71d0
Add type annotation to config object iteration
darthtrevino 8470b43
Merge branch 'master' into 1206_npm_env_vars
darthtrevino 36ebff6
Merge branch 'master' into 1206_npm_env_vars
darthtrevino 936b403
Merge branch 'master' into 1206_npm_env_vars
darthtrevino 85e6c44
Merge remote-tracking branch 'origin/Daniel15-patch-1' into 1206_npm_…
darthtrevino 8edfb68
Merge branch 'master' into 1206_npm_env_vars
darthtrevino 123ddaa
Update envReplace function
darthtrevino b3bd853
Merge branch '1206_npm_env_vars' of github.com:darthtrevino/yarn into…
darthtrevino 2edadcc
Move env-replace function to a separate util module. Add unit tests
darthtrevino 89e5729
Correct the env-replace tests
darthtrevino c452e21
Updates per @kittens' comments
darthtrevino fc30d3a
Merge in master branch
darthtrevino 77042e5
Merge branch 'master' into 1206_npm_env_vars
darthtrevino 2e175a0
Merge branch 'master' into 1206_npm_env_vars
darthtrevino File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,6 +36,24 @@ function getGlobalPrefix(): string { | |
} | ||
} | ||
|
||
function envReplace(f: string): string { | ||
if (typeof f !== 'string' || !f) { | ||
return f; | ||
} | ||
|
||
const envExpr = /(\\*)\$\{([^}]+)\}/g; | ||
return f.replace(envExpr, (orig, esc, name) => { | ||
esc = esc.length && esc.length % 2; | ||
if (esc) { | ||
return orig; | ||
} | ||
if (undefined === process.env[name]) { | ||
throw new Error('Failed to replace env in config: ' + orig); | ||
} | ||
return process.env[name] || ''; | ||
}); | ||
} | ||
|
||
export default class NpmRegistry extends Registry { | ||
constructor(cwd: string, registries: ConfigRegistries, requestManager: RequestManager) { | ||
super(cwd, registries, requestManager); | ||
|
@@ -118,6 +136,9 @@ export default class NpmRegistry extends Registry { | |
|
||
for (const [, loc, file] of await this.getPossibleConfigLocations('.npmrc')) { | ||
const config = ini.parse(file); | ||
Object.keys(config).forEach((key: string) => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use |
||
config[key] = envReplace(config[key]); | ||
}); | ||
|
||
// normalize offline mirror path relative to the current npmrc | ||
const offlineLoc = config['yarn-offline-mirror']; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be more descriptive variable here than
f
.