From 624226567f8c0c87b5724176a614f7dd57209319 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Wed, 28 Jun 2023 11:51:59 -0300 Subject: [PATCH 01/17] Arreglos sobre escenarios iniciales & bloques --- app/services/blocks-gallery.js | 6 +++--- app/utils/staticData/desafios.js | 26 +++++++++++++------------- translations/blocks/en-us.yaml | 4 +++- translations/blocks/es-ar.yaml | 4 +++- translations/blocks/pt-br.yaml | 23 ----------------------- 5 files changed, 22 insertions(+), 41 deletions(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 4e8b6039d..7ababeb2f 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -1110,12 +1110,12 @@ export default Service.extend({ _definirBloquesSensores() { - this.crearBloqueSensor('TocandoPulpito', 'ballHere', { + this.crearBloqueSensor('TocandoPulpito', 'pulpitoBallHere', { icono: 'icono.pelota-pulpo.png', funcionSensor: 'tocando("Pulpito")', }); - this.crearBloqueSensor('TocandoPingPong', 'ballHere', { + this.crearBloqueSensor('TocandoPingPong', 'pingPongBallHere', { icono: 'icono.pelota-pingpong.png', funcionSensor: 'tocando("PingPong")', }); @@ -1126,7 +1126,7 @@ export default Service.extend({ funcionSensor: 'tocando("Paleta")', }); - this.crearBloqueSensor('TocandoPelotaChuy', 'ballHere', { + this.crearBloqueSensor('TocandoPelotaChuy', 'footBallHere', { icono: 'icono.pelota.png', funcionSensor: 'tocando("PelotaAnimada")', }); diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js index 32b16558a..272581a04 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -2776,7 +2776,7 @@ export const desafios = [ [P,-,-,-,-,-],\ [P,P,P,P,P,P],\ [P,-,-,-,-,-],\ - [A,P,P,P,P,P],\")`, + [A&P,P,P,P,P,P],\")`, bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'VolverABordeIzquierdo', 'ObservarPlaneta', 'Procedimiento', 'Repetir'] }, { @@ -2838,13 +2838,13 @@ export const desafios = [ id: 'nuevo17', nombre: 'YvotyDespiertaMasLuciernagas', escena: `new EscenaYvoty("\ - [A],\ + [A&(*>L?)],\ [*>L?],\ [*>L?],\ [*>L?],\ [*>L?],\ [*>L?],\ - [*>L?],\", + [-],\", { coleccion: ["L"] })`, bloques: ['DespertarLuciernaga', 'MoverACasillaAbajo', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoLuciernaga'] }, @@ -2864,7 +2864,7 @@ export const desafios = [ { id: 'nuevo19', nombre: 'SuperYvoty1', - escena: `new EscenaYvoty(["[A],[L],[-]","[A],[L],[L],[-]","[A],[L],[L],[L],[-]", "[A],[L],[L],[L],[L],[-]", "[A],[L],[L],[L],[L],[L],[-]"])`, + escena: `new EscenaYvoty(["[A&L],[L],[-]","[A&L],[L],[L],[-]","[A&L],[L],[L],[L],[-]", "[A&L],[L],[L],[L],[L],[-]", "[A&L],[L],[L],[L],[L],[L],[-]"])`, bloques: ['Procedimiento', 'DespertarLuciernaga', 'MoverACasillaAbajo', 'TocandoFinal', 'Repetir', 'Si', 'SiNo', 'Hasta'], expectations: { @@ -2874,7 +2874,7 @@ export const desafios = [ { id: 'nuevo20', nombre: 'SuperYvoty2', - escena: `new EscenaYvoty(["[A],[#L],[-]","[A],[#L],[#L],[-]","[A],[#L],[#L],[#L],[-]", "[A],[#L],[#L],[#L],[#L],[-]", "[A],[#L],[#L],[#L],[#L],[#L],[-]"], + escena: `new EscenaYvoty(["[A&(#L)],[#L],[-]","[A&(#L)],[#L],[#L],[-]","[A&(#L)],[#L],[#L],[#L],[-]", "[A&(#L)],[#L],[#L],[#L],[#L],[-]", "[A&(#L)],[#L],[#L],[#L],[#L],[#L],[-]"], { macros: { "L": "*>L?" }, coleccion: ["L"] })`, bloques: ['Procedimiento', 'TocandoFinal', 'TocandoLuciernaga', 'DespertarLuciernaga', 'MoverACasillaAbajo', 'Repetir', 'Si', 'SiNo', 'Hasta'], @@ -2886,11 +2886,11 @@ export const desafios = [ id: 'nuevo21', nombre: 'LaberintoConPelotas', escena: `new EscenaChuy([ - '[A,O,O,O,O],[U?,U?,O,O,O],[O,U?,U?,O,O],[O,O,U?,O,O],[O,O,U?,U?,-]', - '[A,O],[U?,-]', - '[A,O,O],[U?,O,O],[U?,O,O],[U?,U?,O],[O,U?,U?],[O,O,-]', - '[A,U?,U?,O,O],[O,O,U?,O,O],[O,O,U?,U?,-]', - '[A,U?,U?,U?,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,U?,O,O],[O,O,O,O,O,U?,U?,O],[O,O,O,O,O,O,U?,O],[O,O,O,O,O,O,U?,-]' + '[A&(U?),O,O,O,O],[U?,U?,O,O,O],[O,U?,U?,O,O],[O,O,U?,O,O],[O,O,U?,U?,-]', + '[A&(U?),O],[U?,-]', + '[A&(U?),O,O],[U?,O,O],[U?,O,O],[U?,U?,O],[O,U?,U?],[O,O,-]', + '[A&(U?),U?,U?,O,O],[O,O,U?,O,O],[O,O,U?,U?,-]', + '[A&(U?),U?,U?,U?,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,O,O,O],[O,O,O,O,U?,U?,O,O],[O,O,O,O,O,U?,U?,O],[O,O,O,O,O,O,U?,O],[O,O,O,O,O,O,U?,-]' ],{},[-1,0])`, bloques: ['Procedimiento', 'MoverACasillaDerecha', 'MoverACasillaAbajo', 'PatearPulpito', 'Repetir', 'Si', 'SiNo', 'Hasta', 'PuedeMoverAbajo', @@ -2999,12 +2999,12 @@ export const desafios = [ id: 'nuevo42', nombre: 'AVecesLatasAVecesPapeles', escena: `new EscenaCapy("\ - [A,L|P,L|P,L|P,L|P],\ + [A,L|P|-,L|P|-,L|P|-,L|P|-],\ [-,O,O,O,O],\ - [-,L|P,L|P,L|P,L|P],\ + [-,L|P|-,L|P|-,L|P|-,L|P|-],\ [-,O,O,O,O],\ [-,O,O,O,O],\ - [-,L|P,L|P,L|P,L|P],\")`, + [-,L|P|-,L|P|-,L|P|-,L|P|-],\")`, bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'RecogerLata', 'RecogerPapel', 'Procedimiento', 'Repetir', 'TocandoLata', 'TocandoPapel', 'Si', 'SiNo'], expectations: { decomposition: false, diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index 73eef1f0e..ccd7b4501 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -125,7 +125,9 @@ paperHere: Is there a paper here ? butterflyHere: Is there a butterfly here? cellphoneHere: Is there a cell phone here? fireflyHere: Is there a firefly here? -ballHere: Is there a ball here? +pulpitoBallHere: Is there a red ball here? +pingPongBallHere: Is there a ping pong ball here? +footBallHere: Is there a soccer ball here? paddleHere: Is there a paddle here? pickTrophy: Pick trophy usePaddle: Use paddle diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index fb8f9fe19..913a80973 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -125,7 +125,9 @@ paperHere: ¿Hay un papel acá? butterflyHere: ¿Hay una mariposa acá? cellphoneHere: ¿Hay un celular acá? fireflyHere: ¿Hay una luciérnaga acá? -ballHere: ¿Hay una pelota acá? +pulpitoBallHere: ¿Hay una pelota pulpito acá? +pingPongBallHere: ¿Hay una pelota de ping pong acá? +footBallHere: ¿Hay una pelota de fútbol acá? paddleHere: ¿Hay una paleta acá? pickTrophy: Agarrar trofeo usePaddle: Usar paleta diff --git a/translations/blocks/pt-br.yaml b/translations/blocks/pt-br.yaml index f3d2db2d7..fb9a629c3 100644 --- a/translations/blocks/pt-br.yaml +++ b/translations/blocks/pt-br.yaml @@ -113,29 +113,6 @@ simpleRepetitionEnd: vezes conditionalRepetition: Repetir até que simpleAlternative: Si completeAlternative: senão -wakeUpFirefly: Despertar luciérnaga -watchButterfly: Observar mariposa -unlockCellphone: Desbloquear celular -pickCharger: Agarrar cargador -chargeCellphone: Cargar celular -telescopeHere: ¿Hay un telescopio acá? -planetHere: ¿Hay un planeta acá? -canHere: ¿Hay una lata acá? -paperHere: ¿Hay un papel acá? -butterflyHere: ¿Hay una mariposa acá? -cellphoneHere: ¿Hay un celular acá? -fireflyHere: ¿Hay una luciérnaga acá? -ballHere: ¿Hay una pelota acá? -paddleHere: ¿Hay una paleta acá? -pickTrophy: Agarrar trofeo -usePaddle: Usar paleta -watchStar: Observar estrella -watchPlanet: Observar planeta -repairTelescope: Reparar telescopio -pickCan: Recoger lata -pickPaper: Recoger papel -holdPaper: Sostener papel -fillBin: Llenar tacho categories: primitives: Primitivas myProcedures: Meus procedimentos From ba2f3160e3a467348cf7eb408108ac5f7ff9b567 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Wed, 28 Jun 2023 12:26:35 -0300 Subject: [PATCH 02/17] Desskipeando tests de condiciones iniciales --- app/utils/staticData/desafios.js | 4 ++-- .../desafios/segundoCiclo/Manic/ManicYLosPlanetas-test.js | 2 +- .../desafios/segundoCiclo/Yvoty/SuperYvoty1-test.js | 4 +--- .../desafios/segundoCiclo/Yvoty/SuperYvoty2-test.js | 5 +---- .../segundoCiclo/Yvoty/YvotyDespiertaMasLuciernagas-test.js | 5 +---- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js index 272581a04..5ec29f995 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -2777,7 +2777,7 @@ export const desafios = [ [P,P,P,P,P,P],\ [P,-,-,-,-,-],\ [A&P,P,P,P,P,P],\")`, - bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'VolverABordeIzquierdo', 'ObservarPlaneta', 'Procedimiento', 'Repetir'] + bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'ObservarPlaneta', 'Procedimiento', 'Repetir'] }, { id: 'nuevo9', @@ -2845,7 +2845,7 @@ export const desafios = [ [*>L?],\ [*>L?],\ [-],\", - { coleccion: ["L"] })`, + { coleccion: ["L"] }, [0,6])`, bloques: ['DespertarLuciernaga', 'MoverACasillaAbajo', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoLuciernaga'] }, { diff --git a/tests/integration/desafios/segundoCiclo/Manic/ManicYLosPlanetas-test.js b/tests/integration/desafios/segundoCiclo/Manic/ManicYLosPlanetas-test.js index 7a3b3e36c..32d292190 100644 --- a/tests/integration/desafios/segundoCiclo/Manic/ManicYLosPlanetas-test.js +++ b/tests/integration/desafios/segundoCiclo/Manic/ManicYLosPlanetas-test.js @@ -6,7 +6,7 @@ const nombre = 'ManicYLosPlanetas'; moduloActividad(nombre, () => { actividadTest(nombre, { - solucion: '5linea_y_uno5mover_y_observar', + solucion: '\n \n \n \n \n \n \n \n \n 2\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Volver atrás\n \n \n \n \n \n 5\n \n \n \n \n \n \n \n \n \n \n Comer fila de sandías\n \n \n \n \n \n 5\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n', }); }); \ No newline at end of file diff --git a/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty1-test.js b/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty1-test.js index 5a8e74138..c4ef38bc9 100644 --- a/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty1-test.js +++ b/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty1-test.js @@ -4,7 +4,6 @@ const nombre = 'SuperYvoty1'; moduloActividad(nombre, () => { - //TODO sacar skip una vez que tenga la misma solución que supertito1 actividadTest(nombre, { solucion: ` @@ -24,8 +23,7 @@ moduloActividad(nombre, () => { - `, - skip: true + ` }); }); \ No newline at end of file diff --git a/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty2-test.js b/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty2-test.js index 6971a4d4c..52fd46a30 100644 --- a/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty2-test.js +++ b/tests/integration/desafios/segundoCiclo/Yvoty/SuperYvoty2-test.js @@ -4,8 +4,6 @@ const nombre = 'SuperYvoty2'; moduloActividad(nombre, () => { - //TODO: sacar skip una vez que tenga la misma solución que supertito2 - actividadTest(nombre, { solucion: ` @@ -40,8 +38,7 @@ moduloActividad(nombre, () => { - `, - skip: true + ` }); }); \ No newline at end of file diff --git a/tests/integration/desafios/segundoCiclo/Yvoty/YvotyDespiertaMasLuciernagas-test.js b/tests/integration/desafios/segundoCiclo/Yvoty/YvotyDespiertaMasLuciernagas-test.js index 15179d279..fa31deb51 100644 --- a/tests/integration/desafios/segundoCiclo/Yvoty/YvotyDespiertaMasLuciernagas-test.js +++ b/tests/integration/desafios/segundoCiclo/Yvoty/YvotyDespiertaMasLuciernagas-test.js @@ -4,8 +4,6 @@ const nombre = 'YvotyDespiertaMasLuciernagas'; moduloActividad(nombre, () => { - //TODO: sacar el skip una vez que tenga la misma solución que Tito recargado - actividadTest(nombre, { solucion: ` @@ -42,8 +40,7 @@ moduloActividad(nombre, () => { - `, - skip: true + ` }); actividadTest(nombre, { From 4e5b836b21339ee6bd8b19c4cb5e304fa0fd308d Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Wed, 28 Jun 2023 18:28:43 -0300 Subject: [PATCH 03/17] prueba de markdown en enunciado --- translations/es-ar.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/translations/es-ar.yaml b/translations/es-ar.yaml index 3b6c8cc3d..6c30ce686 100644 --- a/translations/es-ar.yaml +++ b/translations/es-ar.yaml @@ -706,6 +706,14 @@ model: description: | Súper Yvoty debe despertar a todas las luciérnagas, pero a diferencia del desafío anterior, hay celdas sin luciérnagas. ¿Podrás utilizar el mismo procedimiento que en Súper Yvoty 1? clue: El bloque "repetir hasta que" repite una secuencia de acciones hasta que se cumple una condición. Esto se llama "repetición condicional". + 'nuevo21': + title: Laberinto con pelotas + description: | + Laberinto con _pelotas_. **Chuy** debe patear [la pelota con link](https://es.wikipedia.org/wiki/Spheniscus_magellanicus) + * item 1 + * item 2 + * Pruebo :wink: un emoji. + clue: '' 'nuevo24': title: Prendiendo las compus description: | From 7c72186da35911d9903ac0114b03e4e23494dcb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 05:48:18 +0000 Subject: [PATCH 04/17] Bump word-wrap from 1.2.3 to 1.2.4 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 407 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 289 insertions(+), 118 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21c9324e9..308e60360 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5843,9 +5843,9 @@ } }, "@ember/render-modifiers": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@ember/render-modifiers/-/render-modifiers-2.0.5.tgz", - "integrity": "sha512-5cJ1niIdOJC6k6KtIn9HGbr1DATJQp4ZqMv1vbi6LKQWbVCQ3byvKONtUEi3H0wcewlrcaWCqXOgm0nACzCOQA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz", + "integrity": "sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==", "dev": true, "requires": { "@embroider/macros": "^1.0.0", @@ -5854,12 +5854,12 @@ }, "dependencies": { "@embroider/macros": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.10.0.tgz", - "integrity": "sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.3.tgz", + "integrity": "sha512-ZdgDo7ckNbZ0DxMgEmcX70PUNPqodKSkgifDoX3Ysf5P5LkpST/PV1E49GZTxv9p17+XwQ8j0JSf5yd7KY1f/w==", "dev": true, "requires": { - "@embroider/shared-internals": "2.0.0", + "@embroider/shared-internals": "2.2.3", "assert-never": "^1.2.1", "babel-import-util": "^1.1.0", "ember-cli-babel": "^7.26.6", @@ -5870,9 +5870,9 @@ } }, "@embroider/shared-internals": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.0.0.tgz", - "integrity": "sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.3.tgz", + "integrity": "sha512-4RXJ07TqkQN4FpLBnQ92TZWW4wGAH7CRG37F1iE99rjxoD3IkoKe1IeyNr0Q85lws+2awx4/cEpaUsSwUYiJSg==", "dev": true, "requires": { "babel-import-util": "^1.1.0", @@ -5995,9 +5995,9 @@ } }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -7918,6 +7918,12 @@ "@glimmer/util": "^0.42.2" } }, + "@handlebars/parser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@handlebars/parser/-/parser-2.0.0.tgz", + "integrity": "sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==", + "dev": true + }, "@html-next/vertical-collection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@html-next/vertical-collection/-/vertical-collection-2.1.0.tgz", @@ -15822,9 +15828,9 @@ } }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "optional": true, "requires": { "lru-cache": "^6.0.0" @@ -16298,6 +16304,38 @@ "ember-cli-htmlbars": "^6.0.0" }, "dependencies": { + "@glimmer/interfaces": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.84.3.tgz", + "integrity": "sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==", + "dev": true, + "requires": { + "@simple-dom/interface": "^1.4.0" + } + }, + "@glimmer/syntax": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.84.3.tgz", + "integrity": "sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==", + "dev": true, + "requires": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3", + "@handlebars/parser": "~2.0.0", + "simple-html-tokenizer": "^0.5.11" + } + }, + "@glimmer/util": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/util/-/util-0.84.3.tgz", + "integrity": "sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==", + "dev": true, + "requires": { + "@glimmer/env": "0.1.7", + "@glimmer/interfaces": "0.84.3", + "@simple-dom/interface": "^1.4.0" + } + }, "async-disk-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz", @@ -16314,18 +16352,19 @@ } }, "babel-import-util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.3.0.tgz", - "integrity": "sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz", + "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==", "dev": true }, "babel-plugin-ember-template-compilation": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.2.tgz", - "integrity": "sha512-/sQJbmOqfNfaEYrIayy8qpfi6GhsoMeBVR3IiihOTHaKFN9+EdTzED8fhUqfshBPu5Qz6zhPkY1aMJ3k/mAuxw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz", + "integrity": "sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==", "dev": true, "requires": { - "babel-import-util": "^1.3.0" + "@glimmer/syntax": "^0.84.3", + "babel-import-util": "^2.0.0" } }, "babel-plugin-htmlbars-inline-precompile": { @@ -16394,9 +16433,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -16516,9 +16555,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -16850,12 +16889,12 @@ }, "dependencies": { "@embroider/macros": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.10.0.tgz", - "integrity": "sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.3.tgz", + "integrity": "sha512-ZdgDo7ckNbZ0DxMgEmcX70PUNPqodKSkgifDoX3Ysf5P5LkpST/PV1E49GZTxv9p17+XwQ8j0JSf5yd7KY1f/w==", "dev": true, "requires": { - "@embroider/shared-internals": "2.0.0", + "@embroider/shared-internals": "2.2.3", "assert-never": "^1.2.1", "babel-import-util": "^1.1.0", "ember-cli-babel": "^7.26.6", @@ -16866,9 +16905,9 @@ } }, "@embroider/shared-internals": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.0.0.tgz", - "integrity": "sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.3.tgz", + "integrity": "sha512-4RXJ07TqkQN4FpLBnQ92TZWW4wGAH7CRG37F1iE99rjxoD3IkoKe1IeyNr0Q85lws+2awx4/cEpaUsSwUYiJSg==", "dev": true, "requires": { "babel-import-util": "^1.1.0", @@ -16881,6 +16920,38 @@ "typescript-memoize": "^1.0.1" } }, + "@glimmer/interfaces": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.84.3.tgz", + "integrity": "sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==", + "dev": true, + "requires": { + "@simple-dom/interface": "^1.4.0" + } + }, + "@glimmer/syntax": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.84.3.tgz", + "integrity": "sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==", + "dev": true, + "requires": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3", + "@handlebars/parser": "~2.0.0", + "simple-html-tokenizer": "^0.5.11" + } + }, + "@glimmer/util": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/util/-/util-0.84.3.tgz", + "integrity": "sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==", + "dev": true, + "requires": { + "@glimmer/env": "0.1.7", + "@glimmer/interfaces": "0.84.3", + "@simple-dom/interface": "^1.4.0" + } + }, "async-disk-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz", @@ -16897,18 +16968,19 @@ } }, "babel-plugin-ember-template-compilation": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.2.tgz", - "integrity": "sha512-/sQJbmOqfNfaEYrIayy8qpfi6GhsoMeBVR3IiihOTHaKFN9+EdTzED8fhUqfshBPu5Qz6zhPkY1aMJ3k/mAuxw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz", + "integrity": "sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==", "dev": true, "requires": { - "babel-import-util": "^1.3.0" + "@glimmer/syntax": "^0.84.3", + "babel-import-util": "^2.0.0" }, "dependencies": { "babel-import-util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.3.0.tgz", - "integrity": "sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz", + "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==", "dev": true } } @@ -16979,9 +17051,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -17223,9 +17295,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -19211,9 +19283,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -19835,9 +19907,9 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "shebang-command": { @@ -20096,9 +20168,9 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "shebang-command": { @@ -20563,6 +20635,38 @@ "ember-cli-htmlbars": "^6.0.1" }, "dependencies": { + "@glimmer/interfaces": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.84.3.tgz", + "integrity": "sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==", + "dev": true, + "requires": { + "@simple-dom/interface": "^1.4.0" + } + }, + "@glimmer/syntax": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.84.3.tgz", + "integrity": "sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==", + "dev": true, + "requires": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3", + "@handlebars/parser": "~2.0.0", + "simple-html-tokenizer": "^0.5.11" + } + }, + "@glimmer/util": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/util/-/util-0.84.3.tgz", + "integrity": "sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==", + "dev": true, + "requires": { + "@glimmer/env": "0.1.7", + "@glimmer/interfaces": "0.84.3", + "@simple-dom/interface": "^1.4.0" + } + }, "async-disk-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz", @@ -20579,18 +20683,19 @@ } }, "babel-import-util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.3.0.tgz", - "integrity": "sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz", + "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==", "dev": true }, "babel-plugin-ember-template-compilation": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.2.tgz", - "integrity": "sha512-/sQJbmOqfNfaEYrIayy8qpfi6GhsoMeBVR3IiihOTHaKFN9+EdTzED8fhUqfshBPu5Qz6zhPkY1aMJ3k/mAuxw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz", + "integrity": "sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==", "dev": true, "requires": { - "babel-import-util": "^1.3.0" + "@glimmer/syntax": "^0.84.3", + "babel-import-util": "^2.0.0" } }, "babel-plugin-htmlbars-inline-precompile": { @@ -20659,9 +20764,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -20781,9 +20886,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -21222,9 +21327,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true } } @@ -21305,9 +21410,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "strip-bom": { @@ -21473,6 +21578,38 @@ "ember-cli-version-checker": "^5.1.2" }, "dependencies": { + "@glimmer/interfaces": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.84.3.tgz", + "integrity": "sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==", + "dev": true, + "requires": { + "@simple-dom/interface": "^1.4.0" + } + }, + "@glimmer/syntax": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.84.3.tgz", + "integrity": "sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==", + "dev": true, + "requires": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3", + "@handlebars/parser": "~2.0.0", + "simple-html-tokenizer": "^0.5.11" + } + }, + "@glimmer/util": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/util/-/util-0.84.3.tgz", + "integrity": "sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==", + "dev": true, + "requires": { + "@glimmer/env": "0.1.7", + "@glimmer/interfaces": "0.84.3", + "@simple-dom/interface": "^1.4.0" + } + }, "async-disk-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz", @@ -21489,18 +21626,19 @@ } }, "babel-import-util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.3.0.tgz", - "integrity": "sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz", + "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==", "dev": true }, "babel-plugin-ember-template-compilation": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.2.tgz", - "integrity": "sha512-/sQJbmOqfNfaEYrIayy8qpfi6GhsoMeBVR3IiihOTHaKFN9+EdTzED8fhUqfshBPu5Qz6zhPkY1aMJ3k/mAuxw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz", + "integrity": "sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==", "dev": true, "requires": { - "babel-import-util": "^1.3.0" + "@glimmer/syntax": "^0.84.3", + "babel-import-util": "^2.0.0" } }, "babel-plugin-htmlbars-inline-precompile": { @@ -21569,9 +21707,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -21691,9 +21829,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -22266,9 +22404,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -22360,9 +22498,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true } } @@ -22923,9 +23061,9 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "sync-disk-cache": { @@ -23251,6 +23389,38 @@ "ember-truth-helpers": "^2.1.0 || ^3.0.0" }, "dependencies": { + "@glimmer/interfaces": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.84.3.tgz", + "integrity": "sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==", + "dev": true, + "requires": { + "@simple-dom/interface": "^1.4.0" + } + }, + "@glimmer/syntax": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.84.3.tgz", + "integrity": "sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==", + "dev": true, + "requires": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3", + "@handlebars/parser": "~2.0.0", + "simple-html-tokenizer": "^0.5.11" + } + }, + "@glimmer/util": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/util/-/util-0.84.3.tgz", + "integrity": "sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==", + "dev": true, + "requires": { + "@glimmer/env": "0.1.7", + "@glimmer/interfaces": "0.84.3", + "@simple-dom/interface": "^1.4.0" + } + }, "async-disk-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz", @@ -23267,18 +23437,19 @@ } }, "babel-import-util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.3.0.tgz", - "integrity": "sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz", + "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==", "dev": true }, "babel-plugin-ember-template-compilation": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.2.tgz", - "integrity": "sha512-/sQJbmOqfNfaEYrIayy8qpfi6GhsoMeBVR3IiihOTHaKFN9+EdTzED8fhUqfshBPu5Qz6zhPkY1aMJ3k/mAuxw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz", + "integrity": "sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==", "dev": true, "requires": { - "babel-import-util": "^1.3.0" + "@glimmer/syntax": "^0.84.3", + "babel-import-util": "^2.0.0" } }, "babel-plugin-htmlbars-inline-precompile": { @@ -23347,9 +23518,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -23469,9 +23640,9 @@ "dev": true }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -24169,9 +24340,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "strip-bom": { @@ -38545,9 +38716,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==" }, "wordwrap": { "version": "0.0.3", From 2fdad959694d941151cc03140a256c72eae69306 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Tue, 1 Aug 2023 16:46:39 -0300 Subject: [PATCH 05/17] exercises 1.2.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d121655f..4481d591c 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "creador-de-desafios-pilasbloques": "^1.0.1", "mulang": "^6.0.5", "pilas-bloques-ember-intl": "^1.1.2", - "pilas-bloques-exercises": "1.2.24", + "pilas-bloques-exercises": "1.2.25", "pilasweb": "^0.5.0", "proceds-blockly": "^1.1.0", "ramda": "^0.28.0", From 52ac7e63b77020524d98a05d54220ebc2a18cee8 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Wed, 2 Aug 2023 12:31:07 -0300 Subject: [PATCH 06/17] Release 1.14.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 308e60360..efe089430 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pilasbloques", - "version": "1.14.1", + "version": "1.14.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4481d591c..3e38a2605 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Pilas Bloques", "genericName": "Programacion con bloques", "description": "Una herramienta para aprender a programar utilizando bloques", - "version": "1.14.1", + "version": "1.14.2", "homepage": "http://pilasbloques.program.ar", "author": { "name": "Program.AR", From 24285dede2e55accd358d51f5514d172345ffa4c Mon Sep 17 00:00:00 2001 From: Tomas Floxo Date: Tue, 8 Aug 2023 23:48:58 -0300 Subject: [PATCH 07/17] removin analytics --- app/index.html | 11 ----------- app/router.js | 9 --------- config/environment.js | 2 -- 3 files changed, 22 deletions(-) diff --git a/app/index.html b/app/index.html index 0050e045f..3e3be9da2 100644 --- a/app/index.html +++ b/app/index.html @@ -7,17 +7,6 @@ - - - - {{content-for "head"}} diff --git a/app/router.js b/app/router.js index aec124d43..9269399cb 100644 --- a/app/router.js +++ b/app/router.js @@ -26,13 +26,4 @@ Router.map(function () { this.route('clear'); }); -Router.reopen({ - notifyGoogleAnalytics: on("didTransition", function () { - if (ga && config.googleAnalyticsEnabled) { - let url = this.url; - ga('send', 'pageview', { page: url, title: url }); - } - }) -}); - export default Router; diff --git a/config/environment.js b/config/environment.js index 80021cb0f..cb36b0a98 100644 --- a/config/environment.js +++ b/config/environment.js @@ -22,7 +22,6 @@ module.exports = function (environment) { rootURL: rootURL, locationType: 'hash', versionURL: 'https://api.github.com/repos/Program-AR/pilas-bloques/releases/latest', - googleAnalyticsEnabled: false, linkDeDescarga: 'http://pilasbloques.program.ar/', contentSecurityPolicy: { 'style-src': "'self' 'unsafe-inline'" }, enableChallengeCreator: false, @@ -89,7 +88,6 @@ module.exports = function (environment) { // We use this for staging as well if (environment === 'production') { ENV.enableChallengeCreator = false - ENV.googleAnalyticsEnabled = true // The baseURL is replaced in production and staging during deploy // However, we need this here because it is used when packaging the app. ENV.pbApi.baseURL = 'https://pilasbloques.program.ar/api' From 1a5c9f8953be08b79284acf0e47438459944de89 Mon Sep 17 00:00:00 2001 From: Tomas Floxo Date: Tue, 8 Aug 2023 23:52:03 -0300 Subject: [PATCH 08/17] removin import --- app/router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/router.js b/app/router.js index 9269399cb..19639d141 100644 --- a/app/router.js +++ b/app/router.js @@ -1,4 +1,3 @@ -import { on } from '@ember/object/evented'; import EmberRouter from '@ember/routing/router'; import config from 'pilasbloques/config/environment'; From 7741eac84d5323fd5df9c9634f66b5f867b27637 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Thu, 10 Aug 2023 17:41:51 -0300 Subject: [PATCH 09/17] Release 1.14.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index efe089430..c4c96f9d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pilasbloques", - "version": "1.14.2", + "version": "1.14.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3e38a2605..903ccfb32 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Pilas Bloques", "genericName": "Programacion con bloques", "description": "Una herramienta para aprender a programar utilizando bloques", - "version": "1.14.2", + "version": "1.14.3", "homepage": "http://pilasbloques.program.ar", "author": { "name": "Program.AR", From cae1aad7892cadb897a0d61e91fd5c8ba933eb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diana=20L=C3=B3pez=20Alvas?= Date: Mon, 14 Aug 2023 19:22:15 -0300 Subject: [PATCH 10/17] chuy translations change --- app/services/blocks-gallery.js | 4 ++-- translations/blocks/en-us.yaml | 2 ++ translations/blocks/es-ar.yaml | 2 ++ translations/blocks/pt-br.yaml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 7ababeb2f..bfd0954f5 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -334,7 +334,7 @@ export default Service.extend({ argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una paleta"}', }); - this.crearBloqueAccion('PatearPulpito', 'kickBall', { + this.crearBloqueAccion('PatearPulpito', 'bounceRubberBall', { icono: 'icono.pelota-pulpo.png', comportamiento: 'Recolectar', argumentos: '{etiqueta: "Pulpito", nombreAnimacion:"rebotarPulpito", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una pelota"}', @@ -830,7 +830,7 @@ export default Service.extend({ }`, }); - this.crearBloqueAccion('PatearPelotaChuy', 'kickBall', { + this.crearBloqueAccion('PatearPelotaChuy', 'kickFootballBall', { icono: 'icono.pelota.png', comportamiento: 'PatearPelota', argumentos: `{ diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index ccd7b4501..5ddf27f56 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -47,6 +47,8 @@ countBanana: Count a banana countApple: Count an apple blowUpBallon: Pinch the balloon kickBall: Kick the ball +kickFootballBall: Kick the football ball +bounceRubberBall: Bounce the rubber ball move1Km: Move 1 Km forward changeLightColor: Change spotlight color moveNextLight: Move to next spotlight diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index 913a80973..c1062ce72 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -47,6 +47,8 @@ countBanana: Contar una banana countApple: Contar una manzana blowUpBallon: Explotar globo kickBall: Patear pelota +kickFootballBall: Patear pelota de fútbol +bounceRubberBall: Rebotar pelota pulpito move1Km: Avanzar 1 Km changeLightColor: Cambiar color del foco moveNextLight: Pasar al siguiente foco diff --git a/translations/blocks/pt-br.yaml b/translations/blocks/pt-br.yaml index fb9a629c3..6782192b5 100644 --- a/translations/blocks/pt-br.yaml +++ b/translations/blocks/pt-br.yaml @@ -47,6 +47,8 @@ countBanana: Contar uma banana countApple: Contar uma maçã blowUpBallon: Explodir balão kickBall: Chutar bola +kickFootballBall: Patear pelota de fútbol +bounceRubberBall: Rebotar pelota pulpito move1Km: Avançar 1 Km changeLightColor: Mudar a cor da lâmpada moveNextLight: Ir para a próxima lâmpada From b3748f5035e1692ddfa2b613c4f1f4cc056d6090 Mon Sep 17 00:00:00 2001 From: asanzo Date: Mon, 14 Aug 2023 20:05:06 -0300 Subject: [PATCH 11/17] Update translations/blocks/pt-br.yaml --- translations/blocks/pt-br.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/blocks/pt-br.yaml b/translations/blocks/pt-br.yaml index 6782192b5..b899c26bf 100644 --- a/translations/blocks/pt-br.yaml +++ b/translations/blocks/pt-br.yaml @@ -47,8 +47,8 @@ countBanana: Contar uma banana countApple: Contar uma maçã blowUpBallon: Explodir balão kickBall: Chutar bola -kickFootballBall: Patear pelota de fútbol -bounceRubberBall: Rebotar pelota pulpito +kickFootballBall: Chutar bola de futebol +bounceRubberBall: Chutar bola pulpito move1Km: Avançar 1 Km changeLightColor: Mudar a cor da lâmpada moveNextLight: Ir para a próxima lâmpada From 453ff5664c37cf26fbb025ab67f1800074ada748 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Mon, 14 Aug 2023 20:18:43 -0300 Subject: [PATCH 12/17] bumping exercises --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 903ccfb32..2a9985569 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "creador-de-desafios-pilasbloques": "^1.0.1", "mulang": "^6.0.5", "pilas-bloques-ember-intl": "^1.1.2", - "pilas-bloques-exercises": "1.2.25", + "pilas-bloques-exercises": "1.3.1", "pilasweb": "^0.5.0", "proceds-blockly": "^1.1.0", "ramda": "^0.28.0", From d242ed2fa5558a0dc26bd4c12428c036eac600f7 Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Mon, 14 Aug 2023 20:19:57 -0300 Subject: [PATCH 13/17] Release 1.14.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c4c96f9d1..3a39808bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pilasbloques", - "version": "1.14.3", + "version": "1.14.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2a9985569..60ef2dc4d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Pilas Bloques", "genericName": "Programacion con bloques", "description": "Una herramienta para aprender a programar utilizando bloques", - "version": "1.14.3", + "version": "1.14.4", "homepage": "http://pilasbloques.program.ar", "author": { "name": "Program.AR", From 2e2d52dffbac94db45aeaac495ff83742b39ccf9 Mon Sep 17 00:00:00 2001 From: Tomas Floxo Date: Wed, 23 Aug 2023 14:02:41 -0300 Subject: [PATCH 14/17] limpieza bloques --- app/services/blocks-gallery.js | 27 ++++++++++++++++--- app/utils/staticData/desafios.js | 6 ++--- .../segundoCiclo/Chuy/PelotaPaleta-test.js | 2 +- .../Yvoty/MariposasEncuadradas-test.js | 2 +- .../Yvoty/ObservadoraDeMariposas-test.js | 4 +-- translations/blocks/en-us.yaml | 5 ++-- translations/blocks/es-ar.yaml | 7 ++--- 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index bfd0954f5..41db38c4e 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -328,7 +328,7 @@ export default Service.extend({ argumentos: '{etiqueta: "Trofeo", "mensajeError": "Acá no hay un trofeo"}', }); - this.crearBloqueAccion('UsarPaleta', 'usePaddle', { + this.crearBloqueAccion('RebotarPingPong', 'bouncePingPong', { icono: 'icono.paleta.png', comportamiento: 'Recolectar', argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una paleta"}', @@ -346,7 +346,7 @@ export default Service.extend({ argumentos: "{'etiqueta':'Luciernaga'}" }); - this.crearBloqueAccion('ObservarMariposa', 'watchButterfly', { + this.crearBloqueAccion('FotografiarMariposa', 'photographButterfly', { icono: 'icono.mariposa.png', comportamiento: 'Recolectar', argumentos: '{etiqueta: "Mariposa", nombreAnimacion: "sacarFoto", "mensajeError": "Acá no hay una mariposa"}', @@ -393,6 +393,12 @@ export default Service.extend({ argumentos: `{ etiqueta: "Telescopio" }`, }); + this.crearBloqueAccion('AlinearTelescopio', 'repairTelescope', { + icono: 'icono.telescopio.png', + comportamiento: 'RepararTelescopio', + argumentos: `{ etiqueta: "Telescopio" }`, + }); + this.crearBloqueAccion('RecogerLata', 'pickCan', { icono: 'icono.lata.png', comportamiento: 'RecojoLata', @@ -983,7 +989,7 @@ export default Service.extend({ this.crearBloqueAccion('PrepararEnsalada', 'prepareSalad', { icono: 'icono.ensaladera.png', comportamiento: 'PrepararEnsalada', - argumentos: `{}`, + argumentos: `{etiqueta:"Ensaladera"}`, }); // Para los desafíos de escribir y leer letras @@ -1359,6 +1365,21 @@ export default Service.extend({ funcionSensor: 'tocando("Tomate")', }); + this.crearBloqueSensor('HayCargador', 'chargerHere', { + icono: 'icono.cargador.png', + funcionSensor: 'tocando("Cargador")', + }); + + this.crearBloqueSensor('HayEnsaladera', 'saladBowlHere', { + icono: 'icono.ensaladera.png', + funcionSensor: 'tocando("Ensaladera")', + }); + + this.crearBloqueSensor('HayTrofeo', 'trophyHere', { + icono: 'icono.trofeo.png', + funcionSensor: 'tocando("Trofeo")', + }); + }, _definirBloquesQueRepresentanValores() { diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js index 5ec29f995..d5c7a44d2 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -2810,7 +2810,7 @@ export const desafios = [ id: 'nuevo14', nombre: 'PelotaPaleta', escena: `new EscenaChuy(["[A,P]", "[A,G]"],{},[1,0])`, - bloques: ['PatearPelotaChuy', 'UsarPaleta', 'MoverACasillaDerecha', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoPelotaChuy', 'TocandoPingPong'], + bloques: ['PatearPelotaChuy', 'RebotarPingPong', 'MoverACasillaDerecha', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoPelotaChuy', 'TocandoPingPong'], expectations: { conditionalAlternative: true, decomposition: false @@ -3061,7 +3061,7 @@ export const desafios = [ e: ["M", "M"], f: ["M", "M"] }})`, - bloques: ['MoverACasillaDerecha', 'MoverACasillaArriba', 'VolverABordeIzquierdo', 'ObservarMariposa', 'TocandoMariposa', 'Procedimiento', 'Repetir', 'Si', 'SiNo'] + bloques: ['MoverACasillaDerecha', 'MoverACasillaArriba', 'VolverABordeIzquierdo', 'FotografiarMariposa', 'TocandoMariposa', 'Procedimiento', 'Repetir', 'Si', 'SiNo'] }, { id: 'nuevo46', @@ -3112,7 +3112,7 @@ export const desafios = [ { macros: { "M": "*>M?" }, coleccion: ["M"] })`, bloques: ['ParaLaDerecha', 'ParaLaIzquierda', 'ParaArriba', 'ParaAbajo', 'MoverA', 'Procedimiento', 'RepetirVacio', 'Repetir', 'Si', 'SiNo', 'Hasta', - 'TocandoMariposa', 'ObservarMariposa', 'Numero', 'OpAritmetica'], + 'TocandoMariposa', 'FotografiarMariposa', 'Numero', 'OpAritmetica'], }, { id: 'nuevo134', diff --git a/tests/integration/desafios/segundoCiclo/Chuy/PelotaPaleta-test.js b/tests/integration/desafios/segundoCiclo/Chuy/PelotaPaleta-test.js index ceac86b64..7741d9888 100644 --- a/tests/integration/desafios/segundoCiclo/Chuy/PelotaPaleta-test.js +++ b/tests/integration/desafios/segundoCiclo/Chuy/PelotaPaleta-test.js @@ -19,7 +19,7 @@ moduloActividad(nombre, () => { - + diff --git a/tests/integration/desafios/segundoCiclo/Yvoty/MariposasEncuadradas-test.js b/tests/integration/desafios/segundoCiclo/Yvoty/MariposasEncuadradas-test.js index 444360a04..beb8d7b31 100644 --- a/tests/integration/desafios/segundoCiclo/Yvoty/MariposasEncuadradas-test.js +++ b/tests/integration/desafios/segundoCiclo/Yvoty/MariposasEncuadradas-test.js @@ -99,7 +99,7 @@ moduloActividad(nombre, () => { - + diff --git a/tests/integration/desafios/segundoCiclo/Yvoty/ObservadoraDeMariposas-test.js b/tests/integration/desafios/segundoCiclo/Yvoty/ObservadoraDeMariposas-test.js index 099fb758b..14941edc3 100644 --- a/tests/integration/desafios/segundoCiclo/Yvoty/ObservadoraDeMariposas-test.js +++ b/tests/integration/desafios/segundoCiclo/Yvoty/ObservadoraDeMariposas-test.js @@ -5,12 +5,12 @@ const nombre = 'ObservadoraDeMariposas'; moduloActividad(nombre, () => { actividadTest(nombre, { - solucion: 'Observar fila de mariposas4Subir a la siguiente filaObservar mariposas si hayIr a la segunda galaxia2Observar grupo de mariposas2' + solucion: 'Observar fila de mariposas4Subir a la siguiente filaObservar mariposas si hayIr a la segunda galaxia2Observar grupo de mariposas2' }); actividadTest(nombre, { descripcionAdicional: 'Da error al querer observar una mariposa donde no hay', - solucion: '', + solucion: '', errorEsperado: 'Acá no hay una mariposa', }); diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index 5ddf27f56..cd100452b 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -116,7 +116,7 @@ conditionalRepetition: Repeat until simpleAlternative: If completeAlternative: else wakeUpFirefly: Wake up firefly -watchButterfly: Watch butterfly +photographButterfly: Photograph butterfly unlockCellphone: Unlock cell phone pickCharger: Pick charger chargeCellphone: Charge cell phone @@ -132,10 +132,11 @@ pingPongBallHere: Is there a ping pong ball here? footBallHere: Is there a soccer ball here? paddleHere: Is there a paddle here? pickTrophy: Pick trophy -usePaddle: Use paddle +bouncePingPong: Bounce ping pong ball watchStar: Watch star watchPlanet: Watch planet repairTelescope: Repair telescope +alignTelescope: Align telescope pickCan: Pick can pickPaper: Pick paper holdPaper: Hold paper diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index c1062ce72..7716d5559 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -116,7 +116,7 @@ conditionalRepetition: Repetir hasta que simpleAlternative: Si completeAlternative: sino wakeUpFirefly: Despertar luciérnaga -watchButterfly: Observar mariposa +photographButterfly: Fotografiar mariposa unlockCellphone: Desbloquear celular pickCharger: Agarrar cargador chargeCellphone: Cargar celular @@ -131,11 +131,12 @@ pulpitoBallHere: ¿Hay una pelota pulpito acá? pingPongBallHere: ¿Hay una pelota de ping pong acá? footBallHere: ¿Hay una pelota de fútbol acá? paddleHere: ¿Hay una paleta acá? -pickTrophy: Agarrar trofeo -usePaddle: Usar paleta +pickTrophy: Recoger trofeo +bouncePingPong: Rebotar pelota de ping pong watchStar: Observar estrella watchPlanet: Observar planeta repairTelescope: Reparar telescopio +alignTelescope: Alinear telescope pickCan: Recoger lata pickPaper: Recoger papel holdPaper: Sostener papel From a17dc9c6f9a61aacbf0bffb46ec2b3bf5e406374 Mon Sep 17 00:00:00 2001 From: asanzo Date: Thu, 31 Aug 2023 13:13:13 -0300 Subject: [PATCH 15/17] Update translations/blocks/es-ar.yaml Co-authored-by: Daniel Ferro <91342656+danielferro69@users.noreply.github.com> --- translations/blocks/es-ar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index 7716d5559..36defe044 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -136,7 +136,7 @@ bouncePingPong: Rebotar pelota de ping pong watchStar: Observar estrella watchPlanet: Observar planeta repairTelescope: Reparar telescopio -alignTelescope: Alinear telescope +alignTelescope: Alinear telescopio pickCan: Recoger lata pickPaper: Recoger papel holdPaper: Sostener papel From 6c71dc0a640306c0a1e150eac985d3b31eda141f Mon Sep 17 00:00:00 2001 From: Tomas Floxo Date: Fri, 1 Sep 2023 12:48:37 -0300 Subject: [PATCH 16/17] RecogerPaleta --- app/services/blocks-gallery.js | 6 ++++++ translations/blocks/en-us.yaml | 1 + translations/blocks/es-ar.yaml | 1 + 3 files changed, 8 insertions(+) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 41db38c4e..7ca515f9f 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -328,6 +328,12 @@ export default Service.extend({ argumentos: '{etiqueta: "Trofeo", "mensajeError": "Acá no hay un trofeo"}', }); + this.crearBloqueAccion('RecogerPaleta', 'pickPaddle', { + icono: 'icono.paleta.png', + comportamiento: 'Recolectar', + argumentos: '{etiqueta: "Paleta", "mensajeError": "Acá no hay una paleta"}', + }); + this.crearBloqueAccion('RebotarPingPong', 'bouncePingPong', { icono: 'icono.paleta.png', comportamiento: 'Recolectar', diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index cd100452b..a9709b66d 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -132,6 +132,7 @@ pingPongBallHere: Is there a ping pong ball here? footBallHere: Is there a soccer ball here? paddleHere: Is there a paddle here? pickTrophy: Pick trophy +pickPaddle: Pick paddle bouncePingPong: Bounce ping pong ball watchStar: Watch star watchPlanet: Watch planet diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index 36defe044..a829b88a6 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -132,6 +132,7 @@ pingPongBallHere: ¿Hay una pelota de ping pong acá? footBallHere: ¿Hay una pelota de fútbol acá? paddleHere: ¿Hay una paleta acá? pickTrophy: Recoger trofeo +pickPaddle: Recoger paleta bouncePingPong: Rebotar pelota de ping pong watchStar: Observar estrella watchPlanet: Observar planeta From 5df2a748a2c3e33b997859b3f9d4384b493624d6 Mon Sep 17 00:00:00 2001 From: Tomas Floxo Date: Fri, 1 Sep 2023 13:07:37 -0300 Subject: [PATCH 17/17] mensajeError paleta --- app/services/blocks-gallery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 7ca515f9f..0ad791ebd 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -337,7 +337,7 @@ export default Service.extend({ this.crearBloqueAccion('RebotarPingPong', 'bouncePingPong', { icono: 'icono.paleta.png', comportamiento: 'Recolectar', - argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una paleta"}', + argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una pelota de ping pong"}', }); this.crearBloqueAccion('PatearPulpito', 'bounceRubberBall', {