michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix astro add adding lines from extended configurations (#5095)

Browse source
This commit is contained in:
Erika 2022-10-14 15:16:41 -03:00 committed by GitHub
parent 0173c2b2df
commit ddfbef5acb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/gorgeous-baboons-sleep.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix `astro add` trying to add lines from extended configurations when adding frameworks

5
.changeset/neat-phones-sin.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/react': patch
---
Add `@types/` packages as peerDependencies

2
packages/astro/src/core/config/tsconfig.ts
View file

@ -56,6 +56,7 @@ export function loadTSConfig(cwd: string | undefined, resolve = true): tsr.TsCon
let config = tsr.tsconfigResolverSync({
cwd,
filePath: resolve ? undefined : cwd,
ignoreExtends: !resolve,
});
// When a direct filepath is provided to `tsconfigResolver`, it'll instead return invalid-config even when
@ -70,6 +71,7 @@ export function loadTSConfig(cwd: string | undefined, resolve = true): tsr.TsCon
cwd,
filePath: resolve ? undefined : cwd,
searchName: 'jsconfig.json',
ignoreExtends: !resolve,
});
if (

3
packages/integrations/react/package.json
View file

@ -48,7 +48,8 @@
"peerDependencies": {
"react": "^17.0.2 || ^18.0.0",
"react-dom": "^17.0.2 || ^18.0.0",
"@types/react": "^17.0.50 || ^18.0.21"
"@types/react": "^17.0.50 || ^18.0.21",
"@types/react-dom": "^17.0.17 || ^18.0.6"
},
"engines": {
"node": "^14.18.0 || >=16.12.0"