From c700046b7673a0f470c8d8abeec3cf873049a78a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 4 Jan 2018 12:54:16 +0100 Subject: Apply prettify on json and md files --- packages/website/tsconfig.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packages/website/tsconfig.json') diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 5b3510c26..ebbee7ff3 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -3,7 +3,7 @@ "allowSyntheticDefaultImports": true, "outDir": "./transpiled/", "sourceMap": true, - "lib": [ "es2015", "dom" ], + "lib": ["es2015", "dom"], "noImplicitAny": true, "module": "commonjs", "target": "es5", @@ -11,11 +11,8 @@ "baseUrl": "./", "allowJs": true, "paths": { - "*": [ "node_modules/@types/*", "*"] + "*": ["node_modules/@types/*", "*"] } }, - "include": [ - "./ts/**/*", - "../../node_modules/web3-typescript-typings/index.d.ts" - ] + "include": ["./ts/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } -- cgit v1.2.3 From 27d9fba785a5a53550be53b12baf9069bda8d160 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 4 Jan 2018 18:56:30 +0100 Subject: Include web3 types via typeRoots and factor out common parts of tsconfig.json --- packages/website/tsconfig.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/website/tsconfig.json') diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index ebbee7ff3..43c417be0 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -1,18 +1,16 @@ { + "extends": "../../tsconfig", "compilerOptions": { "allowSyntheticDefaultImports": true, "outDir": "./transpiled/", - "sourceMap": true, - "lib": ["es2015", "dom"], - "noImplicitAny": true, - "module": "commonjs", - "target": "es5", "jsx": "react", "baseUrl": "./", "allowJs": true, + "strictNullChecks": true, + "declaration": false, "paths": { "*": ["node_modules/@types/*", "*"] } }, - "include": ["./ts/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] + "include": ["./ts/**/*"] } -- cgit v1.2.3 From 78fd942faa752980caba6e37edd2932b1235cfd7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 5 Jan 2018 13:32:01 +0100 Subject: Return to old way of including web3 types --- packages/website/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website/tsconfig.json') diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 43c417be0..0e14e5450 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -6,7 +6,7 @@ "jsx": "react", "baseUrl": "./", "allowJs": true, - "strictNullChecks": true, + "strictNullChecks": false, "declaration": false, "paths": { "*": ["node_modules/@types/*", "*"] -- cgit v1.2.3 From e34b0af25133629ad4c177c4d7d5050bd6ac19b8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 10 Jan 2018 12:39:37 +0100 Subject: Fix ts error in portal after enabling more strict checks --- packages/website/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/website/tsconfig.json') diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 0e14e5450..38b177d0b 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -7,10 +7,11 @@ "baseUrl": "./", "allowJs": true, "strictNullChecks": false, + "noImplicitThis": false, "declaration": false, "paths": { "*": ["node_modules/@types/*", "*"] } }, - "include": ["./ts/**/*"] + "include": ["./ts/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } -- cgit v1.2.3