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

fix: Improve TSconfig setup and fix errors in test/test-project #1177

Merged
merged 1 commit into from
Mar 7, 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
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"eslint.workingDirectories": [
"./test/test-project"
]
}
29 changes: 10 additions & 19 deletions locators/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
{
"compilerOptions": {
"module": "node16",
"target": "es6",
"outDir": "out",
"lib": [
"es6"
],
"sourceMap": true,
"rootDir": ".",
"strict": true,
"noUnusedLocals": true,
"experimentalDecorators": true,
"resolveJsonModule": true,
"declaration": true
},
"include": [
"index.ts", "lib"
]
}
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "out",
"rootDir": "."
},
"include": [
"index.ts",
"lib"
]
}
2 changes: 1 addition & 1 deletion page-objects/src/components/bottomBar/AbstractViews.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export abstract class ChannelView extends ElementWithContexMenu {
* View with channel selection and text area
*/
export abstract class TextView extends ChannelView {
protected actionsLabel!: string;
declare protected actionsLabel: string;

/**
* Get all text from the currently open channel
Expand Down
28 changes: 9 additions & 19 deletions page-objects/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
{
"compilerOptions": {
"module": "node16",
"target": "es6",
"outDir": "out",
"lib": [
"es6"
],
"sourceMap": true,
"rootDir": "src",
"strict": true,
"noUnusedLocals": true,
"experimentalDecorators": true,
"resolveJsonModule": true,
"declaration": true
},
"include": [
"src"
]
}
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "out",
"rootDir": "src"
},
"include": [
"src"
]
}
1 change: 1 addition & 0 deletions test/test-project/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.eslintrc.js
6 changes: 0 additions & 6 deletions test/test-project/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
module.exports = {
"env": {
"browser": true,
"es6": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "tsconfig.json",
"sourceType": "module"
},
"plugins": [
Expand Down
24 changes: 14 additions & 10 deletions test/test-project/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"module": "node16",
"target": "es6",
"outDir": "out",
"lib": [
"es6"
],
"sourceMap": true,
"rootDir": ".",
"resolveJsonModule": true,
"esModuleInterop": true
"forceConsistentCasingInFileNames": true,
"strict": false
},
"exclude": ["node_modules", ".vscode-test", "test-resources", "resources"]
}
"include": [
"src"
],
"exclude": [
"resources",
"out",
"node_modules",
"test-extensions",
"test-resources"
]
}
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"compilerOptions": {
"module": "node16",
"target": "es6",
"module": "Node16",
"target": "ES2022",
"outDir": "out",
"lib": [
"es6"
"ES2022"
],
"sourceMap": true,
"rootDir": "src",
Expand Down