try fix require not defined on web

mtgatool · May 4, 2024 · f04a0fd · f04a0fd
1 parent 5005a49
commit f04a0fd
Show file tree

Hide file tree

Showing 8 changed files with 1,093 additions and 1,094 deletions.
diff --git a/public/tooldb-worker/index.js b/public/tooldb-worker/index.js
diff --git a/src/components/views/settings/ReaderStatus.tsx b/src/components/views/settings/ReaderStatus.tsx
@@ -1,9 +1,8 @@
 import { useEffect, useState } from "react";
 
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
 function findMTGA(): boolean {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
   const { findPidByName } = reader;
   return findPidByName("MTGA");
 }

diff --git a/src/info.json b/src/info.json
@@ -1 +1 @@
-{"version":"6.6.8","branch":"dev","timestamp":1714838419904}
+{"version":"6.6.8","branch":"dev","timestamp":1714842289969}
diff --git a/src/reader/readCards.ts b/src/reader/readCards.ts
@@ -2,11 +2,6 @@ import { Cards } from "mtgatool-shared";
 
 import upsertDbCards from "../toolDb/upsertDbCards";
 
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
-const { readData } = reader;
-
 interface ReaderCard {
   key: number;
   value: number;
@@ -15,6 +10,11 @@ interface ReaderCard {
 }
 
 export default function readCards() {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
+
+  const { readData } = reader;
+
   const cards = readData("MTGA", [
     "WrapperController",
     "<Instance>k__BackingField",

diff --git a/src/reader/readMatchManger.ts b/src/reader/readMatchManger.ts
@@ -1,8 +1,3 @@
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
-const { readData } = reader;
-
 interface MatchManager {
   "<BattlefieldId>k__BackingField": string;
   "<CurrentGameNumber>k__BackingField": number;
@@ -21,6 +16,11 @@ interface MatchManager {
 }
 
 export default function readMatchManger(): MatchManager | undefined {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
+
+  const { readData } = reader;
+
   const matchManager = readData("MTGA", ["PAPA", "_instance", "_matchManager"]);
 
   if (matchManager.error) return undefined;

diff --git a/src/reader/readMatchOpponentInfo.ts b/src/reader/readMatchOpponentInfo.ts
@@ -1,8 +1,3 @@
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
-const { readData } = reader;
-
 interface PlayerInfo {
   AvatarSelection: string;
   CommanderGrpId: number;
@@ -17,6 +12,11 @@ interface PlayerInfo {
 }
 
 export default function readMatchOpponentInfo(): PlayerInfo | undefined {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
+
+  const { readData } = reader;
+
   const opponentInfo = readData("MTGA", [
     "PAPA",
     "_instance",

diff --git a/src/reader/readMatchPlayerInfo.ts b/src/reader/readMatchPlayerInfo.ts
@@ -1,8 +1,3 @@
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
-const { readData } = reader;
-
 interface PlayerInfo {
   AvatarSelection: string;
   CommanderGrpId: number;
@@ -17,6 +12,11 @@ interface PlayerInfo {
 }
 
 export default function readMatchPlayerInfo(): PlayerInfo | undefined {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
+
+  const { readData } = reader;
+
   const playerInfo = readData("MTGA", [
     "PAPA",
     "_instance",

diff --git a/src/reader/readPlayerid.ts b/src/reader/readPlayerid.ts
@@ -1,10 +1,5 @@
 import switchPlayerUUID from "../utils/switchPlayerUUID";
 
-// eslint-disable-next-line no-undef
-const reader = __non_webpack_require__("mtga-reader");
-
-const { readData } = reader;
-
 interface AccountInformation {
   AccessToken: string;
   AccountID: string;
@@ -22,6 +17,11 @@ interface AccountInformation {
 }
 
 export default function readPlayerId() {
+  // eslint-disable-next-line no-undef
+  const reader = __non_webpack_require__("mtga-reader");
+
+  const { readData } = reader;
+
   const data = readData("MTGA", [
     "WrapperController",
     "<Instance>k__BackingField",