Merge branch 'preparation-for-0.8.x' into 'master'

Update dependencies and show compatibility with 0.8.x

See merge request ghost/risk-dice-modifier!2
This commit is contained in:
Johannes Loher 2021-05-23 00:28:20 +00:00
commit f6e9aab543
9 changed files with 451 additions and 386 deletions

View file

@ -8,7 +8,6 @@ module.exports = {
extends: [ extends: [
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin 'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. 'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
], ],

1
.husky/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
_

4
.husky/pre-commit Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
yarn run lint-staged

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,2 +1,7 @@
yarnPath: ".yarn/releases/yarn-berry.cjs"
nodeLinker: pnp nodeLinker: pnp
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
yarnPath: .yarn/releases/yarn-2.4.1.cjs

View file

@ -27,34 +27,30 @@
"updateManifest": "gulp updateManifest", "updateManifest": "gulp updateManifest",
"lint": "eslint 'src/**/*.ts' --cache", "lint": "eslint 'src/**/*.ts' --cache",
"lint:fix": "eslint 'src/**/*.ts' --cache --fix", "lint:fix": "eslint 'src/**/*.ts' --cache --fix",
"format": "prettier --write 'src/**/*.(ts|json)'" "format": "prettier --write 'src/**/*.(ts|json)'",
"postinstall": "husky install"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-node-resolve": "^11.1.1", "@rollup/plugin-node-resolve": "^13.0.0",
"@types/fs-extra": "^9.0.6", "@types/fs-extra": "^9.0.11",
"@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.14.2", "@typescript-eslint/parser": "^4.24.0",
"chalk": "^4.1.0", "chalk": "^4.1.1",
"eslint": "^7.19.0", "eslint": "^7.27.0",
"eslint-config-prettier": "^7.2.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.3.1", "eslint-plugin-prettier": "^3.4.0",
"foundry-vtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9", "foundry-vtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9",
"fs-extra": "^9.1.0", "fs-extra": "^10.0.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"husky": "^4.3.8", "husky": "^6.0.0",
"json-stringify-pretty-compact": "^2.0.0", "json-stringify-pretty-compact": "^3.0.0",
"lint-staged": "^10.5.4", "lint-staged": "^11.0.0",
"prettier": "^2.2.1", "prettier": "^2.3.0",
"rollup": "^2.38.5", "rollup": "^2.48.0",
"rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-typescript2": "^0.30.0",
"tslib": "^2.1.0", "tslib": "^2.2.0",
"typescript": "^4.1.3", "typescript": "^4.2.4",
"yargs": "^16.2.0" "yargs": "^17.0.1"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
}, },
"lint-staged": { "lint-staged": {
"*.ts": "eslint --cache --fix", "*.ts": "eslint --cache --fix",

View file

@ -3,12 +3,23 @@
"title": "Risk Dice Modifier", "title": "Risk Dice Modifier",
"description": "An implementation of risk rolls as found for example in the Splittermond game system", "description": "An implementation of risk rolls as found for example in the Splittermond game system",
"author": "Johannes Loher", "author": "Johannes Loher",
"authors": [
{
"name": "Johannes Loher",
"email": "johannes.loher@fg4f.de",
"url": "https://www.johannesloher.com/",
"discord": "ghost#2000"
}
],
"url": "https://git.f3l.de/ghost/risk-dice-modifier",
"license": "MIT",
"readme": "https://git.f3l.de/ghost/risk-dice-modifier/-/blob/master/README.md",
"bugs": "https://git.f3l.de/ghost/risk-dice-modifier/-/issues",
"changelog": "https://git.f3l.de/ghost/risk-dice-modifier/-/releases",
"version": "0.1.1", "version": "0.1.1",
"minimumCoreVersion": "0.7.9", "minimumCoreVersion": "0.7.9",
"compatibleCoreVersion": "0.7.9", "compatibleCoreVersion": "0.8.5",
"esmodules": ["module/risk-dice-modifier.js"], "esmodules": ["module/risk-dice-modifier.js"],
"url": "https://git.f3l.de/ghost/risk-dice-modifier",
"manifest": "https://git.f3l.de/ghost/risk-dice-modifier/-/raw/latest/src/module.json?inline=false", "manifest": "https://git.f3l.de/ghost/risk-dice-modifier/-/raw/latest/src/module.json?inline=false",
"download": "https://git.f3l.de/ghost/risk-dice-modifier/-/jobs/artifacts/0.1.1/download?job=build", "download": "https://git.f3l.de/ghost/risk-dice-modifier/-/jobs/artifacts/0.1.1/download?job=build"
"license": "MIT"
} }

676
yarn.lock

File diff suppressed because it is too large Load diff