-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Support flags for astro add
#8032
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4e0f0dd
astro add cli pass down arguments to install cmd
Elod-T 0a2f550
add changeset
Elod-T 404019f
feat: pass common flags down to install command
natemoo-re 90318ad
Update .changeset/soft-colts-heal.md
natemoo-re c763daf
Merge branch 'main' into feat/add-flags
natemoo-re 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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'astro': patch | ||
--- | ||
|
||
`astro add` now passes down `--save-prod`, `--save-dev`, `--save-exact`, and `--no-save` flags for installation |
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 |
---|---|---|
|
@@ -634,6 +634,15 @@ async function getInstallIntegrationsCommand({ | |
} | ||
} | ||
|
||
// Allow forwarding of standard `npm install` flags | ||
// See https://docs.npmjs.com/cli/v8/commands/npm-install#description | ||
const INHERITED_FLAGS = new Set<string>([ | ||
"P", "save-prod", | ||
"D", "save-dev", | ||
"E", "save-exact", | ||
"no-save", | ||
]) | ||
|
||
async function tryToInstallIntegrations({ | ||
integrations, | ||
cwd, | ||
|
@@ -647,12 +656,24 @@ async function tryToInstallIntegrations({ | |
}): Promise<UpdateResult> { | ||
const installCommand = await getInstallIntegrationsCommand({ integrations, cwd }); | ||
|
||
const inheritedFlags = Object.entries(flags) | ||
.map(([flag]) => { | ||
if (flag == '_') return; | ||
if (INHERITED_FLAGS.has(flag)) { | ||
if (flag.length === 1) return `-${flag}`; | ||
return `--${flag}`; | ||
} | ||
}) | ||
.filter(Boolean) | ||
.flat() as string[]; | ||
|
||
if (installCommand === null) { | ||
return UpdateResult.none; | ||
} else { | ||
const coloredOutput = `${bold(installCommand.pm)} ${installCommand.command}${[ | ||
'', | ||
...installCommand.flags, | ||
...inheritedFlags | ||
].join(' ')} ${cyan(installCommand.dependencies.join(' '))}`; | ||
const message = `\n${boxen(coloredOutput, { | ||
margin: 0.5, | ||
|
@@ -672,14 +693,15 @@ async function tryToInstallIntegrations({ | |
try { | ||
await execa( | ||
installCommand.pm, | ||
[installCommand.command, ...installCommand.flags, ...installCommand.dependencies], | ||
[installCommand.command, ...installCommand.flags, ...inheritedFlags, ...installCommand.dependencies], | ||
{ cwd } | ||
); | ||
spinner.succeed(); | ||
return UpdateResult.updated; | ||
} catch (err) { | ||
debug('add', 'Error installing dependencies', err); | ||
spinner.fail(); | ||
debug('add', 'Error installing dependencies', err); | ||
console.error('\n', (err as any).stdout, '\n'); | ||
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. Added an error log here since the installation step can fail silently. |
||
return UpdateResult.failure; | ||
} | ||
} else { | ||
|
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.
Scoped these commands down to a hard-coded list!