diff --git a/tools/adventure-pack/package.json b/tools/adventure-pack/package.json
index d32e6b63..cf5793b5 100644
--- a/tools/adventure-pack/package.json
+++ b/tools/adventure-pack/package.json
@@ -59,7 +59,7 @@
"jest": "29.7.0",
"prettier": "3.3.2",
"prettier-plugin-java": "2.6.0",
- "ts-jest": "29.1.5",
+ "ts-jest": "29.2.2",
"ts-loader": "9.5.1",
"ts-morph": "23.0.0",
"ts-node": "10.9.2",
diff --git a/tools/adventure-pack/src/app/App.tsx b/tools/adventure-pack/src/app/components/App.tsx
similarity index 81%
rename from tools/adventure-pack/src/app/App.tsx
rename to tools/adventure-pack/src/app/components/App.tsx
index 378d6e7d..bf399b0b 100644
--- a/tools/adventure-pack/src/app/App.tsx
+++ b/tools/adventure-pack/src/app/components/App.tsx
@@ -3,13 +3,11 @@ import React, { useEffect } from "react";
import { Checkbox } from "./Checkbox";
import { GoodyCard } from "./GoodyCard";
import { HighlightedCode } from "./HighlightedCode";
-import { fetchGoodies } from "./fetchGoodies";
-import type { Language } from "./Language";
-import { useMergedCode } from "./useMergedCode";
-import { useAppState } from "./useAppState";
-import { Goody } from "./Goody";
-
-import { LANGUAGE_NAMES } from "./constants";
+import { fetchGoodies } from "../fetchGoodies";
+import { useMergedCode } from "../useMergedCode";
+import { useAppState } from "../useAppState";
+import { Goody } from "../Goody";
+import { LanguageSelector } from "./LanguageSelector";
function Column({
children,
@@ -56,19 +54,19 @@ export function App({ commitHash }: Props) {
return (
@@ -95,23 +93,15 @@ export function App({ commitHash }: Props) {
}}
>
-
+ />
{Object.values(goodies ?? {}).map((goody) => (
void;
+};
+
+export function LanguageSelector({ selectedLanguage, onChange }: Props) {
+ return (
+
+ );
+}
diff --git a/tools/adventure-pack/src/app/constants.tsx b/tools/adventure-pack/src/app/constants.ts
similarity index 100%
rename from tools/adventure-pack/src/app/constants.tsx
rename to tools/adventure-pack/src/app/constants.ts
diff --git a/tools/adventure-pack/src/app/goodyToText.tsx b/tools/adventure-pack/src/app/goodyToText.ts
similarity index 100%
rename from tools/adventure-pack/src/app/goodyToText.tsx
rename to tools/adventure-pack/src/app/goodyToText.ts
diff --git a/tools/adventure-pack/src/app/main.tsx b/tools/adventure-pack/src/app/main.tsx
index 89294242..44f05f33 100644
--- a/tools/adventure-pack/src/app/main.tsx
+++ b/tools/adventure-pack/src/app/main.tsx
@@ -2,7 +2,7 @@ import nullthrows from "nullthrows";
import React from "react";
import ReactDOM from "react-dom/client";
-import { App } from "./App";
+import { App } from "./components/App";
declare const ADVENTURE_PACK_COMMIT_HASH: string;
diff --git a/tools/adventure-pack/src/app/mergeCode.ts b/tools/adventure-pack/src/app/mergeCode.ts
index 0df8558c..8903a2ff 100644
--- a/tools/adventure-pack/src/app/mergeCode.ts
+++ b/tools/adventure-pack/src/app/mergeCode.ts
@@ -14,11 +14,11 @@ import { sortTypeScriptModuleAndInterfaceDeclarations } from "./sortTypeScriptMo
import { stringifyTypeScriptModuleDeclarations } from "./stringifyTypeScriptModuleDeclarations";
function topo({
- goodies,
equippedGoodies,
+ goodies,
}: {
- goodies: ReadonlyDeep>;
equippedGoodies: ReadonlySet;
+ goodies: ReadonlyDeep>;
}): string[] {
const pq = new BinaryHeap(compareStringsCaseInsensitive);
@@ -78,16 +78,16 @@ function topo({
export type Data = {
commitHash: string;
+ equippedGoodies: ReadonlySet;
goodies: ReadonlyDeep>;
language: Language;
- equippedGoodies: ReadonlySet;
};
export function mergeCode({
commitHash,
+ equippedGoodies,
goodies,
language,
- equippedGoodies,
}: Data): string {
if (equippedGoodies.size === 0) {
return language === "python3"
@@ -159,8 +159,8 @@ export function mergeCode({
if (language === "java") {
return (
centerTextInComment({
- text: "BEGIN ADVENTURE PACK CODE",
commentType: "//",
+ text: "BEGIN ADVENTURE PACK CODE",
}) +
"\n" +
`// Adventure Pack commit ${commitHash}\n` +
@@ -168,8 +168,8 @@ export function mergeCode({
mergedCode +
"\n\n" +
centerTextInComment({
- text: "END ADVENTURE PACK CODE",
commentType: "//",
+ text: "END ADVENTURE PACK CODE",
})
);
}
@@ -177,8 +177,8 @@ export function mergeCode({
if (language === "kotlin") {
return (
centerTextInComment({
- text: "BEGIN ADVENTURE PACK CODE",
commentType: "//",
+ text: "BEGIN ADVENTURE PACK CODE",
}) +
"\n" +
`// Adventure Pack commit ${commitHash}\n` +
@@ -195,22 +195,22 @@ export function mergeCode({
if (language === "python3") {
return (
centerTextInComment({
- text: "BEGIN ADVENTURE PACK CODE",
commentType: "#",
+ text: "BEGIN ADVENTURE PACK CODE",
}) +
"\n" +
`# Adventure Pack commit ${commitHash}\n` +
`# Running at: ${window.location.href}\n\n` +
mergedCode +
"\n\n" +
- centerTextInComment({ text: "END ADVENTURE PACK CODE", commentType: "#" })
+ centerTextInComment({ commentType: "#", text: "END ADVENTURE PACK CODE" })
);
}
return (
centerTextInComment({
- text: "BEGIN ADVENTURE PACK CODE",
commentType: "//",
+ text: "BEGIN ADVENTURE PACK CODE",
}) +
"\n" +
`// Adventure Pack commit ${commitHash}\n` +
@@ -218,8 +218,8 @@ export function mergeCode({
mergedCode.replaceAll(/^export\s+/gm, "") +
"\n\n" +
centerTextInComment({
- text: "END ADVENTURE PACK CODE",
commentType: "//",
+ text: "END ADVENTURE PACK CODE",
})
).trim();
}
diff --git a/tools/adventure-pack/src/app/mergeJavaCode.ts b/tools/adventure-pack/src/app/mergeJavaCode.ts
index 1fdb81db..86878b12 100644
--- a/tools/adventure-pack/src/app/mergeJavaCode.ts
+++ b/tools/adventure-pack/src/app/mergeJavaCode.ts
@@ -15,7 +15,7 @@ export function mergeJavaCode(goodies: Iterable>) {
`Only the ${ADVENTURE_PACK_CLASS_NAME} class can exist in multiple goodies!`,
);
- classes[className] ??= { modifiers: new Set(), code: [] };
+ classes[className] ??= { code: [], modifiers: new Set() };
for (const modifier of goody.codeByClass[className].modifiers) {
classes[className].modifiers.add(modifier);
}
diff --git a/tools/adventure-pack/src/app/parsers/goodyBaseParser.ts b/tools/adventure-pack/src/app/parsers/goodyBaseParser.ts
index 741179c6..a1f7a8e1 100644
--- a/tools/adventure-pack/src/app/parsers/goodyBaseParser.ts
+++ b/tools/adventure-pack/src/app/parsers/goodyBaseParser.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
import { nonBlankStringParser } from "./nonBlankStringParser";
export const goodyBaseParser = z.object({
- imports: z.array(nonBlankStringParser),
importedBy: z.array(nonBlankStringParser),
+ imports: z.array(nonBlankStringParser),
name: nonBlankStringParser,
});
diff --git a/tools/adventure-pack/src/app/parsers/javaGoodyParser.ts b/tools/adventure-pack/src/app/parsers/javaGoodyParser.ts
index e81d9e16..6acdbf18 100644
--- a/tools/adventure-pack/src/app/parsers/javaGoodyParser.ts
+++ b/tools/adventure-pack/src/app/parsers/javaGoodyParser.ts
@@ -10,8 +10,8 @@ export const javaGoodyParser = goodyBaseParser
nonBlankStringParser,
z
.object({
- modifiers: z.array(nonBlankStringParser),
code: z.string(),
+ modifiers: z.array(nonBlankStringParser),
})
.strict(),
),
diff --git a/tools/adventure-pack/src/app/useMergedCode.ts b/tools/adventure-pack/src/app/useMergedCode.ts
index ef47302b..81561d12 100644
--- a/tools/adventure-pack/src/app/useMergedCode.ts
+++ b/tools/adventure-pack/src/app/useMergedCode.ts
@@ -7,9 +7,9 @@ import { type Data, mergeCode } from "./mergeCode";
export function useMergedCode({
commitHash,
+ equippedGoodies,
goodies,
language,
- equippedGoodies,
}: Omit & { goodies: Data["goodies"] | null }): string {
const [code, setCode] = useState("");
@@ -25,9 +25,9 @@ export function useMergedCode({
setCode(
mergeCode({
commitHash,
+ equippedGoodies,
goodies,
language,
- equippedGoodies,
}),
);
});
@@ -35,7 +35,7 @@ export function useMergedCode({
return () => {
isActive = false;
};
- }, [commitHash, goodies, language, equippedGoodies]);
+ }, [commitHash, equippedGoodies, goodies, language]);
return code;
}
diff --git a/tools/adventure-pack/src/scripts/build-html.tsx b/tools/adventure-pack/src/scripts/build-html.tsx
index 6f817d0a..2c0fe5cd 100644
--- a/tools/adventure-pack/src/scripts/build-html.tsx
+++ b/tools/adventure-pack/src/scripts/build-html.tsx
@@ -5,7 +5,7 @@ import path from "node:path";
import React from "react";
import ReactDOMServer from "react-dom/server";
-import { App } from "../app/App";
+import { App } from "../app/components/App";
const exec = promisify(execWithCallback);
diff --git a/tools/adventure-pack/src/scripts/package-goodies/java/readBaseGoody.ts b/tools/adventure-pack/src/scripts/package-goodies/java/readBaseGoody.ts
index 47950448..d13c4296 100644
--- a/tools/adventure-pack/src/scripts/package-goodies/java/readBaseGoody.ts
+++ b/tools/adventure-pack/src/scripts/package-goodies/java/readBaseGoody.ts
@@ -25,8 +25,8 @@ export async function readBaseGoody(
codeByClass,
imports: Array.from(imports),
importsCode,
- name,
language: "java",
+ name,
packageName,
};
}
diff --git a/tools/adventure-pack/src/scripts/package-goodies/java/splitCodeIntoClasses.ts b/tools/adventure-pack/src/scripts/package-goodies/java/splitCodeIntoClasses.ts
index 33bc7dc8..c872ccde 100644
--- a/tools/adventure-pack/src/scripts/package-goodies/java/splitCodeIntoClasses.ts
+++ b/tools/adventure-pack/src/scripts/package-goodies/java/splitCodeIntoClasses.ts
@@ -24,7 +24,7 @@ export function splitCodeIntoClasses(
modifiers.delete("public");
currentClassName = classMatch[2];
- classes[currentClassName] = { modifiers, code: [] };
+ classes[currentClassName] = { code: [], modifiers };
continue;
}
diff --git a/tools/adventure-pack/src/scripts/package-goodies/kotlin/readBaseGoody.ts b/tools/adventure-pack/src/scripts/package-goodies/kotlin/readBaseGoody.ts
index de70af2d..e0ea07d9 100644
--- a/tools/adventure-pack/src/scripts/package-goodies/kotlin/readBaseGoody.ts
+++ b/tools/adventure-pack/src/scripts/package-goodies/kotlin/readBaseGoody.ts
@@ -22,8 +22,8 @@ export async function readBaseGoody(
code: codeWithoutImports,
imports: Array.from(imports),
importsCode,
- name,
language: "kotlin",
+ name,
packageName,
};
}
diff --git a/tools/adventure-pack/src/scripts/package-goodies/typescript/readGoodies.ts b/tools/adventure-pack/src/scripts/package-goodies/typescript/readGoodies.ts
index 10a25dda..f7275bc8 100644
--- a/tools/adventure-pack/src/scripts/package-goodies/typescript/readGoodies.ts
+++ b/tools/adventure-pack/src/scripts/package-goodies/typescript/readGoodies.ts
@@ -39,7 +39,6 @@ export async function readGoodies(): Promise<{
const goodiesByName = fillOutImportedByAndSortImports(baseGoodiesByName);
return {
- typescript: goodiesByName,
javascript: await mapObjectValuesAsync(
goodiesByName,
async (goody: TypeScriptGoody): Promise => {
@@ -52,5 +51,7 @@ export async function readGoodies(): Promise<{
};
},
),
+
+ typescript: goodiesByName,
};
}
diff --git a/tools/eslint-config/package.json b/tools/eslint-config/package.json
index c4cac5ec..a491c47e 100644
--- a/tools/eslint-config/package.json
+++ b/tools/eslint-config/package.json
@@ -15,8 +15,8 @@
"dependencies": {
"@stylistic/eslint-plugin-js": "2.3.0",
"@stylistic/eslint-plugin-ts": "2.3.0",
- "@typescript-eslint/eslint-plugin": "7.15.0",
- "@typescript-eslint/parser": "7.15.0",
+ "@typescript-eslint/eslint-plugin": "7.16.0",
+ "@typescript-eslint/parser": "7.16.0",
"globals": "15.8.0"
},
"devDependencies": {
diff --git a/tools/yarn.lock b/tools/yarn.lock
index 466cd499..0d5059d7 100644
--- a/tools/yarn.lock
+++ b/tools/yarn.lock
@@ -1118,30 +1118,30 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz#8eaf396ac2992d2b8f874b68eb3fcd6b179cb7f3"
- integrity sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==
+"@typescript-eslint/eslint-plugin@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.0.tgz#b3563927341eca15124a18c6f94215f779f5c02a"
+ integrity sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw==
dependencies:
"@eslint-community/regexpp" "^4.10.0"
- "@typescript-eslint/scope-manager" "7.15.0"
- "@typescript-eslint/type-utils" "7.15.0"
- "@typescript-eslint/utils" "7.15.0"
- "@typescript-eslint/visitor-keys" "7.15.0"
+ "@typescript-eslint/scope-manager" "7.16.0"
+ "@typescript-eslint/type-utils" "7.16.0"
+ "@typescript-eslint/utils" "7.16.0"
+ "@typescript-eslint/visitor-keys" "7.16.0"
graphemer "^1.4.0"
ignore "^5.3.1"
natural-compare "^1.4.0"
ts-api-utils "^1.3.0"
-"@typescript-eslint/parser@7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.15.0.tgz#f4a536e5fc6a1c05c82c4d263a2bfad2da235c80"
- integrity sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==
+"@typescript-eslint/parser@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.16.0.tgz#53fae8112f8c912024aea7b499cf7374487af6d8"
+ integrity sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw==
dependencies:
- "@typescript-eslint/scope-manager" "7.15.0"
- "@typescript-eslint/types" "7.15.0"
- "@typescript-eslint/typescript-estree" "7.15.0"
- "@typescript-eslint/visitor-keys" "7.15.0"
+ "@typescript-eslint/scope-manager" "7.16.0"
+ "@typescript-eslint/types" "7.16.0"
+ "@typescript-eslint/typescript-estree" "7.16.0"
+ "@typescript-eslint/visitor-keys" "7.16.0"
debug "^4.3.4"
"@typescript-eslint/scope-manager@7.15.0":
@@ -1152,13 +1152,21 @@
"@typescript-eslint/types" "7.15.0"
"@typescript-eslint/visitor-keys" "7.15.0"
-"@typescript-eslint/type-utils@7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz#5b83c904c6de91802fb399305a50a56d10472c39"
- integrity sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==
+"@typescript-eslint/scope-manager@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz#eb0757af5720c9c53c8010d7a0355ae27e17b7e5"
+ integrity sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==
dependencies:
- "@typescript-eslint/typescript-estree" "7.15.0"
- "@typescript-eslint/utils" "7.15.0"
+ "@typescript-eslint/types" "7.16.0"
+ "@typescript-eslint/visitor-keys" "7.16.0"
+
+"@typescript-eslint/type-utils@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.16.0.tgz#ec52b1932b8fb44a15a3e20208e0bd49d0b6bd00"
+ integrity sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg==
+ dependencies:
+ "@typescript-eslint/typescript-estree" "7.16.0"
+ "@typescript-eslint/utils" "7.16.0"
debug "^4.3.4"
ts-api-utils "^1.3.0"
@@ -1167,6 +1175,11 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.15.0.tgz#fb894373a6e3882cbb37671ffddce44f934f62fc"
integrity sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==
+"@typescript-eslint/types@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2"
+ integrity sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==
+
"@typescript-eslint/typescript-estree@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz#e323bfa3966e1485b638ce751f219fc1f31eba37"
@@ -1181,7 +1194,31 @@
semver "^7.6.0"
ts-api-utils "^1.3.0"
-"@typescript-eslint/utils@7.15.0", "@typescript-eslint/utils@^7.12.0":
+"@typescript-eslint/typescript-estree@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz#98ac779d526fab2a781e5619c9250f3e33867c09"
+ integrity sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==
+ dependencies:
+ "@typescript-eslint/types" "7.16.0"
+ "@typescript-eslint/visitor-keys" "7.16.0"
+ debug "^4.3.4"
+ globby "^11.1.0"
+ is-glob "^4.0.3"
+ minimatch "^9.0.4"
+ semver "^7.6.0"
+ ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.16.0.tgz#b38dc0ce1778e8182e227c98d91d3418449aa17f"
+ integrity sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.4.0"
+ "@typescript-eslint/scope-manager" "7.16.0"
+ "@typescript-eslint/types" "7.16.0"
+ "@typescript-eslint/typescript-estree" "7.16.0"
+
+"@typescript-eslint/utils@^7.12.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.15.0.tgz#9e6253c4599b6e7da2fb64ba3f549c73eb8c1960"
integrity sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==
@@ -1199,6 +1236,14 @@
"@typescript-eslint/types" "7.15.0"
eslint-visitor-keys "^3.4.3"
+"@typescript-eslint/visitor-keys@7.16.0":
+ version "7.16.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz#a1d99fa7a3787962d6e0efd436575ef840e23b06"
+ integrity sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==
+ dependencies:
+ "@typescript-eslint/types" "7.16.0"
+ eslint-visitor-keys "^3.4.3"
+
"@vladfrangu/async_event_emitter@^2.2.4":
version "2.2.4"
resolved "https://registry.yarnpkg.com/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.4.tgz#d3537432c6db6444680a596271dff8ea407343b3"
@@ -1456,6 +1501,11 @@ array-union@^2.1.0:
resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+async@^3.2.3:
+ version "3.2.5"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+ integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
babel-jest@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -1601,7 +1651,7 @@ chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1849,6 +1899,13 @@ discord.js@14.15.3:
tslib "2.6.2"
undici "6.13.0"
+ejs@^3.0.0:
+ version "3.1.10"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+ integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
+ dependencies:
+ jake "^10.8.5"
+
electron-to-chromium@^1.4.796:
version "1.4.807"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.807.tgz#4d6c5ea1516f0164ac5bfd487ccd4ee9507c8f01"
@@ -2151,6 +2208,13 @@ file-entry-cache@^8.0.0:
dependencies:
flat-cache "^4.0.0"
+filelist@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+ integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+ dependencies:
+ minimatch "^5.0.1"
+
fill-range@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -2553,6 +2617,16 @@ istanbul-reports@^3.1.3:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
+jake@^10.8.5:
+ version "10.9.1"
+ resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b"
+ integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==
+ dependencies:
+ async "^3.2.3"
+ chalk "^4.0.2"
+ filelist "^1.0.4"
+ minimatch "^3.1.2"
+
java-parser@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/java-parser/-/java-parser-2.3.0.tgz#13037364c04bf7386bef841f872cbc5e8b53830f"
@@ -3146,6 +3220,13 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
dependencies:
brace-expansion "^1.1.7"
+minimatch@^5.0.1:
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+ integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+ dependencies:
+ brace-expansion "^2.0.1"
+
minimatch@^9.0.4:
version "9.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
@@ -3767,12 +3848,13 @@ ts-api-utils@^1.3.0:
resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
-ts-jest@29.1.5:
- version "29.1.5"
- resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69"
- integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==
+ts-jest@29.2.2:
+ version "29.2.2"
+ resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.2.tgz#0d2387bb04d39174b20a05172a968f258aedff4d"
+ integrity sha512-sSW7OooaKT34AAngP6k1VS669a0HdLxkQZnlC7T76sckGCokXFnvJ3yRlQZGRTAoV5K19HfSgCiSwWOSIfcYlg==
dependencies:
bs-logger "0.x"
+ ejs "^3.0.0"
fast-json-stable-stringify "2.x"
jest-util "^29.0.0"
json5 "^2.2.3"