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

withastro · Oct 14, 2022 · ddfbef5 · ddfbef5
1 parent 0173c2b
commit ddfbef5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.changeset/gorgeous-baboons-sleep.md b/.changeset/gorgeous-baboons-sleep.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix `astro add` trying to add lines from extended configurations when adding frameworks
diff --git a/.changeset/neat-phones-sin.md b/.changeset/neat-phones-sin.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/react': patch
+---
+
+Add `@types/` packages as peerDependencies
diff --git a/packages/astro/src/core/config/tsconfig.ts b/packages/astro/src/core/config/tsconfig.ts
@@ -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 (

diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
@@ -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"