From a4e7fb1f416694fc875d9bfbf90aa6a6f0569131 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 1 Apr 2020 14:59:02 +0100 Subject: [PATCH 1/4] Fix the TS used for the GB-Mobile project. Make sure only types inside node_modules/@types are used. This avoids TS to find the ../node_modules/@types inside the gb-mobile repo that lives one path level up of gutenberg root. --- tsconfig.base.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index 8ee1f8b3d415b..b7e538e3faa14 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -29,7 +29,9 @@ /* This needs to be false so our types are possible to consume without setting this */ "esModuleInterop": false, - "resolveJsonModule": true + "resolveJsonModule": true, + + "typeRoots":["./node_modules/@types"] }, "exclude": [ "**/benchmark", "**/test/**", "**/build/**", "**/build-*/**" ] } From 064864b653b2115e38991e68b339042c95732891 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 1 Apr 2020 17:53:12 -0400 Subject: [PATCH 2/4] Framework: Fix configuration spacing --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index b7e538e3faa14..e17cd0ff564d8 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -31,7 +31,7 @@ "esModuleInterop": false, "resolveJsonModule": true, - "typeRoots":["./node_modules/@types"] + "typeRoots": [ "./node_modules/@types" ] }, "exclude": [ "**/benchmark", "**/test/**", "**/build/**", "**/build-*/**" ] } From bfb8b7b3efb74c82bbdb8445d3afce3b8c2a3062 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 2 Apr 2020 00:11:05 +0100 Subject: [PATCH 3/4] Change to types node. --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index e17cd0ff564d8..80c96a592d1aa 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -31,7 +31,7 @@ "esModuleInterop": false, "resolveJsonModule": true, - "typeRoots": [ "./node_modules/@types" ] + "types": [ "node" ] }, "exclude": [ "**/benchmark", "**/test/**", "**/build/**", "**/build-*/**" ] } From cb72c984f574a59f2bb66f5897c60f9d26a13703 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 2 Apr 2020 14:18:31 +0100 Subject: [PATCH 4/4] Revert "Change to types node." This reverts commit bfb8b7b3efb74c82bbdb8445d3afce3b8c2a3062. --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index 80c96a592d1aa..e17cd0ff564d8 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -31,7 +31,7 @@ "esModuleInterop": false, "resolveJsonModule": true, - "types": [ "node" ] + "typeRoots": [ "./node_modules/@types" ] }, "exclude": [ "**/benchmark", "**/test/**", "**/build/**", "**/build-*/**" ] }