Skip to content

Commit

Permalink
Merge pull request #2044 from aeternity/fix-vscode-ts
Browse files Browse the repository at this point in the history
chore: fix tests type checks in vscode
  • Loading branch information
davidyuk authored Feb 22, 2025
2 parents 7839ba6 + 96f3c08 commit cd64a06
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- run: npm run lint
- run: npm run docs:examples && npm run docs:api && ./docs/build-assets.sh
if: contains(github.event.pull_request.title, 'Release')
- run: docker compose up -d --wait
- run: docker compose up -d --wait --quiet-pull
- run: npx nyc npm test
- run: npx nyc report --reporter=text-lcov > coverage.lcov
- uses: codecov/codecov-action@v4
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"sideEffects": false,
"scripts": {
"build:assets": "node tooling/fetch-aesophia-cli.js",
"build:types": "tsc",
"build:types": "tsc -p tsconfig.src.json",
"build:dist": "webpack",
"build:es": "babel src --config-file ./babel.esm.config.js --out-dir es --extensions .ts --source-maps true",
"build:api:node": "autorest tooling/autorest/node.yaml && node tooling/autorest/postprocessing.js node",
Expand All @@ -38,7 +38,7 @@
"lint": "run-p lint:*",
"lint:prettier": "prettier . --check",
"lint:eslint": "eslint . --ext .ts,.js",
"lint:types": "tsc -p tsconfig.tests.json",
"lint:types": "tsc",
"format": "prettier . --write",
"test": "mocha './test/unit/' './test/integration/'",
"test:assets": "node tooling/fetch-metamask.js",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.src.json",
"include": ["src/**/*", "test/**/*", "tooling/**/*"]
}
37 changes: 6 additions & 31 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,10 @@
{
"extends": "./tsconfig.src.json",
"compilerOptions": {
"esModuleInterop": true,
"emitDeclarationOnly": true,
"isolatedModules": true,
"outDir": "./es",
"noImplicitOverride": true,
"module": "es2022",
"target": "es2022",
"lib": ["es2022", "dom"],
"moduleResolution": "node",
"preserveConstEnums": true,
"declaration": true,
"downlevelIteration": true,
"allowSyntheticDefaultImports": true,
"typeRoots": ["./node_modules/@types", "./src/typings"],
"strict": true,
"strictFunctionTypes": false // see https://github.com/aeternity/aepp-sdk-js/issues/1793
"emitDeclarationOnly": false,
"resolveJsonModule": true,
"noEmit": true
},
"include": ["src/**/*"],
"typedocOptions": {
"entryPoints": ["src/index.ts"],
"out": "./docs/api",
"excludePrivate": true,
"githubPages": false,
"excludeExternals": true,
"treatWarningsAsErrors": true,
"validation": {
"invalidLink": true
},
"plugin": ["typedoc-plugin-missing-exports"],
"highlightLanguages": ["vue"],
"readme": "none"
}
"include": ["src/**/*", "test/**/*"],
"exclude": ["test/environment/**/*"]
}
35 changes: 35 additions & 0 deletions tsconfig.src.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"compilerOptions": {
"esModuleInterop": true,
"emitDeclarationOnly": true,
"isolatedModules": true,
"outDir": "./es",
"noImplicitOverride": true,
"module": "es2022",
"target": "es2022",
"lib": ["es2022", "dom"],
"moduleResolution": "node",
"preserveConstEnums": true,
"declaration": true,
"downlevelIteration": true,
"allowSyntheticDefaultImports": true,
"typeRoots": ["./node_modules/@types", "./src/typings"],
"strict": true,
"strictFunctionTypes": false // see https://github.com/aeternity/aepp-sdk-js/issues/1793
},
"include": ["src/**/*"],
"typedocOptions": {
"entryPoints": ["src/index.ts"],
"out": "./docs/api",
"excludePrivate": true,
"githubPages": false,
"excludeExternals": true,
"treatWarningsAsErrors": true,
"validation": {
"invalidLink": true
},
"plugin": ["typedoc-plugin-missing-exports"],
"highlightLanguages": ["vue"],
"readme": "none"
}
}
10 changes: 0 additions & 10 deletions tsconfig.tests.json

This file was deleted.

0 comments on commit cd64a06

Please sign in to comment.