Merge pull request #110 from invariant-labs/fix-build

remove data from tsconfig
invariant-labs · Dec 6, 2024 · b4d60ba · b4d60ba
2 parents fc94da2 + 186292d
commit b4d60ba
Show file tree

Hide file tree

Showing 28 changed files with 79 additions and 2 deletions.
diff --git a/api/a0/daily_usd_values/[net].ts b/api/a0/daily_usd_values/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/a0/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/a0/mainnet.json";
 import { PoolStatsData, A0Network as Network } from "./../../utils";
 

diff --git a/api/a0/full/[net].ts b/api/a0/full/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/a0/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/a0/mainnet.json";
 import { PoolSnapshot, PoolStatsData, A0Network as Network } from "./../../utils";
 

diff --git a/api/a0/full_snap/[net].ts b/api/a0/full_snap/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/a0/full_testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/a0/full_mainnet.json";
 import {
   PoolStatsDataWithString,

diff --git a/api/a0/pool_daily_data/[net]/stats/[address].ts b/api/a0/pool_daily_data/[net]/stats/[address].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../../../data/a0/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../../../data/a0/mainnet.json";
 import {
   PoolStatsData,

diff --git a/api/a0/short/[net].ts b/api/a0/short/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/a0/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/a0/mainnet.json";
 import { PoolStatsData, A0Network as Network } from "./../../utils";
 

diff --git a/api/alph/daily_usd_values/[net].ts b/api/alph/daily_usd_values/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/alph/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/alph/mainnet.json";
 import { PoolStatsData, ALPHNetwork as Network } from "../../utils";
 

diff --git a/api/alph/full/[net].ts b/api/alph/full/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/alph/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/alph/mainnet.json";
 import {
   PoolSnapshot,

diff --git a/api/alph/full_snap/[net].ts b/api/alph/full_snap/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/alph/full_testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/alph/full_mainnet.json";
 import {
   PoolStatsDataWithString,

diff --git a/api/alph/pool_daily_data/[net]/stats/[address].ts b/api/alph/pool_daily_data/[net]/stats/[address].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../../../data/alph/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../../../data/alph/mainnet.json";
 import {
   PoolStatsData,

diff --git a/api/alph/short/[net].ts b/api/alph/short/[net].ts
@@ -1,5 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/alph/testnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/alph/mainnet.json";
 import { PoolStatsData, ALPHNetwork as Network } from "../../utils";
 

diff --git a/api/eclipse/tickers.ts b/api/eclipse/tickers.ts
@@ -8,7 +8,9 @@ import {
   PoolStructure,
 } from "@invariant-labs/sdk-eclipse/lib/market";
 import { PoolSnapshot, printBN } from "../utils";
+//@ts-ignore
 import data from "../../data/eclipse/mainnet.json";
+//@ts-ignore
 import fullData from "../../data/eclipse/full_mainnet.json";
 import {
   PoolStatsDataWithString,

diff --git a/api/solana/tickers.ts b/api/solana/tickers.ts
@@ -5,8 +5,11 @@ import { getMarketAddress, Market, Network } from "@invariant-labs/sdk";
 import { Connection, Keypair, PublicKey } from "@solana/web3.js";
 import { PoolStructure } from "@invariant-labs/sdk/lib/market";
 import { PoolSnapshot, printBN } from "../utils";
+// @ts-ignore
 import data from "../../data/mainnet.json";
+// @ts-ignore
 import fullData from "../../data/full_mainnet.json";
+
 import {
   PoolStatsDataWithString,
   TimeData,

diff --git a/api/solana/tickers_sorted.ts b/api/solana/tickers_sorted.ts
@@ -5,8 +5,11 @@ import { getMarketAddress, Market, Network } from "@invariant-labs/sdk";
 import { Connection, Keypair, PublicKey } from "@solana/web3.js";
 import { PoolStructure } from "@invariant-labs/sdk/lib/market";
 import { PoolSnapshot, printBN } from "../utils";
+// @ts-ignore
 import data from "../../data/mainnet.json";
+// @ts-ignore
 import fullData from "../../data/full_mainnet.json";
+
 import {
   PoolStatsDataWithString,
   TimeData,

diff --git a/api/svm/[net]/aggregated/[address].ts b/api/svm/[net]/aggregated/[address].ts
@@ -1,12 +1,20 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
 import BN from "bn.js";
+//@ts-ignore
 import DEVNET_DATA from "../../../../data/devnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../../data/mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_DATA from "../../../../data/eclipse/devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_DATA from "../../../../data/eclipse/mainnet.json";
+//@ts-ignore
 import DEVNET_APY from "../../../../data/pool_apy_archive_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../../data/pool_apy_archive_mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_APY from "../../../../data/eclipse/pool_apy_archive_devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_APY from "../../../../data/eclipse/pool_apy_archive_mainnet.json";
 import {
   PoolApyArchiveSnapshot,

diff --git a/api/svm/[net]/apy/[address].ts b/api/svm/[net]/apy/[address].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_APY from "../../../../data/pool_apy_archive_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../../data/pool_apy_archive_mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_APY from "../../../../data/eclipse/pool_apy_archive_devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_APY from "../../../../data/eclipse/pool_apy_archive_mainnet.json";
 import { PoolApyArchiveSnapshot } from "../../../../solana/src/utils";
 

diff --git a/api/svm/daily_usd_values/[net].ts b/api/svm/daily_usd_values/[net].ts
@@ -1,6 +1,9 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_DATA from "../../../data/devnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_DATA from "../../../data/eclipse/devnet.json";
 import { PoolStatsData } from "../../../solana/src/utils";
 

diff --git a/api/svm/full/[net].ts b/api/svm/full/[net].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_DATA from "../../../data/devnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_DATA from "../../../data/eclipse/devnet.json";
+//@ts-ignore
 import ECLIPSE_TESTNET_DATA from "../../../data/eclipse/testnet.json";
 import { PoolSnapshot, PoolStatsData } from "../../../solana/src/utils";
 

diff --git a/api/svm/full_snap/[net].ts b/api/svm/full_snap/[net].ts
@@ -1,8 +1,13 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_DATA from "../../../data/full_devnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/full_mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_DATA from "../../../data/eclipse/full_devnet.json";
+//@ts-ignore
 import ECLIPSE_TESTNET_DATA from "../../../data/eclipse/full_testnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_DATA from "../../../data/eclipse/full_mainnet.json";
 import {
   PoolStatsDataWithString,

diff --git a/api/svm/incentive_rewards/[net].ts b/api/svm/incentive_rewards/[net].ts
@@ -1,8 +1,12 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_APY from "../../../data/incentive_apy_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../data/incentive_apy_mainnet.json";
 import { IncentiveApySnapshot, RewardsData } from "../../../solana/src/utils";
+//@ts-ignore
 import DEVNET_REWARDS from "../../../data/rewards_data_devnet.json";
+//@ts-ignore
 import MAINNET_REWARDS from "../../../data/rewards_data_mainnet.json";
 
 export default function (req: VercelRequest, res: VercelResponse) {

diff --git a/api/svm/pool_apy/[net].ts b/api/svm/pool_apy/[net].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_APY from "../../../data/pool_apy_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../data/pool_apy_mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_APY from "../../../data/eclipse/pool_apy_devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_APY from "../../../data/eclipse/pool_apy_archive_mainnet.json";
 import { ApySnapshot } from "../../../solana/src/utils";
 

diff --git a/api/svm/pool_apy_archive/[net].ts b/api/svm/pool_apy_archive/[net].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_APY from "../../../data/pool_apy_archive_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../data/pool_apy_archive_mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_APY from "../../../data/eclipse/pool_apy_archive_devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_APY from "../../../data/eclipse/pool_apy_archive_mainnet.json";
 
 export default function (req: VercelRequest, res: VercelResponse) {

diff --git a/api/svm/pool_volume_range/[net].ts b/api/svm/pool_volume_range/[net].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import ECLIPSE_DEVNET_APY from "../../../data/eclipse/pool_apy_devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_APY from "../../../data/eclipse/pool_apy_archive_mainnet.json";
+//@ts-ignore
 import DEVNET_APY from "../../../data/pool_apy_devnet.json";
+//@ts-ignore
 import MAINNET_APY from "../../../data/pool_apy_mainnet.json";
 import { ApySnapshot } from "../../../solana/src/utils";
 

diff --git a/api/svm/short/[net].ts b/api/svm/short/[net].ts
@@ -1,7 +1,11 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import DEVNET_DATA from "../../../data/devnet.json";
+//@ts-ignore
 import MAINNET_DATA from "../../../data/mainnet.json";
+//@ts-ignore
 import ECLIPSE_DEVNET_DATA from "../../../data/eclipse/devnet.json";
+//@ts-ignore
 import ECLIPSE_MAINNET_DATA from "../../../data/eclipse/mainnet.json";
 import { PoolStatsData } from "../../../solana/src/utils";
 

diff --git a/api/vara/full/[net].ts b/api/vara/full/[net].ts
@@ -1,4 +1,5 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/vara/testnet.json";
 import {
   PoolSnapshot,

diff --git a/api/vara/full_snap/[net].ts b/api/vara/full_snap/[net].ts
@@ -1,4 +1,5 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
+//@ts-ignore
 import TESTNET_DATA from "../../../data/vara/full_testnet.json";
 import {
   PoolStatsDataWithString,

diff --git a/solana/src/utils.ts b/solana/src/utils.ts
@@ -7,6 +7,7 @@ import { DECIMAL, Range } from "@invariant-labs/sdk/lib/utils";
 import { BN } from "@project-serum/anchor";
 import { PublicKey } from "@solana/web3.js";
 import axios, { AxiosResponse } from "axios";
+// @ts-ignore
 import MAINNET_TOKENS from "../../data/mainnet_tokens.json";
 import { TokenInfo } from "@solana/spl-token-registry";
 import { Network as EclipseNetwork } from "@invariant-labs/sdk-eclipse";

diff --git a/solana/tsconfig.json b/solana/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "typeRoots": ["./node_modules/@types"],
     "lib": ["es2015"],

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,7 @@
     "typeRoots": ["./node_modules/@types"],
     "lib": ["es2015"],
     "target": "es6",
-    "resolveJsonModule": true,
+    "resolveJsonModule": false,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
@@ -15,5 +15,6 @@
     "isolatedModules": true,
     "noFallthroughCasesInSwitch": true
   },
-  "exclude": ["a0", "alph", "solana", "eclipse"]
+  "include": ["api/**/*"],
+  "exclude": ["data/**/*"],
 }