diff --git a/package-lock.json b/package-lock.json index c4d61c9..b3d6be4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { "name": "@tcgdex/sdk", - "version": "2.6.0", + "version": "2.7.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@tcgdex/sdk", - "version": "2.6.0", + "version": "2.7.0", "license": "MIT", "dependencies": { "@cachex/memory": "^1", "@cachex/web-storage": "^1", - "@dzeio/object-util": "^1", - "isomorphic-unfetch": "^3" + "@dzeio/object-util": "^1" }, "devDependencies": { "@babel/core": "^7", @@ -6222,15 +6221,6 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "node_modules/isomorphic-unfetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", - "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "dependencies": { - "node-fetch": "^2.6.1", - "unfetch": "^4.2.0" - } - }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", @@ -8331,25 +8321,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -9782,11 +9753,6 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -10390,11 +10356,6 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, - "node_modules/unfetch": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" - }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -10723,20 +10684,6 @@ "makeerror": "1.0.12" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -15236,15 +15183,6 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "isomorphic-unfetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", - "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "requires": { - "node-fetch": "^2.6.1", - "unfetch": "^4.2.0" - } - }, "istanbul-lib-coverage": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", @@ -16807,14 +16745,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -17885,11 +17815,6 @@ "is-number": "^7.0.0" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -18227,11 +18152,6 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, - "unfetch": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" - }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -18414,20 +18334,6 @@ "makeerror": "1.0.12" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 8a52084..002f24d 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,19 @@ { "name": "@tcgdex/sdk", "version": "2.7.0", - "main": "./dist/tcgdex.node.js", - "module": "./dist/tcgdex.node.mjs", - "types": "./dist/tcgdex.node.d.ts", - "browser": "./dist/tcgdex.browser.global.js", + "main": "./dist/tcgdex.js", + "module": "./dist/tcgdex.mjs", + "types": "./dist/tcgdex.d.ts", + "browser": "./dist/tcgdex.global.js", "exports": { ".": { "require": { - "types": "./dist/tcgdex.node.d.ts", - "default": "./dist/tcgdex.node.js" + "types": "./dist/tcgdex.d.ts", + "default": "./dist/tcgdex.js" }, "import": { - "types": "./dist/tcgdex.node.d.mts", - "default": "./dist/tcgdex.node.mjs" + "types": "./dist/tcgdex.d.mts", + "default": "./dist/tcgdex.mjs" } } }, @@ -57,12 +57,11 @@ "dependencies": { "@cachex/memory": "^1", "@cachex/web-storage": "^1", - "@dzeio/object-util": "^1", - "isomorphic-unfetch": "^3" + "@dzeio/object-util": "^1" }, "scripts": { "prebuild": "node scripts/export-version-number.js", - "build": "rm -rf dist && tsup ./src/tcgdex.node.ts --format cjs,esm --dts --clean && tsup ./src/tcgdex.browser.ts --format iife --global-name TCGdex --sourcemap", + "build": "rm -rf dist && tsup ./src/tcgdex.ts --format cjs,esm,iife --global-name TCGdex --sourcemap --dts --clean", "prepublishOnly": "npm run build", "lint": "eslint", "test": "vitest run --coverage" diff --git a/src/interfaces.d.ts b/src/interfaces.d.ts index 70eb685..6ee1e1b 100644 --- a/src/interfaces.d.ts +++ b/src/interfaces.d.ts @@ -27,7 +27,7 @@ interface booster { name: string logo?: string artwork_front?: string - artwork_back?: string + artwork_back?: string } export type SetList = Array diff --git a/src/tcgdex.browser.ts b/src/tcgdex.browser.ts deleted file mode 100644 index 8104c03..0000000 --- a/src/tcgdex.browser.ts +++ /dev/null @@ -1,5 +0,0 @@ -import TCGdex from './tcgdex' - -TCGdex.fetch = window.fetch - -export default TCGdex diff --git a/src/tcgdex.node.ts b/src/tcgdex.node.ts deleted file mode 100644 index 130fc70..0000000 --- a/src/tcgdex.node.ts +++ /dev/null @@ -1,7 +0,0 @@ -import TCGdex from './tcgdex' -import fetch from 'isomorphic-unfetch' - -TCGdex.fetch = fetch as any - -export default TCGdex -export * from './tcgdex' diff --git a/src/tcgdex.ts b/src/tcgdex.ts index ca3802f..e9e64ea 100644 --- a/src/tcgdex.ts +++ b/src/tcgdex.ts @@ -31,7 +31,11 @@ export default class TCGdex { /** * How the remote data is going to be fetched */ - public static fetch: typeof fetch = fetch + public static fetch: typeof fetch = + detectContext() === 'browser' + // fixe: TypeError: 'fetch' called on an object that does not implement interface Window. + ? (...params: Parameters) => window.fetch(...params) + : fetch /** * @deprecated to change the lang use {@link TCGdex.getLang} and {@link TCGdex.setLang} @@ -42,7 +46,9 @@ export default class TCGdex { * the previously hidden caching system used by TCGdex to not kill the API */ public cache: CacheInterface = - detectContext() === 'browser' ? new LocalStorageCache('tcgdex-cache') : new MemoryCache() + detectContext() === 'browser' + ? new LocalStorageCache('tcgdex-cache') + : new MemoryCache() /** * the default cache TTL, only subsequent requests will have their ttl changed diff --git a/src/utils.ts b/src/utils.ts index f88a47c..169d5bf 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,7 @@ import type { Endpoints } from './interfaces' /** - * detect the current running context ofthe program + * detect the current running context of the program */ export function detectContext(): 'browser' | 'server' { try {