From aa236df7d81df711c541b9dc2226b5cbf022c1c7 Mon Sep 17 00:00:00 2001 From: GambleBranch <122032368+GambleBranch@users.noreply.github.com> Date: Fri, 6 Jan 2023 18:12:05 +0100 Subject: [PATCH 01/38] :zap: Update Dutch translation (#405 by @GambleBranch) --- app/data/i18n/Dutch.json | 109 ++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 37 deletions(-) diff --git a/app/data/i18n/Dutch.json b/app/data/i18n/Dutch.json index 2dc2d39ac..5269125ce 100644 --- a/app/data/i18n/Dutch.json +++ b/app/data/i18n/Dutch.json @@ -136,7 +136,7 @@ "globalPalette": "Globaal Palet", "old": "Oud", "projectPalette": "Palet van Project", - "altClick": "" + "altClick": "Alt-klik om te verwijderen" }, "curveEditor": { "curveLineHint": "Klik op de kromming om een punt toe te voegen", @@ -217,8 +217,8 @@ "templates": "Sjablonen", "templatesInfo": "Je kan je game ontwikkeling een snelle start geven door een van deze sjablonen te gebruiken. Ze bevatten enkel tijdelijke afbeeldingen, maar hebben werkende mechanics. Als je een project hebt geselecteerd kan je een opslagmap kiezen.", "boosty": "Steun ct.js op Boosty!", - "sponsoredBy": "", - "supportedBy": "" + "sponsoredBy": "Trots gesponsord door $1!", + "supportedBy": "Gesteund door $1" }, "onboarding": { "hoorayHeader": "Wow! Je hebt zojuist een project gecreëerd!", @@ -481,9 +481,9 @@ "helpPages": "Help" }, "patreon": { - "aboutPatrons": "Patrons zijn mensen die hun steun betuigen aan ComigoGames op Patreon, in de vorm van terugkerende donaties. Niet iedereen daar komt voor ct.js; sommigen gebruiken andere apps van ComigoGames. Tip: als je een maker bent en via Patreon aan ComigoGames doneert, krijg je hier een link naar je pagina - dat is mijn kleine hulp voor je creaties :)", + "aboutPatrons": "Patrons zijn mensen die hun steun betuigen aan ComigoGames via Boosty, in de vorm van terugkerende donaties, gelijkaardig aan de abonnementen op Patreon.", "patronsHeader": "Onze patrons", - "thankAllPatrons": "Dank aan alle vaste en voormalige klanten van ComigoGames, want jouw steun houdt Comigo vooruit en maakt nog betere apps! :)", + "thankAllPatrons": "Dank aan alle patrons van ComigoGames, huidige en vroegere, want jouw steun helpt Comigo vooruit en nog betere apps maken! :)", "becomeAPatron": "Wordt een patron", "aboutFillers": [ "is hartstikke cool 😎", @@ -504,13 +504,13 @@ "brengt licht en hoop 🌞", "is elegant en mooi 🎩" ], - "sponsors": "", - "noSponsorsYet": "", - "sponsorsDescription": "", - "businessCats": "", - "businessCatsDescription": "", - "cats": "", - "catsDescription": "" + "sponsors": "Sponsors", + "noSponsorsYet": "Er zijn nog geen sponsors. Je kunt de eerste zijn!", + "sponsorsDescription": "Sponsors worden als volgt weergegeven op de site van ct.js en andere pagina's, zoals op ct.js game jams.", + "businessCats": "Businesskatten", + "businessCatsDescription": "Businesskatten krijgen toegang tot een speciaal hulpkanaal op de Discord server en ontvangen steun voor ct.js en gamedev in het algemeen.", + "cats": "Katten", + "catsDescription": "Katten zijn mensen die ct.js willen steunen met meer dan een simpel \"dank je\". Ze worden opgesomd in ct.js (hier!) en overal waar CoMiGo eraan denkt ze toe te voegen." }, "docsPanel": { "documentation": "Documentatie", @@ -614,15 +614,17 @@ "altTemplateLayout": "Alternatieve layout voor sjabloonbewerker" }, "project": { - "save": "Sla project op", - "openIncludeFolder": "Open de map \"include\"", - "openProject": "Open een project...", + "save": "Project opslaan", + "openIncludeFolder": "De map \"include\" openen", + "openProject": "Een project openen...", "openExample": "Open een voorbeeld project...", - "startScreen": "Keer terug naar het startscherm", - "startNewWindow": "", + "startScreen": "Terugkeren naar het startscherm", + "startNewWindow": "Nieuw venster voor je project openen", "successZipProject": "Het project is succesvol naar {0} ingepakt.", "zipProject": "Project inpakken naar .zip", - "heading": "Project" + "heading": "Project", + "convertToJs": "Omzetten naar JavaScript", + "confirmationConvertToJs": "Dit zal automatisch ALLE events in het project omzetten naar JavaScript. Deze actie is onomkeerbaar. (Het zal wel alles terugzetten als het een fout in je scripts vindt.) Ben je zeker dat je dit project in CoffeeScript wil omzetten naar JavaScript?" }, "meta": { "license": "Licentie", @@ -712,17 +714,18 @@ "dismissWarning": "Negeer." }, "roomTiles": { - "moveTileLayer": "Beweeg naar een nieuwe diepte", - "show": "Laat de laag zien", - "hide": "Verberg de laag", - "findTileset": "Zoek een tegelset", - "addTileLayer": "Een tegellaag toevoegen" + "moveTileLayer": "Naar een nieuwe diepte bewegen", + "show": "De laag laten zien", + "hide": "De laag verbergen", + "findTileset": "Een tegelset zoeken", + "addTileLayer": "Een tegellaag toevoegen", + "addTileLayerFirst": "Voeg eerst een tegellaag toe in het linkerpaneel!" }, "roomView": { "name": "Naam:", "width": "Venster breedte:", "height": "Venster hoogte:", - "events": "Kamer events", + "events": "Kamerevents", "copies": "Kopieën", "backgrounds": "Achtergronden", "tiles": "Tegels", @@ -771,10 +774,10 @@ "toCenter": "Centreren", "shiftLabel": "Verschuiven met:", "newDepth": "Nieuwe diepte:", - "deleteCopy": "Verwijder kopie {0}", - "changeCopyScale": "Verander schaal", - "shiftCopy": "Stel coördinaten in", - "deleteTile": "Verwijder een tegel", + "deleteCopy": "Kopie {0} verwijderen", + "changeCopyScale": "Schaal veranderen", + "shiftCopy": "Coördinaten instellen", + "deleteTile": "Een tegel verwijderen", "deleteTiles": "Tegels verwijderen", "moveTilesToLayer": "Bewegen naar laag", "shiftTiles": "Tegels verschuiven", @@ -791,7 +794,10 @@ "manageBackgrounds": "Achtergronden beheren", "roomProperties": "Kamereigenschappen" }, - "resetView": "View resetten" + "resetView": "View resetten", + "viewportHeading": "Viewport", + "followTemplate": "Een sjabloon volgen:", + "followCodeHint": "Leer hoe je verder aan deze functie kunt sleutelen met code" }, "styleView": { "active": "Activeer", @@ -842,7 +848,7 @@ "round": "Cirkel", "rows": "Rijen:", "speed": "Framerate:", - "tiled": "Gebruiken als achtergrond?", + "tiled": "Dit is een getegelde achtergrond", "corrupted": "Bestand is corrupt of zoek! Nu afsluiten.", "width": "Lengte:", "height": "Hoogte:", @@ -855,11 +861,11 @@ "symmetryTool": "Symmetrie tool", "padding": "Opvulling:", "paddingNotice": "Dit heeft invloed op de manier waarop een textuur wordt geëxporteerd: het voegt dubbele pixels toe aan de randen en voorkomt uitvloeiende artefacten op betegelde en geschaalde texturen. De standaardwaarde is meestal voldoende, maar als je texturen sterk verkleint, kan de uitvloeiing opnieuw optreden. Verhoog deze waarde als je textuur artefacten heeft tijdens het spelen.", - "updateFromClipboard": "Update vanuit klembord", + "updateFromClipboard": "Updaten vanuit klembord", "previewAnimationNotice": "Dit is een preview. Gebruik de this.animationSpeed waarde om het te veranderen voor echte kopieën.", "showFrameIndices": "Frame-indexen tonen", "blankTexture": "Als een lege textuur exporteren", - "pasteCollisionMask": "Plak een botsingsmasker", + "pasteCollisionMask": "Een botsingsmasker plakken", "copyCollisionMask": "Het botsingsmasker kopiëren", "bgColor": "Verander achtergrondkleur", "setCenter": "Centreer afbeeldingen", @@ -869,7 +875,11 @@ "marginY": "Marge Y:", "offX": "Offset X:", "offY": "Offset Y:", - "blankTextureNotice": "Exporteert de afbeelding als een doorzichtige rechthoek. Deze is dan onzichtbaar tijdens de game. Dit is nuttig voor het maken van placeholders voor de ct.js editor, terwijl de bundelgrootte klein blijft. " + "blankTextureNotice": "Exporteert de afbeelding als een doorzichtige rechthoek. Deze is dan onzichtbaar tijdens de game. Dit is nuttig voor het maken van placeholders voor de ct.js editor, terwijl de bundelgrootte klein blijft. ", + "slicing": "Opsplitsing", + "viewSettings": "Weergave-instellingen", + "exportSettings": "Exportinstellingen ", + "axisExplanation": "Definiëert welke plaats wordt beschouwd als de (0;0) positie van een kopie en beïnvloedt hoe het zich tenopzichte van een raster opstelt, en rond welk punt het roteert. " }, "soundView": { "import": "Importeer", @@ -965,15 +975,15 @@ "scriptables": { "addEvent": "Een event toevoegen", "removeEvent": "Event verwijderen", - "removeEventConfirm": "Ben je zeker dat je deze event wil verwijderen? Dit kan niet ongedaan gemaakt worden!", + "removeEventConfirm": "Ben je zeker dat je dit event wil verwijderen? Dit kan niet ongedaan gemaakt worden!", "changeArguments": "Argumenten veranderen", - "eventAlreadyExists": "Dezelfde event bestaat al!", + "eventAlreadyExists": "Hetzelfde event bestaat al!", "localEventVars": "Locale variabelen", "createEventHint": "Maak je eerste event in de linkerkolom en definieer je logica hier", "coreEventsCategories": { "lifecycle": "Levenscyclus", "actions": "Acties", - "pointer": "Aanwijzer events", + "pointer": "Aanwijzerevents", "misc": "Overige", "animation": "Animatie", "timers": "Timers" @@ -1034,6 +1044,31 @@ "OnAnimationLoop": "Activeert telkens een animatie herstart.", "OnAnimationComplete": "Activeert wanneer een niet-herhalende animatie is afgelopen.", "Timer": "Stel de duur in seconden voor deze timer in met this.timer$1 = 3;" - } + }, + "jumpToProblem": "Naar het probleem" + }, + "exporterError": { + "exporterErrorHeader": "Er deed zich een fout voor tijdens het exporteren van jouw project", + "errorSource": "In een $1 genaamd $2", + "clueSolutions": { + "syntax": "Dit is een syntax fout in je code. Ga naar het onderdeel en los het op — de code-editor zal de problematische plek aanduiden.", + "eventConfiguration": "Een van de events is verkeerd ingesteld, met lege velden. Ga naar het onderdeel en pas zijn parameters aan.", + "emptySound": "Een van je geluiden heeft bevat geen geluidsbestanden. Importeer er een geluidsbestand naar of verwijder dit lege geluid.", + "emptyEmitter": "Een van je deeltjessystemen mist een textuur in zijn verspreider. Je zal een textuur moeten instellen of de verspreider verwijderen.", + "windowsFileLock": "Dit probleem is specifiek voor Windows met een afgesloten bestand. Zorg ervoor dat je alle externe browsers sluit die de game opstarten en probeer dan nog eens te exporteren. Als dat niet helpt, herstart dan ct.js." + }, + "stacktrace": "Stack oproepen", + "jumpToProblem": "Nnaar het probleem", + "saveAndQuit": "Opslaan en afsluiten" + }, + "languageSelector": { + "chooseLanguageHeader": "Je programmeertaal kiezen.", + "chooseLanguageExplanation": "Dit is de taal waarmee je events zal schrijven om je gameplay logic te beschrijven. Eerder gebruikten alle projecten JavaScript+TypeScript. Merk op dat je enkel CoffeeScript projecten naar JavaScript kunt omzetten, maar niet omgekeerd, dus kies zorgvuldig!", + "coffeeScriptDescription": "Een goede taal voor beginners met een simpele syntax. Ga voor deze taal als je geen eerdere ervaring hebt met programmeren in code, of als je houdt van Python.", + "pickCoffeeScript": "Ik kies CoffeeScript!", + "jsAndTs": "JavaScript (en Typescript)", + "jsTsDescription": "De taal van het web. De syntax is complexer maar fouten worden in de editor aangeduid en er zijn codesuggesties. Kies hiervoor als je al met JS, C# of Java code hebt gewerkt.", + "pickJsTs": "Ik kies JavaScript!", + "acceptAndSpecifyDirectory": "Accepteren en projectenmap selecteren" } } From d4eb5666da3cf9a59ab1e915afa9d0e7c6f937d0 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Thu, 12 Jan 2023 16:59:42 +1200 Subject: [PATCH 02/38] :bento: Update docs. Fix links to tutorials on the onboarding screen --- docs | 2 +- src/riotTags/new-project-onboarding.tag | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs b/docs index 02e20cb95..ef5576ec7 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 02e20cb954e791d5d5f42d7d7d64fd391eefa2a8 +Subproject commit ef5576ec77957077da9b9c465bcdcb19c303f63e diff --git a/src/riotTags/new-project-onboarding.tag b/src/riotTags/new-project-onboarding.tag index 2d9acca45..b2048d353 100644 --- a/src/riotTags/new-project-onboarding.tag +++ b/src/riotTags/new-project-onboarding.tag @@ -8,15 +8,15 @@ new-project-onboarding h1 {voc.hoorayHeader} p {voc.nowWhatParagraph} ul.aMenu - li(onclick="{openDocs('/tut-making-shooter.html')}") + li(onclick="{openDocs('/tutorials/making-games-shooter.html')}") svg.feather use(xlink:href="#space-shooter") span {voc.openSpaceShooterTutorial} - li(onclick="{openDocs('/tut-making-platformer.html')}") + li(onclick="{openDocs('/tutorials/making-games-platformer.html')}") svg.feather use(xlink:href="#platformer") span {voc.openPlatformerTutorial} - li(onclick="{openDocs('/tut-making-jettycat.html')}") + li(onclick="{openDocs('/tutorials/making-games-jettycat.html')}") svg.feather use(xlink:href="#jettycat") span {voc.openJettyCatTutorial} From e5957471d5f88811b25831c5a0489d081b6051f0 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Thu, 9 Feb 2023 18:56:10 +1200 Subject: [PATCH 03/38] :bug: Use collision shape from a texture set in the extensions parameter of ct.templates.copy method --- app/data/ct.release/templates.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/data/ct.release/templates.js b/app/data/ct.release/templates.js index ab19b5cd8..ebd1d1a5e 100644 --- a/app/data/ct.release/templates.js +++ b/app/data/ct.release/templates.js @@ -112,9 +112,13 @@ const Copy = (function Copy() { onStep: t.onStep, onDraw: t.onDraw, onCreate: t.onCreate, - onDestroy: t.onDestroy, - shape: ct.res.getTextureShape(t.texture || -1) + onDestroy: t.onDestroy }); + if (exts && exts.tex !== void 0) { + this.shape = ct.res.getTextureShape(exts.tex || -1); + } else { + this.shape = ct.res.getTextureShape(t.texture || -1); + } if (exts && exts.depth !== void 0) { this.depth = exts.depth; } From 9f60431231c5d18499f83b6f92ed47a46b7ed910 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 05:12:30 +0000 Subject: [PATCH 04/38] :arrow_up: Bump http-cache-semantics from 4.1.0 to 4.1.1 in /app Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 89bf2bfcd..4e638fd1b 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -4286,9 +4286,9 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, "node_modules/http2-wrapper": { "version": "1.0.3", @@ -14025,9 +14025,9 @@ } }, "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, "http2-wrapper": { "version": "1.0.3", From feaf654e4f93150afe85aea01de92d36b359d740 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:32:23 +0000 Subject: [PATCH 05/38] :arrow_up: Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d0e7ab51..027e298c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6293,9 +6293,9 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, "node_modules/http-signature": { "version": "1.2.0", @@ -19154,9 +19154,9 @@ } }, "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, "http-signature": { "version": "1.2.0", From eebe48bfe10eef202acf249852409c7953339104 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:31:43 +0000 Subject: [PATCH 06/38] :arrow_up: Bump class-validator and javascript-obfuscator in /app Bumps [class-validator](https://github.com/typestack/class-validator) to 0.14.0 and updates ancestor dependency [javascript-obfuscator](https://github.com/javascript-obfuscator/javascript-obfuscator). These dependencies need to be updated together. Updates `class-validator` from 0.13.1 to 0.14.0 - [Release notes](https://github.com/typestack/class-validator/releases) - [Changelog](https://github.com/typestack/class-validator/blob/develop/CHANGELOG.md) - [Commits](https://github.com/typestack/class-validator/compare/v0.13.1...v0.14.0) Updates `javascript-obfuscator` from 2.19.1 to 4.0.2 - [Release notes](https://github.com/javascript-obfuscator/javascript-obfuscator/releases) - [Changelog](https://github.com/javascript-obfuscator/javascript-obfuscator/blob/master/CHANGELOG.md) - [Commits](https://github.com/javascript-obfuscator/javascript-obfuscator/commits) --- updated-dependencies: - dependency-name: class-validator dependency-type: indirect - dependency-name: javascript-obfuscator dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/package-lock.json | 445 ++++++++++++++++-------------------------- app/package.json | 2 +- 2 files changed, 174 insertions(+), 273 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 4e638fd1b..e69355751 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -25,7 +25,7 @@ "highlight.js": "^10.4.1", "html-minifier": "^3.5.21", "html2pug": "^4.0.0", - "javascript-obfuscator": "^2.6.0", + "javascript-obfuscator": "^4.0.2", "js-yaml": "^3.14.0", "markdown-it": "12.3.2", "maxrects-packer": "^2.7.3", @@ -612,9 +612,9 @@ } }, "node_modules/@javascript-obfuscator/escodegen": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.2.2.tgz", - "integrity": "sha512-0VoGJun/lpGEPv8J8R8fpwt1iAGyctUjHTQoYoCbKY2rcGc6d+NycrqSMo61vRXhZiTnHgud1UF8dOI7UAPdTw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.3.0.tgz", + "integrity": "sha512-QVXwMIKqYMl3KwtTirYIA6gOCiJ0ZDtptXqAv/8KWLG9uQU2fZqTVy7a/A5RvcoZhbDoFfveTxuGxJ5ibzQtkw==", "dependencies": { "@javascript-obfuscator/estraverse": "^5.3.0", "esprima": "^4.0.1", @@ -629,9 +629,9 @@ } }, "node_modules/@javascript-obfuscator/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-SxIFtV5/wlXYS7G3zLVj7CddLolX8Bm/hr68fiyNL3MyG2k4FwF9B5Z5GTpVLhw2EELYNwyoYBvFlR4gGnQPdw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.4.0.tgz", + "integrity": "sha512-CZFX7UZVN9VopGbjTx4UXaXsi9ewoM1buL0kY7j1ftYdSs7p2spv9opxFjHlQ/QGTgh4UqufYqJJ0WKLml7b6w==", "engines": { "node": ">=4.0" } @@ -741,87 +741,6 @@ "node": ">= 8" } }, - "node_modules/@nuxtjs/opencollective": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz", - "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==", - "dependencies": { - "chalk": "^4.1.0", - "consola": "^2.15.0", - "node-fetch": "^2.6.1" - }, - "bin": { - "opencollective": "bin/opencollective.js" - }, - "engines": { - "node": ">=8.0.0", - "npm": ">=5.0.0" - } - }, - "node_modules/@nuxtjs/opencollective/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@nuxtjs/opencollective/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@nuxtjs/opencollective/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@nuxtjs/opencollective/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/@nuxtjs/opencollective/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@nuxtjs/opencollective/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@pixi/accessibility": { "version": "5.3.11", "resolved": "https://registry.npmjs.org/@pixi/accessibility/-/accessibility-5.3.11.tgz", @@ -1475,9 +1394,9 @@ } }, "node_modules/@types/validator": { - "version": "13.7.1", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.1.tgz", - "integrity": "sha512-I6OUIZ5cYRk5lp14xSOAiXjWrfVoMZVjDuevBYgQDYzZIjsf2CAISpEcXOkFAtpAHbmWIDLcZObejqny/9xq5Q==" + "version": "13.7.12", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz", + "integrity": "sha512-YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA==" }, "node_modules/@types/yauzl": { "version": "2.9.1", @@ -1510,9 +1429,9 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "node_modules/acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "bin": { "acorn": "bin/acorn" }, @@ -2165,9 +2084,9 @@ } }, "node_modules/chance": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz", - "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg==" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.9.tgz", + "integrity": "sha512-TfxnA/DcZXRTA4OekA2zL9GH8qscbbl6X0ZqU4tXhGveVY/mXWvEQLt5GwZcYXTEyEFflVtj+pG8nc8EwSm1RQ==" }, "node_modules/char-regex": { "version": "1.0.2", @@ -2238,13 +2157,13 @@ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" }, "node_modules/class-validator": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.13.1.tgz", - "integrity": "sha512-zWIeYFhUitvAHBwNhDdCRK09hWx+P0HUwFE8US8/CxFpMVzkUK8RJl7yOIE+BVu2lxyPNgeOaFv78tLE47jBIg==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz", + "integrity": "sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==", "dependencies": { - "@types/validator": "^13.1.3", - "libphonenumber-js": "^1.9.7", - "validator": "^13.5.2" + "@types/validator": "^13.7.10", + "libphonenumber-js": "^1.10.14", + "validator": "^13.7.0" } }, "node_modules/clean-css": { @@ -2423,11 +2342,6 @@ "node": ">=8" } }, - "node_modules/consola": { - "version": "2.15.3", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz", - "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" - }, "node_modules/content-disposition": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", @@ -3330,9 +3244,9 @@ } }, "node_modules/eslint-scope": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz", - "integrity": "sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -3341,6 +3255,14 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/eslint-visitor-keys": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -3470,7 +3392,7 @@ "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "node_modules/fast-plist": { "version": "0.1.2", @@ -4383,9 +4305,9 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/inversify": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz", - "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==" + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz", + "integrity": "sha512-B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ==" }, "node_modules/is-arguments": { "version": "1.0.4", @@ -4749,39 +4671,40 @@ "integrity": "sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw==" }, "node_modules/javascript-obfuscator": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/javascript-obfuscator/-/javascript-obfuscator-2.19.1.tgz", - "integrity": "sha512-NPoC0pUBKHiFJqAm/+hHDM1FzpreUGkzkBTAWDYkA+XI6wZWRqjwlDAjLOwWbjqNwnW/QqkPf35KMAZC/oHtiw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/javascript-obfuscator/-/javascript-obfuscator-4.0.2.tgz", + "integrity": "sha512-MRBQREvjEwqEGdwNGG7yp0te5uZBFzrPZdxEs4rDYkPpHhhOQu+E0IhSXP7bO9dIUWXZU0Kkdohsuws525aVGQ==", "hasInstallScript": true, "dependencies": { - "@javascript-obfuscator/escodegen": "2.2.2", - "@javascript-obfuscator/estraverse": "5.3.0", - "@nuxtjs/opencollective": "0.3.2", - "acorn": "8.5.0", + "@javascript-obfuscator/escodegen": "2.3.0", + "@javascript-obfuscator/estraverse": "5.4.0", + "acorn": "8.8.2", "assert": "2.0.0", "chalk": "4.1.2", - "chance": "1.1.8", - "class-validator": "0.13.1", - "commander": "8.2.0", - "eslint-scope": "6.0.0", + "chance": "1.1.9", + "class-validator": "0.14.0", + "commander": "10.0.0", + "eslint-scope": "7.1.1", + "eslint-visitor-keys": "3.3.0", "fast-deep-equal": "3.1.3", - "inversify": "5.1.1", + "inversify": "6.0.1", "js-string-escape": "1.0.1", "md5": "2.3.0", - "mkdirp": "1.0.4", + "mkdirp": "2.1.3", "multimatch": "5.0.0", + "opencollective-postinstall": "2.0.3", "process": "0.11.10", "reflect-metadata": "0.1.13", - "source-map-support": "0.5.20", + "source-map-support": "0.5.21", "string-template": "1.0.0", "stringz": "2.1.0", - "tslib": "2.3.1" + "tslib": "2.5.0" }, "bin": { "javascript-obfuscator": "bin/javascript-obfuscator" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^12.22.0 || ^14.0.0 || ^16.0.0 || ^17.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -4834,11 +4757,11 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/javascript-obfuscator/node_modules/commander": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz", - "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", + "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", "engines": { - "node": ">= 12" + "node": ">=14" } }, "node_modules/javascript-obfuscator/node_modules/has-flag": { @@ -4849,6 +4772,20 @@ "node": ">=8" } }, + "node_modules/javascript-obfuscator/node_modules/mkdirp": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz", + "integrity": "sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/javascript-obfuscator/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4993,7 +4930,7 @@ "node_modules/levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", "dependencies": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" @@ -5003,9 +4940,9 @@ } }, "node_modules/libphonenumber-js": { - "version": "1.9.44", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz", - "integrity": "sha512-zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g==" + "version": "1.10.20", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.20.tgz", + "integrity": "sha512-kQovlKNdLcVzerbTPmJ+Fx4R+7/pYXmPDIllHjg7IxL4X6MsMG7jaT5opfYrBok0uqkByVif//JUR8e11l/V7w==" }, "node_modules/lines-and-columns": { "version": "1.2.4", @@ -8211,6 +8148,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/opencollective-postinstall": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", + "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", + "bin": { + "opencollective-postinstall": "index.js" + } + }, "node_modules/opentype.js": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-1.3.3.tgz", @@ -8626,7 +8571,7 @@ "node_modules/prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", "engines": { "node": ">= 0.8.0" } @@ -9438,9 +9383,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -10033,9 +9978,9 @@ } }, "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" }, "node_modules/ttf2woff": { "version": "2.0.2", @@ -10062,7 +10007,7 @@ "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dependencies": { "prelude-ls": "~1.1.2" }, @@ -10317,9 +10262,9 @@ } }, "node_modules/validator": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", - "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz", + "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==", "engines": { "node": ">= 0.10" } @@ -11128,9 +11073,9 @@ } }, "@javascript-obfuscator/escodegen": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.2.2.tgz", - "integrity": "sha512-0VoGJun/lpGEPv8J8R8fpwt1iAGyctUjHTQoYoCbKY2rcGc6d+NycrqSMo61vRXhZiTnHgud1UF8dOI7UAPdTw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.3.0.tgz", + "integrity": "sha512-QVXwMIKqYMl3KwtTirYIA6gOCiJ0ZDtptXqAv/8KWLG9uQU2fZqTVy7a/A5RvcoZhbDoFfveTxuGxJ5ibzQtkw==", "requires": { "@javascript-obfuscator/estraverse": "^5.3.0", "esprima": "^4.0.1", @@ -11140,9 +11085,9 @@ } }, "@javascript-obfuscator/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-SxIFtV5/wlXYS7G3zLVj7CddLolX8Bm/hr68fiyNL3MyG2k4FwF9B5Z5GTpVLhw2EELYNwyoYBvFlR4gGnQPdw==" + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.4.0.tgz", + "integrity": "sha512-CZFX7UZVN9VopGbjTx4UXaXsi9ewoM1buL0kY7j1ftYdSs7p2spv9opxFjHlQ/QGTgh4UqufYqJJ0WKLml7b6w==" }, "@jridgewell/gen-mapping": { "version": "0.3.2", @@ -11218,61 +11163,6 @@ "fastq": "^1.6.0" } }, - "@nuxtjs/opencollective": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz", - "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==", - "requires": { - "chalk": "^4.1.0", - "consola": "^2.15.0", - "node-fetch": "^2.6.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "@pixi/accessibility": { "version": "5.3.11", "resolved": "https://registry.npmjs.org/@pixi/accessibility/-/accessibility-5.3.11.tgz", @@ -11896,9 +11786,9 @@ } }, "@types/validator": { - "version": "13.7.1", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.1.tgz", - "integrity": "sha512-I6OUIZ5cYRk5lp14xSOAiXjWrfVoMZVjDuevBYgQDYzZIjsf2CAISpEcXOkFAtpAHbmWIDLcZObejqny/9xq5Q==" + "version": "13.7.12", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz", + "integrity": "sha512-YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA==" }, "@types/yauzl": { "version": "2.9.1", @@ -11928,9 +11818,9 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==" + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==" }, "acorn-walk": { "version": "8.2.0", @@ -12407,9 +12297,9 @@ } }, "chance": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz", - "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg==" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.9.tgz", + "integrity": "sha512-TfxnA/DcZXRTA4OekA2zL9GH8qscbbl6X0ZqU4tXhGveVY/mXWvEQLt5GwZcYXTEyEFflVtj+pG8nc8EwSm1RQ==" }, "char-regex": { "version": "1.0.2", @@ -12460,13 +12350,13 @@ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" }, "class-validator": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.13.1.tgz", - "integrity": "sha512-zWIeYFhUitvAHBwNhDdCRK09hWx+P0HUwFE8US8/CxFpMVzkUK8RJl7yOIE+BVu2lxyPNgeOaFv78tLE47jBIg==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz", + "integrity": "sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==", "requires": { - "@types/validator": "^13.1.3", - "libphonenumber-js": "^1.9.7", - "validator": "^13.5.2" + "@types/validator": "^13.7.10", + "libphonenumber-js": "^1.10.14", + "validator": "^13.7.0" } }, "clean-css": { @@ -12611,11 +12501,6 @@ "xdg-basedir": "^4.0.0" } }, - "consola": { - "version": "2.15.3", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz", - "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" - }, "content-disposition": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", @@ -13306,14 +13191,19 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint-scope": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz", - "integrity": "sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, + "eslint-visitor-keys": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -13406,7 +13296,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "fast-plist": { "version": "0.1.2", @@ -14100,9 +13990,9 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "inversify": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz", - "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==" + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz", + "integrity": "sha512-B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ==" }, "is-arguments": { "version": "1.0.4", @@ -14348,32 +14238,33 @@ "integrity": "sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw==" }, "javascript-obfuscator": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/javascript-obfuscator/-/javascript-obfuscator-2.19.1.tgz", - "integrity": "sha512-NPoC0pUBKHiFJqAm/+hHDM1FzpreUGkzkBTAWDYkA+XI6wZWRqjwlDAjLOwWbjqNwnW/QqkPf35KMAZC/oHtiw==", - "requires": { - "@javascript-obfuscator/escodegen": "2.2.2", - "@javascript-obfuscator/estraverse": "5.3.0", - "@nuxtjs/opencollective": "0.3.2", - "acorn": "8.5.0", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/javascript-obfuscator/-/javascript-obfuscator-4.0.2.tgz", + "integrity": "sha512-MRBQREvjEwqEGdwNGG7yp0te5uZBFzrPZdxEs4rDYkPpHhhOQu+E0IhSXP7bO9dIUWXZU0Kkdohsuws525aVGQ==", + "requires": { + "@javascript-obfuscator/escodegen": "2.3.0", + "@javascript-obfuscator/estraverse": "5.4.0", + "acorn": "8.8.2", "assert": "2.0.0", "chalk": "4.1.2", - "chance": "1.1.8", - "class-validator": "0.13.1", - "commander": "8.2.0", - "eslint-scope": "6.0.0", + "chance": "1.1.9", + "class-validator": "0.14.0", + "commander": "10.0.0", + "eslint-scope": "7.1.1", + "eslint-visitor-keys": "3.3.0", "fast-deep-equal": "3.1.3", - "inversify": "5.1.1", + "inversify": "6.0.1", "js-string-escape": "1.0.1", "md5": "2.3.0", - "mkdirp": "1.0.4", + "mkdirp": "2.1.3", "multimatch": "5.0.0", + "opencollective-postinstall": "2.0.3", "process": "0.11.10", "reflect-metadata": "0.1.13", - "source-map-support": "0.5.20", + "source-map-support": "0.5.21", "string-template": "1.0.0", "stringz": "2.1.0", - "tslib": "2.3.1" + "tslib": "2.5.0" }, "dependencies": { "ansi-styles": { @@ -14407,15 +14298,20 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "commander": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz", - "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", + "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, + "mkdirp": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz", + "integrity": "sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==" + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -14529,16 +14425,16 @@ "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", "requires": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" } }, "libphonenumber-js": { - "version": "1.9.44", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz", - "integrity": "sha512-zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g==" + "version": "1.10.20", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.20.tgz", + "integrity": "sha512-kQovlKNdLcVzerbTPmJ+Fx4R+7/pYXmPDIllHjg7IxL4X6MsMG7jaT5opfYrBok0uqkByVif//JUR8e11l/V7w==" }, "lines-and-columns": { "version": "1.2.4", @@ -16771,6 +16667,11 @@ "is-wsl": "^2.1.1" } }, + "opencollective-postinstall": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", + "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==" + }, "opentype.js": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-1.3.3.tgz", @@ -17092,7 +16993,7 @@ "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==" }, "prepend-http": { "version": "2.0.0", @@ -17695,9 +17596,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -18155,9 +18056,9 @@ } }, "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" }, "ttf2woff": { "version": "2.0.2", @@ -18178,7 +18079,7 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "requires": { "prelude-ls": "~1.1.2" } @@ -18375,9 +18276,9 @@ } }, "validator": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", - "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==" + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz", + "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==" }, "vinyl": { "version": "2.2.0", diff --git a/app/package.json b/app/package.json index 8f2a2635f..8bf5fd956 100644 --- a/app/package.json +++ b/app/package.json @@ -68,7 +68,7 @@ "highlight.js": "^10.4.1", "html-minifier": "^3.5.21", "html2pug": "^4.0.0", - "javascript-obfuscator": "^2.6.0", + "javascript-obfuscator": "^4.0.2", "js-yaml": "^3.14.0", "markdown-it": "12.3.2", "maxrects-packer": "^2.7.3", From 49d56b5edac0821f3b0c01e09ed8a11652a21452 Mon Sep 17 00:00:00 2001 From: Karintou Date: Fri, 24 Feb 2023 12:51:43 +0900 Subject: [PATCH 07/38] :zap: Update Japanese translation (#404 by @taxi13245) --- app/data/i18n/Japanese.json | 197 +++++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 81 deletions(-) diff --git a/app/data/i18n/Japanese.json b/app/data/i18n/Japanese.json index 22d650ab6..1d534103c 100644 --- a/app/data/i18n/Japanese.json +++ b/app/data/i18n/Japanese.json @@ -28,6 +28,7 @@ "filter": "フィルター:", "loading": "読み込み中・・・", "name": "名前:", + "next":"次", "no": "いいえ", "none": "なし", "nothingToShowFiller": "何もありません", @@ -35,6 +36,7 @@ "open": "開く", "paste": "貼り付け", "pastedFromClipboard": "クリップボードからの貼り付け", + "previous": "プレビュー", "rename": "名前の変更", "required": "必須", "save": "保存", @@ -45,9 +47,11 @@ "sort": "分類:", "wrongFormat": "ファイル形式が誤っています", "yes": "はい", - "zoom": "拡大", + "zoom": "ズーム", "zoomIn": "ズームイン", "zoomOut": "ズームアウト", + "undo": "元に戻す", + "redo": "やり直す", "fieldTypes": { "checkbox": "チェックボックス", "code": "コード", @@ -83,7 +87,7 @@ "noRooms": "アプリのコンパイルには、少なくとも一つのルームが必要です。", "tileLayer": "タイトルのレイヤー", "ctSite": "ct.jsのホームページ", - "openAssetGallery": "", + "openAssetGallery": "ギャラリー", "assetTypes": { "textures": [ "テクスチャ", @@ -125,11 +129,7 @@ "透過スプライト", "透過スプライト" ] - }, - "next": "", - "previous": "", - "undo": "", - "redo": "" + } }, "assetInput": { "changeAsset": "アセットを変更する", @@ -159,7 +159,7 @@ "colorPicker": { "current": "新しい", "globalPalette": "グローバルのパレット", - "altClick": "", + "altClick": "Altキーを押しながらクリックすると削除されます。", "old": "古い", "projectPalette": "プロジェクトのパレット" }, @@ -198,7 +198,7 @@ "exportPanel": "プロジェクトをエクスポート", "log": "ログ", "windowsCrossBuildWarning": "Linux/MacOSからWindows用にビルドするには、Wineをシステムにインストールする必要があります。インストール方法は環境によって異なるので、自分で検索してください(*‘∀‘)", - "cannotBuildForMacOnWin": "残念ながら、Windowsでは壊れたMacのパッケージしか作れません。Linuxでやることを推奨します。", + "cannotBuildForMacOnWin": "残念ながら、Windowsでは壊れたMacのパッケージしか作れません。Linuxで行うことを推奨します。", "projectTitleRequired": "プロジェクト名は必須です", "appIdRequired": "App IDは必須です", "noAndroidSdkFound": "Android SDKが見つかりませんでした（環境変数ANDROID_SDK_ROOTが設定されていません）。Android Studioをインストールして、Android SDKを設定してください。", @@ -207,7 +207,21 @@ "requiresInternetNotice": "この操作には、インターネット接続が必要です。", "noJdkFound": "JDK 11が見つからない（JAVA_HOME環境変数が設定されていないか、設定が間違っている）。JDK 11はこちらから入手できます。:", "downloadJDK": "JDK 11をダウンロード", - "firstRunNotice": "各プラットフォームで初めて実行するとき、ct.jsが梱包に必要な追加ライブラリをダウンロードし保存するため、時間が掛かります。（次回以降はすぐに実行されます。）" + "firstRunNotice": "各プラットフォームで初めて実行するとき、ct.jsがパッケージングに必要な追加ライブラリをダウンロードし保存するため、時間が掛かります。（次回以降はすぐに実行されます。）" + }, + "exporterError": { + "exporterErrorHeader": "プロジェクトのエクスポート時にエラーが発生しました", + "errorSource": "In a $1 called $2", + "clueSolutions": { + "syntax": "コードの構文エラーのようです。アセットに移動して修正してください。コードエディタが問題のある箇所をハイライト表示します。", + "eventConfiguration": "イベントの1つが誤った設定になっています。空のフィールドがあります。そのアセットに移動して、そのイベントのパラメータを編集してください。", + "emptySound": "サウンドの1つに、サウンドファイルが設定されていません。サウンドファイルをインポートするか、この空のサウンドを削除してください。", + "emptyEmitter": "パーティクルシステムの1つに、エミッタのテクスチャがありません。テクスチャを設定するか、エミッタを削除する必要があります。", + "windowsFileLock": "ファイルをほかのプログラムが使用中です。これは、Windows特有の問題です。ゲームを起動した外部ブラウザをすべて閉じたことを確認し、再度エクスポートを試してみてください。それでも解決しない場合は、ct.jsを再起動してください。" + }, + "stacktrace": "コールスタック", + "jumpToProblem": "問題箇所に移動する", + "saveAndQuit": "保存して終了" }, "extensionsEditor": { "noEntries": "まだエントリーがありません", @@ -240,7 +254,7 @@ "newer": "(新しい)", "older": "(古い)" }, - "loadingProject": "プロジェクトを読み込み", + "loadingProject": "プロジェクトを読み込み中......", "loadingProjectError": "次のエラーが発生したため、このプロジェクトを開くことができません。 ", "homepage": "ホームページ", "latestVersion": "バージョン $1 が利用可能", @@ -249,6 +263,8 @@ "browse": "ブラウズ", "latest": "最新のプロジェクト", "examples": "サンプル", + "templates": "テンプレート", + "templatesInfo": "これらのテンプレートを使って、ゲーム開発を始めることができます。これらのテンプレートには、プレースホルダーのグラフィックのみが含まれていますが、動作する仕組みは備わっています。プロジェクトを選択すると、新規プロジェクト用のセーブディレクトリ選択画面が表示されます。", "unableToWriteToFolders": "ct.jsアプリを保存しているフォルダが書き込み可能になっているか確認してください。", "twitter": "Twitter", "discord": "Discord", @@ -256,12 +272,10 @@ "itch": "itch.ioのCt.jsストアページ", "vkontakte": "Vkontakte公開コミュニティ", "patreon": "ct.jsをPatreonで応援しよう!", - "createOrBrowseJunction": "or", - "templates": "テンプレート", - "templatesInfo": "これらのテンプレートを使って、ゲーム開発を始めることができます。これらのテンプレートには、プレースホルダーのグラフィックのみが含まれていますが、動作する仕組みは備わっています。プロジェクトを選択すると、新規プロジェクト用のセーブディレクトリ選択画面が表示されます。", - "boosty": "", - "sponsoredBy": "", - "supportedBy": "" + "boosty": "ct.jsをBoostyで応援しよう！", + "sponsoredBy": "協賛： $1!", + "supportedBy": "サポート： $1", + "createOrBrowseJunction": "or" }, "onboarding": { "hoorayHeader": "やったぁ！プロジェクトが出来上がりましたよ！", @@ -272,6 +286,16 @@ "doNothing": "この画面をスキップして、自分でゲームを作る", "showOnboardingCheckbox": "新規プロジェクト作成時にこの画面を表示する" }, + "languageSelector": { + "chooseLanguageHeader": "使用するプログラミング言語の選択", + "chooseLanguageExplanation": "ゲームプレイの仕組みを構築するために、イベントを記述するための言語です。(以前は、すべてのプロジェクトがJavaScript+TypeScriptを使用していました。) 注意：CoffeeScriptのプロジェクトをJavaScriptに変換することはできますが、その逆はできませんので、慎重に選択してください。", + "coffeeScriptDescription": "シンプルな構文で初心者に適した言語です。コードを使ったプログラミングの経験がない人や、Pythonが好きな人はこの言語を選んでみてください。", + "pickCoffeeScript": "私はCoffeeScriptを選ぶ!", + "jsAndTs": "JavaScript (そして TypeScript)", + "jsTsDescription": "主にWebサイトで使われる言語。構文は複雑ですが、エディタ内でのエラーハイライトやコードサジェストが可能です。JS、C#、Javaのコードを扱ったことがある人は、この言語を選ぶとよいでしょう。", + "pickJsTs": "私はJavaScriptを選ぶ!", + "acceptAndSpecifyDirectory": "プロジェクトフォルダを選択してください" + }, "settings": { "actions": { "heading": "アクションと入力方法", @@ -555,35 +579,35 @@ }, "patreon": { "aboutPatrons": "パトロンとは、PatreonでComigoGamesに定期的な寄付という形で支援をしている人たちのことです。ct.jsのユーザーばかりではなく、ComigoGamesの他のアプリを利用しているユーザーも支援してくれています。もしあなたがクリエイターで、Patreonを通じてComigoGamesに寄付をすると、あなたのページへのリンクがここに表示されます！これは、あなたの作品の助けになるはずです。^_^", - "patronsHeader": "ご愛顧いただいている皆様へ", "thankAllPatrons": "ComigoGamesのパトロンの皆様、現在および過去のパトロンの皆様、皆様のご支援のおかげで、Comigoは前進し、より良いアプリを作ることができます。(*‘∀‘)", + "patronsHeader": "ご愛顧いただいている皆様へ", + "sponsors": "スポンサー", + "noSponsorsYet": "スポンサーはまだいません。あなたが初めてのスポンサーになれるかも？", + "sponsorsDescription": "ct.jsのサイトやゲームジャムなどのページで、スポンサーが表示されます。", + "businessCats": "ビジネスキャット", + "businessCatsDescription": "ビジネスキャットはDiscordサーバーの特別なサポートチャンネルにアクセスでき、ct.jsやゲームデバッグ全体のサポートも受けられます。", + "cats": "キャッツ", + "catsDescription": "キャッツは、ct.jsをサポートしたい人たちのことです。「ありがとう」だけじゃなくて、ct.js（ここ！）とCoMiGoが覚えている場所すべてに記載されます。", "becomeAPatron": "パトロンになる", "aboutFillers": [ - "は、どこもかしこもカッコイイ？", - "は、おしゃべりするのが好き？", - "はまだスターになれていない？", - "は、まさに天才？", - "は、良い友達？", - "は信頼できる？", - "はゴールデンハートを持っている？", - "はマジシャン？", - "がお手伝いします! ?", - "はスーパーヒーローなのか？", - "は、まだ見せていない？", - "は未解決のミステリー？", - "は壮大!?", - "はロボット？", - "は燃え盛る炎のよう！", - "は、光と希望をもたらす？", - "は、エレガントで美しい？" - ], - "sponsors": "", - "noSponsorsYet": "", - "sponsorsDescription": "", - "businessCats": "", - "businessCatsDescription": "", - "cats": "", - "catsDescription": "" + "は、どこもかしこもカッコイイ😎", + "は、おしゃべりするのが好き🤗", + "はまだスターになれていない💫", + "は、まさに天才⭐️", + "は、良い友達🤝", + "は信頼できる🙏", + "はゴールデンハートを持っている🧡", + "はマジシャン🔮", + "がお手伝いします💪", + "はスーパーヒーローなのか🦸", + "は、まだ真の力を見せていない🦹", + "は未解決のミステリー🔍", + "は壮大!✨", + "はロボット🤖", + "は燃え盛る炎のよう！🔥", + "は、光と希望をもたらす🌞", + "は、エレガントで美しい🎩" + ] }, "textureInput": { "jumpToTexture": "テクスチャーに移動", @@ -599,7 +623,7 @@ "folderDoesNotExist": "このフォルダは存在しません。", "notADirectory": "これはディレクトリではありません。", "folderNotWritable": "このフォルダーへの書き込み権限がありません。別のものを選んでください。", - "complete": "フォルダが設定されました。これで問題ないですか？" + "complete": "フォルダが設定されました。これで問題ありません。" }, "mainMenu": { "troubleshooting": { @@ -636,6 +660,7 @@ "RosePineMoon": "ローズパインムーン", "RosePineDawn": "ローズパインダウン" }, + "prideMode": "プライドモード", "language": "言語", "translateToYourLanguage": "ct.jsを翻訳する！", "codeFontDefault": "デフォルト (Iosevka Light)", @@ -646,11 +671,10 @@ "codeFont": "コードのフォント", "codeLigatures": "リガチャー(Ligatures)", "codeDense": "高密度なレイアウト", + "altTemplateLayout": "テンプレートエディターの代替レイアウト", "disableSounds": "UIサウンドを無効化", "changeDataFolder": "データフォルダの場所を設定", - "forceProductionForDebug": "デバッグエクスポートのためのプロダクションタスクの強制", - "prideMode": "プライドモード", - "altTemplateLayout": "テンプレートエディターの代わりのレイアウト" + "forceProductionForDebug": "デバッグエクスポートのためのプロダクションタスクの強制" }, "project": { "heading": "プロジェクト", @@ -659,9 +683,11 @@ "openProject": "プロジェクトを開く", "openExample": "サンプルプロジェクトを開く", "startScreen": "起動画面に戻る", - "startNewWindow": "", + "startNewWindow": "新しいプロジェクトウィンドウを開く", "successZipProject": "プロジェクトのZip圧縮に成功。 {0} に保存されました。", - "zipProject": "プロジェクトを.zipに圧縮" + "zipProject": "プロジェクトを.zipに圧縮", + "convertToJs": "プロジェクトを JavaScript に変換", + "confirmationConvertToJs": "これにより、プロジェクト内のすべてのイベントが自動的にJavaScriptに変換されます。この動作は元に戻せません。(ただし、スクリプトにエラーが見つかった場合はロールバックされます。) 本当にこのCoffeeScriptプロジェクトをJavaScriptに変換しますか?" }, "meta": { "heading": "メタ", @@ -717,7 +743,7 @@ "helpPanelReminder": "また、ビルトイン ドキュメントも忘れないでください。独自のプロジェクトを開始する前に、公式のチュートリアルを完了することをお勧めします。", "buttonStartTutorial": "チュートリアルを開く" } - }, + }, "roomBackgrounds": { "add": "背景を追加", "depth": "階層:", @@ -735,12 +761,16 @@ "show": "レイヤーを表示", "hide": "レイヤーを非表示", "findTileset": "タイルセットの検索", - "addTileLayer": "" + "addTileLayer": "タイルレイヤーを追加", + "addTileLayerFirst": "まず、左パネルにタイル レイヤーを追加します!" }, "roomView": { "name": "名前:", + "viewportHeading": "ビューポート", "width": "幅を表示:", "height": "高さを表示:", + "followTemplate": "テンプレートに従う:", + "followCodeHint": "この機能にさらに手を加える方法をコードで説明します。", "isUi": "UIレイヤーですか？", "simulate": "シミュレート", "grid": "グリッド", @@ -818,7 +848,7 @@ "apply": "適用", "fill": "塗りつぶし", "font": "フォント", - "italic": "Italic", + "italic": "イタリック", "lineHeight": "線の高さ:", "shadow": "影", "stroke": "ストローク", @@ -847,7 +877,11 @@ "fontSize": "フォントサイズ:" }, "textureView": { - "center": "軸", + "slicing": "スライス", + "viewSettings": "設定を表示", + "exportSettings": "設定をエクスポート", + "center": "軸:", + "axisExplanation": "どの場所がコピーの (0;0) 位置としてカウントされます。グリッドに対する位置決めや、どの点を中心に回転するかに影響を与えるかを定義します。", "cols": "コラム:", "done": "適用", "fill": "塗りつぶし", @@ -898,7 +932,7 @@ "poolSize": "プールの大きさ:" }, "fontView": { - "italic": "italicですか？", + "italic": "イタリックですか？", "reimport": "再インポート", "generateBitmapFont": "ビットマップフォントも生成", "bitmapFont": "ビットマップフォント", @@ -943,6 +977,7 @@ "eventAlreadyExists": "同じイベントが既に存在します！", "localEventVars": "ローカル変数", "createEventHint": "左の列で最初のイベントを作成し、ここでロジックを定義します", + "jumpToProblem": "問題個所に移動", "coreEventsCategories": { "lifecycle": "ライフサイクル", "actions": "アクション", @@ -1008,32 +1043,32 @@ "OnAnimationComplete": "ループしないアニメーションが終了すると発生します。", "Timer": "this.timer$1 = 3; を使用して、このタイマーの期間を秒単位で設定します。" } - }, - "templates": { - "create": "作成" - }, - "templateView": { - "change": "スプライトを変更", - "create": "作成", - "depth": "階層:", - "destroy": "削除", - "done": "完了", - "draw": "描く", - "learnAboutTypes": "コーディングテンプレートについて", - "name": "名前:", - "step": "ステップ", - "visible": "可視", - "appearance": "外観", - "opacity": "不透明度", - "blendMode": "ブレンド モード:", - "animationFPS": "アニメーション FPS:", - "playAnimationOnStart": "開始時にアニメーションを再生します", - "loopAnimation": "ループアニメーション", - "blendModes": { - "normal": "標準", - "add": "追加 (burn)", - "multiply": "Multiply (darken)", - "screen": "画面 (lighten)" +}, + "templates": { + "create": "作成" + }, + "templateView": { + "change": "スプライトを変更", + "create": "作成", + "depth": "階層:", + "destroy": "削除", + "done": "完了", + "draw": "描く", + "learnAboutTypes": "コーディングテンプレートについて", + "name": "名前:", + "step": "ステップ", + "visible": "可視", + "appearance": "外観", + "opacity": "不透明度", + "blendMode": "ブレンド モード:", + "animationFPS": "アニメーション FPS:", + "playAnimationOnStart": "開始時にアニメーションを再生します", + "loopAnimation": "ループアニメーション", + "blendModes": { + "normal": "標準", + "add": "追加 (burn)", + "multiply": "Multiply (darken)", + "screen": "画面 (lighten)" + } } - } } From 43a1b77cfa0ce96869e370e575f69dfefe6f6c66 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Fri, 24 Feb 2023 16:09:24 +1200 Subject: [PATCH 08/38] :zap: Clamp zoom value in the room editor Closes #407 --- src/node_requires/roomEditor/index.ts | 13 +++++++++---- .../roomEditor/interactions/camera/zoom.ts | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/node_requires/roomEditor/index.ts b/src/node_requires/roomEditor/index.ts index d77f48968..988493358 100644 --- a/src/node_requires/roomEditor/index.ts +++ b/src/node_requires/roomEditor/index.ts @@ -16,7 +16,7 @@ import {IRoomEditorInteraction, AllowedListener, allowedListeners, interactions} import {getPixiSwatch} from './../themes'; import {defaultTextStyle, recolorFilters, eraseCursor, toPrecision, snapToDiagonalGrid, snapToRectangularGrid} from './common'; import {getTemplateFromId} from '../resources/templates'; -import {ease} from 'node_modules/pixi-ease'; +import {ease, Easing} from 'node_modules/pixi-ease'; const roomEditorDefaults = { @@ -536,7 +536,7 @@ class RoomEditor extends PIXI.Application { } } cleanupTemplates(templateId: string): void { - console.log('cleanup for', templateId); + console.warn('cleanup for', templateId); let cleaned = false; for (const child of this.room.children) { if (child instanceof Copy) { @@ -665,9 +665,14 @@ class RoomEditor extends PIXI.Application { this.riotEditor.refs.zoomLabel.innerHTML = `${Math.round(this.getZoom())}%`; }); } - zoomTo(zoom: number): void { + /** + * @param {Number} zoom Zoom value, in percents + */ + zoomTo(zoom: number): Easing { + // @see https://github.com/ct-js/ct-js/issues/407 + zoom = Math.min(8_000, Math.max(zoom, 1)); // Clamp zoom to avoid flickering const scale = 1 / zoom * 100; - ease.add(this.camera, { + return ease.add(this.camera, { scale }, { duration: 500 diff --git a/src/node_requires/roomEditor/interactions/camera/zoom.ts b/src/node_requires/roomEditor/interactions/camera/zoom.ts index d3bcb17f2..6fadc62ef 100644 --- a/src/node_requires/roomEditor/interactions/camera/zoom.ts +++ b/src/node_requires/roomEditor/interactions/camera/zoom.ts @@ -21,9 +21,11 @@ const zoomInteraction: IRoomEditorInteraction = { } else { newZoom = oldZoom * 1.25; } - if (Math.abs(newZoom - 1) < 0.1) { + if (Math.abs(newZoom - 1) < 0.1) { // Snap to 100% newZoom = 1; } + // @see https://github.com/ct-js/ct-js/issues/407 + newZoom = Math.min(100, Math.max(1 / 80, newZoom)); // Clamp at 8 000% and 1% roomTag.zoom = newZoom; if (affixedData.ease) { affixedData.ease.remove(); From 84b153995e92ca11fbfe170d937c84739f488aa6 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Fri, 24 Feb 2023 16:21:30 +1200 Subject: [PATCH 09/38] :bug: Fix copies' custom properties in the room editor --- src/riotTags/rooms/room-entities-properties.tag | 2 +- src/styl/buildingBlocks.styl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/riotTags/rooms/room-entities-properties.tag b/src/riotTags/rooms/room-entities-properties.tag index 19a606796..9a1f52c76 100644 --- a/src/riotTags/rooms/room-entities-properties.tag +++ b/src/riotTags/rooms/room-entities-properties.tag @@ -72,7 +72,7 @@ room-entities-properties // Custom properties for copies div(if="{hasCopies}") h3 {voc.customProperties} - table.wide.aPaddedTable.cellsmiddle(if="{changes.customProps?.length}") + table.wide.aPaddedTable.dense.cellsmiddle(if="{changes?.customProps && Object.entries(changes.customProps).length}") tr th {voc.copyCustomProperties.property} th {voc.copyCustomProperties.value} diff --git a/src/styl/buildingBlocks.styl b/src/styl/buildingBlocks.styl index 8431479b1..be4aabf57 100644 --- a/src/styl/buildingBlocks.styl +++ b/src/styl/buildingBlocks.styl @@ -393,6 +393,13 @@ sounds-panel, rooms-panel padding-left 0 &:last-child padding-right 0 + &.dense + td, th + padding 0.35rem 0.25rem + &:first-child + padding-left 0 + &:last-child + padding-right 0 th border-bottom 1px solid borderBright text-align left From 2818c935098d5ffcd0e657be6b05c223a4f575f2 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Fri, 24 Feb 2023 16:31:22 +1200 Subject: [PATCH 10/38] :bug: Allow setting scale value with plain numbers, like `this.scale = 5`. Closes #403 --- app/data/ct.release/templates.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/data/ct.release/templates.js b/app/data/ct.release/templates.js index ebd1d1a5e..d8776e10f 100644 --- a/app/data/ct.release/templates.js +++ b/app/data/ct.release/templates.js @@ -82,6 +82,13 @@ const Copy = (function Copy() { } else { super([PIXI.Texture.EMPTY]); } + const oldScale = this.scale; + Object.defineProperty(this, 'scale', { + get: () => oldScale, + set: value => { + this.scale.x = this.scale.y = Number(value); + } + }); // it is defined in main.js // eslint-disable-next-line no-undef this[copyTypeSymbol] = true; From 89751bfa783986300ec9f3fea4371b56c6b9b209 Mon Sep 17 00:00:00 2001 From: Cosmo Myzrail Gorynych Date: Fri, 24 Feb 2023 20:13:11 +1200 Subject: [PATCH 11/38] =?UTF-8?q?:sparkles:=20Ct.js=20now=20adds=20hash=20?= =?UTF-8?q?sums=20of=20exported=20files'=20names=20to=20textures,=20icons,?= =?UTF-8?q?=20and=20your=20game's=20source=20code.=20It=20makes=20it=20eas?= =?UTF-8?q?ier=20to=20update=20your=20games=20on=20your=20own=20servers=20?= =?UTF-8?q?and=20prevents=20the=20usage=20of=20outdated=20assets=20for=20y?= =?UTF-8?q?our=20players.=20Note=20that=20index.html=20file=20should=20nev?= =?UTF-8?q?er=20be=20cached=20=E2=80=94=20the=20other=20assets=20can=20now?= =?UTF-8?q?=20be=20cached.=20Sounds=20are=20currently=20left=20with=20the?= =?UTF-8?q?=20old=20behavior=20as=20I=20have=20bigger=20plans=20for=20them?= =?UTF-8?q?=20and=20hashing=20large=20sound=20files=20is=20probably=20not?= =?UTF-8?q?=20the=20best=20idea.=20If=20you=20need=20to=20cache-invalidate?= =?UTF-8?q?=20a=20sound=20asset=20(say,=20by=20replacing=20one=20sound=20f?= =?UTF-8?q?ile=20with=20another),=20you=20can=20recreate=20the=20sound=20a?= =?UTF-8?q?sset=20under=20the=20same=20name.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partially closes #409 --- app/data/ct.release/index.html | 38 +++++------ .../exporter/{html.js => html.ts} | 36 +++++++---- .../exporter/{icons.js => icons.ts} | 46 +++++++++---- src/node_requires/exporter/index.ts | 55 ++++++++++------ src/node_requires/exporter/textures.ts | 64 ++++++++++++++----- src/node_requires/utils/revHash.ts | 7 ++ 6 files changed, 169 insertions(+), 77 deletions(-) rename src/node_requires/exporter/{html.js => html.ts} (57%) rename src/node_requires/exporter/{icons.js => icons.ts} (53%) create mode 100644 src/node_requires/utils/revHash.ts diff --git a/app/data/ct.release/index.html b/app/data/ct.release/index.html index a03a41cf5..7d6f03e55 100644 --- a/app/data/ct.release/index.html +++ b/app/data/ct.release/index.html @@ -8,39 +8,39 @@ - + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + @@ -65,7 +65,7 @@ - + diff --git a/src/node_requires/exporter/html.js b/src/node_requires/exporter/html.ts similarity index 57% rename from src/node_requires/exporter/html.js rename to src/node_requires/exporter/html.ts index 9aa47c6a6..7b032cf9b 100644 --- a/src/node_requires/exporter/html.js +++ b/src/node_requires/exporter/html.ts @@ -1,5 +1,5 @@ -const ifHTMLMatcher = (varName, symbol = '@') => new RegExp(`([\\s\\S]*)(?:([\\s\\S]*?))?`, 'g'); -const varHTMLMatcher = (varName, symbol = '@') => new RegExp(``, 'g'); +const ifHTMLMatcher = (varName: string, symbol = '@') => new RegExp(`([\\s\\S]*)(?:([\\s\\S]*?))?`, 'g'); +const varHTMLMatcher = (varName: string, symbol = '@') => new RegExp(``, 'g'); /** * A little home-brewn string templating function for HTML. @@ -19,7 +19,11 @@ const varHTMLMatcher = (varName, symbol = '@') => new RegExp(`