diff --git a/site/real_game/class/Player.js b/site/real_game/class/Player.js index c6e12b4..6b27134 100644 --- a/site/real_game/class/Player.js +++ b/site/real_game/class/Player.js @@ -6,7 +6,7 @@ /* By: edbernar pressedButton = ['w', 'a'] - Les lignes avec cleanup sont l'êquivalent d'un destructeur en CPP - Pour appliquer des actions sur les touches, il suffit de faire ça dans la fonction - update en regardant si la touche voulue est pressée dans la variable "pressedButton" + update en regardant si la touche voulue est dans la variable "pressedButton" - Par défaut, la caméra est accroché, si on veut qu'elle ne bouge plus, il faut - modifier "cameraFixed" à true + modifier "cameraFixed" à true (se fait avec la touche 'm' en jeu) - Si on utilise une touche qui ne sera utilisée que pour un appui simple, il faudra la - mettre dans 'addEventListerner('keypress') et pas dans update() + mettre dans 'addEventListerner('keypress') et pas dans update() pour eviter les + problèmes de touche non détecté + - La variable "limits" sert à délimiter les mouvements de la barre */ /* @@ -32,18 +34,27 @@ import * as THREE from 'three'; - Ajouter une camera sur l'object (OK) - Faire une fonction pour changer le mode de la camera (fix ou accrochée) (OK) - Ajouter une rotation quand la caméra est fixe (OK) + - Corriger bug quand changement de caméra (camera qui se remet au dessus + quand on repasse au dessus alors qu'elle devrait être en dessous vu que la + barre est en haut). Mais peut etre faire ça quand la barre aura des mouvements + définis sur la hauteur. */ let playerExist = false; +const limits = { + up : 2, + down: 0.2, + left: -4, + right: 4, +} class Player { pressedButton = []; object = null; camera = null; - speed = 0.05; + speed = 0.1; cameraFixed = false; - orbital = null; constructor (object, renderer) { @@ -51,10 +62,7 @@ class Player throw Error("Player is already init."); playerExist = true; this.object = object; - this.camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 10000); - this.orbital = new OrbitControls(this.camera, renderer.domElement); - - this.orbital.enableZoom = false; + this.camera = new THREE.PerspectiveCamera(80, window.innerWidth / window.innerHeight, 0.1, 10000); this.cleanup = new FinalizationRegistry((heldValue) => { playerExist = false; @@ -86,13 +94,16 @@ class Player { this.cameraFixed = !this.cameraFixed; if (!this.cameraFixed) + { this.setCameraPosition( this.object.position.x, this.object.position.y + 0.5, this.object.position.z + 1 ); + this.camera.rotation.set(0, 0, 0); + } else - this.setCameraPosition(0, 1, 1) + this.setCameraPosition(0, 1, 0.7) } }); } @@ -103,27 +114,36 @@ class Player i = 0; if (this.cameraFixed) - { - this.orbital.target = new THREE.Vector3(this.object.position.x, this.object.position.y, this.object.position.z - 5); - this.orbital.update(); - } - else - this.camera.rotation.set(0, 0, 0); + this.camera.lookAt(new THREE.Vector3(this.object.position.x / 4, (this.object.position.y + 1) / 1.75, this.object.position.z - 1.5)); while (i < this.pressedButton.length) { - if (this.pressedButton[i] == 'w' || this.pressedButton[i] == 's') + if (this.pressedButton[i] == 'w' && this.object.position.y < limits.up) { - this.object.position.y += (this.pressedButton[i] == 'w' ? this.speed : -this.speed); + this.object.position.y += this.speed; if (!this.cameraFixed) - this.camera.position.y += (this.pressedButton[i] == 'w' ? this.speed : -this.speed); + this.camera.position.y += (this.speed / 2); } - if (this.pressedButton[i] == 'a' || this.pressedButton[i] == 'd') + if (this.pressedButton[i] == 's' && this.object.position.y > limits.down) { - this.object.position.x += (this.pressedButton[i] == 'a' ? -this.speed : this.speed); + this.object.position.y -= this.speed; if (!this.cameraFixed) - this.camera.position.x += (this.pressedButton[i] == 'a' ? -this.speed : this.speed); + this.camera.position.y -= (this.speed / 2); + } + if (this.pressedButton[i] == 'd' && this.object.position.x < limits.right) + { + this.object.position.x += this.speed; + if (!this.cameraFixed) + this.camera.position.x += this.speed; + } + if (this.pressedButton[i] == 'a' && this.object.position.x > limits.left) + { + this.object.position.x -= this.speed; + if (!this.cameraFixed) + this.camera.position.x -= this.speed; } i++; + + } } diff --git a/site/real_game/index.html b/site/real_game/index.html index 6aaa555..88a7967 100644 --- a/site/real_game/index.html +++ b/site/real_game/index.html @@ -6,6 +6,8 @@ body { margin: 0; padding: 0; + width: 100%; + height: 100%; } diff --git a/site/real_game/main.js b/site/real_game/main.js index 449e862..eee5917 100644 --- a/site/real_game/main.js +++ b/site/real_game/main.js @@ -6,7 +6,7 @@ /* By: edbernar =12" } }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz", - "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==", + "node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", "cpu": [ - "arm64" + "x64" ], "license": "MIT", "optional": true, "os": [ - "darwin" + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz", + "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" ] }, "node_modules/@types/estree": { @@ -143,9 +159,9 @@ } }, "node_modules/rollup": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz", - "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz", + "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" @@ -158,22 +174,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.20.0", - "@rollup/rollup-android-arm64": "4.20.0", - "@rollup/rollup-darwin-arm64": "4.20.0", - "@rollup/rollup-darwin-x64": "4.20.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.20.0", - "@rollup/rollup-linux-arm-musleabihf": "4.20.0", - "@rollup/rollup-linux-arm64-gnu": "4.20.0", - "@rollup/rollup-linux-arm64-musl": "4.20.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0", - "@rollup/rollup-linux-riscv64-gnu": "4.20.0", - "@rollup/rollup-linux-s390x-gnu": "4.20.0", - "@rollup/rollup-linux-x64-gnu": "4.20.0", - "@rollup/rollup-linux-x64-musl": "4.20.0", - "@rollup/rollup-win32-arm64-msvc": "4.20.0", - "@rollup/rollup-win32-ia32-msvc": "4.20.0", - "@rollup/rollup-win32-x64-msvc": "4.20.0", + "@rollup/rollup-android-arm-eabi": "4.21.0", + "@rollup/rollup-android-arm64": "4.21.0", + "@rollup/rollup-darwin-arm64": "4.21.0", + "@rollup/rollup-darwin-x64": "4.21.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.21.0", + "@rollup/rollup-linux-arm-musleabihf": "4.21.0", + "@rollup/rollup-linux-arm64-gnu": "4.21.0", + "@rollup/rollup-linux-arm64-musl": "4.21.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0", + "@rollup/rollup-linux-riscv64-gnu": "4.21.0", + "@rollup/rollup-linux-s390x-gnu": "4.21.0", + "@rollup/rollup-linux-x64-gnu": "4.21.0", + "@rollup/rollup-linux-x64-musl": "4.21.0", + "@rollup/rollup-win32-arm64-msvc": "4.21.0", + "@rollup/rollup-win32-ia32-msvc": "4.21.0", + "@rollup/rollup-win32-x64-msvc": "4.21.0", "fsevents": "~2.3.2" } }, diff --git a/site/real_game/node_modules/.vite/deps/_metadata.json b/site/real_game/node_modules/.vite/deps/_metadata.json index c08c187..56f0b99 100644 --- a/site/real_game/node_modules/.vite/deps/_metadata.json +++ b/site/real_game/node_modules/.vite/deps/_metadata.json @@ -1,19 +1,19 @@ { - "hash": "2b6c1fb1", - "configHash": "4027b9ee", - "lockfileHash": "13ac84ee", - "browserHash": "5053c46e", + "hash": "0d872a36", + "configHash": "0b4c6e74", + "lockfileHash": "db0c8729", + "browserHash": "9bd24b43", "optimized": { "three": { "src": "../../three/build/three.module.js", "file": "three.js", - "fileHash": "b62fcce2", + "fileHash": "cbcebf47", "needsInterop": false }, "three/examples/jsm/controls/OrbitControls.js": { "src": "../../three/examples/jsm/controls/OrbitControls.js", "file": "three_examples_jsm_controls_OrbitControls__js.js", - "fileHash": "914c2fd8", + "fileHash": "40fe091e", "needsInterop": false } }, diff --git a/site/real_game/node_modules/@esbuild/linux-x64/README.md b/site/real_game/node_modules/@esbuild/linux-x64/README.md new file mode 100644 index 0000000..b2f1930 --- /dev/null +++ b/site/real_game/node_modules/@esbuild/linux-x64/README.md @@ -0,0 +1,3 @@ +# esbuild + +This is the Linux 64-bit binary for esbuild, a JavaScript bundler and minifier. See https://github.com/evanw/esbuild for details. diff --git a/site/real_game/node_modules/@esbuild/linux-x64/bin/esbuild b/site/real_game/node_modules/@esbuild/linux-x64/bin/esbuild new file mode 100755 index 0000000..288f768 Binary files /dev/null and b/site/real_game/node_modules/@esbuild/linux-x64/bin/esbuild differ diff --git a/site/real_game/node_modules/@esbuild/linux-x64/package.json b/site/real_game/node_modules/@esbuild/linux-x64/package.json new file mode 100644 index 0000000..b70b09e --- /dev/null +++ b/site/real_game/node_modules/@esbuild/linux-x64/package.json @@ -0,0 +1,20 @@ +{ + "name": "@esbuild/linux-x64", + "version": "0.21.5", + "description": "The Linux 64-bit binary for esbuild, a JavaScript bundler.", + "repository": { + "type": "git", + "url": "git+https://github.com/evanw/esbuild.git" + }, + "license": "MIT", + "preferUnplugged": true, + "engines": { + "node": ">=12" + }, + "os": [ + "linux" + ], + "cpu": [ + "x64" + ] +} diff --git a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/README.md b/site/real_game/node_modules/@rollup/rollup-darwin-arm64/README.md deleted file mode 100644 index c29619c..0000000 --- a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `@rollup/rollup-darwin-arm64` - -This is the **aarch64-apple-darwin** binary for `rollup` diff --git a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/rollup.darwin-arm64.node b/site/real_game/node_modules/@rollup/rollup-darwin-arm64/rollup.darwin-arm64.node deleted file mode 100644 index e2fca0f..0000000 Binary files a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/rollup.darwin-arm64.node and /dev/null differ diff --git a/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/README.md b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/README.md new file mode 100644 index 0000000..cabe280 --- /dev/null +++ b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/README.md @@ -0,0 +1,3 @@ +# `@rollup/rollup-linux-x64-gnu` + +This is the **x86_64-unknown-linux-gnu** binary for `rollup` diff --git a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/package.json b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/package.json similarity index 54% rename from site/real_game/node_modules/@rollup/rollup-darwin-arm64/package.json rename to site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/package.json index b15828d..6be96a6 100644 --- a/site/real_game/node_modules/@rollup/rollup-darwin-arm64/package.json +++ b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/package.json @@ -1,19 +1,22 @@ { - "name": "@rollup/rollup-darwin-arm64", - "version": "4.20.0", + "name": "@rollup/rollup-linux-x64-gnu", + "version": "4.21.0", "os": [ - "darwin" + "linux" ], "cpu": [ - "arm64" + "x64" ], "files": [ - "rollup.darwin-arm64.node" + "rollup.linux-x64-gnu.node" ], "description": "Native bindings for Rollup", "author": "Lukas Taegert-Atkinson", "homepage": "https://rollupjs.org/", "license": "MIT", "repository": "rollup/rollup", - "main": "./rollup.darwin-arm64.node" + "libc": [ + "glibc" + ], + "main": "./rollup.linux-x64-gnu.node" } \ No newline at end of file diff --git a/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/rollup.linux-x64-gnu.node b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/rollup.linux-x64-gnu.node new file mode 100644 index 0000000..d49380d Binary files /dev/null and b/site/real_game/node_modules/@rollup/rollup-linux-x64-gnu/rollup.linux-x64-gnu.node differ diff --git a/site/real_game/node_modules/rollup/dist/bin/rollup b/site/real_game/node_modules/rollup/dist/bin/rollup index 11b9878..5a8cd24 100755 --- a/site/real_game/node_modules/rollup/dist/bin/rollup +++ b/site/real_game/node_modules/rollup/dist/bin/rollup @@ -1,8 +1,8 @@ #!/usr/bin/env node /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup @@ -1745,7 +1745,7 @@ else if (command.version) { } else { try { - // eslint-disable-next-line unicorn/prefer-module + // eslint-disable-next-line unicorn/prefer-module, @typescript-eslint/no-require-imports require('source-map-support').install(); } catch { diff --git a/site/real_game/node_modules/rollup/dist/es/getLogFilter.js b/site/real_game/node_modules/rollup/dist/es/getLogFilter.js index 828c116..7f30964 100644 --- a/site/real_game/node_modules/rollup/dist/es/getLogFilter.js +++ b/site/real_game/node_modules/rollup/dist/es/getLogFilter.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/es/parseAst.js b/site/real_game/node_modules/rollup/dist/es/parseAst.js index e17ea4b..549c9c1 100644 --- a/site/real_game/node_modules/rollup/dist/es/parseAst.js +++ b/site/real_game/node_modules/rollup/dist/es/parseAst.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/es/rollup.js b/site/real_game/node_modules/rollup/dist/es/rollup.js index 4d72c0f..46a6c0f 100644 --- a/site/real_game/node_modules/rollup/dist/es/rollup.js +++ b/site/real_game/node_modules/rollup/dist/es/rollup.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/es/shared/node-entry.js b/site/real_game/node_modules/rollup/dist/es/shared/node-entry.js index 4f7dcb2..094c035 100644 --- a/site/real_game/node_modules/rollup/dist/es/shared/node-entry.js +++ b/site/real_game/node_modules/rollup/dist/es/shared/node-entry.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup @@ -16,7 +16,7 @@ import { performance } from 'node:perf_hooks'; import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises'; import * as tty from 'tty'; -var version = "4.20.0"; +var version = "4.21.0"; const comma = ','.charCodeAt(0); const semicolon = ';'.charCodeAt(0); @@ -7414,7 +7414,9 @@ class ChildScope extends Scope { this.parent.addNamespaceMemberAccess(name, variable); } addReturnExpression(expression) { - this.parent instanceof ChildScope && this.parent.addReturnExpression(expression); + if (this.parent instanceof ChildScope) { + this.parent.addReturnExpression(expression); + } } addUsedOutsideNames(usedNames, format, exportNamesByVariable, accessedGlobalsByScope) { for (const variable of this.accessedOutsideVariables.values()) { @@ -7730,12 +7732,15 @@ function renderStatementList(statements, code, start, end, options) { currentNode.end + findFirstLineBreakOutsideComment(code.original.slice(currentNode.end, nextNode === undefined ? end : nextNode.start))[1]; if (currentNode.included) { - currentNodeNeedsBoundaries - ? currentNode.render(code, options, { + if (currentNodeNeedsBoundaries) { + currentNode.render(code, options, { end: nextNodeStart, start: currentNodeStart - }) - : currentNode.render(code, options); + }); + } + else { + currentNode.render(code, options); + } } else { treeshakeNode(currentNode, code, currentNodeStart, nextNodeStart); @@ -7929,7 +7934,9 @@ class RestElement extends NodeBase { return this.argument.declare(kind, UNKNOWN_EXPRESSION); } deoptimizePath(path) { - path.length === 0 && this.argument.deoptimizePath(EMPTY_PATH); + if (path.length === 0) { + this.argument.deoptimizePath(EMPTY_PATH); + } } hasEffectsOnInteractionAtPath(path, interaction, context) { return (path.length > 0 || @@ -8384,7 +8391,9 @@ class AssignmentPattern extends NodeBase { return this.left.declare(kind, init); } deoptimizePath(path) { - path.length === 0 && this.left.deoptimizePath(path); + if (path.length === 0) { + this.left.deoptimizePath(path); + } } hasEffectsOnInteractionAtPath(path, interaction, context) { return (path.length > 0 || this.left.hasEffectsOnInteractionAtPath(EMPTY_PATH, interaction, context)); @@ -11774,7 +11783,9 @@ class SwitchCase extends NodeBase { } render(code, options, nodeRenderOptions) { if (this.consequent.length > 0) { - this.test && this.test.render(code, options); + if (this.test) { + this.test.render(code, options); + } const testEnd = this.test ? this.test.end : findFirstOccurrenceOutsideComment(code.original, 'default', this.start) + 7; @@ -13954,7 +13965,9 @@ class Module { ]); } error(properties, pos) { - pos !== undefined && this.addLocationToLogProps(properties, pos); + if (pos !== undefined) { + this.addLocationToLogProps(properties, pos); + } return error(properties); } // sum up the length of all ast nodes that are included @@ -15930,12 +15943,16 @@ const removeUnreferencedAssets = (outputBundle) => { const unreferencedAssets = new Set(); const bundleEntries = Object.values(outputBundle); for (const asset of bundleEntries) { - asset.type === 'asset' && asset.needsCodeReference && unreferencedAssets.add(asset.fileName); + if (asset.type === 'asset' && asset.needsCodeReference) { + unreferencedAssets.add(asset.fileName); + } } for (const chunk of bundleEntries) { if (chunk.type === 'chunk') { for (const referencedFile of chunk.referencedFiles) { - unreferencedAssets.has(referencedFile) && unreferencedAssets.delete(referencedFile); + if (unreferencedAssets.has(referencedFile)) { + unreferencedAssets.delete(referencedFile); + } } } } @@ -16382,7 +16399,9 @@ class Chunk { magicString.prepend(banner); if (format === 'es' || format === 'cjs') { const shebang = facadeModule !== null && facadeModule.info.isEntry && facadeModule.shebang; - shebang && magicString.prepend(`#!${shebang}\n`); + if (shebang) { + magicString.prepend(`#!${shebang}\n`); + } } if (footer) magicString.append(footer); @@ -16703,7 +16722,7 @@ class Chunk { : relative$1(this.inputBase, idWithoutExtension); } else { - return `_virtual/${basename(idWithoutExtension)}`; + return (this.outputOptions.virtualDirname.replace(/\/$/, '') + '/' + basename(idWithoutExtension)); } } getReexportSpecifiers() { @@ -17542,11 +17561,13 @@ function getOptimizedChunks(chunks, minChunkSize, sideEffectAtoms, sizeByAtom, l timeEnd('optimize chunks', 3); return chunks; // the actual modules } - minChunkSize > 1 && + if (minChunkSize > 1) { log('info', logOptimizeChunkStatus(chunks.length, chunkPartition.small.size, 'Initially')); + } mergeChunks(chunkPartition, minChunkSize, sideEffectAtoms, sizeByAtom); - minChunkSize > 1 && + if (minChunkSize > 1) { log('info', logOptimizeChunkStatus(chunkPartition.small.size + chunkPartition.big.size, chunkPartition.small.size, 'After merging chunks')); + } timeEnd('optimize chunks', 3); return [...chunkPartition.small, ...chunkPartition.big]; } @@ -19888,7 +19909,7 @@ class PluginDriver { if (typeof handler !== 'function') { return handler; } - // eslint-disable-next-line @typescript-eslint/ban-types + // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type const hookResult = handler.apply(context, parameters); if (!hookResult?.then) { // short circuit for non-thenables and non-Promises @@ -19933,7 +19954,7 @@ class PluginDriver { context = replaceContext(context, plugin); } try { - // eslint-disable-next-line @typescript-eslint/ban-types + // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type return handler.apply(context, parameters); } catch (error_) { @@ -20495,7 +20516,8 @@ async function normalizeOutputOptions(config, inputOptions, unsetInputOptions) { sourcemapPathTransform: config.sourcemapPathTransform, strict: config.strict ?? true, systemNullSetters: config.systemNullSetters ?? true, - validate: config.validate || false + validate: config.validate || false, + virtualDirname: config.virtualDirname || '_virtual' }; warnUnknownOptions(config, Object.keys(outputOptions), 'output options', inputOptions.onLog); return { options: outputOptions, unsetOptions }; @@ -21203,7 +21225,8 @@ async function mergeOutputOptions(config, overrides, log) { sourcemapPathTransform: getOption('sourcemapPathTransform'), strict: getOption('strict'), systemNullSetters: getOption('systemNullSetters'), - validate: getOption('validate') + validate: getOption('validate'), + virtualDirname: getOption('virtualDirname') }; warnUnknownOptions(config, Object.keys(outputOptions), 'output options', log); return outputOptions; diff --git a/site/real_game/node_modules/rollup/dist/es/shared/parseAst.js b/site/real_game/node_modules/rollup/dist/es/shared/parseAst.js index 0bb5a45..8c3fca4 100644 --- a/site/real_game/node_modules/rollup/dist/es/shared/parseAst.js +++ b/site/real_game/node_modules/rollup/dist/es/shared/parseAst.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/es/shared/watch.js b/site/real_game/node_modules/rollup/dist/es/shared/watch.js index 54b05d4..312b8a7 100644 --- a/site/real_game/node_modules/rollup/dist/es/shared/watch.js +++ b/site/real_game/node_modules/rollup/dist/es/shared/watch.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/getLogFilter.js b/site/real_game/node_modules/rollup/dist/getLogFilter.js index 9abc557..df46c51 100644 --- a/site/real_game/node_modules/rollup/dist/getLogFilter.js +++ b/site/real_game/node_modules/rollup/dist/getLogFilter.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/loadConfigFile.js b/site/real_game/node_modules/rollup/dist/loadConfigFile.js index fec8667..b48f983 100644 --- a/site/real_game/node_modules/rollup/dist/loadConfigFile.js +++ b/site/real_game/node_modules/rollup/dist/loadConfigFile.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/parseAst.js b/site/real_game/node_modules/rollup/dist/parseAst.js index 3e6e48f..ec12e0c 100644 --- a/site/real_game/node_modules/rollup/dist/parseAst.js +++ b/site/real_game/node_modules/rollup/dist/parseAst.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/rollup.d.ts b/site/real_game/node_modules/rollup/dist/rollup.d.ts index bdcf867..2fc8730 100644 --- a/site/real_game/node_modules/rollup/dist/rollup.d.ts +++ b/site/real_game/node_modules/rollup/dist/rollup.d.ts @@ -227,6 +227,7 @@ export type ParseAst = ( // declare AbortSignal here for environments without DOM lib or @types/node declare global { + // eslint-disable-next-line @typescript-eslint/no-empty-object-type interface AbortSignal {} } @@ -395,7 +396,6 @@ export type WatchChangeHook = ( * const myPlugin: PluginImpl = (options = {}) => { ... } * ``` */ -// eslint-disable-next-line @typescript-eslint/ban-types export type PluginImpl = (options?: O) => Plugin; export interface OutputBundle { @@ -505,13 +505,13 @@ type MakeAsync = Function_ extends ( ? (this: This, ...parameters: Arguments) => Return | Promise : never; -// eslint-disable-next-line @typescript-eslint/ban-types +// eslint-disable-next-line @typescript-eslint/no-empty-object-type type ObjectHook = T | ({ handler: T; order?: 'pre' | 'post' | null } & O); export type PluginHooks = { [K in keyof FunctionPluginHooks]: ObjectHook< K extends AsyncPluginHooks ? MakeAsync : FunctionPluginHooks[K], - // eslint-disable-next-line @typescript-eslint/ban-types + // eslint-disable-next-line @typescript-eslint/no-empty-object-type K extends ParallelPluginHooks ? { sequential?: boolean } : {} >; }; @@ -756,6 +756,7 @@ export interface OutputOptions { strict?: boolean; systemNullSetters?: boolean; validate?: boolean; + virtualDirname?: string; } export interface NormalizedOutputOptions { @@ -809,6 +810,7 @@ export interface NormalizedOutputOptions { strict: boolean; systemNullSetters: boolean; validate: boolean; + virtualDirname: string; } export type WarningHandlerWithDefault = ( diff --git a/site/real_game/node_modules/rollup/dist/rollup.js b/site/real_game/node_modules/rollup/dist/rollup.js index 9a13fa0..c6b8fd6 100644 --- a/site/real_game/node_modules/rollup/dist/rollup.js +++ b/site/real_game/node_modules/rollup/dist/rollup.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/shared/fsevents-importer.js b/site/real_game/node_modules/rollup/dist/shared/fsevents-importer.js index 4b8f15f..bef1323 100644 --- a/site/real_game/node_modules/rollup/dist/shared/fsevents-importer.js +++ b/site/real_game/node_modules/rollup/dist/shared/fsevents-importer.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/shared/index.js b/site/real_game/node_modules/rollup/dist/shared/index.js index 73cfd2c..3187d58 100644 --- a/site/real_game/node_modules/rollup/dist/shared/index.js +++ b/site/real_game/node_modules/rollup/dist/shared/index.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/shared/loadConfigFile.js b/site/real_game/node_modules/rollup/dist/shared/loadConfigFile.js index 0443252..904cb4f 100644 --- a/site/real_game/node_modules/rollup/dist/shared/loadConfigFile.js +++ b/site/real_game/node_modules/rollup/dist/shared/loadConfigFile.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup @@ -418,7 +418,7 @@ function getCamelizedPluginBaseName(pluginText) { } async function requireOrImport(pluginPath) { try { - // eslint-disable-next-line unicorn/prefer-module + // eslint-disable-next-line unicorn/prefer-module, @typescript-eslint/no-require-imports return require(pluginPath); } catch { diff --git a/site/real_game/node_modules/rollup/dist/shared/parseAst.js b/site/real_game/node_modules/rollup/dist/shared/parseAst.js index ce726da..c8bd293 100644 --- a/site/real_game/node_modules/rollup/dist/shared/parseAst.js +++ b/site/real_game/node_modules/rollup/dist/shared/parseAst.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/shared/rollup.js b/site/real_game/node_modules/rollup/dist/shared/rollup.js index a84ae4a..85e370b 100644 --- a/site/real_game/node_modules/rollup/dist/shared/rollup.js +++ b/site/real_game/node_modules/rollup/dist/shared/rollup.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup @@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) { const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty); -var version = "4.20.0"; +var version = "4.21.0"; function ensureArray$1(items) { if (Array.isArray(items)) { @@ -165,12 +165,16 @@ const removeUnreferencedAssets = (outputBundle) => { const unreferencedAssets = new Set(); const bundleEntries = Object.values(outputBundle); for (const asset of bundleEntries) { - asset.type === 'asset' && asset.needsCodeReference && unreferencedAssets.add(asset.fileName); + if (asset.type === 'asset' && asset.needsCodeReference) { + unreferencedAssets.add(asset.fileName); + } } for (const chunk of bundleEntries) { if (chunk.type === 'chunk') { for (const referencedFile of chunk.referencedFiles) { - unreferencedAssets.has(referencedFile) && unreferencedAssets.delete(referencedFile); + if (unreferencedAssets.has(referencedFile)) { + unreferencedAssets.delete(referencedFile); + } } } } @@ -992,7 +996,7 @@ class PluginDriver { if (typeof handler !== 'function') { return handler; } - // eslint-disable-next-line @typescript-eslint/ban-types + // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type const hookResult = handler.apply(context, parameters); if (!hookResult?.then) { // short circuit for non-thenables and non-Promises @@ -1037,7 +1041,7 @@ class PluginDriver { context = replaceContext(context, plugin); } try { - // eslint-disable-next-line @typescript-eslint/ban-types + // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type return handler.apply(context, parameters); } catch (error_) { @@ -1294,7 +1298,8 @@ async function mergeOutputOptions(config, overrides, log) { sourcemapPathTransform: getOption('sourcemapPathTransform'), strict: getOption('strict'), systemNullSetters: getOption('systemNullSetters'), - validate: getOption('validate') + validate: getOption('validate'), + virtualDirname: getOption('virtualDirname') }; warnUnknownOptions(config, Object.keys(outputOptions), 'output options', log); return outputOptions; @@ -8863,7 +8868,9 @@ class ChildScope extends Scope { this.parent.addNamespaceMemberAccess(name, variable); } addReturnExpression(expression) { - this.parent instanceof ChildScope && this.parent.addReturnExpression(expression); + if (this.parent instanceof ChildScope) { + this.parent.addReturnExpression(expression); + } } addUsedOutsideNames(usedNames, format, exportNamesByVariable, accessedGlobalsByScope) { for (const variable of this.accessedOutsideVariables.values()) { @@ -9179,12 +9186,15 @@ function renderStatementList(statements, code, start, end, options) { currentNode.end + findFirstLineBreakOutsideComment(code.original.slice(currentNode.end, nextNode === undefined ? end : nextNode.start))[1]; if (currentNode.included) { - currentNodeNeedsBoundaries - ? currentNode.render(code, options, { + if (currentNodeNeedsBoundaries) { + currentNode.render(code, options, { end: nextNodeStart, start: currentNodeStart - }) - : currentNode.render(code, options); + }); + } + else { + currentNode.render(code, options); + } } else { treeshakeNode(currentNode, code, currentNodeStart, nextNodeStart); @@ -9378,7 +9388,9 @@ class RestElement extends NodeBase { return this.argument.declare(kind, UNKNOWN_EXPRESSION); } deoptimizePath(path) { - path.length === 0 && this.argument.deoptimizePath(EMPTY_PATH); + if (path.length === 0) { + this.argument.deoptimizePath(EMPTY_PATH); + } } hasEffectsOnInteractionAtPath(path, interaction, context) { return (path.length > 0 || @@ -9833,7 +9845,9 @@ class AssignmentPattern extends NodeBase { return this.left.declare(kind, init); } deoptimizePath(path) { - path.length === 0 && this.left.deoptimizePath(path); + if (path.length === 0) { + this.left.deoptimizePath(path); + } } hasEffectsOnInteractionAtPath(path, interaction, context) { return (path.length > 0 || this.left.hasEffectsOnInteractionAtPath(EMPTY_PATH, interaction, context)); @@ -13223,7 +13237,9 @@ class SwitchCase extends NodeBase { } render(code, options, nodeRenderOptions) { if (this.consequent.length > 0) { - this.test && this.test.render(code, options); + if (this.test) { + this.test.render(code, options); + } const testEnd = this.test ? this.test.end : findFirstOccurrenceOutsideComment(code.original, 'default', this.start) + 7; @@ -15396,7 +15412,9 @@ class Module { ]); } error(properties, pos) { - pos !== undefined && this.addLocationToLogProps(properties, pos); + if (pos !== undefined) { + this.addLocationToLogProps(properties, pos); + } return parseAst_js.error(properties); } // sum up the length of all ast nodes that are included @@ -17719,7 +17737,9 @@ class Chunk { magicString.prepend(banner); if (format === 'es' || format === 'cjs') { const shebang = facadeModule !== null && facadeModule.info.isEntry && facadeModule.shebang; - shebang && magicString.prepend(`#!${shebang}\n`); + if (shebang) { + magicString.prepend(`#!${shebang}\n`); + } } if (footer) magicString.append(footer); @@ -18040,7 +18060,7 @@ class Chunk { : parseAst_js.relative(this.inputBase, idWithoutExtension); } else { - return `_virtual/${path$2.basename(idWithoutExtension)}`; + return (this.outputOptions.virtualDirname.replace(/\/$/, '') + '/' + path$2.basename(idWithoutExtension)); } } getReexportSpecifiers() { @@ -18879,11 +18899,13 @@ function getOptimizedChunks(chunks, minChunkSize, sideEffectAtoms, sizeByAtom, l timeEnd('optimize chunks', 3); return chunks; // the actual modules } - minChunkSize > 1 && + if (minChunkSize > 1) { log('info', parseAst_js.logOptimizeChunkStatus(chunks.length, chunkPartition.small.size, 'Initially')); + } mergeChunks(chunkPartition, minChunkSize, sideEffectAtoms, sizeByAtom); - minChunkSize > 1 && + if (minChunkSize > 1) { log('info', parseAst_js.logOptimizeChunkStatus(chunkPartition.small.size + chunkPartition.big.size, chunkPartition.small.size, 'After merging chunks')); + } timeEnd('optimize chunks', 3); return [...chunkPartition.small, ...chunkPartition.big]; } @@ -20889,7 +20911,8 @@ async function normalizeOutputOptions(config, inputOptions, unsetInputOptions) { sourcemapPathTransform: config.sourcemapPathTransform, strict: config.strict ?? true, systemNullSetters: config.systemNullSetters ?? true, - validate: config.validate || false + validate: config.validate || false, + virtualDirname: config.virtualDirname || '_virtual' }; warnUnknownOptions(config, Object.keys(outputOptions), 'output options', inputOptions.onLog); return { options: outputOptions, unsetOptions }; diff --git a/site/real_game/node_modules/rollup/dist/shared/watch-cli.js b/site/real_game/node_modules/rollup/dist/shared/watch-cli.js index 4a7e54b..616d1f1 100644 --- a/site/real_game/node_modules/rollup/dist/shared/watch-cli.js +++ b/site/real_game/node_modules/rollup/dist/shared/watch-cli.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/dist/shared/watch.js b/site/real_game/node_modules/rollup/dist/shared/watch.js index 4b1913f..11b11fe 100644 --- a/site/real_game/node_modules/rollup/dist/shared/watch.js +++ b/site/real_game/node_modules/rollup/dist/shared/watch.js @@ -1,7 +1,7 @@ /* @license - Rollup.js v4.20.0 - Sat, 03 Aug 2024 04:48:21 GMT - commit df12edfea6e9c1a71bda1a01bed1ab787b7514d5 + Rollup.js v4.21.0 + Sun, 18 Aug 2024 05:55:06 GMT - commit c4bb050938778bcbe7b3b3ea3419f7fa70d60f5b https://github.com/rollup/rollup diff --git a/site/real_game/node_modules/rollup/package.json b/site/real_game/node_modules/rollup/package.json index 9ffdc7a..f34f16f 100644 --- a/site/real_game/node_modules/rollup/package.json +++ b/site/real_game/node_modules/rollup/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "4.20.0", + "version": "4.21.0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", @@ -107,22 +107,22 @@ "homepage": "https://rollupjs.org/", "optionalDependencies": { "fsevents": "~2.3.2", - "@rollup/rollup-darwin-arm64": "4.20.0", - "@rollup/rollup-android-arm64": "4.20.0", - "@rollup/rollup-win32-arm64-msvc": "4.20.0", - "@rollup/rollup-linux-arm64-gnu": "4.20.0", - "@rollup/rollup-linux-arm64-musl": "4.20.0", - "@rollup/rollup-android-arm-eabi": "4.20.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.20.0", - "@rollup/rollup-linux-arm-musleabihf": "4.20.0", - "@rollup/rollup-win32-ia32-msvc": "4.20.0", - "@rollup/rollup-linux-riscv64-gnu": "4.20.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0", - "@rollup/rollup-linux-s390x-gnu": "4.20.0", - "@rollup/rollup-darwin-x64": "4.20.0", - "@rollup/rollup-win32-x64-msvc": "4.20.0", - "@rollup/rollup-linux-x64-gnu": "4.20.0", - "@rollup/rollup-linux-x64-musl": "4.20.0" + "@rollup/rollup-darwin-arm64": "4.21.0", + "@rollup/rollup-android-arm64": "4.21.0", + "@rollup/rollup-win32-arm64-msvc": "4.21.0", + "@rollup/rollup-linux-arm64-gnu": "4.21.0", + "@rollup/rollup-linux-arm64-musl": "4.21.0", + "@rollup/rollup-android-arm-eabi": "4.21.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.21.0", + "@rollup/rollup-linux-arm-musleabihf": "4.21.0", + "@rollup/rollup-win32-ia32-msvc": "4.21.0", + "@rollup/rollup-linux-riscv64-gnu": "4.21.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0", + "@rollup/rollup-linux-s390x-gnu": "4.21.0", + "@rollup/rollup-darwin-x64": "4.21.0", + "@rollup/rollup-win32-x64-msvc": "4.21.0", + "@rollup/rollup-linux-x64-gnu": "4.21.0", + "@rollup/rollup-linux-x64-musl": "4.21.0" }, "dependencies": { "@types/estree": "1.0.5" @@ -137,7 +137,7 @@ "@codemirror/language": "^6.10.2", "@codemirror/search": "^6.5.6", "@codemirror/state": "^6.4.1", - "@codemirror/view": "^6.29.1", + "@codemirror/view": "^6.32.0", "@jridgewell/sourcemap-codec": "^1.5.0", "@mermaid-js/mermaid-cli": "^10.9.1", "@napi-rs/cli": "^2.18.4", @@ -150,15 +150,15 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^11.1.6", "@rollup/pluginutils": "^5.1.0", - "@shikijs/vitepress-twoslash": "^1.12.0", + "@shikijs/vitepress-twoslash": "^1.12.1", "@types/eslint": "^8.56.11", "@types/inquirer": "^9.0.7", "@types/mocha": "^10.0.7", "@types/node": "~18.18.14", "@types/semver": "^7.5.8", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/eslint-plugin": "^8.1.0", + "@typescript-eslint/parser": "^8.1.0", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^13.0.0", "acorn": "^8.12.1", @@ -184,21 +184,21 @@ "fs-extra": "^11.2.0", "github-api": "^3.4.0", "husky": "^9.1.4", - "inquirer": "^10.1.5", + "inquirer": "^10.1.8", "is-reference": "^3.0.2", - "lint-staged": "^15.2.7", + "lint-staged": "^15.2.8", "locate-character": "^3.0.0", "magic-string": "^0.30.11", - "mocha": "^10.7.0", + "mocha": "^10.7.3", "nodemon": "^3.1.4", "npm-audit-resolver": "^3.0.0-RC.0", "nyc": "^17.0.0", - "pinia": "^2.2.0", + "pinia": "^2.2.1", "prettier": "^3.3.3", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.1.0", "requirejs": "^2.3.7", - "rollup": "^4.19.1", + "rollup": "^4.20.0", "rollup-plugin-license": "^3.5.2", "rollup-plugin-string": "^3.0.0", "semver": "^7.6.3", @@ -207,17 +207,17 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "systemjs": "^6.15.1", - "terser": "^5.31.3", + "terser": "^5.31.5", "tslib": "^2.6.3", "typescript": "^5.5.4", - "vite": "^5.3.5", - "vitepress": "^1.3.1", - "vue": "^3.4.34", + "vite": "^5.4.0", + "vitepress": "^1.3.2", + "vue": "^3.4.37", "wasm-pack": "^0.13.0", "yargs-parser": "^21.1.1" }, "overrides": { - "axios": "^1.7.2", + "axios": "^1.7.3", "semver": "^7.6.3", "ws": "^8.18.0" }, diff --git a/site/real_game/package-lock.json b/site/real_game/package-lock.json index 237aea2..2d7a4c0 100644 --- a/site/real_game/package-lock.json +++ b/site/real_game/package-lock.json @@ -1,10 +1,11 @@ { - "name": "class", + "name": "real_game", "lockfileVersion": 3, "requires": true, "packages": { "": { "dependencies": { + "rollup": "^4.21.0", "three": "^0.167.1", "vite": "^5.4.1" } @@ -378,9 +379,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.20.0.tgz", - "integrity": "sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz", + "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==", "cpu": [ "arm" ], @@ -391,9 +392,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.20.0.tgz", - "integrity": "sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz", + "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==", "cpu": [ "arm64" ], @@ -404,9 +405,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz", - "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz", + "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==", "cpu": [ "arm64" ], @@ -417,9 +418,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.20.0.tgz", - "integrity": "sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz", + "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==", "cpu": [ "x64" ], @@ -430,9 +431,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.20.0.tgz", - "integrity": "sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz", + "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==", "cpu": [ "arm" ], @@ -443,9 +444,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.20.0.tgz", - "integrity": "sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz", + "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==", "cpu": [ "arm" ], @@ -456,9 +457,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.20.0.tgz", - "integrity": "sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz", + "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==", "cpu": [ "arm64" ], @@ -469,9 +470,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.20.0.tgz", - "integrity": "sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz", + "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==", "cpu": [ "arm64" ], @@ -482,9 +483,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.20.0.tgz", - "integrity": "sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz", + "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==", "cpu": [ "ppc64" ], @@ -495,9 +496,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.20.0.tgz", - "integrity": "sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz", + "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==", "cpu": [ "riscv64" ], @@ -508,9 +509,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.20.0.tgz", - "integrity": "sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz", + "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==", "cpu": [ "s390x" ], @@ -521,9 +522,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.20.0.tgz", - "integrity": "sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz", + "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==", "cpu": [ "x64" ], @@ -534,9 +535,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.20.0.tgz", - "integrity": "sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz", + "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==", "cpu": [ "x64" ], @@ -547,9 +548,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.20.0.tgz", - "integrity": "sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz", + "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==", "cpu": [ "arm64" ], @@ -560,9 +561,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.20.0.tgz", - "integrity": "sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz", + "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==", "cpu": [ "ia32" ], @@ -573,9 +574,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz", - "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz", + "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==", "cpu": [ "x64" ], @@ -696,9 +697,9 @@ } }, "node_modules/rollup": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz", - "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz", + "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" @@ -711,22 +712,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.20.0", - "@rollup/rollup-android-arm64": "4.20.0", - "@rollup/rollup-darwin-arm64": "4.20.0", - "@rollup/rollup-darwin-x64": "4.20.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.20.0", - "@rollup/rollup-linux-arm-musleabihf": "4.20.0", - "@rollup/rollup-linux-arm64-gnu": "4.20.0", - "@rollup/rollup-linux-arm64-musl": "4.20.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0", - "@rollup/rollup-linux-riscv64-gnu": "4.20.0", - "@rollup/rollup-linux-s390x-gnu": "4.20.0", - "@rollup/rollup-linux-x64-gnu": "4.20.0", - "@rollup/rollup-linux-x64-musl": "4.20.0", - "@rollup/rollup-win32-arm64-msvc": "4.20.0", - "@rollup/rollup-win32-ia32-msvc": "4.20.0", - "@rollup/rollup-win32-x64-msvc": "4.20.0", + "@rollup/rollup-android-arm-eabi": "4.21.0", + "@rollup/rollup-android-arm64": "4.21.0", + "@rollup/rollup-darwin-arm64": "4.21.0", + "@rollup/rollup-darwin-x64": "4.21.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.21.0", + "@rollup/rollup-linux-arm-musleabihf": "4.21.0", + "@rollup/rollup-linux-arm64-gnu": "4.21.0", + "@rollup/rollup-linux-arm64-musl": "4.21.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0", + "@rollup/rollup-linux-riscv64-gnu": "4.21.0", + "@rollup/rollup-linux-s390x-gnu": "4.21.0", + "@rollup/rollup-linux-x64-gnu": "4.21.0", + "@rollup/rollup-linux-x64-musl": "4.21.0", + "@rollup/rollup-win32-arm64-msvc": "4.21.0", + "@rollup/rollup-win32-ia32-msvc": "4.21.0", + "@rollup/rollup-win32-x64-msvc": "4.21.0", "fsevents": "~2.3.2" } }, diff --git a/site/real_game/package.json b/site/real_game/package.json index 4443593..98df8eb 100644 --- a/site/real_game/package.json +++ b/site/real_game/package.json @@ -3,6 +3,7 @@ "dev": "vite" }, "dependencies": { + "rollup": "^4.21.0", "three": "^0.167.1", "vite": "^5.4.1" }