From 6848b0ad4deb1a4205ee41fffece8f4d0967fa66 Mon Sep 17 00:00:00 2001 From: Dummy Tester 123 Date: Sun, 7 Feb 2021 12:34:36 -0600 Subject: [PATCH] Adding some more fixes to make things run --- lending/package.json | 1 + lending/src/App.test.tsx | 9 --------- lending/src/contexts/lending.tsx | 2 +- lending/tsconfig.json | 5 ++++- packages/common/tsconfig.json | 2 +- tsconfig.json | 1 + yarn.lock | 25 ++++++++++++++++++++++++- 7 files changed, 32 insertions(+), 13 deletions(-) delete mode 100644 lending/src/App.test.tsx diff --git a/lending/package.json b/lending/package.json index a4c40e0..70e4f38 100644 --- a/lending/package.json +++ b/lending/package.json @@ -18,6 +18,7 @@ "@types/chart.js": "^2.9.29", "@types/echarts": "^4.9.0", "@types/react-router-dom": "^5.1.6", + "@types/testing-library__react": "^10.2.0", "@welldone-software/why-did-you-render": "^6.0.5", "antd": "^4.6.6", "bn.js": "^5.1.3", diff --git a/lending/src/App.test.tsx b/lending/src/App.test.tsx deleted file mode 100644 index 352d7b8..0000000 --- a/lending/src/App.test.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; -import { render } from "@testing-library/react"; -import App from "./App"; - -test("renders learn react link", () => { - const { getByText } = render(); - const linkElement = getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/lending/src/contexts/lending.tsx b/lending/src/contexts/lending.tsx index 33737a3..5c8b6ed 100644 --- a/lending/src/contexts/lending.tsx +++ b/lending/src/contexts/lending.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useState } from 'react'; -import { useConnection } from '@common/contexts/connection'; +import { useConnection } from '@packages/common/contexts/connection'; import { LENDING_PROGRAM_ID } from '@packages/common/utils/ids'; import { LendingMarketParser, diff --git a/lending/tsconfig.json b/lending/tsconfig.json index 3cf966d..19139df 100644 --- a/lending/tsconfig.json +++ b/lending/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../tsconfig.json", - "include": ["src"] + "include": [ + "src" + ], + "compilerOptions": {} } diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json index c6c13de..e620f0d 100644 --- a/packages/common/tsconfig.json +++ b/packages/common/tsconfig.json @@ -5,5 +5,5 @@ "composite": true, "noEmit": false }, - "include": ["src/**/*"] + "include": ["src/**/*", "src/config/tokens.json"] } diff --git a/tsconfig.json b/tsconfig.json index 20517e2..3a90715 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,6 +15,7 @@ "noEmit": true, "jsx": "react", "isolatedModules": true, + "noImplicitAny": false, "baseUrl": "./", "paths": { "@packages/common/*": ["packages/common/src/*"] diff --git a/yarn.lock b/yarn.lock index f204e26..5948d8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2386,7 +2386,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:*": +"@testing-library/dom@npm:*, @testing-library/dom@npm:^7.28.1": version: 7.29.4 resolution: "@testing-library/dom@npm:7.29.4" dependencies: @@ -2434,6 +2434,19 @@ __metadata: languageName: node linkType: hard +"@testing-library/react@npm:*": + version: 11.2.5 + resolution: "@testing-library/react@npm:11.2.5" + dependencies: + "@babel/runtime": ^7.12.5 + "@testing-library/dom": ^7.28.1 + peerDependencies: + react: "*" + react-dom: "*" + checksum: 1389b4eb110ad32ac328634846fd92570979c0cb739a3ee99eeb2278860a1910a81126612457379fc306dbd6417b4b5ff1ddd88ede3d8ebb1da3972e70877e83 + languageName: node + linkType: hard + "@testing-library/react@npm:^9.5.0": version: 9.5.0 resolution: "@testing-library/react@npm:9.5.0" @@ -2858,6 +2871,15 @@ __metadata: languageName: node linkType: hard +"@types/testing-library__react@npm:^10.2.0": + version: 10.2.0 + resolution: "@types/testing-library__react@npm:10.2.0" + dependencies: + "@testing-library/react": "*" + checksum: 84af6b07c8225f2942c064baf7d4884f5cd95c6dd8273743f7190ebcd1ad0978032fa433f6f808d9a993b0ef4289ca17036a0d5dfeecaf08251ff890b0c13b9d + languageName: node + linkType: hard + "@types/testing-library__react@npm:^9.1.2": version: 9.1.3 resolution: "@types/testing-library__react@npm:9.1.3" @@ -10460,6 +10482,7 @@ fsevents@~2.3.1: "@types/react": ^16.9.50 "@types/react-dom": ^16.9.8 "@types/react-router-dom": ^5.1.6 + "@types/testing-library__react": ^10.2.0 "@welldone-software/why-did-you-render": ^6.0.5 antd: ^4.6.6 arweave-deploy: ^1.9.1