diff --git a/package-lock.json b/package-lock.json index 7a9dc9f..8121cc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ "@types/node": "^16.18.104", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", + "axios": "^0.21.4", "base-64": "^1.0.0", "bootstrap": "^5.3.3", - "jmap-client-ts": "^1.0.0", "react": "^18.3.1", "react-bootstrap": "^2.10.4", "react-dom": "^18.3.1", @@ -5257,6 +5257,14 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -11999,11 +12007,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jmap-client-ts": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jmap-client-ts/-/jmap-client-ts-1.0.0.tgz", - "integrity": "sha512-qL31lYUpLAqrVFMaMsogorcAcpZRTSjWPwnxdl61mDNY9DINQvrKIkYCMstva4cxTbL1kQFG4aT8K9wOesrj7g==" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index a564594..6627f40 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "@types/node": "^16.18.104", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", + "axios": "^0.21.4", "base-64": "^1.0.0", "bootstrap": "^5.3.3", - "jmap-client-ts": "^1.0.0", "react": "^18.3.1", "react-bootstrap": "^2.10.4", "react-dom": "^18.3.1", diff --git a/src/client/Client.tsx b/src/client/Client.tsx index 2febff8..4ed9de5 100644 --- a/src/client/Client.tsx +++ b/src/client/Client.tsx @@ -3,8 +3,8 @@ * None of the dependencies should leak, in types or otherwise */ import * as base64 from "base-64"; -import * as jmapclient from "jmap-client-ts"; -import { FetchTransport } from "jmap-client-ts/lib/utils/fetch-transport"; +import * as jmapclient from "./jmap-client-ts/src"; +import { FetchTransport } from "./jmap-client-ts/src/utils/fetch-transport"; import { IAccount, IEmail, IEmailStub, IMailbox, ISession } from "./types"; diff --git a/src/client/types.tsx b/src/client/types.tsx index f2aa964..a479d70 100644 --- a/src/client/types.tsx +++ b/src/client/types.tsx @@ -1,4 +1,4 @@ -import client from "jmap-client-ts/lib/types"; +import * as client from "./jmap-client-ts/src/types"; export interface IEmailStub { from: Array | null; diff --git a/tsconfig.json b/tsconfig.json index 9d379a3..757ec45 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,5 +16,6 @@ "noEmit": true, "jsx": "react-jsx" }, - "include": ["src"] + "include": ["src"], + "exclude": ["src/client/jmap-client-ts/tests"] }