Skip to content

Commit

Permalink
chore: fix failing e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
saleel committed Aug 30, 2023
1 parent de946e6 commit 69d85ca
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 56 deletions.
2 changes: 1 addition & 1 deletion packages/circuits/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "2.0.0",
"scripts": {
"publish": "yarn npm publish --access=public",
"test": "NODE_OPTIONS=--max_old_space_size=4096 jest tests/*.ts"
"test": "NODE_OPTIONS=--max_old_space_size=8192 jest tests/*.ts"
},
"devDependencies": {
"circom_tester": "^0.0.19",
Expand Down
9 changes: 8 additions & 1 deletion packages/helpers/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["dist", "tests"],
"exclude": [
"dist",
"tests",
"node_modules",
"./node_modules",
"./node_modules/*",
"./node_modules/@types/node/index.d.ts",
],
"compilerOptions": {
"module": "commonjs",
"declaration": true,
Expand Down
1 change: 1 addition & 0 deletions packages/twitter-verifier-app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
Link,
Navigate,
} from "react-router-dom";
// @ts-ignore
import { useLocation } from "react-use";
import styled from "styled-components";
import { ConnectButton } from "@rainbow-me/rainbowkit";
Expand Down
2 changes: 1 addition & 1 deletion packages/twitter-verifier-app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>

<script type="module" src="./index.jsx"></script>
<script type="module" src="./index.tsx"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
import { WagmiConfig, createConfig } from "wagmi";
import { InjectedConnector } from 'wagmi/connectors/injected';
import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
import { createPublicClient, http } from 'viem'
import { goerli } from "wagmi/chains";
import { publicProvider } from "wagmi/providers/public";
import {
getDefaultWallets,
RainbowKitProvider,
Expand Down
11 changes: 7 additions & 4 deletions packages/twitter-verifier-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
"version": "1.0.0",
"dependencies": {
"@rainbow-me/rainbowkit": "^1.0.9",
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.4",
"@twitter-verifier/circuits": "workspace:^",
"@zk-email/helpers": "workspace:^",
"atob": "^2.1.2",
"circomlibjs": "^0.1.2",
"ethers": "^6.7.1",
"jsdom-worker": "^0.3.0",
"lodash": "^4.17.21",
"node-forge": "^1.3.1",
"react": "^17.0.2",
Expand All @@ -16,12 +20,13 @@
"serve": "^14.0.1",
"snarkjs": "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e",
"styled-components": "^5.3.5",
"typescript": "^4.8.3",
"vite": "^4.4.9",
"wagmi": "^1.3.10"
},
"scripts": {
"start": "vite",
"build": "tsc && vite build",
"build": "npx tsc -p ./tsconfig.json && vite build",
"serve": "vite preview",
"test": "jest --runInBand --testPathIgnorePatterns='e2e' --reporters=default --reporters=jest-junit",
"start-e2e-test-server": "serve -s dist -p 3000",
Expand Down Expand Up @@ -49,8 +54,6 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.4",
"@types/atob": "^2.1.2",
"@types/jest": "^29.5.1",
"@types/lodash": "^4.14.181",
Expand All @@ -66,11 +69,11 @@
"jest-environment-jsdom": "^29.5.0",
"jest-fetch-mock": "^3.0.3",
"jest-junit": "^15.0.0",
"jsdom-worker": "^0.3.0",
"madge": "^6.0.0",
"puppeteer": "18.1",
"rollup-plugin-node-polyfills": "^0.2.1",
"selenium-webdriver": "^4.8.1",
"typescript": "^4.8.3",
"vite-plugin-commonjs": "^0.7.1",
"vite-plugin-ngmi-polyfill": "^0.0.2",
"vite-plugin-node-polyfills": "^0.8.2",
Expand Down
1 change: 1 addition & 0 deletions packages/twitter-verifier-app/pages/MainPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useEffect, useState } from "react";
// @ts-ignore
import { useAsync, useMount, useUpdateEffect } from "react-use";
import styled from "styled-components";
import _, { add } from "lodash";
Expand Down
7 changes: 6 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@
"types": ["node", "jest"],
"incremental": true
},
"exclude": ["node_modules"]
"exclude": [
"node_modules",
"./node_modules",
"./node_modules/*",
"./node_modules/@types/node/index.d.ts",
],
}
114 changes: 70 additions & 44 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1448,16 +1448,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.22.5
resolution: "@babel/runtime@npm:7.22.5"
dependencies:
regenerator-runtime: ^0.13.11
checksum: 12a50b7de2531beef38840d17af50c55a094253697600cee255311222390c68eed704829308d4fd305e1b3dfbce113272e428e9d9d45b1730e0fede997eaceb1
languageName: node
linkType: hard

