Skip to content

Commit

Permalink
fix: Reformatting all files (using the current settings)
Browse files Browse the repository at this point in the history
Should be chore, but I set it to fix to force a new release, as I have also reformatted the github workflow files and want to make sure nothing broke...
  • Loading branch information
xdy committed Aug 7, 2020
1 parent ebad021 commit f638f17
Show file tree
Hide file tree
Showing 12 changed files with 412 additions and 390 deletions.
116 changes: 58 additions & 58 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
---
env:
browser: true
es6: true
browser: true
es6: true
extends:
- eslint:recommended
- plugin:@typescript-eslint/recommended
- eslint-config-prettier
- eslint:recommended
- plugin:@typescript-eslint/recommended
- eslint-config-prettier
globals:
Atomics: readonly
SharedArrayBuffer: readonly
ItemSheet: readonly
game: readonly
mergeObject: readonly
CONFIG: writable
duplicate: readonly
"$": readonly
Tabs: readonly
Hooks: readonly
Items: readonly
loadTemplates: readonly
Combat: writable
canvas: readonly
ActorSheet: readonly
Actor: readonly
Actors: readonly
fetchSpell: readonly
Atomics: readonly
SharedArrayBuffer: readonly
ItemSheet: readonly
game: readonly
mergeObject: readonly
CONFIG: writable
duplicate: readonly
"$": readonly
Tabs: readonly
Hooks: readonly
Items: readonly
loadTemplates: readonly
Combat: writable
canvas: readonly
ActorSheet: readonly
Actor: readonly
Actors: readonly
fetchSpell: readonly
parserOptions:
ecmaVersion: 2018
sourceType: module
ecmaVersion: 2018
sourceType: module
rules:
prettier/prettier: error
no-restricted-syntax: 0
no-new: 0
no-underscore-dangle: 0
no-console: 0
class-methods-use-this: 0
max-classes-per-file: 0
prefer-destructuring: 0
no-plusplus: 0
no-undef: 0
prefer-rest-params: 0
"@typescript-eslint/explicit-module-boundary-types":
- error
- allowDirectConstAssertionInArrowFunctions: true
allowHigherOrderFunctions: true
allowTypedFunctionExpressions: true
prettier/prettier: error
no-restricted-syntax: 0
no-new: 0
no-underscore-dangle: 0
no-console: 0
class-methods-use-this: 0
max-classes-per-file: 0
prefer-destructuring: 0
no-plusplus: 0
no-undef: 0
prefer-rest-params: 0
"@typescript-eslint/explicit-module-boundary-types":
- error
- allowDirectConstAssertionInArrowFunctions: true
allowHigherOrderFunctions: true
allowTypedFunctionExpressions: true
settings:
import/resolver:
node:
paths:
- src
- ''
- dist
extensions:
- ".js"
- ".jsx"
- ".ts"
- ".tsx"
- ".json"
import/resolver:
node:
paths:
- src
- ''
- dist
extensions:
- ".js"
- ".jsx"
- ".ts"
- ".tsx"
- ".json"
plugins:
- prettier
- "@typescript-eslint"
- prettier
- "@typescript-eslint"
overrides:
- files: tests/**/*
rules:
global-require: 'off'
- files: tests/**/*
rules:
global-require: 'off'
parser: "@typescript-eslint/parser"
11 changes: 10 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
*.db text
# Autodetect text files
* text=auto eol=lf

# Definitively text
*.db text

# Definitively not text
*.jpg binary
*.png binary
*.pdf binary
12 changes: 6 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ pull_request_rules:
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflicts. Could you fix it? 🙏
comment:
message: This pull request is now in conflicts. Could you fix it? 🙏

- name: ask to fix commit message
conditions:
- status-failure=Semantic Pull Request
- -closed
actions:
comment:
message: |
Title does not follow the guidelines of [Conventional Commits](https://www.conventionalcommits.org).
Please adjust title before merge.
comment:
message: |
Title does not follow the guidelines of [Conventional Commits](https://www.conventionalcommits.org).
Please adjust title before merge.
16 changes: 8 additions & 8 deletions src/scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" static/system.json \
&& cp static/system.json dist \
&& sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" package.json \
&& npm install \
&& npm audit fix \
&& cd dist || exit \
&& zip -r twodsix.zip ./* \
&& cd ..
sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" static/system.json &&
cp static/system.json dist &&
sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" package.json &&
npm install &&
npm audit fix &&
cd dist || exit &&
zip -r twodsix.zip ./* &&
cd ..
47 changes: 26 additions & 21 deletions static/assets/actor/Profile-Block3b.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 31 additions & 27 deletions static/assets/actor/profile-block.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 17 additions & 15 deletions static/assets/actor/psiblock1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions static/assets/actor/statblock1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions static/assets/actor/tabs-bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions static/templates/actors/parts/actor-info.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="tab info" data-group="primary" data-tab="-info">
{{editor content=data.details.description target="data.details.description" button=true owner=owner
editable=editable}}
{{editor content=data.details.description target="data.details.description" button=true owner=owner
editable=editable}}
</div>
Loading

0 comments on commit f638f17

Please sign in to comment.