Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding test-specific tsconfig files in appropriate dirs #1996

Merged
merged 3 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions __tests__/test-tsconfig.json → __tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
{
// tsconfig for test files //
"compilerOptions": {
"types": [
"node",
"jest"
],
"types": ["node", "jest"],
"lib": ["esnext"],
"target": "es2015",
"module": "commonjs",
"declaration": true,
"moduleResolution": "node",
"noImplicitAny": true,
"outDir": "./lib",
"preserveConstEnums": true,
"experimentalDecorators": true,
"removeComments": false,
"pretty": true,
"sourceMap": true,
"newLine": "lf"
"newLine": "lf",
"esModuleInterop": true
},
"include": [
"./**/*.ts",
"../packages/**/__tests__/**/*.ts"
],
"files": [
"../__types__/wontache.d.ts"
"**/*.test.ts",
"**/*.subtest.ts",
"**/__tests__/**/*"
],
"exclude": [
"lib",
"__results__/",
"__snapshots__",
"node_modules"
]
}
}
7 changes: 4 additions & 3 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"clean": "lerna run --parallel clean",
"clean:exe": "cd zowex && cargo clean",
"installWithBuild": "npm install && npm run build",
"checkTestsCompile": "echo \"Checking that test source compiles...\" && tsc --project __tests__/test-tsconfig.json --noEmit",
"checkTestsCompile": "echo \"Checking that test source compiles...\" && tsc --project __tests__/tsconfig.json --noEmit",
"circularDependencyCheck": "lerna run --parallel circularDependencyCheck -- -- --warning --no-spinner",
"lint": "eslint \"packages/**/*.ts\" \"**/__tests__/**/*.ts\"",
"lint:packages": "eslint \"packages/**/*.ts\" --ignore-pattern \"**/__tests__/**/*.ts\"",
Expand All @@ -39,9 +39,8 @@
"bundle:webHelp": "cd packages/imperative/web-help && node build.js",
"prepare": "husky install && npm run bundle:webHelp"
},
"dependencies": {},
"devDependencies": {
"@types/jest": "^29.0.0",
"@types/jest": "^29.5.11",
"@types/node": "^14.18.28",
"@types/which": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.33.0",
Expand All @@ -61,8 +60,8 @@
"jest-environment-node-debug": "^2.0.0",
"jest-html-reporter": "^3.6.0",
"jest-junit": "^12.0.0",
"jest-stare": "^2.2.0",
"jest-sonar-reporter": "^2.0.0",
"jest-stare": "^2.2.0",
"js-yaml": "^4.1.0",
"jsonfile": "^4.0.0",
"lerna": "^5.4.3",
Expand All @@ -73,8 +72,8 @@
"shebang-regex": "^2.0.0",
"symlink-dir": "^5.1.1",
"syncpack": "^5.6.10",
"ts-node": "^7.0.1",
"ts-jest": "^29.0.0",
"ts-node": "^7.0.1",
"typedoc": "^0.23.10",
"typescript": "^4.0.0"
},
Expand Down
27 changes: 27 additions & 0 deletions packages/cli/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// tsconfig for test files //
"compilerOptions": {
"types": ["node", "jest"],
"lib": ["esnext"],
"target": "es2015",
"module": "commonjs",
"declaration": true,
"moduleResolution": "node",
"noImplicitAny": true,
"preserveConstEnums": true,
"experimentalDecorators": true,
"removeComments": false,
"pretty": true,
"sourceMap": true,
"newLine": "lf",
"esModuleInterop": true
},
"include": [
"**/*.test.ts",
"**/__tests__/**/*"
],
"exclude": [
"lib",
"node_modules"
]
}
4 changes: 4 additions & 0 deletions packages/core/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
27 changes: 27 additions & 0 deletions packages/imperative/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// tsconfig for test files //
"compilerOptions": {
"types": ["node", "jest"],
"lib": ["esnext"],
"target": "es2015",
"module": "commonjs",
"declaration": true,
"moduleResolution": "node",
"noImplicitAny": true,
"preserveConstEnums": true,
"experimentalDecorators": true,
"removeComments": false,
"pretty": true,
"sourceMap": true,
"newLine": "lf",
"esModuleInterop": true
},
"include": [
"**/*.test.ts",
"**/__tests__/**/*"
],
"exclude": [
"lib",
"node_modules"
]
}
4 changes: 4 additions & 0 deletions packages/provisioning/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/workflows/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zosconsole/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zosfiles/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zosjobs/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zoslogs/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zosmf/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zostso/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}
4 changes: 4 additions & 0 deletions packages/zosuss/__tests__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// tsconfig for test files //
"extends": "../../__tests__/tsconfig.json"
}