"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.22.6":
"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.22.6":
version: 7.22.11
resolution: "@babel/runtime@npm:7.22.11"
dependencies:
Expand All @@ -1466,6 +1457,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.22.5
resolution: "@babel/runtime@npm:7.22.5"
dependencies:
regenerator-runtime: ^0.13.11
checksum: 12a50b7de2531beef38840d17af50c55a094253697600cee255311222390c68eed704829308d4fd305e1b3dfbce113272e428e9d9d45b1730e0fede997eaceb1
languageName: node
linkType: hard

"@babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
version: 7.22.5
resolution: "@babel/template@npm:7.22.5"
Expand Down Expand Up @@ -2847,10 +2847,10 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.6.3":
version: 1.6.3
resolution: "@remix-run/router@npm:1.6.3"
checksum: f6968b1626af930b42f8cb5a044f05e4fbce05af6c7947beb1704e45c9570944e3be16ee008b185e5e13baac97948299eb55341b2a359c3e2e54b9d6646ae167
"@remix-run/router@npm:1.8.0":
version: 1.8.0
resolution: "@remix-run/router@npm:1.8.0"
checksum: f754f02d3b4fc86791b88acf16065000609e2324b9436027844a76831c7107c0994067cb83abdd6093c282bd518a5c89b5e02aead585782978586e3a04534428
languageName: node
linkType: hard

Expand Down Expand Up @@ -4500,19 +4500,21 @@ __metadata:
browserify-fs: ^1.0.0
browserstack-local: ^1.5.1
browserstack-node-sdk: ^1.6.1
circomlibjs: ^0.1.2
ethers: ^6.7.1
jest: ^29.5.0
jest-environment-jsdom: ^29.5.0
jest-fetch-mock: ^3.0.3
jest-junit: ^15.0.0
jsdom-worker: ^0.3.0
lodash: ^4.17.21
madge: ^6.0.0
node-forge: ^1.3.1
puppeteer: 18.1
react: ^17.0.2
react-dom: ^17.0.2
react-router-dom: ^6.2.2
react-use: ^17.3.2
react-dom: ^18.2.0
react-router-dom: ^6.15.0
react-use: ^17.4.0
rollup-plugin-node-polyfills: ^0.2.1
selenium-webdriver: ^4.8.1
serve: ^14.0.1
Expand Down Expand Up @@ -10394,6 +10396,18 @@ __metadata:
languageName: node
linkType: hard

"jsdom-worker@npm:^0.3.0":
version: 0.3.0
resolution: "jsdom-worker@npm:0.3.0"
dependencies:
mitt: ^3.0.0
uuid-v4: ^0.1.0
peerDependencies:
node-fetch: "*"
checksum: 43bc1777752cbc5c5bf9a1dc456300e853b0b0c2ef274b31ce0f4bbdaf093f0837e25e654f6fc173addaef22213c0329eaaf925c18aa580de46bfcc1ac145167
languageName: node
linkType: hard

"jsdom@npm:^20.0.0":
version: 20.0.3
resolution: "jsdom@npm:20.0.3"
Expand Down Expand Up @@ -11370,6 +11384,13 @@ __metadata:
languageName: node
linkType: hard

"mitt@npm:^3.0.0":
version: 3.0.1
resolution: "mitt@npm:3.0.1"
checksum: b55a489ac9c2949ab166b7f060601d3b6d893a852515ae9eca4e11df01c013876df777ea109317622b5c1c60e8aae252558e33c8c94e14124db38f64a39614b1
languageName: node
linkType: hard

