Merge branch 'update-dependencies' into 'master'

chore: remove chalk and update yarn

See merge request dungeonslayers/ds4!158

.yarnrc.yml

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

gulpfile.js

@@ -4,7 +4,6 @@
 
 const { rollup } = require("rollup");
 const argv = require("yargs").argv;
-const chalk = require("chalk");
 const fs = require("fs-extra");
 const gulp = require("gulp");
 const path = require("path");
@@ -209,8 +208,8 @@ async function clean() {
         files.push("css");
     }
 
-    console.log(" ", chalk.yellow("Files to clean:"));
-    console.log("   ", chalk.blueBright(files.join("\n    ")));
+    console.log(" ", "Files to clean:");
+    console.log("   ", files.join("\n    "));
 
     for (const filePath of files) {
         await fs.remove(path.join(distDirectory, filePath));
@@ -246,17 +245,17 @@ async function linkUserData() {
     if (fs.existsSync(path.resolve(".", sourceDirectory, "system.json"))) {
         destinationDirectory = "systems";
     } else {
-        throw new Error(`Could not find ${chalk.blueBright("system.json")}`);
+        throw new Error("Could not find system.json");
     }
 
     const linkDirectory = path.resolve(getDataPath(), destinationDirectory, name);
 
     if (argv.clean || argv.c) {
-        console.log(chalk.yellow(`Removing build in ${chalk.blueBright(linkDirectory)}.`));
+        console.log(`Removing build in ${linkDirectory}.`);
 
         await fs.remove(linkDirectory);
     } else if (!fs.existsSync(linkDirectory)) {
-        console.log(chalk.green(`Copying build to ${chalk.blueBright(linkDirectory)}.`));
+        console.log(`Copying build to ${linkDirectory}.`);
         await fs.ensureDir(path.resolve(linkDirectory, ".."));
         await fs.symlink(path.resolve(".", distDirectory), linkDirectory);
     }
@@ -298,7 +297,7 @@ function bumpVersion(cb) {
     const packageJson = fs.readJSONSync("package.json");
     const manifest = getManifest();
 
-    if (!manifest) cb(Error(chalk.red("Manifest JSON not found")));
+    if (!manifest) cb(Error("Manifest JSON not found"));
 
     try {
         const release = argv.release || argv.r;
@@ -312,11 +311,11 @@ function bumpVersion(cb) {
         const targetVersion = getTargetVersion(currentVersion, release);
 
         if (!targetVersion) {
-            return cb(new Error(chalk.red("Error: Incorrect version arguments")));
+            return cb(new Error("Error: Incorrect version arguments"));
         }
 
         if (targetVersion === currentVersion) {
-            return cb(new Error(chalk.red("Error: Target version is identical to current version")));
+            return cb(new Error("Error: Target version is identical to current version"));
         }
 
         console.log(`Updating version number to '${targetVersion}'`);

package.json

@@ -48,7 +48,7 @@
         "test": "jest",
         "test:watch": "jest --watch",
         "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
-        "format": "prettier --write \"./**/*.(ts|js|json|scss)\"",
+        "format": "prettier --write \"./**/*.(ts|js|json|scss|yml)\"",
         "typecheck": "tsc --noEmit",
         "postinstall": "husky install",
         "changelog": "conventional-changelog -n changelog.config.js -o CHANGELOG.md -r 2"
@@ -62,7 +62,6 @@
         "@types/jest": "27.0.3",
         "@typescript-eslint/eslint-plugin": "5.5.0",
         "@typescript-eslint/parser": "5.5.0",
-        "chalk": "4.1.2",
         "conventional-changelog-cli": "2.1.1",
         "conventional-changelog-conventionalcommits": "4.6.1",
         "eslint": "8.3.0",
@@ -90,6 +89,6 @@
     },
     "lint-staged": {
         "*.ts": "eslint --cache --fix",
-        "*.(json|scss)": "prettier --write"
+        "*.(json|scss|yml)": "prettier --write"
     }
 }

src/scss/ds4.scss

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-@use 'sass:meta';
+@use "sass:meta";
 
 /* Global styles */
 @include meta.load-css("global/accessibility");

yarn.lock

@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0":
@@ -39,7 +39,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.14.6, @babel/core@npm:^7.1.0, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5":
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5":
   version: 7.14.6
   resolution: "@babel/core@npm:7.14.6"
   dependencies:
@@ -2652,16 +2652,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:4.1.2":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc
-  languageName: node
-  linkType: hard
-
 "chalk@npm:^2.0.0":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
@@ -3582,7 +3572,6 @@ __metadata:
     "@types/jest": 27.0.3
     "@typescript-eslint/eslint-plugin": 5.5.0
     "@typescript-eslint/parser": 5.5.0
-    chalk: 4.1.2
     conventional-changelog-cli: 2.1.1
     conventional-changelog-conventionalcommits: 4.6.1
     eslint: 8.3.0
@@ -4516,6 +4505,7 @@ fsevents@^1.2.7:
     bindings: ^1.5.0
     nan: ^2.12.1
   checksum: ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -4525,25 +4515,26 @@ fsevents@^1.2.7:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
 "fsevents@patch:fsevents@^1.2.7#~builtin<compat/fsevents>":
   version: 1.2.13
-  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=18f3a7"
   dependencies:
     bindings: ^1.5.0
     nan: ^2.12.1
-  checksum: b264407498db2cfdcc2a05287334a4160c985a88e4a989e2f2f8dcc6afc8b04a4fcd82c797266442452e11c1fb07d7747d138b078fe4bb1f8f4fd2a6f2484d7e
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
 "fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -6010,7 +6001,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:27.4.0, jest-resolve@npm:^27.4.0":
+"jest-resolve@npm:^27.4.0":
   version: 27.4.0
   resolution: "jest-resolve@npm:27.4.0"
   dependencies:
@@ -8312,11 +8303,11 @@ fsevents@^1.2.7:
 
 "resolve@patch:resolve@1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
   version: 1.20.0
-  resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=00b1ff"
+  resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=07638b"
   dependencies:
     is-core-module: ^2.2.0
     path-parse: ^1.0.6
-  checksum: bed00be983cd20a8af0e7840664f655c4b269786dbd9595c5f156cd9d8a0050e65cdbbbdafc30ee9b6245b230c78a2c8ab6447a52545b582f476c29adb188cc5
+  checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5
   languageName: node
   linkType: hard
 
@@ -9625,21 +9616,21 @@ typescript@^4.4.3:
 
 "typescript@patch:typescript@4.4.4#~builtin<compat/typescript>":
   version: 4.4.4
-  resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=32657b"
+  resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=493e53"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: c97c33903f1eb4f9e178649befdfc859d93157db1eccd1e521e84976ec6861db53412d8018e5e4c5d09268771c65498d42caa64bd881878346c3644f6b7cd202
+  checksum: bd629ad0da4a15d79aaad56baf3ee7d96f6a181760d430ae77f8c5325df7bffd9edee57544a3970e3651e8b796fe03a5838a7eb39c6d46cc3866c0b23d36a0dd
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>":
   version: 4.4.3
-  resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=32657b"
+  resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=493e53"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 28ab98313afab46788ff41014fdb5932430ada6e03cf9e92ac47f406526a2cac1ae2894834e7da61e46b7429318e9c47f45ba8de323332f0cb9af99b72ebae74
+  checksum: 79f5c13d21c9dea3eb44d2b7002ff25a0569fefc432e083d65a360e3aca990aca25fc733e14aa6883b5e9a68e3e2f0330a34123e048806f91d701732ece00e6f
   languageName: node
   linkType: hard