chore(repo): refactor tsconfig hierarchy

- move the base tsconfig into the root of the workspace - unifying tsconfig tsconfig.build tsconfig.test and tsconfig.watch settings
jacoblogan · Jan 31, 2024 · fa0423d · fa0423d
1 parent e20782e
commit fa0423d
Show file tree

Hide file tree

Showing 80 changed files with 288 additions and 232 deletions.
diff --git a/packages/adapter-nextjs/package.json b/packages/adapter-nextjs/package.json
@@ -61,9 +61,9 @@
 	"scripts": {
 		"build": "npm run clean && npm run build:esm-cjs",
 		"build-with-test": "npm test && npm run build",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"clean": "npm run clean:size && rimraf dist",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",

diff --git a/packages/adapter-nextjs/rollup.config.mjs b/packages/adapter-nextjs/rollup.config.mjs
@@ -18,23 +18,13 @@ const config = defineConfig([
 	{
 		input: input,
 		output: cjsOutput,
-		plugins: [
-			typescript({
-				...cjsTSOptions,
-				tsconfig: 'tsconfig.build.json',
-			}),
-		],
+		plugins: [typescript(cjsTSOptions)],
 	},
 	// ESM config
 	{
 		input: input,
 		output: esmOutput,
-		plugins: [
-			typescript({
-				...esmTSOptions,
-				tsconfig: 'tsconfig.build.json',
-			}),
-		],
+		plugins: [typescript(esmTSOptions)],
 	},
 ]);
 

diff --git a/packages/adapter-nextjs/tsconfig.build.json b/packages/adapter-nextjs/tsconfig.build.json
@@ -1,8 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["./src"]
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
 }
diff --git a/packages/adapter-nextjs/tsconfig.json b/packages/adapter-nextjs/tsconfig.json
@@ -1,21 +1,8 @@
-//WARNING: If you are manually specifying files to compile then the tsconfig.json is completely ignored, you must use command line flags
 {
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"allowSyntheticDefaultImports": true,
-		"target": "es2020",
-		"noImplicitAny": true,
-		"lib": ["dom", "es2019", "esnext.asynciterable"],
-		"module": "commonjs",
-		"moduleResolution": "node",
-		"allowJs": true,
-		"declaration": true,
-		"typeRoots": ["./node_modules/@types", "../../node_modules/@types"],
-		"types": ["node"],
-		"esModuleInterop": true,
-		"resolveJsonModule": true,
-		"strict": true,
 		"alwaysStrict": true
 	},
