diff --git a/.babelrc b/.babelrc index ddde2b8..aa0f64c 100644 --- a/.babelrc +++ b/.babelrc @@ -1,14 +1,9 @@ { - "presets": [ - ["env", {"targets": {"browsers": ["last 2 versions", "> 5%"], "node": 6}, "loose": true}], - "stage-0" - ], "env": { "test": { "plugins": [ - ["istanbul", {"include": ["src/**"]}], "rewire" ] } } -} \ No newline at end of file +} diff --git a/.gitignore b/.gitignore index 00629f1..c516529 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,6 @@ npm-debug.log* # Coverage directories coverage/ -.nyc_output/ - -# Compiled code -build/ # Dependencies node_modules/ @@ -19,4 +15,4 @@ node_modules/ # Operating System .DS_Store -Thumbs.db \ No newline at end of file +Thumbs.db diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 5491a77..0000000 --- a/.npmignore +++ /dev/null @@ -1,22 +0,0 @@ -# Logs -npm-debug.log* - -# Coverage directories -coverage/ -.nyc_output/ - -# Source code -src/ - -# Dependencies -node_modules/ - -# Optional npm cache directory -.npm/ - -# Webflow -.idea/ - -# Operating System -.DS_Store -Thumbs.db \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index deae316..1d92e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: node_js node_js: - - "6" -after_script: "$(npm bin)/codecov" + - "8" +script: + - npm run test -- --coverage + - npm run lint +after_script: "curl -s https://codecov.io/bash | bash" branches: only: - master - /^greenkeeper.*$/ services: - - redis-server \ No newline at end of file + - redis-server diff --git a/README.md b/README.md index 0d27ab8..0ee9723 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This module can be used for Node.js as well as browsers using [Browserify](https ### Basic usage ```js -import client from 'gw2api-client' +const client = require('gw2api-client') // Get an instance of an API client let api = client() @@ -53,7 +53,7 @@ api.items().all().then(items => console.log(items)) By default, calling any endpoint requests data from the live API. However, you can easily enable caching for all appropriate endpoints by giving the client a cache storage to work with. You can find the default cache times of all endpoints [here](./docs/endpoints.md). ```js -import cacheMemory from 'gw2api-client/build/cache/memory' +const cacheMemory = require('gw2api-client/build/cache/memory') api.cacheStorage(cacheMemory()) // This will only call the official API once @@ -73,8 +73,8 @@ api.items().live().ids() You can also chain multiple cache storages together. In this case, the cache gets saved in all storages and read from the first storage in the list answering with a valid value. The more persistent and more reliable cache storages should therefore be on the end of the list and the fastest (e.g. memory) should be at the start of the list. ```js -import cacheMemory from 'gw2api-client/build/cache/memory' -import cacheRedisStorage from 'gw2api-client/build/cache/redis' +const cacheMemory = require('gw2api-client/build/cache/memory') +const cacheRedisStorage = require('gw2api-client/build/cache/redis') // Save in memory and local storage // Try to answer from memory first, then from local storage and then hit the API @@ -150,8 +150,8 @@ You can extend or overwrite the API client with your own endpoints if you wish s If you need more specific ways to handle data then the already defined ones, take a look at how the existing endpoints handle these edge cases (e.g. in [`/src/endpoints/recipes.js`](/src/endpoints/recipes.js)). ```js -import client from 'gw2api-client' -import AbstractEndpoint from 'gw2api-client/build/endpoint' +const client = require('gw2api-client') +const AbstractEndpoint = require('gw2api-client/build/endpoint') // Get an instance of an API client const api = client() @@ -192,8 +192,8 @@ api.items().many([123, 456]) If you want to mock this module in your tests, you can replace the underlying `lets-fetch` library with the provided mock module, e.g. using [rewire](https://github.com/speedskater/babel-plugin-rewire). You can find all available mock methods [here](https://github.com/queicherius/lets-fetch#mocking). ```js -import fetchMock from 'lets-fetch/mock' -import file from './some/file/using/gw2api/client.js' +const fetchMock = require('lets-fetch/mock') +const file = require('./some/file/using/gw2api/client.js') // Get the variable "api" (which would be the initialized api client // in your own code) and replace the fetch method with the fetchMock diff --git a/package.json b/package.json index b8202b3..a5ba615 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,10 @@ "name": "gw2api-client", "version": "6.1.1", "description": "A javascript wrapper around the official Guild Wars 2 API", - "main": "./build/index.js", + "main": "./src/index.js", "scripts": { - "build": "abc build", - "test": "jest --runInBand --forceExit && abc lint", - "version": "abc build" + "test": "jest --runInBand --forceExit", + "lint": "abc lint" }, "author": "queicherius@gmail.com", "license": "MIT", diff --git a/src/cache/browser.js b/src/cache/browser.js index 790e7d7..802c736 100644 --- a/src/cache/browser.js +++ b/src/cache/browser.js @@ -1,14 +1,13 @@ -import debounce from 'debounce' -import * as idbKeyval from 'idb-keyval' +const debounce = require('debounce') +const idbKeyval = require('idb-keyval') -export default function (configuration) { - configuration = { +module.exports = function (configuration) { + configuration = Object.assign({ storageKey: 'gw2api-cache', gcTick: 5 * 60 * 1000, persistDebounce: 3 * 1000, - storageEngine: idbKeyval, - ...configuration - } + storageEngine: idbKeyval + }, configuration) let _storage = {} const storageEngine = configuration.storageEngine diff --git a/src/cache/memory.js b/src/cache/memory.js index 75442ea..5d98729 100644 --- a/src/cache/memory.js +++ b/src/cache/memory.js @@ -1,5 +1,7 @@ -export default function (configuration) { - configuration = {gcTick: 5 * 60 * 1000, ...configuration} +module.exports = function (configuration) { + configuration = Object.assign({ + gcTick: 5 * 60 * 1000 + }, configuration) // Scope the storage to the function, so multiple instances don't interfere let _storage = {} diff --git a/src/cache/null.js b/src/cache/null.js index 1deaae4..2006c11 100644 --- a/src/cache/null.js +++ b/src/cache/null.js @@ -1,4 +1,4 @@ -export default function () { +module.exports = function () { return {get, set, mget, mset, flush} } diff --git a/src/cache/redis.js b/src/cache/redis.js index 0a46cd7..3cdde8a 100644 --- a/src/cache/redis.js +++ b/src/cache/redis.js @@ -1,5 +1,7 @@ -export default function (configuration) { - configuration = {prefix: 'gw2api-', ...configuration} +module.exports = function (configuration) { + configuration = Object.assign({ + prefix: 'gw2api-', + }, configuration) if (!configuration.redis) { throw new Error('The `redis` cache storage requires a `redis` instance') diff --git a/src/client.js b/src/client.js index ec98adb..27a1450 100644 --- a/src/client.js +++ b/src/client.js @@ -1,11 +1,11 @@ -import fetch from 'lets-fetch' -import flow from 'promise-control-flow' -import debugging from 'debug' -import nullCache from './cache/null' -import * as endpoints from './endpoints' +const fetch = require('lets-fetch') +const flow = require('promise-control-flow') +const debugging = require('debug') +const nullCache = require('./cache/null') +const endpoints = require('./endpoints') const debug = debugging('gw2api-client') -export default class Client { +module.exports = class Client { constructor () { this.lang = 'en' this.apiKey = false diff --git a/src/endpoint.js b/src/endpoint.js index 30a74a0..cf9b578 100644 --- a/src/endpoint.js +++ b/src/endpoint.js @@ -1,14 +1,14 @@ -import parseUrl from 'url-parse' -import unique from 'array-unique' -import Rusha from 'rusha' -import clone from 'fast-clone' -import chunk from 'chunk' -import debugging from 'debug' +const parseUrl = require('url-parse') +const unique = require('array-unique') +const Rusha = require('rusha') +const clone = require('fast-clone') +const chunk = require('chunk') +const debugging = require('debug') const sha = (s) => (new Rusha()).digestFromString(s) const debug = debugging('gw2api-client') const debugRequest = debugging('gw2api-client:request') -export default class AbstractEndpoint { +module.exports = class AbstractEndpoint { constructor (parent) { this.lang = parent.lang this.apiKey = parent.apiKey diff --git a/src/endpoints/account-blob.js b/src/endpoints/account-blob.js index 893a7ab..7e57dd6 100644 --- a/src/endpoints/account-blob.js +++ b/src/endpoints/account-blob.js @@ -1,9 +1,9 @@ -import flow from 'promise-control-flow' -import flat from 'flat' -import _get from 'fast-get' -import api from '../index.js' +const flow = require('promise-control-flow') +const flat = require('flat') +const _get = require('fast-get') +const api = require('../index.js') -export default function (parent) { +function blob (parent) { const client = api() .authenticate(parent.apiKey) .language(parent.lang) @@ -91,7 +91,7 @@ function filterBetaCharacters (characters) { // Wrap a promise function so all errors that have to do with the API // just result in an empty response instead of throwing an error // This prevents API errors / changes breaking the entire infrastructure -export function wrap (func) { +function wrap (func) { return () => new Promise((resolve, reject) => { func() .then(x => resolve(x)) @@ -108,3 +108,6 @@ export function wrap (func) { }) }) } + +module.exports = blob +module.exports.wrap = wrap diff --git a/src/endpoints/account.js b/src/endpoints/account.js index f0663b1..0419b07 100644 --- a/src/endpoints/account.js +++ b/src/endpoints/account.js @@ -1,10 +1,10 @@ -import AbstractEndpoint from '../endpoint' -import CharactersEndpoint from './characters' -import PvpEndpoint from './pvp' -import CommerceEndpoint from './commerce' -import accountBlob from './account-blob.js' +const AbstractEndpoint = require('../endpoint') +const CharactersEndpoint = require('./characters') +const PvpEndpoint = require('./pvp') +const CommerceEndpoint = require('./commerce') +const accountBlob = require('./account-blob.js') -export default class AccountEndpoint extends AbstractEndpoint { +module.exports = class AccountEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/account' diff --git a/src/endpoints/achievements.js b/src/endpoints/achievements.js index 7609826..1d71055 100644 --- a/src/endpoints/achievements.js +++ b/src/endpoints/achievements.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class AchievementsEndpoint extends AbstractEndpoint { +module.exports = class AchievementsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/achievements' diff --git a/src/endpoints/backstory.js b/src/endpoints/backstory.js index 00b36e1..53655eb 100644 --- a/src/endpoints/backstory.js +++ b/src/endpoints/backstory.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class BackstoryEndpoint extends AbstractEndpoint { +module.exports = class BackstoryEndpoint extends AbstractEndpoint { answers () { return new AnswersEndpoint(this) } diff --git a/src/endpoints/build.js b/src/endpoints/build.js index 20363d0..baa0430 100644 --- a/src/endpoints/build.js +++ b/src/endpoints/build.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class BuildEndpoint extends AbstractEndpoint { +module.exports = class BuildEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/build' diff --git a/src/endpoints/cats.js b/src/endpoints/cats.js index 6a46a9b..04d9a76 100644 --- a/src/endpoints/cats.js +++ b/src/endpoints/cats.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class CatsEndpoint extends AbstractEndpoint { +module.exports = class CatsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/cats' diff --git a/src/endpoints/characters.js b/src/endpoints/characters.js index 79ab37b..b8708d2 100644 --- a/src/endpoints/characters.js +++ b/src/endpoints/characters.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class CharactersEndpoint extends AbstractEndpoint { +module.exports = class CharactersEndpoint extends AbstractEndpoint { constructor (client, name) { super(client) this.name = name diff --git a/src/endpoints/colors.js b/src/endpoints/colors.js index 4143f88..8bb97e6 100644 --- a/src/endpoints/colors.js +++ b/src/endpoints/colors.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class ColorsEndpoint extends AbstractEndpoint { +module.exports = class ColorsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/colors' diff --git a/src/endpoints/commerce.js b/src/endpoints/commerce.js index ed16500..248ac47 100644 --- a/src/endpoints/commerce.js +++ b/src/endpoints/commerce.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class CommerceEndpoint extends AbstractEndpoint { +module.exports = class CommerceEndpoint extends AbstractEndpoint { // Current things to grab in the delivery box delivery () { return new DeliveryEndpoint(this) diff --git a/src/endpoints/continents.js b/src/endpoints/continents.js index 0ef4614..b301b3e 100644 --- a/src/endpoints/continents.js +++ b/src/endpoints/continents.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class ContinentsEndpoint extends AbstractEndpoint { +module.exports = class ContinentsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/continents' diff --git a/src/endpoints/currencies.js b/src/endpoints/currencies.js index 797699b..495d533 100644 --- a/src/endpoints/currencies.js +++ b/src/endpoints/currencies.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class CurrenciesEndpoint extends AbstractEndpoint { +module.exports = class CurrenciesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/currencies' diff --git a/src/endpoints/dungeons.js b/src/endpoints/dungeons.js index 56841a4..ccfc604 100644 --- a/src/endpoints/dungeons.js +++ b/src/endpoints/dungeons.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class DungeonsEndpoint extends AbstractEndpoint { +module.exports = class DungeonsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/dungeons' diff --git a/src/endpoints/emblem.js b/src/endpoints/emblem.js index 03490c9..5d67e77 100644 --- a/src/endpoints/emblem.js +++ b/src/endpoints/emblem.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class EmblemEndpoint extends AbstractEndpoint { +module.exports = class EmblemEndpoint extends AbstractEndpoint { backgrounds () { return new LayersEndpoint(this, 'backgrounds') } diff --git a/src/endpoints/events.js b/src/endpoints/events.js index e332c61..c588e0d 100644 --- a/src/endpoints/events.js +++ b/src/endpoints/events.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class EventsEndpoint extends AbstractEndpoint { +module.exports = class EventsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v1/event_details.json' @@ -22,7 +22,7 @@ function transformV1Format (json) { const keys = Object.keys(events) for (let i = 0; i !== keys.length; i++) { - transformed.push({id: keys[i], ...events[keys[i]]}) + transformed.push(Object.assign({id: keys[i]}, events[keys[i]])) } return transformed diff --git a/src/endpoints/files.js b/src/endpoints/files.js index 05bd492..565d249 100644 --- a/src/endpoints/files.js +++ b/src/endpoints/files.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class FilesEndpoint extends AbstractEndpoint { +module.exports = class FilesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/files' diff --git a/src/endpoints/finishers.js b/src/endpoints/finishers.js index abcc4e5..7c4b105 100644 --- a/src/endpoints/finishers.js +++ b/src/endpoints/finishers.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class FinishersEndpoint extends AbstractEndpoint { +module.exports = class FinishersEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/finishers' diff --git a/src/endpoints/gliders.js b/src/endpoints/gliders.js index addbf9e..fa237ab 100644 --- a/src/endpoints/gliders.js +++ b/src/endpoints/gliders.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class GlidersEndpoint extends AbstractEndpoint { +module.exports = class GlidersEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/gliders' diff --git a/src/endpoints/guild.js b/src/endpoints/guild.js index 061225f..6ffda69 100644 --- a/src/endpoints/guild.js +++ b/src/endpoints/guild.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class GuildEndpoint extends AbstractEndpoint { +module.exports = class GuildEndpoint extends AbstractEndpoint { constructor (client, id) { super(client) this.id = id diff --git a/src/endpoints/index.js b/src/endpoints/index.js index 4dfa350..e59e8ce 100644 --- a/src/endpoints/index.js +++ b/src/endpoints/index.js @@ -1,44 +1,46 @@ -export AccountEndpoint from './account' -export AchievementsEndpoint from './achievements' -export BackstoryEndpoint from './backstory' -export BuildEndpoint from './build' -export CatsEndpoint from './cats' -export CharactersEndpoint from './characters' -export ColorsEndpoint from './colors' -export CommerceEndpoint from './commerce' -export ContinentsEndpoint from './continents' -export CurrenciesEndpoint from './currencies' -export DungeonsEndpoint from './dungeons' -export EmblemEndpoint from './emblem' -export EventsEndpoint from './events' -export FilesEndpoint from './files' -export FinishersEndpoint from './finishers' -export GlidersEndpoint from './gliders' -export GuildEndpoint from './guild' -export ItemsEndpoint from './items' -export ItemstatsEndpoint from './itemstats' -export LegendsEndpoint from './legends' -export MailcarriersEndpoint from './mailcarriers' -export MapsEndpoint from './maps' -export MasteriesEndpoint from './masteries' -export MaterialsEndpoint from './materials' -export MinisEndpoint from './minis' -export MountsEndpoint from './mounts' -export NodesEndpoint from './nodes' -export OutfitsEndpoint from './outfits' -export PetsEndpoint from './pets' -export ProfessionsEndpoint from './professions' -export PvpEndpoint from './pvp' -export QuaggansEndpoint from './quaggans' -export RacesEndpoint from './races' -export RaidsEndpoint from './raids' -export RecipesEndpoint from './recipes' -export SkillsEndpoint from './skills' -export SkinsEndpoint from './skins' -export SpecializationsEndpoint from './specializations' -export StoriesEndpoint from './stories' -export TitlesEndpoint from './titles' -export TokeninfoEndpoint from './tokeninfo' -export TraitsEndpoint from './traits' -export WorldsEndpoint from './worlds' -export WvwEndpoint from './wvw' +module.exports = { + AccountEndpoint: require('./account'), + AchievementsEndpoint: require('./achievements'), + BackstoryEndpoint: require('./backstory'), + BuildEndpoint: require('./build'), + CatsEndpoint: require('./cats'), + CharactersEndpoint: require('./characters'), + ColorsEndpoint: require('./colors'), + CommerceEndpoint: require('./commerce'), + ContinentsEndpoint: require('./continents'), + CurrenciesEndpoint: require('./currencies'), + DungeonsEndpoint: require('./dungeons'), + EmblemEndpoint: require('./emblem'), + EventsEndpoint: require('./events'), + FilesEndpoint: require('./files'), + FinishersEndpoint: require('./finishers'), + GlidersEndpoint: require('./gliders'), + GuildEndpoint: require('./guild'), + ItemsEndpoint: require('./items'), + ItemstatsEndpoint: require('./itemstats'), + LegendsEndpoint: require('./legends'), + MailcarriersEndpoint: require('./mailcarriers'), + MapsEndpoint: require('./maps'), + MasteriesEndpoint: require('./masteries'), + MaterialsEndpoint: require('./materials'), + MinisEndpoint: require('./minis'), + MountsEndpoint: require('./mounts'), + NodesEndpoint: require('./nodes'), + OutfitsEndpoint: require('./outfits'), + PetsEndpoint: require('./pets'), + ProfessionsEndpoint: require('./professions'), + PvpEndpoint: require('./pvp'), + QuaggansEndpoint: require('./quaggans'), + RacesEndpoint: require('./races'), + RaidsEndpoint: require('./raids'), + RecipesEndpoint: require('./recipes'), + SkillsEndpoint: require('./skills'), + SkinsEndpoint: require('./skins'), + SpecializationsEndpoint: require('./specializations'), + StoriesEndpoint: require('./stories'), + TitlesEndpoint: require('./titles'), + TokeninfoEndpoint: require('./tokeninfo'), + TraitsEndpoint: require('./traits'), + WorldsEndpoint: require('./worlds'), + WvwEndpoint: require('./wvw') +} diff --git a/src/endpoints/items.js b/src/endpoints/items.js index b22a498..6091d61 100644 --- a/src/endpoints/items.js +++ b/src/endpoints/items.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class ItemsEndpoint extends AbstractEndpoint { +module.exports = class ItemsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/items' diff --git a/src/endpoints/itemstats.js b/src/endpoints/itemstats.js index 042a263..798a4ce 100644 --- a/src/endpoints/itemstats.js +++ b/src/endpoints/itemstats.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class ItemstatsEndpoint extends AbstractEndpoint { +module.exports = class ItemstatsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/itemstats' diff --git a/src/endpoints/legends.js b/src/endpoints/legends.js index 573722a..3bd64df 100644 --- a/src/endpoints/legends.js +++ b/src/endpoints/legends.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class LegendsEndpoint extends AbstractEndpoint { +module.exports = class LegendsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/legends' diff --git a/src/endpoints/mailcarriers.js b/src/endpoints/mailcarriers.js index 7d5dcba..26b9e31 100644 --- a/src/endpoints/mailcarriers.js +++ b/src/endpoints/mailcarriers.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MailcarriersEndpoint extends AbstractEndpoint { +module.exports = class MailcarriersEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/mailcarriers' diff --git a/src/endpoints/maps.js b/src/endpoints/maps.js index 5fc70eb..4c2c073 100644 --- a/src/endpoints/maps.js +++ b/src/endpoints/maps.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MapsEndpoint extends AbstractEndpoint { +module.exports = class MapsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/maps' diff --git a/src/endpoints/masteries.js b/src/endpoints/masteries.js index a6e1493..2651486 100644 --- a/src/endpoints/masteries.js +++ b/src/endpoints/masteries.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MasteriesEndpoint extends AbstractEndpoint { +module.exports = class MasteriesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/masteries' diff --git a/src/endpoints/materials.js b/src/endpoints/materials.js index f2b6d48..069b146 100644 --- a/src/endpoints/materials.js +++ b/src/endpoints/materials.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MaterialsEndpoint extends AbstractEndpoint { +module.exports = class MaterialsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/materials' diff --git a/src/endpoints/minis.js b/src/endpoints/minis.js index 19ce9b2..9d0f8fa 100644 --- a/src/endpoints/minis.js +++ b/src/endpoints/minis.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MinisEndpoint extends AbstractEndpoint { +module.exports = class MinisEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/minis' diff --git a/src/endpoints/mounts.js b/src/endpoints/mounts.js index 0a2c459..c50c33f 100644 --- a/src/endpoints/mounts.js +++ b/src/endpoints/mounts.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class MountsEndpoint extends AbstractEndpoint { +module.exports = class MountsEndpoint extends AbstractEndpoint { types () { return new TypesEndpoint(this) } diff --git a/src/endpoints/nodes.js b/src/endpoints/nodes.js index 3d96fb4..361fa66 100644 --- a/src/endpoints/nodes.js +++ b/src/endpoints/nodes.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class NodesEndpoint extends AbstractEndpoint { +module.exports = class NodesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/nodes' diff --git a/src/endpoints/outfits.js b/src/endpoints/outfits.js index 10d9e06..673adcb 100644 --- a/src/endpoints/outfits.js +++ b/src/endpoints/outfits.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class OutfitsEndpoint extends AbstractEndpoint { +module.exports = class OutfitsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/outfits' diff --git a/src/endpoints/pets.js b/src/endpoints/pets.js index a4ea40d..cad51b9 100644 --- a/src/endpoints/pets.js +++ b/src/endpoints/pets.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class PetsEndpoint extends AbstractEndpoint { +module.exports = class PetsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/pets' diff --git a/src/endpoints/professions.js b/src/endpoints/professions.js index 7daee89..78d0019 100644 --- a/src/endpoints/professions.js +++ b/src/endpoints/professions.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class ProfessionsEndpoint extends AbstractEndpoint { +module.exports = class ProfessionsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/professions' diff --git a/src/endpoints/pvp.js b/src/endpoints/pvp.js index 8b77108..e397046 100644 --- a/src/endpoints/pvp.js +++ b/src/endpoints/pvp.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class PvpEndpoint extends AbstractEndpoint { +module.exports = class PvpEndpoint extends AbstractEndpoint { constructor (client, fromAccount) { super(client) this.fromAccount = fromAccount diff --git a/src/endpoints/quaggans.js b/src/endpoints/quaggans.js index a267615..dd7a219 100644 --- a/src/endpoints/quaggans.js +++ b/src/endpoints/quaggans.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class QuaggansEndpoint extends AbstractEndpoint { +module.exports = class QuaggansEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/quaggans' diff --git a/src/endpoints/races.js b/src/endpoints/races.js index 12d7331..69f5252 100644 --- a/src/endpoints/races.js +++ b/src/endpoints/races.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class RacesEndpoint extends AbstractEndpoint { +module.exports = class RacesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/races' diff --git a/src/endpoints/raids.js b/src/endpoints/raids.js index c7d49ce..22706ea 100644 --- a/src/endpoints/raids.js +++ b/src/endpoints/raids.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class RaidsEndpoint extends AbstractEndpoint { +module.exports = class RaidsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/raids' diff --git a/src/endpoints/recipes.js b/src/endpoints/recipes.js index 1dbeb83..aed36da 100644 --- a/src/endpoints/recipes.js +++ b/src/endpoints/recipes.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class RecipesEndpoint extends AbstractEndpoint { +module.exports = class RecipesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/recipes' diff --git a/src/endpoints/skills.js b/src/endpoints/skills.js index 853750a..de08f8f 100644 --- a/src/endpoints/skills.js +++ b/src/endpoints/skills.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class SkillsEndpoint extends AbstractEndpoint { +module.exports = class SkillsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/skills' diff --git a/src/endpoints/skins.js b/src/endpoints/skins.js index f8ea971..8fdb33c 100644 --- a/src/endpoints/skins.js +++ b/src/endpoints/skins.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class SkinsEndpoint extends AbstractEndpoint { +module.exports = class SkinsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/skins' diff --git a/src/endpoints/specializations.js b/src/endpoints/specializations.js index b9a1387..2826c07 100644 --- a/src/endpoints/specializations.js +++ b/src/endpoints/specializations.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class SpecializationsEndpoint extends AbstractEndpoint { +module.exports = class SpecializationsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/specializations' diff --git a/src/endpoints/stories.js b/src/endpoints/stories.js index 5789f48..746cfbe 100644 --- a/src/endpoints/stories.js +++ b/src/endpoints/stories.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class StoriesEndpoint extends AbstractEndpoint { +module.exports = class StoriesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/stories' diff --git a/src/endpoints/titles.js b/src/endpoints/titles.js index 89fa4cf..6600683 100644 --- a/src/endpoints/titles.js +++ b/src/endpoints/titles.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class TitlesEndpoint extends AbstractEndpoint { +module.exports = class TitlesEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/titles' diff --git a/src/endpoints/tokeninfo.js b/src/endpoints/tokeninfo.js index 2cf1724..6157f1d 100644 --- a/src/endpoints/tokeninfo.js +++ b/src/endpoints/tokeninfo.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class TokeninfoEndpoint extends AbstractEndpoint { +module.exports = class TokeninfoEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/tokeninfo' diff --git a/src/endpoints/traits.js b/src/endpoints/traits.js index a5a1672..a1f2167 100644 --- a/src/endpoints/traits.js +++ b/src/endpoints/traits.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class TraitsEndpoint extends AbstractEndpoint { +module.exports = class TraitsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/traits' diff --git a/src/endpoints/worlds.js b/src/endpoints/worlds.js index 1341575..5ac78e8 100644 --- a/src/endpoints/worlds.js +++ b/src/endpoints/worlds.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class WorldsEndpoint extends AbstractEndpoint { +module.exports = class WorldsEndpoint extends AbstractEndpoint { constructor (client) { super(client) this.url = '/v2/worlds' diff --git a/src/endpoints/wvw.js b/src/endpoints/wvw.js index 85ba618..a21d5f8 100644 --- a/src/endpoints/wvw.js +++ b/src/endpoints/wvw.js @@ -1,6 +1,6 @@ -import AbstractEndpoint from '../endpoint' +const AbstractEndpoint = require('../endpoint') -export default class WvwEndpoint extends AbstractEndpoint { +module.exports = class WvwEndpoint extends AbstractEndpoint { abilities () { return new AbilitiesEndpoint(this) } diff --git a/src/index.js b/src/index.js index cfeab5a..60b3e47 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ -import Client from './client' +const Client = require('./client') // Each time the api wrapper is called, we give back a new instance -export default function () { +module.exports = function () { return new Client() } diff --git a/tests/cache/browser.spec.js b/tests/cache/browser.spec.js index 204dee7..9f2a61a 100644 --- a/tests/cache/browser.spec.js +++ b/tests/cache/browser.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import storage from '../../src/cache/browser' -import idbMock from '../mocks/idb.mock.js' +const storage = require('../../src/cache/browser') +const idbMock = require('../mocks/idb.mock.js') const cache = storage({storageEngine: idbMock, gcTick: 500, persistDebounce: 100}) const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) diff --git a/tests/cache/memory.spec.js b/tests/cache/memory.spec.js index 7b88795..b5c5e06 100644 --- a/tests/cache/memory.spec.js +++ b/tests/cache/memory.spec.js @@ -1,5 +1,5 @@ /* eslint-env jest */ -import storage from '../../src/cache/memory' +const storage = require('../../src/cache/memory') const cache = storage({gcTick: 500}) const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) diff --git a/tests/cache/null.spec.js b/tests/cache/null.spec.js index 405ece1..fabf5d4 100644 --- a/tests/cache/null.spec.js +++ b/tests/cache/null.spec.js @@ -1,5 +1,5 @@ /* eslint-env jest */ -import storage from '../../src/cache/null' +const storage = require('../../src/cache/null') const cache = storage() describe('cache > null', function () { diff --git a/tests/cache/redis.spec.js b/tests/cache/redis.spec.js index c31d7fa..c501ff7 100644 --- a/tests/cache/redis.spec.js +++ b/tests/cache/redis.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import storage from '../../src/cache/redis' -import redis from 'redis' +const storage = require('../../src/cache/redis') +const redis = require('redis') const cache = storage({redis: redis.createClient()}) const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) diff --git a/tests/client.spec.js b/tests/client.spec.js index ddb81c2..a9e21f0 100644 --- a/tests/client.spec.js +++ b/tests/client.spec.js @@ -1,7 +1,7 @@ /* eslint-env jest */ -import nullCache from '../src/cache/null' -import memoryCache from '../src/cache/memory' -import Module from '../src/client' +const nullCache = require('../src/cache/null') +const memoryCache = require('../src/cache/memory') +const Module = require('../src/client') const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) describe('client', () => { diff --git a/tests/endpoint.spec.js b/tests/endpoint.spec.js index cb3c608..990ce97 100644 --- a/tests/endpoint.spec.js +++ b/tests/endpoint.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from './mocks/client.mock' -import Module from '../src/endpoint' +const { mockClient, fetchMock } = require('./mocks/client.mock') +const Module = require('../src/endpoint') const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) async function expectError (callback) { diff --git a/tests/endpoints/account-blob.spec.js b/tests/endpoints/account-blob.spec.js index d3d2919..a7c4838 100644 --- a/tests/endpoints/account-blob.spec.js +++ b/tests/endpoints/account-blob.spec.js @@ -1,5 +1,5 @@ /* eslint-env jest */ -import endpoint, { wrap } from '../../src/endpoints/account-blob' +const endpoint = require('../../src/endpoints/account-blob') function makeApi (hasGuildPermission) { return () => ({ @@ -155,7 +155,7 @@ describe('endpoints > account.blob()', () => { }) it('test wrap() handling api errors', async () => { - function endpoint () { + function mockEndpoint () { let error = new Error() error.response = {status: 503} error.content = {text: 'API is disabled'} @@ -163,19 +163,19 @@ describe('endpoints > account.blob()', () => { return _e(error) } - let response = await wrap(endpoint)() + let response = await endpoint.wrap(mockEndpoint)() expect(response).toEqual(null) }) it('test /v2/account .blob() handling library errors', async () => { - function endpoint () { + function mockEndpoint () { return _e(new Error('Oh no.')) } let error try { - await wrap(endpoint)() + await endpoint.wrap(mockEndpoint)() } catch (err) { error = err } diff --git a/tests/endpoints/account.spec.js b/tests/endpoints/account.spec.js index fa75aa3..65754f6 100644 --- a/tests/endpoints/account.spec.js +++ b/tests/endpoints/account.spec.js @@ -1,7 +1,7 @@ /* eslint-env jest */ -import sinon from 'sinon' -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/account' +const sinon = require('sinon') +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/account') describe('endpoints > account', () => { let endpoint diff --git a/tests/endpoints/achievements.spec.js b/tests/endpoints/achievements.spec.js index e226da3..1118c65 100644 --- a/tests/endpoints/achievements.spec.js +++ b/tests/endpoints/achievements.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/achievements' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/achievements') describe('endpoints > achievements', () => { let endpoint diff --git a/tests/endpoints/backstory.spec.js b/tests/endpoints/backstory.spec.js index 13a8f36..8176828 100644 --- a/tests/endpoints/backstory.spec.js +++ b/tests/endpoints/backstory.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/backstory' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/backstory') describe('endpoints > backstory', () => { let endpoint diff --git a/tests/endpoints/build.spec.js b/tests/endpoints/build.spec.js index c2ca1d9..b103c04 100644 --- a/tests/endpoints/build.spec.js +++ b/tests/endpoints/build.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/build' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/build') describe('endpoints > build', () => { let endpoint diff --git a/tests/endpoints/cats.spec.js b/tests/endpoints/cats.spec.js index aa75261..e1482de 100644 --- a/tests/endpoints/cats.spec.js +++ b/tests/endpoints/cats.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/cats' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/cats') describe('endpoints > cats', () => { let endpoint diff --git a/tests/endpoints/characters.spec.js b/tests/endpoints/characters.spec.js index 3ecea0c..add58cf 100644 --- a/tests/endpoints/characters.spec.js +++ b/tests/endpoints/characters.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/characters' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/characters') describe('endpoints > characters', () => { let endpoint diff --git a/tests/endpoints/colors.spec.js b/tests/endpoints/colors.spec.js index c9ef4bd..7331961 100644 --- a/tests/endpoints/colors.spec.js +++ b/tests/endpoints/colors.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/colors' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/colors') describe('endpoints > colors', () => { let endpoint diff --git a/tests/endpoints/commerce.spec.js b/tests/endpoints/commerce.spec.js index eef226f..e9947a7 100644 --- a/tests/endpoints/commerce.spec.js +++ b/tests/endpoints/commerce.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/commerce' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/commerce') describe('endpoints > commerce', () => { let endpoint diff --git a/tests/endpoints/continents.spec.js b/tests/endpoints/continents.spec.js index cd0bc5c..2781007 100644 --- a/tests/endpoints/continents.spec.js +++ b/tests/endpoints/continents.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/continents' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/continents') describe('endpoints > continents', () => { let endpoint diff --git a/tests/endpoints/currencies.spec.js b/tests/endpoints/currencies.spec.js index d8dc074..73809b0 100644 --- a/tests/endpoints/currencies.spec.js +++ b/tests/endpoints/currencies.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/currencies' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/currencies') describe('endpoints > currencies', () => { let endpoint diff --git a/tests/endpoints/dungeons.spec.js b/tests/endpoints/dungeons.spec.js index f129bfc..667407b 100644 --- a/tests/endpoints/dungeons.spec.js +++ b/tests/endpoints/dungeons.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/dungeons' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/dungeons') describe('endpoints > dungeons', () => { let endpoint diff --git a/tests/endpoints/emblem.spec.js b/tests/endpoints/emblem.spec.js index 8d23722..56f4504 100644 --- a/tests/endpoints/emblem.spec.js +++ b/tests/endpoints/emblem.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/emblem' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/emblem') describe('endpoints > emblem', () => { let endpoint diff --git a/tests/endpoints/events.spec.js b/tests/endpoints/events.spec.js index f715407..ed0e814 100644 --- a/tests/endpoints/events.spec.js +++ b/tests/endpoints/events.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/events' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/events') describe('endpoints > events', () => { let endpoint diff --git a/tests/endpoints/files.spec.js b/tests/endpoints/files.spec.js index 0df9812..b50d73a 100644 --- a/tests/endpoints/files.spec.js +++ b/tests/endpoints/files.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/files' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/files') describe('endpoints > files', () => { let endpoint diff --git a/tests/endpoints/finishers.spec.js b/tests/endpoints/finishers.spec.js index a3b6b79..47a699d 100644 --- a/tests/endpoints/finishers.spec.js +++ b/tests/endpoints/finishers.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/finishers' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/finishers') describe('endpoints > finishers', () => { let endpoint diff --git a/tests/endpoints/gliders.spec.js b/tests/endpoints/gliders.spec.js index 8d5c165..9a206eb 100644 --- a/tests/endpoints/gliders.spec.js +++ b/tests/endpoints/gliders.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/gliders' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/gliders') describe('endpoints > gliders', () => { let endpoint diff --git a/tests/endpoints/guild.spec.js b/tests/endpoints/guild.spec.js index 4df1285..b7154b1 100644 --- a/tests/endpoints/guild.spec.js +++ b/tests/endpoints/guild.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/guild' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/guild') describe('endpoints > guild', () => { let endpoint diff --git a/tests/endpoints/items.spec.js b/tests/endpoints/items.spec.js index c4fb560..26ffac5 100644 --- a/tests/endpoints/items.spec.js +++ b/tests/endpoints/items.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/items' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/items') describe('endpoints > items', () => { let endpoint diff --git a/tests/endpoints/itemstats.spec.js b/tests/endpoints/itemstats.spec.js index ceb10fb..7feeb84 100644 --- a/tests/endpoints/itemstats.spec.js +++ b/tests/endpoints/itemstats.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/itemstats' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/itemstats') describe('endpoints > itemstats', () => { let endpoint diff --git a/tests/endpoints/legends.spec.js b/tests/endpoints/legends.spec.js index 063d044..1060436 100644 --- a/tests/endpoints/legends.spec.js +++ b/tests/endpoints/legends.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/legends' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/legends') describe('endpoints > legends', () => { let endpoint diff --git a/tests/endpoints/mailcarriers.spec.js b/tests/endpoints/mailcarriers.spec.js index de688b4..4ea0271 100644 --- a/tests/endpoints/mailcarriers.spec.js +++ b/tests/endpoints/mailcarriers.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/mailcarriers' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/mailcarriers') describe('endpoints > mailcarriers', () => { let endpoint diff --git a/tests/endpoints/maps.spec.js b/tests/endpoints/maps.spec.js index 94c70b0..f51ac73 100644 --- a/tests/endpoints/maps.spec.js +++ b/tests/endpoints/maps.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/maps' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/maps') describe('endpoints > maps', () => { let endpoint diff --git a/tests/endpoints/masteries.spec.js b/tests/endpoints/masteries.spec.js index 600f25f..0aa40bf 100644 --- a/tests/endpoints/masteries.spec.js +++ b/tests/endpoints/masteries.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/masteries' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/masteries') describe('endpoints > masteries', () => { let endpoint diff --git a/tests/endpoints/materials.spec.js b/tests/endpoints/materials.spec.js index 9552e36..3bc0f69 100644 --- a/tests/endpoints/materials.spec.js +++ b/tests/endpoints/materials.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/materials' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/materials') describe('endpoints > materials', () => { let endpoint diff --git a/tests/endpoints/minis.spec.js b/tests/endpoints/minis.spec.js index 7d10390..1d19d90 100644 --- a/tests/endpoints/minis.spec.js +++ b/tests/endpoints/minis.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/minis' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/minis') describe('endpoints > minis', () => { let endpoint diff --git a/tests/endpoints/mounts.spec.js b/tests/endpoints/mounts.spec.js index f37a68f..0bb0fce 100644 --- a/tests/endpoints/mounts.spec.js +++ b/tests/endpoints/mounts.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/mounts' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/mounts') describe('endpoints > mounts', () => { let endpoint diff --git a/tests/endpoints/nodes.spec.js b/tests/endpoints/nodes.spec.js index 8ce60f9..e765b54 100644 --- a/tests/endpoints/nodes.spec.js +++ b/tests/endpoints/nodes.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/nodes' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/nodes') describe('endpoints > nodes', () => { let endpoint diff --git a/tests/endpoints/outfits.spec.js b/tests/endpoints/outfits.spec.js index 576e42c..9b21a20 100644 --- a/tests/endpoints/outfits.spec.js +++ b/tests/endpoints/outfits.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/outfits' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/outfits') describe('endpoints > outfits', () => { let endpoint diff --git a/tests/endpoints/pets.spec.js b/tests/endpoints/pets.spec.js index 3ab8150..5bc5c4a 100644 --- a/tests/endpoints/pets.spec.js +++ b/tests/endpoints/pets.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/pets' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/pets') describe('endpoints > pets', () => { let endpoint diff --git a/tests/endpoints/professions.spec.js b/tests/endpoints/professions.spec.js index 6753410..fb5095e 100644 --- a/tests/endpoints/professions.spec.js +++ b/tests/endpoints/professions.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/professions' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/professions') describe('endpoints > professions', () => { let endpoint diff --git a/tests/endpoints/pvp.spec.js b/tests/endpoints/pvp.spec.js index 4c3e518..b375c6f 100644 --- a/tests/endpoints/pvp.spec.js +++ b/tests/endpoints/pvp.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/pvp' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/pvp') describe('endpoints > pvp', () => { let endpoint diff --git a/tests/endpoints/quaggans.spec.js b/tests/endpoints/quaggans.spec.js index 9ba7b11..c209036 100644 --- a/tests/endpoints/quaggans.spec.js +++ b/tests/endpoints/quaggans.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/quaggans' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/quaggans') describe('endpoints > quaggans', () => { let endpoint diff --git a/tests/endpoints/races.spec.js b/tests/endpoints/races.spec.js index b1d4644..73aa400 100644 --- a/tests/endpoints/races.spec.js +++ b/tests/endpoints/races.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/races' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/races') describe('endpoints > races', () => { let endpoint diff --git a/tests/endpoints/raids.spec.js b/tests/endpoints/raids.spec.js index 97b2bb0..5e1f96d 100644 --- a/tests/endpoints/raids.spec.js +++ b/tests/endpoints/raids.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/raids' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/raids') describe('endpoints > raids', () => { let endpoint diff --git a/tests/endpoints/recipes.spec.js b/tests/endpoints/recipes.spec.js index 3811dcb..35fa72b 100644 --- a/tests/endpoints/recipes.spec.js +++ b/tests/endpoints/recipes.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/recipes' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/recipes') describe('endpoints > recipes', () => { let endpoint diff --git a/tests/endpoints/skills.spec.js b/tests/endpoints/skills.spec.js index 9805c9e..7de5d2a 100644 --- a/tests/endpoints/skills.spec.js +++ b/tests/endpoints/skills.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/skills' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/skills') describe('endpoints > skills', () => { let endpoint diff --git a/tests/endpoints/skins.spec.js b/tests/endpoints/skins.spec.js index 40b243b..ea958b2 100644 --- a/tests/endpoints/skins.spec.js +++ b/tests/endpoints/skins.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/skins' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/skins') describe('endpoints > skins', () => { let endpoint diff --git a/tests/endpoints/specializations.spec.js b/tests/endpoints/specializations.spec.js index 3d3448b..3a90b43 100644 --- a/tests/endpoints/specializations.spec.js +++ b/tests/endpoints/specializations.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/specializations' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/specializations') describe('endpoints > specializations', () => { let endpoint diff --git a/tests/endpoints/stories.spec.js b/tests/endpoints/stories.spec.js index 963829d..ed97e5c 100644 --- a/tests/endpoints/stories.spec.js +++ b/tests/endpoints/stories.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/stories' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/stories') describe('endpoints > stories', () => { let endpoint diff --git a/tests/endpoints/titles.spec.js b/tests/endpoints/titles.spec.js index 804188a..5fd698c 100644 --- a/tests/endpoints/titles.spec.js +++ b/tests/endpoints/titles.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/titles' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/titles') describe('endpoints > titles', () => { let endpoint diff --git a/tests/endpoints/tokeninfo.spec.js b/tests/endpoints/tokeninfo.spec.js index e4153c8..7361dff 100644 --- a/tests/endpoints/tokeninfo.spec.js +++ b/tests/endpoints/tokeninfo.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/tokeninfo' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/tokeninfo') describe('endpoints > tokeninfo', () => { let endpoint diff --git a/tests/endpoints/traits.spec.js b/tests/endpoints/traits.spec.js index 3ea5ad1..dd66f8b 100644 --- a/tests/endpoints/traits.spec.js +++ b/tests/endpoints/traits.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/traits' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/traits') describe('endpoints > traits', () => { let endpoint diff --git a/tests/endpoints/worlds.spec.js b/tests/endpoints/worlds.spec.js index b15b0b0..9ed7dfa 100644 --- a/tests/endpoints/worlds.spec.js +++ b/tests/endpoints/worlds.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/worlds' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/worlds') describe('endpoints > worlds', () => { let endpoint diff --git a/tests/endpoints/wvw.spec.js b/tests/endpoints/wvw.spec.js index 0269653..e7078d1 100644 --- a/tests/endpoints/wvw.spec.js +++ b/tests/endpoints/wvw.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import { mockClient, fetchMock } from '../mocks/client.mock' -import Module from '../../src/endpoints/wvw' +const { mockClient, fetchMock } = require('../mocks/client.mock') +const Module = require('../../src/endpoints/wvw') describe('endpoints > wvw', () => { let endpoint diff --git a/tests/index.spec.js b/tests/index.spec.js index e78f4d4..9e9e438 100644 --- a/tests/index.spec.js +++ b/tests/index.spec.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -import index from '../src/index' -import Client from '../src/client' +const index = require('../src/index') +const Client = require('../src/client') describe('index', () => { it('exports a function that returns a new client object', () => { diff --git a/tests/mocks/client.mock.js b/tests/mocks/client.mock.js index 03c7956..9b4c66a 100644 --- a/tests/mocks/client.mock.js +++ b/tests/mocks/client.mock.js @@ -1,8 +1,8 @@ -import fetch from 'lets-fetch/mock' -import nullCache from '../../src/cache/null' -import memoryCache from '../../src/cache/memory' +const fetch = require('lets-fetch/mock') +const nullCache = require('../../src/cache/null') +const memoryCache = require('../../src/cache/memory') -export const mockClient = { +const mockClient = { lang: 'en', apiKey: false, fetch: fetch, @@ -15,4 +15,7 @@ export const mockClient = { } } -export const fetchMock = fetch +module.exports = { + mockClient: mockClient, + fetchMock: fetch +} diff --git a/tests/mocks/idb.mock.js b/tests/mocks/idb.mock.js index 37df9e5..a4580a0 100644 --- a/tests/mocks/idb.mock.js +++ b/tests/mocks/idb.mock.js @@ -1,6 +1,6 @@ let cache = {} -export default { +module.exports = { set: (key, value) => { cache[key] = value return Promise.resolve()