From 4885c81111d22c62fdad0ada67e129f7ee11246a Mon Sep 17 00:00:00 2001 From: "Kent C. Dodds" Date: Wed, 2 Dec 2020 16:19:32 -0700 Subject: [PATCH 1/3] chore: update all deps --- package.json | 11 +++++------ types/test.ts | 2 +- types/tsconfig.json | 16 ++-------------- types/tslint.json | 9 --------- 4 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 types/tslint.json diff --git a/package.json b/package.json index 9d54ba5..dd6f54f 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test:cypress:run": "cypress run", "test:unit": "kcd-scripts test --no-watch", "test:unit:watch": "kcd-scripts test", - "typecheck": "dtslint ./types/", + "typecheck": "kcd-scripts typecheck --build types", "validate": "kcd-scripts validate build,lint,test,typecheck" }, "files": [ @@ -41,14 +41,13 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", - "@testing-library/dom": "^7.26.6" + "@testing-library/dom": "^7.28.1" }, "devDependencies": { - "cypress": "^5.6.0", - "dtslint": "^4.0.5", - "kcd-scripts": "^7.0.3", + "cypress": "^6.0.1", + "kcd-scripts": "^7.5.1", "npm-run-all": "^4.1.5", - "typescript": "^4.0.5" + "typescript": "^4.1.2" }, "peerDependencies": { "cypress": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" diff --git a/types/test.ts b/types/test.ts index 28f3bf9..fc601aa 100644 --- a/types/test.ts +++ b/types/test.ts @@ -1,5 +1,5 @@ /// -import {configure} from '@testing-library/cypress' +import {configure} from '.' import '@testing-library/cypress/add-commands' configure({testIdAttribute: 'data-myown-testid'}) diff --git a/types/tsconfig.json b/types/tsconfig.json index 22497e9..a782906 100644 --- a/types/tsconfig.json +++ b/types/tsconfig.json @@ -1,16 +1,4 @@ { - "compilerOptions": { - "module": "commonjs", - "lib": ["es6", "dom"], - "noImplicitAny": true, - "noImplicitThis": true, - "strictFunctionTypes": true, - "strictNullChecks": true, - "baseUrl": ".", - "noEmit": true, - "types": [], - "paths": { - "@testing-library/cypress": ["."] - } - } + "extends": "../node_modules/kcd-scripts/shared-tsconfig.json", + "include": ["."] } diff --git a/types/tslint.json b/types/tslint.json deleted file mode 100644 index cb0fce9..0000000 --- a/types/tslint.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": ["dtslint/dtslint.json"], - "rules": { - "no-useless-files": false, - "no-relative-import-in-test": false, - "semicolon": false, - "whitespace": false - } -} From 30c347a980be9804ad96438e8baa97c2492f40f1 Mon Sep 17 00:00:00 2001 From: "Kent C. Dodds" Date: Wed, 2 Dec 2020 16:28:33 -0700 Subject: [PATCH 2/3] chore: run kcd-scripts format --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0081e74..6cd3ace 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ Thanks goes to these people ([emoji key][emojis]): + This project follows the [all-contributors][all-contributors] specification. From b37f43b7188714bc1678ae40785c6cade86abd85 Mon Sep 17 00:00:00 2001 From: "Kent C. Dodds" Date: Thu, 3 Dec 2020 18:38:13 -0700 Subject: [PATCH 3/3] Update types/test.ts Co-authored-by: Nicholas Boll --- types/test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/test.ts b/types/test.ts index fc601aa..aed3675 100644 --- a/types/test.ts +++ b/types/test.ts @@ -1,6 +1,6 @@ /// import {configure} from '.' -import '@testing-library/cypress/add-commands' + import './add-commands' configure({testIdAttribute: 'data-myown-testid'})