"mixin-object@npm:^2.0.1":
version: 2.0.1
resolution: "mixin-object@npm:2.0.1"
Expand Down Expand Up @@ -12887,16 +12908,15 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^17.0.2":
version: 17.0.2
resolution: "react-dom@npm:17.0.2"
"react-dom@npm:^18.2.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
scheduler: ^0.20.2
scheduler: ^0.23.0
peerDependencies:
react: 17.0.2
checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c
react: ^18.2.0
checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
languageName: node
linkType: hard

Expand Down Expand Up @@ -12963,27 +12983,27 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.2.2":
version: 6.12.1
resolution: "react-router-dom@npm:6.12.1"
"react-router-dom@npm:^6.15.0":
version: 6.15.0
resolution: "react-router-dom@npm:6.15.0"
dependencies:
"@remix-run/router": 1.6.3
react-router: 6.12.1
"@remix-run/router": 1.8.0
react-router: 6.15.0
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 885528986b6e32bde0cc6ff1f318186ce6931cf4a2a36511fe12eafb380576b448a991d43fe473dbb9bc97bb7efa0c87ac179a7470345a1d3534a34b65578677
checksum: 95301837e293654f00934de6a4bdb27bfb06f613503e4cce7a93f19384793729832e7479d50faf3b9457d149014d4df40a3ee3a5193d7e3a3caadb7aaa6ec0f9
languageName: node
linkType: hard

"react-router@npm:6.12.1":
version: 6.12.1
resolution: "react-router@npm:6.12.1"
"react-router@npm:6.15.0":
version: 6.15.0
resolution: "react-router@npm:6.15.0"
dependencies:
"@remix-run/router": 1.6.3
"@remix-run/router": 1.8.0
peerDependencies:
react: ">=16.8"
checksum: a23a0f2e6635eba19aec8d50b9126f61663d1e6ee6e69d6b2ca6e5dd678496b54d925f0d86a375270646da11cc12be66ac5e6ebf73962957af91ac828b63d10b
checksum: 345b29277e13997f2625f0037f537eaf1955bb9f44ebfea80dd3ff83fc06273f7b64e1be944bfc75945fd2af5af917874133a8a93ed5ecaca523be8f045ae166
languageName: node
linkType: hard

Expand Down Expand Up @@ -13014,7 +13034,7 @@ __metadata:
languageName: node
linkType: hard

"react-use@npm:^17.3.2":
"react-use@npm:^17.4.0":
version: 17.4.0
resolution: "react-use@npm:17.4.0"
dependencies:
Expand Down Expand Up @@ -13629,13 +13649,12 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.20.2":
version: 0.20.2
resolution: "scheduler@npm:0.20.2"
"scheduler@npm:^0.23.0":
version: 0.23.0
resolution: "scheduler@npm:0.23.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc
checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
languageName: node
linkType: hard

Expand Down Expand Up @@ -14354,9 +14373,9 @@ __metadata:
linkType: hard

"stylis@npm:^4.0.6":
version: 4.2.0
resolution: "stylis@npm:4.2.0"
checksum: 0eb6cc1b866dc17a6037d0a82ac7fa877eba6a757443e79e7c4f35bacedbf6421fadcab4363b39667b43355cbaaa570a3cde850f776498e5450f32ed2f9b7584
version: 4.3.0
resolution: "stylis@npm:4.3.0"
checksum: 6120de3f03eacf3b5adc8e7919c4cca991089156a6badc5248752a3088106afaaf74996211a6817a7760ebeadca09004048eea31875bd8d4df51386365c50025
languageName: node
linkType: hard

Expand Down Expand Up @@ -15202,6 +15221,13 @@ __metadata:
languageName: node
linkType: hard

"uuid-v4@npm:^0.1.0":
version: 0.1.0
resolution: "uuid-v4@npm:0.1.0"
checksum: f107fd9a271ab512a645ad658775cd34abcb388bb39c20633056c48a0901f008a6393362ec19073aa150f52d01458f7ca9e32d594902693e7bde416c153a9f8c
languageName: node
linkType: hard

"uuid@npm:^3.3.2":
version: 3.4.0
resolution: "uuid@npm:3.4.0"
Expand Down

0 comments on commit 69d85ca

Please sign in to comment.