From 1d5bdba16b0e157104a22fd0aa832c78691aef6a Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 19 Aug 2021 10:49:35 +0100 Subject: [PATCH] Setup tsconfig.base.json --- apps/debugger/tsconfig.json | 2 +- apps/remix-ide-e2e/tsconfig.json | 2 +- apps/remix-ide/tsconfig.json | 2 +- libs/remix-analyzer/tsconfig.json | 2 +- libs/remix-astwalker/tsconfig.json | 2 +- libs/remix-core-plugin/tsconfig.json | 2 +- libs/remix-debug/tsconfig.json | 2 +- libs/remix-lib/tsconfig.json | 2 +- libs/remix-simulator/tsconfig.json | 2 +- libs/remix-solidity/tsconfig.json | 2 +- libs/remix-tests/tsconfig.json | 2 +- libs/remix-ui/checkbox/tsconfig.json | 2 +- libs/remix-ui/clipboard/tsconfig.json | 2 +- libs/remix-ui/debugger-ui/tsconfig.json | 2 +- libs/remix-ui/file-explorer/tsconfig.json | 2 +- libs/remix-ui/modal-dialog/tsconfig.json | 2 +- .../remix-ui/publish-to-storage/tsconfig.json | 2 +- libs/remix-ui/renderer/tsconfig.json | 2 +- libs/remix-ui/settings/tsconfig.json | 2 +- libs/remix-ui/solidity-compiler/tsconfig.json | 2 +- libs/remix-ui/static-analyser/tsconfig.json | 2 +- libs/remix-ui/toaster/tsconfig.json | 2 +- libs/remix-ui/tree-view/tsconfig.json | 2 +- libs/remix-ui/utils/tsconfig.json | 2 +- libs/remix-ui/workspace/tsconfig.json | 2 +- libs/remix-url-resolver/tsconfig.json | 2 +- libs/remixd/tsconfig.json | 2 +- nx.json | 3 +- tsconfig.base.json | 48 +++++++++++++++++++ tsconfig.json | 33 ++----------- 30 files changed, 80 insertions(+), 58 deletions(-) create mode 100644 tsconfig.base.json diff --git a/apps/debugger/tsconfig.json b/apps/debugger/tsconfig.json index 7c6fcde8f2..b2a6956c94 100644 --- a/apps/debugger/tsconfig.json +++ b/apps/debugger/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/apps/remix-ide-e2e/tsconfig.json b/apps/remix-ide-e2e/tsconfig.json index a26c03d891..3de00b0f62 100644 --- a/apps/remix-ide-e2e/tsconfig.json +++ b/apps/remix-ide-e2e/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "nightwatch"], "esModuleInterop": true diff --git a/apps/remix-ide/tsconfig.json b/apps/remix-ide/tsconfig.json index fa0186ddd0..b32eb87bd7 100644 --- a/apps/remix-ide/tsconfig.json +++ b/apps/remix-ide/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-analyzer/tsconfig.json b/libs/remix-analyzer/tsconfig.json index cd69567953..751eaf755d 100644 --- a/libs/remix-analyzer/tsconfig.json +++ b/libs/remix-analyzer/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node"], "module": "commonjs", diff --git a/libs/remix-astwalker/tsconfig.json b/libs/remix-astwalker/tsconfig.json index edbdcaeaa9..b516fcbd30 100644 --- a/libs/remix-astwalker/tsconfig.json +++ b/libs/remix-astwalker/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node"], "module": "commonjs", diff --git a/libs/remix-core-plugin/tsconfig.json b/libs/remix-core-plugin/tsconfig.json index f14da61cdf..c23e61c800 100644 --- a/libs/remix-core-plugin/tsconfig.json +++ b/libs/remix-core-plugin/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/libs/remix-debug/tsconfig.json b/libs/remix-debug/tsconfig.json index 71c41a5aba..d66e6f3252 100644 --- a/libs/remix-debug/tsconfig.json +++ b/libs/remix-debug/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "tape"], "esModuleInterop": true diff --git a/libs/remix-lib/tsconfig.json b/libs/remix-lib/tsconfig.json index 71c41a5aba..d66e6f3252 100644 --- a/libs/remix-lib/tsconfig.json +++ b/libs/remix-lib/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "tape"], "esModuleInterop": true diff --git a/libs/remix-simulator/tsconfig.json b/libs/remix-simulator/tsconfig.json index f19ef7e5a8..3d3a2b990f 100644 --- a/libs/remix-simulator/tsconfig.json +++ b/libs/remix-simulator/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "mocha"], "esModuleInterop": true diff --git a/libs/remix-solidity/tsconfig.json b/libs/remix-solidity/tsconfig.json index 54497bbbe1..5ed408bd51 100644 --- a/libs/remix-solidity/tsconfig.json +++ b/libs/remix-solidity/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node"] }, diff --git a/libs/remix-tests/tsconfig.json b/libs/remix-tests/tsconfig.json index cf7076c1d1..3b54496f3d 100644 --- a/libs/remix-tests/tsconfig.json +++ b/libs/remix-tests/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "jest"], "module": "commonjs", diff --git a/libs/remix-ui/checkbox/tsconfig.json b/libs/remix-ui/checkbox/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/checkbox/tsconfig.json +++ b/libs/remix-ui/checkbox/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/clipboard/tsconfig.json b/libs/remix-ui/clipboard/tsconfig.json index 42b7ee636f..a7180ef589 100644 --- a/libs/remix-ui/clipboard/tsconfig.json +++ b/libs/remix-ui/clipboard/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/debugger-ui/tsconfig.json b/libs/remix-ui/debugger-ui/tsconfig.json index 42b7ee636f..a7180ef589 100644 --- a/libs/remix-ui/debugger-ui/tsconfig.json +++ b/libs/remix-ui/debugger-ui/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/file-explorer/tsconfig.json b/libs/remix-ui/file-explorer/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/file-explorer/tsconfig.json +++ b/libs/remix-ui/file-explorer/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/modal-dialog/tsconfig.json b/libs/remix-ui/modal-dialog/tsconfig.json index 42b7ee636f..a7180ef589 100644 --- a/libs/remix-ui/modal-dialog/tsconfig.json +++ b/libs/remix-ui/modal-dialog/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/publish-to-storage/tsconfig.json b/libs/remix-ui/publish-to-storage/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/publish-to-storage/tsconfig.json +++ b/libs/remix-ui/publish-to-storage/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/renderer/tsconfig.json b/libs/remix-ui/renderer/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/renderer/tsconfig.json +++ b/libs/remix-ui/renderer/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/settings/tsconfig.json b/libs/remix-ui/settings/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/settings/tsconfig.json +++ b/libs/remix-ui/settings/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/solidity-compiler/tsconfig.json b/libs/remix-ui/solidity-compiler/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/solidity-compiler/tsconfig.json +++ b/libs/remix-ui/solidity-compiler/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/static-analyser/tsconfig.json b/libs/remix-ui/static-analyser/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/static-analyser/tsconfig.json +++ b/libs/remix-ui/static-analyser/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/toaster/tsconfig.json b/libs/remix-ui/toaster/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/toaster/tsconfig.json +++ b/libs/remix-ui/toaster/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/tree-view/tsconfig.json b/libs/remix-ui/tree-view/tsconfig.json index 42b7ee636f..a7180ef589 100644 --- a/libs/remix-ui/tree-view/tsconfig.json +++ b/libs/remix-ui/tree-view/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/utils/tsconfig.json b/libs/remix-ui/utils/tsconfig.json index 42b7ee636f..a7180ef589 100644 --- a/libs/remix-ui/utils/tsconfig.json +++ b/libs/remix-ui/utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-ui/workspace/tsconfig.json b/libs/remix-ui/workspace/tsconfig.json index 6b65264565..d52e31ad74 100644 --- a/libs/remix-ui/workspace/tsconfig.json +++ b/libs/remix-ui/workspace/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", "allowJs": true, diff --git a/libs/remix-url-resolver/tsconfig.json b/libs/remix-url-resolver/tsconfig.json index 985037a3f3..f74b077096 100644 --- a/libs/remix-url-resolver/tsconfig.json +++ b/libs/remix-url-resolver/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "types": ["node", "mocha"], "module": "commonjs", diff --git a/libs/remixd/tsconfig.json b/libs/remixd/tsconfig.json index 546e940e20..62ebbd9464 100644 --- a/libs/remixd/tsconfig.json +++ b/libs/remixd/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/nx.json b/nx.json index 16e4c56d76..c736439cc6 100644 --- a/nx.json +++ b/nx.json @@ -6,8 +6,9 @@ "dependencies": "*", "devDependencies": "*" }, - "tsconfig.json": "*", + "tsconfig.base.json": "*", "tslint.json": "*", + ".eslintrc": "*", "nx.json": "*" }, "tasksRunnerOptions": { diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 0000000000..87a3bd1b40 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,48 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "rootDir": ".", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "target": "es2015", + "module": "commonjs", + "typeRoots": ["node_modules/@types"], + "lib": ["es2017", "es2019", "dom"], + "skipLibCheck": true, + "skipDefaultLibCheck": true, + "baseUrl": ".", + "paths": { + "@remix-project/remix-analyzer": ["dist/libs/remix-analyzer/index.js"], + "@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/index.js"], + "@remix-project/remix-debug": ["dist/libs/remix-debug/src/index.js"], + "@remix-project/remix-lib": ["dist/libs/remix-lib/src/index.js"], + "@remix-project/remix-simulator": ["dist/libs/remix-simulator/src/index.js"], + "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"], + "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"], + "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"], + "@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"], + "@remix-project/remixd": ["dist/libs/remixd/index.js"], + "@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"], + "@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"], + "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"], + "@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"], + "@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"], + "@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"], + "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"], + "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"], + "@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"], + "@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"], + "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"], + "@remix-ui/settings": ["libs/remix-ui/settings/src/index.ts"], + "@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"], + "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"], + "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"], + "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"] + } + }, + "exclude": ["node_modules", "tmp"] +} diff --git a/tsconfig.json b/tsconfig.json index 87a3bd1b40..6204014228 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,39 +10,12 @@ "importHelpers": true, "target": "es2015", "module": "commonjs", - "typeRoots": ["node_modules/@types"], - "lib": ["es2017", "es2019", "dom"], + "lib": ["es2017", "dom"], "skipLibCheck": true, "skipDefaultLibCheck": true, "baseUrl": ".", - "paths": { - "@remix-project/remix-analyzer": ["dist/libs/remix-analyzer/index.js"], - "@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/index.js"], - "@remix-project/remix-debug": ["dist/libs/remix-debug/src/index.js"], - "@remix-project/remix-lib": ["dist/libs/remix-lib/src/index.js"], - "@remix-project/remix-simulator": ["dist/libs/remix-simulator/src/index.js"], - "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"], - "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"], - "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"], - "@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"], - "@remix-project/remixd": ["dist/libs/remixd/index.js"], - "@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"], - "@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"], - "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"], - "@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"], - "@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"], - "@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"], - "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"], - "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"], - "@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"], - "@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"], - "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"], - "@remix-ui/settings": ["libs/remix-ui/settings/src/index.ts"], - "@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"], - "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"], - "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"], - "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"] - } + "paths": {}, + "allowSyntheticDefaultImports": true }, "exclude": ["node_modules", "tmp"] }