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

Yarn and Typescript fixes #1

Merged
merged 2 commits into from
May 12, 2022
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
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,12 @@ node_modules/
coverage
report.json
test_results.txt

.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-debug.log*
yarn-error.log*
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/index.d.ts b/index.d.ts
index bf5cafc4f65cc01844dac7b933b253505c47446b..cda24a2c9bdcac74311dbc02f7bfae4dd740e283 100755
--- a/index.d.ts
+++ b/index.d.ts
@@ -7,12 +7,11 @@
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 3.8

-/// <reference types="jest" />
-
-import { TestingLibraryMatchers } from './matchers';
+import { TestingLibraryMatchers } from "./matchers";

declare global {
- namespace jest {
- interface Matchers<R = void, T = {}> extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
- }
+ namespace jest {
+ interface Matchers<R = void, T = {}>
+ extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
+ }
}
785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
yarnPath: .yarn/releases/yarn-3.2.0.cjs
nodeLinker: node-modules

defaultSemverRangePrefix: ""
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"test": "vitest run",
"test:watch": "vitest --watchAll",
"test:coverage": "vitest run --coverage",
"test:ci": "vitest run"
"test:ci": "vitest run",
"typescript": "tsc"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -45,11 +46,11 @@
"@testing-library/react": "12.1.3",
"@testing-library/user-event": "13.5.0",
"@types/dompurify": "2.3.3",
"@types/react": "17.0.33",
"@types/react-dom": "17.0.10",
"@types/react-linkify": "1.0.1",
"@types/react-portal": "^4.0.4",
"@types/uuid": "^8.3.4",
"@types/react": "^17.0.33",
"@types/react-dom": "^17.0.10",
"@types/react-linkify": "1.0.1",
"@typescript-eslint/eslint-plugin": "^5.23.0",
"@typescript-eslint/parser": "^5.23.0",
"@vanilla-extract/css": "1.7.0",
Expand Down Expand Up @@ -77,7 +78,13 @@
"react": "^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0",
"react-dom": "^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0"
},
"resolutions": {
"@types/react": "17.0.33",
"@types/react-dom": "17.0.10",
"@types/[email protected]": "patch:@types/testing-library__jest-dom@npm:5.14.3#.yarn/patches/@types-testing-library__jest-dom-npm-5.14.3-0aa35d2c00.patch"
},
"publishConfig": {
"@openmindlearning:registry": "https://npm.pkg.github.com"
}
},
"packageManager": "[email protected]"
}
Empty file.
27,638 changes: 16,071 additions & 11,567 deletions yarn.lock

Large diffs are not rendered by default.