Merge remote-tracking branch 'origin/trunk' into update/convert-e2e-t…

…ests-to-esm
Automattic · Nov 2, 2023 · b2c3668 · b2c3668
2 parents 9363fc5 + ce1e346
commit b2c3668
Show file tree

Hide file tree

Showing 289 changed files with 3,054 additions and 2,299 deletions.
diff --git a/.github/files/lint-project-structure.sh b/.github/files/lint-project-structure.sh
@@ -200,6 +200,14 @@ for PROJECT in projects/*/*; do
 		fi
 	fi
 
+	# Should have only one of jsconfig.json or tsconfig.json.
+	# @todo Having neither is ok in some cases. Can we determine when one is needed to flag that it should be added?
+	if [[ -e "$PROJECT/jsconfig.json" && -e "$PROJECT/tsconfig.json" ]]; then
+		EXIT=1
+		echo "::error file=$PROJECT/jsconfig.json::The project should have either jsconfig.json or tsconfig.json, not both. Keep tsconfig if the project uses TypeScript, or jsconfig if the project is JS-only."
+		echo "::error file=$PROJECT/tsconfig.json::The project should have either jsconfig.json or tsconfig.json, not both. Keep tsconfig if the project uses TypeScript, or jsconfig if the project is JS-only."
+	fi
+
 	# - composer.json must exist.
 	if [[ ! -e "$PROJECT/composer.json" ]]; then
 		EXIT=1