Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

fix: exclude tailwind package when installing integration ()

Browse source 
* fix: exclude tailwind package when installing integration

* Update .changeset/green-sloths-switch.md

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
This commit is contained in:
Matt Kane 2025-01-31 10:32:14 +00:00 • committed by GitHub
parent 3b10b97a4f
commit 187c4d3244
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 7 deletions
.changeset
green-sloths-switch.md
packages/astro/src/cli/add
index.ts

5
.changeset/green-sloths-switch.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes a bug that caused peer dependency errors when running `astro add tailwind`

22
packages/astro/src/cli/add/index.ts
View file

@ -40,6 +40,7 @@ interface AddOptions {
interface IntegrationInfo {
id: string;
packageName: string;
integrationName: string;
dependencies: [name: string, version: string][];
type: 'integration' | 'adapter';
}
@ -283,7 +284,7 @@ export async function add(names: string[], { flags }: AddOptions) {
'SKIP_FORMAT',
`\n ${magenta(
`Check our deployment docs for ${bold(
integration.packageName,
integration.integrationName,
)} to update your "adapter" config.`,
)}`,
);
@ -349,7 +350,9 @@ export async function add(names: string[], { flags }: AddOptions) {
case UpdateResult.failure:
case UpdateResult.updated:
case undefined: {
const list = integrations.map((integration) => ` - ${integration.packageName}`).join('\n');
const list = integrations
.map((integration) => ` - ${integration.integrationName}`)
.join('\n');
logger.info(
'SKIP_FORMAT',
msg.success(
@ -618,8 +621,7 @@ async function convertIntegrationsToInstallSpecifiers(
integrations: IntegrationInfo[],
): Promise<string[]> {
const ranges: Record<string, string> = {};
for (let { packageName, dependencies } of integrations) {
ranges[packageName] = '*';
for (let { dependencies } of integrations) {
for (const [name, range] of dependencies) {
ranges[name] = range;
}
@ -790,7 +792,7 @@ async function validateIntegrations(integrations: string[]): Promise<Integration
const resolvedScope = pkgType === 'first-party' ? '@astrojs' : scope;
const packageName = `${resolvedScope ? `${resolvedScope}/` : ''}${name}`;
let integrationName = packageName;
let dependencies: IntegrationInfo['dependencies'] = [
[pkgJson['name'], `^${pkgJson['version']}`],
];
@ -823,13 +825,19 @@ async function validateIntegrations(integrations: string[]): Promise<Integration
}
if (integration === 'tailwind') {
integrationName = 'tailwind';
dependencies = [
['@tailwindcss/vite', '^4.0.0'],
['tailwindcss', '^4.0.0'],
];
}
return { id: integration, packageName, dependencies, type: integrationType };
return {
id: integration,
packageName,
dependencies,
type: integrationType,
integrationName,
};
}),
);
spinner.success();