-	"include": ["src/**/*"],
-	"exclude": ["src/setupTests.ts"]
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/adapter-nextjs/tsconfig.test.json b/packages/adapter-nextjs/tsconfig.test.json
@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -16,14 +16,14 @@
 		"build-with-test": "npm run clean && npm run test && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 71.4"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 71.4"
 	},
 	"typesVersions": {
 		">=4.2": {

diff --git a/packages/analytics/tsconfig.build.json b/packages/analytics/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/analytics/tsconfig.json b/packages/analytics/tsconfig.json
@@ -1,9 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"importHelpers": true,
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["./src", "../core/src/utils/haveCredentialsChanged.ts"]
+	"extends": "../../tsconfig.json",
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/analytics/tsconfig.test.json b/packages/analytics/tsconfig.test.json
@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}
diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -19,14 +19,14 @@
 		"build-with-test": "npm test && npm build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 70.0"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 70.0"
 	},
 	"exports": {
 		".": {

diff --git a/packages/api-graphql/tsconfig.build.json b/packages/api-graphql/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/api-graphql/tsconfig.json b/packages/api-graphql/tsconfig.json
@@ -1,11 +1,7 @@
 {
-	"extends": "../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
-		"importHelpers": true,
-		"strict": true,
-		"noImplicitAny": true,
-		"strictNullChecks": true,
-		"skipLibCheck": true
+		"strictNullChecks": true
 	},
-	"include": ["./src"]
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/api-graphql/tsconfig.test.json b/packages/api-graphql/tsconfig.test.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		// TODO(test): enable noImplicitAny for tests
+		"noImplicitAny": false
+	}
+}
diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -16,14 +16,14 @@
 		"build-with-test": "npm test && npm build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 70.0"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 70.0"
 	},
 	"exports": {
 		".": {

diff --git a/packages/api-rest/tsconfig.build.json b/packages/api-rest/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/api-rest/tsconfig.json b/packages/api-rest/tsconfig.json
@@ -1,9 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"importHelpers": true,
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["./src"]
+	"extends": "../../tsconfig.json",
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/api-rest/tsconfig.test.json b/packages/api-rest/tsconfig.test.json
@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -18,14 +18,14 @@
 		"build-with-test": "npm test && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 88"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88"
 	},
 	"exports": {
 		".": {

diff --git a/packages/api/tsconfig.build.json b/packages/api/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "__mocks__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
@@ -1,11 +1,7 @@
 {
-	"extends": "../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
-		"importHelpers": true,
-		"strict": true,
-		"noImplicitAny": true,
-		"strictNullChecks": true,
-		"skipLibCheck": true
+		"strictNullChecks": true
 	},
-	"include": ["./src"]
+	"include": ["./src", "__tests__", "__mocks__"]
 }
diff --git a/packages/api/tsconfig.test.json b/packages/api/tsconfig.test.json
@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -20,14 +20,14 @@
 		"build-with-test": "npm test && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "npm run clean:size && rimraf lib-esm lib dist",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint '{src}/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 91.18"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 91.18"
 	},
 	"typesVersions": {
 		">=4.2": {

diff --git a/packages/auth/tsconfig.build.json b/packages/auth/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json
@@ -1,10 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"importHelpers": true,
-		"types": ["jest", "node"],
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["src"]
+	"extends": "../../tsconfig.json",
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/auth/tsconfig.test.json b/packages/auth/tsconfig.test.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		// TODO(test): enable noImplicitAny for tests
+		"noImplicitAny": false
+	}
+}
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -240,15 +240,15 @@
 		"build-with-test": "npm run clean && npm test && tsc && webpack -p",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m es6 --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m es6 --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "rimraf lib-esm lib dist",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"generate-docs-local": "typedoc --out docs src",
 		"generate-docs-root": "typedoc --out ../../docs src",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 93.26"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 93.26"
 	},
 	"repository": {
 		"type": "git",

diff --git a/packages/aws-amplify/tsconfig.build.json b/packages/aws-amplify/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/aws-amplify/tsconfig.json b/packages/aws-amplify/tsconfig.json
@@ -1,8 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["./src"]
+	"extends": "../../tsconfig.json",
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/aws-amplify/tsconfig.test.json b/packages/aws-amplify/tsconfig.test.json
@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -21,16 +21,16 @@
 		"build-with-test": "npm test && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run generate-version && npm run build:esm-cjs && npm run build:umd",
 		"generate-version": "genversion src/Platform/version.ts --es6 --semi --source ../aws-amplify",
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"prepublishOnly": "npm run build",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 92.36"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 92.36"
 	},
 	"repository": {
 		"type": "git",

diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "coverage", "coverage-ts", "dist"]
+}
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -1,12 +1,4 @@
 {
-	"extends": "../tsconfig.base.json",
-	"compilerOptions": {
-		"importHelpers": false,
-		"strict": true,
-		"noImplicitAny": true
-	},
-	"include": ["./src"],
-	"watchOptions": {
-		"excludeDirectories": ["lib*"]
-	}
+	"extends": "../../tsconfig.json",
+	"include": ["./src", "__tests__"]
 }
diff --git a/packages/core/tsconfig.test.json b/packages/core/tsconfig.test.json
@@ -0,0 +1,8 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		// TODO(test): enable noImplicitAny for tests
+		"noImplicitAny": false,
+		"types": ["node", "jest", "jsdom"]
+	}
+}
diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json
@@ -14,13 +14,13 @@
 		"build-with-test": "npm test && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
-		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -p tsconfig.watch.json -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -p tsconfig.watch.json -m esnext --outDir dist/esm --watch",
 		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
 		"clean": "rimraf dist lib lib-esm",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint '{__tests__,src}/**/*.ts'  && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 94.16"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 94.16"
 	},
 	"repository": {
 		"type": "git",

diff --git a/packages/datastore-storage-adapter/tsconfig.build.json b/packages/datastore-storage-adapter/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["__tests__", "ExpoSQLiteAdapter", "SQLiteAdapter"]
+}