From 2acadc7d000308c91b775aa595f4df65cafae163 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Sat, 6 Aug 2022 19:18:09 -0300 Subject: [PATCH] Forked react-qr-reader to add react 18 support --- package-lock.json | 64 ++++++++++++++++++++---------------- package.json | 2 +- src/search/CameraScanner.tsx | 4 +-- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73c4d2a..7852bf7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "@blackbox-vision/react-qr-reader": "^5.0.0", "@chainlink/contracts": "^0.4.2", "@fontsource/fira-code": "^4.5.10", "@fontsource/roboto": "^4.5.7", @@ -21,6 +20,7 @@ "@fortawesome/free-solid-svg-icons": "^6.1.2", "@fortawesome/react-fontawesome": "^0.2.0", "@headlessui/react": "^1.6.6", + "@otterscan/react-qr-reader": "^5.2.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", @@ -554,19 +554,6 @@ "node": ">=6.9.0" } }, - "node_modules/@blackbox-vision/react-qr-reader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@blackbox-vision/react-qr-reader/-/react-qr-reader-5.0.0.tgz", - "integrity": "sha512-VLNKwwJTv4UX1inUNgt2aGC2yIhKBYptW9EOhn7Nq//WzjD5KvHG7WR48HTzGUZ2s/EA0XlxZSfKOarHV1Vb/A==", - "dependencies": { - "@zxing/browser": "0.0.7", - "@zxing/library": "^0.18.3" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - } - }, "node_modules/@chainlink/contracts": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/@chainlink/contracts/-/contracts-0.4.2.tgz", @@ -1511,6 +1498,19 @@ "node": ">= 8" } }, + "node_modules/@otterscan/react-qr-reader": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@otterscan/react-qr-reader/-/react-qr-reader-5.2.0.tgz", + "integrity": "sha512-5dTK36QEMlsRE925LIO7affrHV0y83/tuj8u8x3gG6nlGp28kGCJk1VMM+ub44Ev3k6/gpcwpxaRmGGDnNZAyw==", + "dependencies": { + "@zxing/browser": "0.0.7", + "@zxing/library": "^0.18.3" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/@testing-library/dom": { "version": "7.31.2", "license": "MIT", @@ -5397,15 +5397,6 @@ "to-fast-properties": "^2.0.0" } }, - "@blackbox-vision/react-qr-reader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@blackbox-vision/react-qr-reader/-/react-qr-reader-5.0.0.tgz", - "integrity": "sha512-VLNKwwJTv4UX1inUNgt2aGC2yIhKBYptW9EOhn7Nq//WzjD5KvHG7WR48HTzGUZ2s/EA0XlxZSfKOarHV1Vb/A==", - "requires": { - "@zxing/browser": "0.0.7", - "@zxing/library": "^0.18.3" - } - }, "@chainlink/contracts": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/@chainlink/contracts/-/contracts-0.4.2.tgz", @@ -5688,7 +5679,8 @@ "ws": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "requires": {} } } }, @@ -5903,7 +5895,8 @@ "@headlessui/react": { "version": "1.6.6", "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.6.tgz", - "integrity": "sha512-MFJtmj9Xh/hhBMhLccGbBoSk+sk61BlP6sJe4uQcVMtXZhCgGqd2GyIQzzmsdPdTEWGSF434CBi8mnhR6um46Q==" + "integrity": "sha512-MFJtmj9Xh/hhBMhLccGbBoSk+sk61BlP6sJe4uQcVMtXZhCgGqd2GyIQzzmsdPdTEWGSF434CBi8mnhR6um46Q==", + "requires": {} }, "@jest/types": { "version": "26.6.2", @@ -5973,6 +5966,15 @@ "fastq": "^1.6.0" } }, + "@otterscan/react-qr-reader": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@otterscan/react-qr-reader/-/react-qr-reader-5.2.0.tgz", + "integrity": "sha512-5dTK36QEMlsRE925LIO7affrHV0y83/tuj8u8x3gG6nlGp28kGCJk1VMM+ub44Ev3k6/gpcwpxaRmGGDnNZAyw==", + "requires": { + "@zxing/browser": "0.0.7", + "@zxing/library": "^0.18.3" + } + }, "@testing-library/dom": { "version": "7.31.2", "requires": { @@ -7657,7 +7659,8 @@ "react-chartjs-2": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz", - "integrity": "sha512-5i3mjP6tU7QSn0jvb8I4hudTzHJqS8l00ORJnVwI2sYu0ihpj83Lv2YzfxunfxTZkscKvZu2F2w9LkwNBhj6xA==" + "integrity": "sha512-5i3mjP6tU7QSn0jvb8I4hudTzHJqS8l00ORJnVwI2sYu0ihpj83Lv2YzfxunfxTZkscKvZu2F2w9LkwNBhj6xA==", + "requires": {} }, "react-dom": { "version": "18.2.0", @@ -7696,7 +7699,8 @@ "react-image": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/react-image/-/react-image-4.0.3.tgz", - "integrity": "sha512-19MUK9u1qaw9xys8XEsVkSpVhHctEBUeYFvrLTe1PN+4w5Co13AN2WA7xtBshPM6SthsOj77SlDrEAeOaJpf7g==" + "integrity": "sha512-19MUK9u1qaw9xys8XEsVkSpVhHctEBUeYFvrLTe1PN+4w5Co13AN2WA7xtBshPM6SthsOj77SlDrEAeOaJpf7g==", + "requires": {} }, "react-is": { "version": "17.0.1" @@ -7989,7 +7993,8 @@ "swr": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/swr/-/swr-1.3.0.tgz", - "integrity": "sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==" + "integrity": "sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==", + "requires": {} }, "tailwindcss": { "version": "npm:@tailwindcss/postcss7-compat@2.2.6", @@ -8293,7 +8298,8 @@ "use-keyboard-shortcut": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/use-keyboard-shortcut/-/use-keyboard-shortcut-1.1.4.tgz", - "integrity": "sha512-diFzhVWYkoR9WdHGOxp1EWVr2YUaiQC3vdlT1FbdK25UfPcTb3wlVqgSzvEBdrXh0cg1FW3PCBKzNGMGpslMqg==" + "integrity": "sha512-diFzhVWYkoR9WdHGOxp1EWVr2YUaiQC3vdlT1FbdK25UfPcTb3wlVqgSzvEBdrXh0cg1FW3PCBKzNGMGpslMqg==", + "requires": {} }, "util-deprecate": { "version": "1.0.2", diff --git a/package.json b/package.json index 22061d9..b025e84 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "private": true, "license": "MIT", "dependencies": { - "@blackbox-vision/react-qr-reader": "^5.0.0", "@chainlink/contracts": "^0.4.2", "@fontsource/fira-code": "^4.5.10", "@fontsource/roboto": "^4.5.7", @@ -16,6 +15,7 @@ "@fortawesome/free-solid-svg-icons": "^6.1.2", "@fortawesome/react-fontawesome": "^0.2.0", "@headlessui/react": "^1.6.6", + "@otterscan/react-qr-reader": "^5.2.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", diff --git a/src/search/CameraScanner.tsx b/src/search/CameraScanner.tsx index 5766814..43100ec 100644 --- a/src/search/CameraScanner.tsx +++ b/src/search/CameraScanner.tsx @@ -1,8 +1,8 @@ import React from "react"; import { useNavigate } from "react-router-dom"; import { isAddress } from "@ethersproject/address"; -import { QrReader } from "@blackbox-vision/react-qr-reader"; -import { OnResultFunction } from "@blackbox-vision/react-qr-reader/dist-types/types"; +import { QrReader } from "@otterscan/react-qr-reader"; +import { OnResultFunction } from "@otterscan/react-qr-reader/dist-types/types"; import { BarcodeFormat } from "@zxing/library"; import { Dialog } from "@headlessui/react";