diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index eca7013..63b7291 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,6 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: + - run: sudo apt-get update - run: sudo apt-get install -y protobuf-compiler # deno_kv needs this - uses: actions/checkout@v4 diff --git a/dev_plugin/package.json b/dev_plugin/package.json index e4d6d48..13eb26c 100644 --- a/dev_plugin/package.json +++ b/dev_plugin/package.json @@ -14,6 +14,6 @@ "@types/react": "^18.2.14", "@project-gauntlet/deno": "file:../js/deno", "@project-gauntlet/tools": "file:../../tools", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } } diff --git a/js/api/.gitignore b/js/api/.gitignore index 0358eb3..cf0ba43 100644 --- a/js/api/.gitignore +++ b/js/api/.gitignore @@ -1,6 +1,2 @@ -component_model.json -gentypes -gendist -hookstypes -hooksdist -builddist \ No newline at end of file +dist +disttypes diff --git a/js/api/package.json b/js/api/package.json index f9179a2..acc3291 100644 --- a/js/api/package.json +++ b/js/api/package.json @@ -4,10 +4,10 @@ "type": "module", "exports": { "./components": { - "types": "./gentypes/components.d.ts" + "types": "./disttypes/gen/components.d.ts" }, "./hooks": { - "types": "./hookstypes/hooks.d.ts" + "types": "./disttypes/hooks.d.ts" } }, "repository": { @@ -16,24 +16,14 @@ "directory": "js/api" }, "files": [ - "gentypes", - "hookstypes" + "disttypes" ], "scripts": { - "build": "npm run run-generator && npm run build-api", - "build-api": "tsc --project tsconfig.hooks.json", - "run-generator-json": "cd ../.. && cargo run --package component_model -- ./js/api/component_model.json", - "run-generator-source": "tsc --project tsconfig.json && node builddist/index.js", - "run-generator-declarations": "tsc --project tsconfig.gentypes.json", - "run-generator": "npm run run-generator-json && npm run run-generator-source && npm run run-generator-declarations" - }, - "dependencies": { - "@project-gauntlet/typings": "*", - "@project-gauntlet/deno": "*" + "build": "tsc" }, "devDependencies": { - "@types/node": "^18.17.1", - "typescript": "^5.2.2" + "@project-gauntlet/typings": "*", + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" diff --git a/js/api/gen/components.tsx b/js/api/src/gen/components.tsx similarity index 100% rename from js/api/gen/components.tsx rename to js/api/src/gen/components.tsx diff --git a/js/api/tsconfig.hooks.json b/js/api/tsconfig.hooks.json deleted file mode 100644 index 8a71abc..0000000 --- a/js/api/tsconfig.hooks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "strict": true, - "module": "ES2022", - "esModuleInterop": true, - "target": "ES2022", - "moduleResolution": "bundler", - "jsx": "react-jsx", - "types": ["@project-gauntlet/typings", "@project-gauntlet/deno"], - "declaration": true, - "outDir": "./hooksdist", - "declarationDir": "./hookstypes" - }, - "lib": ["ES2020"], - "include": ["./src"] -} \ No newline at end of file diff --git a/js/api/tsconfig.json b/js/api/tsconfig.json index 6e24c35..520a04c 100644 --- a/js/api/tsconfig.json +++ b/js/api/tsconfig.json @@ -6,9 +6,12 @@ "target": "ES2022", "moduleResolution": "bundler", "jsx": "react-jsx", - "types": ["@types/node", "@project-gauntlet/typings"], - "outDir": "./builddist" + "types": ["@project-gauntlet/typings"], + "stripInternal": true, + "declaration": true, + "outDir": "./dist", + "declarationDir": "./disttypes" }, "lib": ["ES2020"], - "include": ["./generator"] + "include": ["./src"] } \ No newline at end of file diff --git a/js/api_build/.gitignore b/js/api_build/.gitignore new file mode 100644 index 0000000..d77bc98 --- /dev/null +++ b/js/api_build/.gitignore @@ -0,0 +1,2 @@ +component_model.json +dist \ No newline at end of file diff --git a/js/api_build/package.json b/js/api_build/package.json new file mode 100644 index 0000000..813d333 --- /dev/null +++ b/js/api_build/package.json @@ -0,0 +1,15 @@ +{ + "name": "@project-gauntlet/api-build", + "version": "0.1.0", + "type": "module", + "scripts": { + "build": "npm run generate-json && npm run build-generator && npm run run-generator", + "generate-json": "cd ../.. && cargo run --package component_model -- ./js/api_build/component_model.json", + "build-generator": "tsc", + "run-generator": "node dist/index.js" + }, + "devDependencies": { + "@types/node": "^18.17.1", + "typescript": "^5.3.3" + } +} diff --git a/js/api/generator/index.ts b/js/api_build/src/index.ts similarity index 99% rename from js/api/generator/index.ts rename to js/api_build/src/index.ts index 8d5517d..67479ee 100644 --- a/js/api/generator/index.ts +++ b/js/api_build/src/index.ts @@ -600,7 +600,7 @@ function makeType(type: PropertyType): ts.TypeNode { } -const genDir = "./gen"; +const genDir = "../api/src/gen"; if (!existsSync(genDir)) { mkdirSync(genDir); } diff --git a/js/api/tsconfig.gentypes.json b/js/api_build/tsconfig.json similarity index 60% rename from js/api/tsconfig.gentypes.json rename to js/api_build/tsconfig.json index 10cefeb..8c9c8cb 100644 --- a/js/api/tsconfig.gentypes.json +++ b/js/api_build/tsconfig.json @@ -6,11 +6,9 @@ "target": "ES2022", "moduleResolution": "bundler", "jsx": "react-jsx", - "stripInternal": true, - "declaration": true, - "outDir": "./gendist", - "declarationDir": "./gentypes" + "types": ["@types/node", "@project-gauntlet/typings"], + "outDir": "./dist" }, "lib": ["ES2020"], - "include": ["./gen"] + "include": ["./src"] } \ No newline at end of file diff --git a/js/build/package.json b/js/build/package.json index 8fe34df..7e78974 100644 --- a/js/build/package.json +++ b/js/build/package.json @@ -17,6 +17,6 @@ "@rollup/plugin-typescript": "^11.1.5", "@types/node": "^18.17.1", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } } diff --git a/js/build/src/main.ts b/js/build/src/main.ts index e4fcf36..c9b3e9f 100644 --- a/js/build/src/main.ts +++ b/js/build/src/main.ts @@ -25,6 +25,8 @@ program.command('build') await program.parseAsync(process.argv); function build(projectRoot: string, check: boolean) { + console.log("Building @project-gauntlet/api-build...") + execSync('npm run build --workspace @project-gauntlet/api-build', { stdio: "inherit", cwd: projectRoot}); console.log("Building @project-gauntlet/api...") execSync('npm run build --workspace @project-gauntlet/api', { stdio: "inherit", cwd: projectRoot}); console.log("Building @project-gauntlet/deno...") diff --git a/js/core/package.json b/js/core/package.json index f895bdd..5a5a04c 100644 --- a/js/core/package.json +++ b/js/core/package.json @@ -13,6 +13,6 @@ "@project-gauntlet/deno": "*", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } } diff --git a/js/deno/package.json b/js/deno/package.json index cf98fa4..2ff8ca4 100644 --- a/js/deno/package.json +++ b/js/deno/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@types/node": "^18.17.1", - "typescript": "^5.2.2" + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" diff --git a/js/react/package.json b/js/react/package.json index eb63ae3..5a0d165 100644 --- a/js/react/package.json +++ b/js/react/package.json @@ -13,6 +13,6 @@ "@rollup/plugin-typescript": "^11.1.5", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } } diff --git a/js/react_renderer/package.json b/js/react_renderer/package.json index 66374c2..9745046 100644 --- a/js/react_renderer/package.json +++ b/js/react_renderer/package.json @@ -18,6 +18,6 @@ "@project-gauntlet/deno": "*", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } } diff --git a/package-lock.json b/package-lock.json index 36df0c3..8b4a9cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,13 +12,17 @@ "js/api": { "name": "@project-gauntlet/api", "version": "0.1.0", - "dependencies": { - "@project-gauntlet/deno": "*", - "@project-gauntlet/typings": "*" - }, + "devDependencies": { + "@project-gauntlet/typings": "*", + "typescript": "^5.3.3" + } + }, + "js/api_build": { + "name": "@project-gauntlet/api-build", + "version": "0.1.0", "devDependencies": { "@types/node": "^18.17.1", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/build": { @@ -34,7 +38,7 @@ "@rollup/plugin-typescript": "^11.1.5", "@types/node": "^18.17.1", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/core": { @@ -48,7 +52,7 @@ "@types/react": "^18.2.35", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/deno": { @@ -56,22 +60,7 @@ "version": "0.1.0", "devDependencies": { "@types/node": "^18.17.1", - "typescript": "^5.2.2" - } - }, - "js/dev_plugin": { - "name": "@project-gauntlet/dev-plugin", - "extraneous": true, - "dependencies": { - "@project-gauntlet/api": "*", - "@types/lodash": "^4.14.196", - "lodash": "^4.17.21" - }, - "devDependencies": { - "@project-gauntlet/deno": "*", - "@project-gauntlet/tools": "*", - "@types/react": "^18.2.14", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/react": { @@ -85,7 +74,7 @@ "@rollup/plugin-typescript": "^11.1.5", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/react_renderer": { @@ -104,49 +93,7 @@ "@types/react-reconciler": "^0.28.6", "rollup": "^4.3.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" - } - }, - "js/release": { - "name": "@project-gauntlet/release", - "extraneous": true, - "dependencies": { - "commander": "^11.1.0", - "octokit": "^3.1.2", - "simple-git": "^3.22.0" - }, - "devDependencies": { - "@rollup/plugin-commonjs": "^25.0.7", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-typescript": "^11.1.5", - "@types/node": "^18.17.1", - "tslib": "^2.6.2", - "typescript": "^5.2.2" - } - }, - "js/tools": { - "name": "@project-gauntlet/tools", - "version": "0.1.0", - "extraneous": true, - "dependencies": { - "@rollup/plugin-commonjs": "^25.0.7", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-typescript": "^11.1.5", - "chalk": "^5.3.0", - "commander": "^11.1.0", - "dbus-ts": "^0.0.7", - "rollup": "^4.3.0", - "toml": "^3.0.0", - "zod": "^3.22.4" - }, - "bin": { - "gauntlet": "bin/main.js" - }, - "devDependencies": { - "@rollup/plugin-json": "^6.1.0", - "@types/node": "^18.17.1", - "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "^5.3.3" } }, "js/typings": { @@ -207,14 +154,6 @@ "node": ">= 18" } }, - "node_modules/@octokit/auth-app/node_modules/lru-cache": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", - "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/@octokit/auth-oauth-app": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-7.0.1.tgz", @@ -441,9 +380,9 @@ } }, "node_modules/@octokit/request": { - "version": "8.1.6", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.6.tgz", - "integrity": "sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.2.0.tgz", + "integrity": "sha512-exPif6x5uwLqv1N1irkLG1zZNJkOtj8bZxuVHd71U5Ftuxf2wGNvAJyNBcPbPC+EBzwYEbBDdSFb8EPcjpYxPQ==", "dependencies": { "@octokit/endpoint": "^9.0.0", "@octokit/request-error": "^5.0.0", @@ -476,13 +415,13 @@ } }, "node_modules/@octokit/webhooks": { - "version": "12.0.11", - "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-12.0.11.tgz", - "integrity": "sha512-YEQOb7v0TZ662nh5jsbY1CMgJyMajCEagKrHWC30LTCwCtnuIrLtEpE20vq4AtH0SuZI90+PtV66/Bnnw0jkvg==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-12.1.0.tgz", + "integrity": "sha512-ppqZ1DyHhZklpeuxnx7WRn5S5WRxjHYt/fQlr33JNvbK+Dpaz6XFD5Zw/AFri62J4NH3jKreHeQFQkLouMqdog==", "dependencies": { "@octokit/request-error": "^5.0.0", "@octokit/webhooks-methods": "^4.0.0", - "@octokit/webhooks-types": "7.1.0", + "@octokit/webhooks-types": "7.3.2", "aggregate-error": "^3.1.0" }, "engines": { @@ -498,14 +437,18 @@ } }, "node_modules/@octokit/webhooks-types": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-7.1.0.tgz", - "integrity": "sha512-y92CpG4kFFtBBjni8LHoV12IegJ+KFxLgKRengrVjKmGE5XMeCuGvlfRe75lTRrgXaG6XIWJlFpIDTlkoJsU8w==" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-7.3.2.tgz", + "integrity": "sha512-JWOoOgtWTFnTSAamPXXyjTY5/apttvNxF+vPBnwdSu5cj5snrd7FO0fyw4+wTXy8fHduq626JjhO+TwCyyA6vA==" }, "node_modules/@project-gauntlet/api": { "resolved": "js/api", "link": true }, + "node_modules/@project-gauntlet/api-build": { + "resolved": "js/api_build", + "link": true + }, "node_modules/@project-gauntlet/build": { "resolved": "js/build", "link": true @@ -649,114 +592,10 @@ } } }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz", - "integrity": "sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz", - "integrity": "sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz", - "integrity": "sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz", - "integrity": "sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz", - "integrity": "sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz", - "integrity": "sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz", - "integrity": "sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz", - "integrity": "sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz", - "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.10.0.tgz", + "integrity": "sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==", "cpu": [ "x64" ], @@ -767,9 +606,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz", - "integrity": "sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.10.0.tgz", + "integrity": "sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==", "cpu": [ "x64" ], @@ -779,49 +618,10 @@ "linux" ] }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz", - "integrity": "sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz", - "integrity": "sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz", - "integrity": "sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@types/aws-lambda": { - "version": "8.10.131", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.131.tgz", - "integrity": "sha512-IWmFpqnVDvskYWnNSiu/qlRn80XlIOU0Gy5rKCl/NjhnI95pV8qIHs6L5b+bpHhyzuOSzjLgBcwgFSXrC1nZWA==" + "version": "8.10.133", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.133.tgz", + "integrity": "sha512-sr852MAL/79rjDelXP6ZuJ6GwOvXIRrFAoC8a+w91mZ5XR71CuzSgo1d0+pG1qgfPhjFgaibu7SWaoC5BA7pyQ==" }, "node_modules/@types/btoa-lite": { "version": "1.0.2", @@ -843,9 +643,9 @@ } }, "node_modules/@types/node": { - "version": "18.19.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.8.tgz", - "integrity": "sha512-g1pZtPhsvGVTwmeVoexWZLTQaOvXwoSq//pTL0DHeNzUDrFnir4fgETdhjhIxjVnN+hKOuh98+E1eMLnUXstFg==", + "version": "18.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.15.tgz", + "integrity": "sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA==", "dependencies": { "undici-types": "~5.26.4" } @@ -857,9 +657,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.48", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz", - "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==", + "version": "18.2.55", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz", + "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -1025,20 +825,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -1068,9 +854,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -1236,10 +1022,18 @@ "loose-envify": "cli.js" } }, + "node_modules/lru-cache": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/magic-string": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -1355,9 +1149,9 @@ } }, "node_modules/rollup": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.5.tgz", - "integrity": "sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz", + "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -1370,19 +1164,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.5", - "@rollup/rollup-android-arm64": "4.9.5", - "@rollup/rollup-darwin-arm64": "4.9.5", - "@rollup/rollup-darwin-x64": "4.9.5", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", - "@rollup/rollup-linux-arm64-gnu": "4.9.5", - "@rollup/rollup-linux-arm64-musl": "4.9.5", - "@rollup/rollup-linux-riscv64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-musl": "4.9.5", - "@rollup/rollup-win32-arm64-msvc": "4.9.5", - "@rollup/rollup-win32-ia32-msvc": "4.9.5", - "@rollup/rollup-win32-x64-msvc": "4.9.5", + "@rollup/rollup-android-arm-eabi": "4.10.0", + "@rollup/rollup-android-arm64": "4.10.0", + "@rollup/rollup-darwin-arm64": "4.10.0", + "@rollup/rollup-darwin-x64": "4.10.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.10.0", + "@rollup/rollup-linux-arm64-gnu": "4.10.0", + "@rollup/rollup-linux-arm64-musl": "4.10.0", + "@rollup/rollup-linux-riscv64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-musl": "4.10.0", + "@rollup/rollup-win32-arm64-msvc": "4.10.0", + "@rollup/rollup-win32-ia32-msvc": "4.10.0", + "@rollup/rollup-win32-x64-msvc": "4.10.0", "fsevents": "~2.3.2" } }, @@ -1414,9 +1208,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dependencies": { "lru-cache": "^6.0.0" },