Skip to content

Commit

Permalink
Merge pull request #613 from Gabb-c/master
Browse files Browse the repository at this point in the history
Fix other sprites
  • Loading branch information
Gabb-c authored Aug 26, 2022
2 parents 87eaf6f + 0bc361e commit aa9f21d
Show file tree
Hide file tree
Showing 8 changed files with 634 additions and 476 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22
with:
install-command: yarn --frozen-lockfile --check-files --silent

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
node-version: current

- name: Install dependencies (with cache)
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22
with:
install-command: yarn --frozen-lockfile --check-files --silent

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
node-version: current

- name: Install dependencies
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22
with:
install-command: yarn --frozen-lockfile --check-files --silent

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
node-version: current

- name: Install dependencies
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22
with:
install-command: yarn --frozen-lockfile --check-files --silent

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
node-version: current

- name: Install dependencies
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22
with:
install-command: yarn --frozen-lockfile --check-files --silent

Expand All @@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@v3

- name: Install deps and build (with cache)
uses: bahmutov/npm-install@v1.8.21
uses: bahmutov/npm-install@v1.8.22

- name: Semantic Release
uses: cycjimmy/semantic-release-action@v3.1.0
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
"dependencies": {
"axios": "^0.27.2",
"axios-cache-adapter": "^2.7.3",
"pino": "^8.4.1",
"pino-pretty": "^9.0.1",
"pino": "^8.4.2",
"pino-pretty": "^9.1.0",
"tslib": "^2.4.0"
},
"devDependencies": {
"@babel/cli": "^7.18.10",
"@babel/core": "^7.18.10",
"@babel/core": "^7.18.13",
"@babel/node": "^7.18.10",
"@babel/preset-env": "^7.18.10",
"@babel/preset-typescript": "^7.18.6",
Expand All @@ -65,12 +65,12 @@
"@semantic-release/github": "^8.0.5",
"@semantic-release/npm": "^9.0.1",
"@semantic-release/release-notes-generator": "^10.0.3",
"@swc/core": "^1.2.237",
"@swc/core": "^1.2.244",
"@swc/jest": "^0.2.22",
"@types/jest": "^28.1.7",
"@types/node": "^18.7.6",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@types/jest": "^28.1.8",
"@types/node": "^18.7.13",
"@typescript-eslint/eslint-plugin": "^5.35.1",
"@typescript-eslint/parser": "^5.35.1",
"babel-plugin-module-resolver": "^4.1.0",
"dts-bundle-generator": "^6.12.0",
"eslint": "^8.22.0",
Expand All @@ -80,22 +80,22 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.8.3",
"eslint-plugin-jest": "^26.8.7",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-promise": "^6.0.1",
"eslint-plugin-unicorn": "^43.0.2",
"http-status-codes": "^2.2.0",
"husky": "^8.0.1",
"is-ci": "^3.0.1",
"jest": "^28.1.3",
"jest": "^29.0.0",
"lint-staged": "^13.0.3",
"lockfile-lint": "^4.8.0",
"prettier": "^2.7.1",
"semantic-release": "^19.0.3",
"semantic-release": "^19.0.5",
"sort-package-json": "^1.57.0",
"ts-node-dev": "^2.0.0",
"typescript": "^4.7.4"
"typescript": "^4.8.2"
},
"engines": {
"node": ">=14"
Expand Down
2 changes: 1 addition & 1 deletion src/models/Pokemon/pokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export interface PokemonSprites {
/** The shiny female depiction of this Pokémon from the back in battle */
back_shiny_female: string | null;
/** Dream World, Official Artwork and Home sprites */
other?: OtherPokemonSprites[];
other?: OtherPokemonSprites;
/** Version Sprites of this Pokémon */
versions: VersionSprites;
}
Expand Down
Loading

0 comments on commit aa9f21d

Please sign in to comment.