Skip to content

Commit

Permalink
fix: merge conflicts (#30)
Browse files Browse the repository at this point in the history
* fix(ci): disable jest report step for dependavot

* fix(ci): enable automerge for dependabot prs

* chore(deps): bump tmpl from 1.0.4 to 1.0.5

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix(ci): remove branch conditions from build

* chore(deps): bump nth-check from 2.0.0 to 2.0.1

Bumps [nth-check](https://github.com/fb55/nth-check) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/fb55/nth-check/releases)
- [Commits](fb55/nth-check@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: nth-check
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* test(character): add test for character with shield

* fix(character): rename server attribute to be homeWorld

* feat(character): add support for parsing Reaper and Sage levels and as active class

fixes #19

* feat(character): remove parsing of waist gear

Remove support for parsing waist gear due to deprecation with the introduction of 6.0, remove tests.

closes #20

* fix(character): fix parsing of free company

Resolve issue where free company was being incorrectly parsed.

Fixes #21

* chore(gh): move to v2 of issue template for bug form

* chore(gh): Add emoji to title of bug report form

* chore(gh): complete move to gh-issue-templates v2

* chore(gh): fix link to docs in issue template

[skip ci]

* ci(actions): add option to suppress build to release workflow

* feat(creature): add support for parsing of mount and minion tooltips

re #22, re #23

* feat(pvpteam): add support for fetching the name and ID of a pvp team associated to a character

Implements #25

* feat(freecompany): update free company parsing to return both id and name

* chore(freecompany): fix file issues

* feat(creature): add asMapping method

* fix(tests): fix issue in character tests where strings were being treated as arrays

* chore(formatting): fix formatting of file

* refactor(class): Refactor manner in which classes are handled
Add support for localizations
Restructure significant chunks of code
Add support for fetching non-english site versions

* refactor(character): update character class map to use new style class

* chore(character): add html sample for lodestone maintenance

* refactor(all): restructure package structure (phase 1)

Migrate towards package/diretory structure structured by logical entity

* refactor(all): simplify language mapping types & rename server to world

* refactor(all): restructure directory structure further

* fix(all): fix bugs added in prior commit

* refactor(client): restructure clients to decompose core client

* ci(mergify): resolve issues with mergify strict mode deprecation

* ci(mergify): Fix tabbing of yml

* ci(mergify): Remove deprecated commit_message property

* ci(mergify): Fix name of ci job being checked

* ci(mergify): Remove status checks
github handles these

* ci(mergify): Re-add status check

* chore(deps): bump follow-redirects from 1.14.3 to 1.14.7 (#29)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Reid <peter@reidweb.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* ci(tests): decouple unit and integration tests

Unit and integration tests no run on separate commands

#18

* style(itest): fix lint errors following previous change

* fix(ci): fix unit test script command

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 17, 2022
2 parents b8664d5 + 6898739 commit 845c026
Show file tree
Hide file tree
Showing 83 changed files with 16,977 additions and 2,568 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
*/

module.exports = {
plugins: ['@typescript-eslint', 'prettier', 'notice'],
plugins: ['@typescript-eslint', 'prettier', 'notice', 'jsdoc'],
extends: [
'eslint:recommended',
'airbnb-typescript',
'prettier',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:jsdoc/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: {
Expand Down
52 changes: 0 additions & 52 deletions .github/ISSUE_TEMPLATE/bug.md

This file was deleted.

78 changes: 78 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Bug Report
description: Report a bug
title: "(entity name): short issue description"
labels: [bug, needs-triage]
body:
- type: textarea
id: problem
attributes:
label: What is the problem?
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: Reproduction Steps
description: |
Minimal amount of code that causes the bug (if possible) or a reference.
The code sample should be an SSCCE. See http://sscce.org/ for details.
In short, provide a code sample that we can copy/paste, run and reproduce.
validations:
required: true

- type: textarea
id: expected
attributes:
label: What did you expect to happen?
description: |
What were you trying to achieve by performing the steps above?
validations:
required: true

- type: textarea
id: actual
attributes:
label: What actually happened?
description: |
What is the unexpected behavior you were seeing? If you got an error, paste it here.
validations:
required: true

- type: input
id: module-version
attributes:
label: Module version
validations:
required: true

- type: input
id: node-version
attributes:
label: Node.js Version
validations:
required: true

- type: input
id: operating-system
attributes:
label: OS
validations:
required: true

- type: textarea
id: other
attributes:
label: Other information
description: |
e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
validations:
required: false

- type: markdown
attributes:
value: |
---
This is :bug: Bug Report
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/doc.md

This file was deleted.

30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/doc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Documentation Issue
description: Issue in the reference documentation or developer guide
title: "(entity name): short issue description"
labels: [feature-request, documentation, needs-triage]
body:
- type: markdown
attributes:
value: |
Want to help? Submit a pull request here: https://github.com/xivstats/lodestone
- type: input
id: doc-link
attributes:
label: link to reference doc page
validations:
required: false

- type: textarea
id: issue
attributes:
label: Describe your issue?
validations:
required: true

- type: markdown
attributes:
value: |
---
This is a 📕 documentation issue
46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/feature-request.md

This file was deleted.

56 changes: 56 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Feature Request
description: Request a new feature
title: "(entity name): short issue description"
labels: [feature-request, needs-triage]
body:
- type: textarea
id: description
attributes:
label: Description
description: Short description of the feature you are proposing.
validations:
required: true

- type: textarea
id: use-case
attributes:
label: Use Case
description: |
Why do you need this feature?
validations:
required: true

- type: textarea
id: solution
attributes:
label: Proposed Solution
description: |
Please include prototype/workaround/sketch/reference implementation.
validations:
required: true

- type: textarea
id: other
attributes:
label: Other information
description: |
e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, etc
validations:
required: false

- type: checkboxes
id: acknowledgments
attributes:
label: Acknowledge
options:
- label: I may be able to implement this feature request
required: false
- label: This feature might incur a breaking change
required: false

- type: markdown
attributes:
value: |
---
This is a :rocket: Feature Request
52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/general-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: General Issue
description: Create a new issue
title: "(module name): short issue description"
labels: [needs-triage, guidance]
body:
- type: input
id: issue
attributes:
label: General Issue
description: |
For support questions, please first reference our [documentation](https://github.com/XIVStats/lodestone/tree/main/docs), then use [GitHub Discussions](https://github.com/XIVStats/lodestone/discussions). This repository's issues are intended for feature requests and bug reports.
validations:
required: true

- type: textarea
id: question
attributes:
label: The Question
description: |
Ask your question here. Include any details relevant. Make sure you are not falling prey to the [X/Y problem](http://xyproblem.info)!
validations:
required: true

- type: input
id: module-version
attributes:
label: Module Version
validations:
required: true

- type: input
id: node-version
attributes:
label: Node.js Version
validations:
required: false

- type: input
id: operating-system
attributes:
label: OS
validations:
required: false

- type: textarea
id: other
attributes:
label: Other information
description: |
e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, etc
validations:
required: false
30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE/general-issues.md

This file was deleted.

Loading

0 comments on commit 845c026

Please sign in to comment.