Merge branch 'update-dependencies' into 'master'

Update dependencies

See merge request dungeonslayers/ds4!87

.eslintrc.js

@@ -1,21 +1,14 @@
 module.exports = {
-    parser: "@typescript-eslint/parser", // Specifies the ESLint parser
+    parser: "@typescript-eslint/parser",
 
     parserOptions: {
-        ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
+        ecmaVersion: 2020,
-        sourceType: "module", // Allows for the use of imports
+        sourceType: "module",
     },
 
-    extends: [
+    extends: ["plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
-        "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.
-    ],
 
     plugins: ["@typescript-eslint"],
 
-    rules: {
+    rules: {},
-        // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
-        // e.g. "@typescript-eslint/explicit-function-return-type": "off",
-    },
 };

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

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

.yarnrc.yml

@@ -4,4 +4,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-berry.cjs
+yarnPath: .yarn/releases/yarn-2.4.1.cjs

package.json

@@ -35,37 +35,37 @@
         "build:watch": "gulp watch",
         "link-project": "gulp link",
         "clean": "gulp clean && gulp link --clean",
-        "update": "yarn add --dev foundry-vtt-types@github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9",
         "updateManifest": "gulp updateManifest",
         "lint": "eslint 'src/**/*.ts' --cache",
         "lint:fix": "eslint 'src/**/*.ts' --cache --fix",
         "test": "jest",
         "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
-        "format": "prettier --write 'src/**/*.(ts|json|scss)'"
+        "format": "prettier --write 'src/**/*.(ts|json|scss)'",
+        "postinstall": "husky install"
     },
     "devDependencies": {
-        "@types/fs-extra": "^9.0.7",
+        "@league-of-foundry-developers/foundry-vtt-types": "^0.7.9-0",
+        "@types/fs-extra": "^9.0.8",
         "@types/jest": "^26.0.20",
-        "@typescript-eslint/eslint-plugin": "^4.15.1",
+        "@typescript-eslint/eslint-plugin": "^4.16.1",
-        "@typescript-eslint/parser": "^4.15.1",
+        "@typescript-eslint/parser": "^4.16.1",
         "chalk": "^4.1.0",
-        "eslint": "^7.20.0",
+        "eslint": "^7.21.0",
-        "eslint-config-prettier": "^7.2.0",
+        "eslint-config-prettier": "^8.1.0",
         "eslint-plugin-prettier": "^3.3.1",
-        "foundry-vtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9",
         "fs-extra": "^9.1.0",
         "gulp": "^4.0.2",
         "gulp-sass": "^4.1.0",
         "gulp-typescript": "^6.0.0-alpha.1",
-        "husky": "^4.3.8",
+        "husky": "^5.1.3",
         "jest": "^26.6.3",
         "jest-junit": "^12.0.0",
-        "json-stringify-pretty-compact": "^2.0.0",
+        "json-stringify-pretty-compact": "^3.0.0",
         "lint-staged": "^10.5.4",
         "prettier": "^2.2.1",
         "sass": "^1.32.8",
-        "ts-jest": "^26.5.1",
+        "ts-jest": "^26.5.2",
-        "typescript": "^4.1.5",
+        "typescript": "^4.2.2",
         "yargs": "^16.2.0"
     },
     "husky": {

spec/tsconfig.spec.json

@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig.json",
     "compilerOptions": {
-        "types": ["foundry-vtt-types", "jest"]
+        "types": ["@league-of-foundry-developers/foundry-vtt-types", "jest"]
     },
     "include": ["src", "./"]
 }

tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "ES2020",
         "lib": ["DOM", "ES2020"],
-        "types": ["foundry-vtt-types"],
+        "types": ["@league-of-foundry-developers/foundry-vtt-types"],
         "esModuleInterop": true,
         "moduleResolution": "node",
         "forceConsistentCasingInFileNames": true,