chore: Extending "@guardian/tsconfig" in tsconfig (#838)

* Update tsconfig * Using "@guardian/tsconfig" * Update getConsentState.ts * Update .gitignore * Changed rootDir * Installed @guardian/tsconfig * Installed @guardian/tsconfig in cdk * Using "@guardian/tsconfig" in monitoring * Update tsconfig.json * Updated tsconfig.json * Remove module or target * Update tsconfig to use ES2020 * Reverting to use guardian/tsconfig * Update tsconfig.json * USing Common JS * Create calm-foxes-happen.md * Removed omment
guardian · Nov 8, 2023 · 6d390ce · 6d390ce · github-actions · Nov 8, 2023
1 parent 6738e64
commit 6d390ce
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 21 deletions.
diff --git a/.changeset/calm-foxes-happen.md b/.changeset/calm-foxes-happen.md
@@ -0,0 +1,5 @@
+---
+'@guardian/consent-management-platform': patch
+---
+
+Updating TS Config.json (Patching to test changeset)
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,9 @@ dist
 /coverage
 .idea/
 test-page/dist
+tsconfig.build.tsbuildinfo
+tsconfig.tsbuildinfo
+.rollup.cache
 
 # Cypress Tests
 cypress/dist

diff --git a/cdk/package.json b/cdk/package.json
@@ -19,6 +19,7 @@
 	"devDependencies": {
 		"@guardian/eslint-config-typescript": "^6.0.1",
 		"@guardian/prettier": "^4.0.0",
+		"@guardian/tsconfig": "^0.2.0",
 		"@types/jest": "^29.5.3",
 		"@types/node": "20.4.2",
 		"aws-cdk": "2.87.0",

diff --git a/cdk/tsconfig.json b/cdk/tsconfig.json
@@ -1,31 +1,29 @@
 {
+	"extends": "@guardian/tsconfig",
 	"ts-node": {
 		"compilerOptions": {
 			"module": "CommonJS"
 		}
 	},
 	"compilerOptions": {
-		"target": "ES2020",
-		"module": "ES2020",
-		"moduleResolution": "node",
 		"lib": ["ES2020"],
 		"declaration": true,
-		"strict": true,
 		"noImplicitAny": true,
 		"strictNullChecks": true,
-		"esModuleInterop": true,
 		"noImplicitThis": true,
 		"alwaysStrict": true,
-		"noUnusedLocals": false,
 		"noUnusedParameters": false,
-		"noImplicitReturns": true,
 		"noFallthroughCasesInSwitch": false,
 		"inlineSourceMap": true,
 		"inlineSources": true,
 		"experimentalDecorators": true,
 		"strictPropertyInitialization": false,
 		"typeRoots": ["./node_modules/@types"],
-		"outDir": "dist"
+		"outDir": "dist",
+		"allowJs": true,
+		"isolatedModules": true,
+		"noEmit": true,
+		"removeComments": true,
 	},
 	"include": ["lib/**/*", "bin/**/*"],
 	"exclude": [

diff --git a/cdk/yarn.lock b/cdk/yarn.lock
@@ -469,6 +469,11 @@
   resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-4.0.0.tgz#1ad1d7d079194937bfd0107789dde7b0fb84fa11"
   integrity sha512-JvvnDnI04NcmpuD2mF5ZXTWI7tand1pj1s33fh4JxHNAV00QXwTWZBI2/QWS3ck7KjpYjpRaz8CDUcMz35hReg==
 
+"@guardian/tsconfig@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.2.0.tgz#b1dac8831d2ff7ac557229f350d4b2f8c9fc60b5"
+  integrity sha512-RauppalK+cQZDRK6IssVmDSnU/VyqMNuVOxPxhmI03kVRxEdwcmBuRqexHwDbnClVUxW/N9hYLbFNuAb9V/p+A==
+
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"

diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -1,11 +1,10 @@
 {
+	"extends": "@guardian/tsconfig",
 	"compilerOptions": {
 		"esModuleInterop": true,
 		"lib": ["ES2019", "DOM"],
 		"module": "commonjs",
 		"noEmit": true,
-		// https://github.com/cypress-io/cypress/issues/9298
-		"target": "ES2019",
 		"types": ["node", "cypress"],
 		"skipLibCheck": true,
 		"strict": true,

diff --git a/monitoring/package.json b/monitoring/package.json
@@ -27,6 +27,7 @@
 		"@aws-sdk/client-lambda": "^3.369.0",
 		"@guardian/eslint-config-typescript": "^6.0.1",
 		"@guardian/prettier": "^4.0.0",
+		"@guardian/tsconfig": "^0.2.0",
 		"@tsconfig/node18": "^18.2.0",
 		"@types/aws-lambda": "^8.10.119",
 		"@types/inquirer": "^8.2.3",

diff --git a/monitoring/src/check-page/common-functions.ts b/monitoring/src/check-page/common-functions.ts
@@ -239,6 +239,8 @@ export const checkCMPIsNotVisible = async (page: Page): Promise<void> => {
 			const computedStyle = window.getComputedStyle(element);
 			return computedStyle.getPropertyValue('display');
 		}
+
+		return null;
 	};
 
 	const display = await page.evaluate(

diff --git a/monitoring/tsconfig.json b/monitoring/tsconfig.json
@@ -1,9 +1,8 @@
 {
-	"extends": "@tsconfig/node18/tsconfig.json",
+	"extends": "@guardian/tsconfig",
 	"include": ["./*.ts"],
-	"target": "es5",
 	"compilerOptions": {
-		"lib": ["DOM", "es2019"],
-		"moduleResolution": "node"
+		"moduleResolution": "node",
+		"module": "commonjs",
 	}
 }
diff --git a/monitoring/yarn.lock b/monitoring/yarn.lock
@@ -894,6 +894,11 @@
   resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-4.0.0.tgz#1ad1d7d079194937bfd0107789dde7b0fb84fa11"
   integrity sha512-JvvnDnI04NcmpuD2mF5ZXTWI7tand1pj1s33fh4JxHNAV00QXwTWZBI2/QWS3ck7KjpYjpRaz8CDUcMz35hReg==
 
+"@guardian/tsconfig@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.2.0.tgz#b1dac8831d2ff7ac557229f350d4b2f8c9fc60b5"
+  integrity sha512-RauppalK+cQZDRK6IssVmDSnU/VyqMNuVOxPxhmI03kVRxEdwcmBuRqexHwDbnClVUxW/N9hYLbFNuAb9V/p+A==
+
 "@hapi/hoek@^9.0.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"

diff --git a/package.json b/package.json
@@ -52,6 +52,7 @@
 		"@guardian/libs": "15.0.0",
 		"@guardian/node-riffraff-artifact": "^0.3.2",
 		"@guardian/prettier": "^4.0.0",
+		"@guardian/tsconfig": "^0.2.0",
 		"@rollup/plugin-babel": "^6.0.3",
 		"@rollup/plugin-commonjs": "^25.0.1",
 		"@rollup/plugin-html": "^1.0.2",

diff --git a/src/tcfv2/getConsentState.ts b/src/tcfv2/getConsentState.ts
@@ -38,7 +38,7 @@ export const getConsentState: () => Promise<TCFv2ConsentState> = async () => {
 
 	const vendorConsents: TCFv2ConsentList = Object.keys(grants)
 		.sort()
-		.reduce((acc, cur) => ({ ...acc, [cur]: grants[cur].vendorGrant }), {});
+		.reduce((acc, cur) => ({ ...acc, [cur]: grants[cur]?.vendorGrant }), {});
 
 	return {
 		consents,

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -5,7 +5,7 @@
 		"emitDeclarationOnly": true,
 		"noEmit": false,
 		"outDir": "dist",
-		"rootDir": "src"
+		"rootDir": "./"
 	},
 	"files": ["src/index.ts"],
 	"include": ["src"]

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,10 @@
 {
+	"extends": "@guardian/tsconfig",
 	"compilerOptions": {
 		"allowJs": true,
-		"esModuleInterop": true,
 		"isolatedModules": true,
-		"module": "ES6",
-		"moduleResolution": "node",
 		"noEmit": true,
 		"removeComments": true,
-		"strict": true,
-		"target": "ES2020"
 	},
 	"include": ["*.js", "src", ".eslintrc.js"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1535,6 +1535,11 @@
   resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-4.0.0.tgz#1ad1d7d079194937bfd0107789dde7b0fb84fa11"
   integrity sha512-JvvnDnI04NcmpuD2mF5ZXTWI7tand1pj1s33fh4JxHNAV00QXwTWZBI2/QWS3ck7KjpYjpRaz8CDUcMz35hReg==
 
+"@guardian/tsconfig@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.2.0.tgz#b1dac8831d2ff7ac557229f350d4b2f8c9fc60b5"
+  integrity sha512-RauppalK+cQZDRK6IssVmDSnU/VyqMNuVOxPxhmI03kVRxEdwcmBuRqexHwDbnClVUxW/N9hYLbFNuAb9V/p+A==
+
 "@hapi/hoek@^9.0.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
St.^❔	Category	Percentage	Covered / Total
🟢	Statements	92.45%	245/265
🟢	Branches	83.19%	94/113
🟢	Functions	90%	63/70
🟢	Lines	92.19%	236/256