Skip to content

Commit

Permalink
Extract common TS config
Browse files Browse the repository at this point in the history
  • Loading branch information
LogvinovLeon committed Feb 14, 2024
1 parent a45c0de commit 546aa47
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 24 deletions.
6 changes: 3 additions & 3 deletions ethereum_history_api/oracles/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "noir-ethereum-api-oracles",
"version": "1.0.0",
"main": "dist/src/main.js",
"types": "dist/src/main.d.ts",
"main": "dist/main.js",
"types": "dist/main.d.ts",
"type": "module",
"scripts": {
"test:unit": "vitest run --config vitest.unit.config.ts",
"build": "tsc",
"build": "tsc --build --verbose",
"typecheck": "tsc --noEmit",
"lint": "eslint --ext .ts",
"lint:fix": "eslint --ext .ts --fix",
Expand Down
5 changes: 3 additions & 2 deletions ethereum_history_api/oracles/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*.ts", "fixtures/*.json", "package.json"],
"extends": "../../tsconfig.common.json",
"include": ["src/**/*.ts", "fixtures/*.json", "package.json", "../contracts/out/UltraVerifier.sol/UltraVerifier.json"],
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
}
}
2 changes: 1 addition & 1 deletion ethereum_history_api/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "module",
"scripts": {
"test:e2e": "vitest run --config vitest.e2e.config.ts",
"build": "tsc",
"build": "tsc --build --verbose",
"typecheck": "tsc --noEmit",
"lint": "eslint --ext .ts",
"lint:fix": "eslint --ext .ts --fix",
Expand Down
3 changes: 2 additions & 1 deletion ethereum_history_api/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.common.json",
"include": ["src/**/*.ts"],
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
}
}
20 changes: 20 additions & 0 deletions tsconfig.common.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"compilerOptions": {
"target": "es2020",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"resolveJsonModule": true,
"allowJs": false,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitAny": true,
"declaration": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"skipLibCheck": true,
"composite": true,
"incremental": true,
"tsBuildInfoFile": "./dist/.tsbuildinfo"
}
}
17 changes: 0 additions & 17 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
{
"compilerOptions": {
"target": "es2020",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"resolveJsonModule": true,
"allowJs": false,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitAny": true,
"declaration": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"skipLibCheck": true,
"composite": true,
"incremental": true
},
"files": [],
"references": [
{ "path": "ethereum_history_api/oracles/tsconfig.json" },
Expand Down

0 comments on commit 546aa47

Please sign in to comment.