From 7f5723d93141017c29b34349bdaef9587dadccae Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 6 Mar 2024 14:36:01 -0800 Subject: [PATCH 01/12] format --- package-lock.json | 24 ++++++++++++------------ package.json | 6 +++--- src/components/tasks/TaskFluency.vue | 2 ++ src/router/index.js | 12 ++++++------ 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index af4065827..b86d68e87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,15 +8,15 @@ "name": "roar-dashboard", "version": "1.7.1", "dependencies": { - "@bdelab/roam-fluency": "^1.9.14", - "@bdelab/roar-firekit": "^4.8.4", + "@bdelab/roam-fluency": "^1.10.0", + "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", "@bdelab/roar-pa": "^1.6.4", "@bdelab/roar-sre": "^1.11.4", "@bdelab/roar-swr": "^1.8.4", "@bdelab/roar-utils": "^1.0.18", - "@bdelab/roar-vocab": "^1.6.10", + "@bdelab/roar-vocab": "^1.6.11", "@sentry/browser": "^7.103.0", "@sentry/integrations": "^7.103.0", "@sentry/vite-plugin": "^2.14.2", @@ -1560,9 +1560,9 @@ } }, "node_modules/@bdelab/roam-fluency": { - "version": "1.9.14", - "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.9.14.tgz", - "integrity": "sha512-Pi/Fwf5yVg8DSNQq4KQouTZtVNVyo6OUjS3IqR+j3tv1ULMCOCeLVm8wwd7hj03PD2LjlMtjrNw7Ubugnh9Krw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.0.tgz", + "integrity": "sha512-Ri9iOeDd4/6WS4WP3TSNZOFlcgk5QL2Vny8g9GrQBAG0SCYYL1N5VEYKROEkRpHrE7+V1fg/f0fff0e8Oq1+dQ==", "dependencies": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -1605,9 +1605,9 @@ } }, "node_modules/@bdelab/roar-firekit": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-4.8.4.tgz", - "integrity": "sha512-N7hnXGA+/cnCGV6T3FiLYhdAnsoydJuSrp/BxxCf+v9K2Qdj4zUfnYu3R3mPcjI8MS2MQJBLcuOa7LFSOE8Axw==", + "version": "4.8.6", + "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-4.8.6.tgz", + "integrity": "sha512-2qyZ42vsMqEpyMGfSTvGSBXqzN1VdihDhx74gf96LbYicHscefkZHdeXSZIovxuU0uX7s77AHyPjBb8d17Saqg==", "dependencies": { "@bdelab/roar-firekit": "^4.1.1", "crc-32": "^1.2.2", @@ -3630,9 +3630,9 @@ } }, "node_modules/@bdelab/roar-vocab": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/@bdelab/roar-vocab/-/roar-vocab-1.6.10.tgz", - "integrity": "sha512-yAp3/8q1llKNGeY+voRa0FffQIDwN+/VnsSk64s5IafGhL65DNyPmUCyPUlBwYjQo/CfkAo7uDrIvFSAJCHDxw==", + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/@bdelab/roar-vocab/-/roar-vocab-1.6.11.tgz", + "integrity": "sha512-o0wB5yR9HLeki0dttK5EvvsCp/WymkD0BTAN/KBqf05OXppwqLSc85T0+U53FDQWURiKIdDS47YuIonxOf4YvQ==", "dependencies": { "@babel/core": "^7.19.0", "@babel/preset-env": "^7.19.0", diff --git a/package.json b/package.json index 556639bb3..5ff9493fd 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,15 @@ "version": "npm run format && git add -A" }, "dependencies": { - "@bdelab/roam-fluency": "^1.9.14", - "@bdelab/roar-firekit": "^4.8.4", + "@bdelab/roam-fluency": "^1.10.0", + "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", "@bdelab/roar-pa": "^1.6.4", "@bdelab/roar-sre": "^1.11.4", "@bdelab/roar-swr": "^1.8.4", "@bdelab/roar-utils": "^1.0.18", - "@bdelab/roar-vocab": "^1.6.10", + "@bdelab/roar-vocab": "^1.6.11", "@sentry/browser": "^7.103.0", "@sentry/integrations": "^7.103.0", "@sentry/vite-plugin": "^2.14.2", diff --git a/src/components/tasks/TaskFluency.vue b/src/components/tasks/TaskFluency.vue index 87b01a36b..538992501 100644 --- a/src/components/tasks/TaskFluency.vue +++ b/src/components/tasks/TaskFluency.vue @@ -18,6 +18,7 @@ import { fetchDocById } from '@/helpers/query/utils'; const props = defineProps({ taskId: { type: String, required: true, default: 'fluency' }, + language: { type: String, required: true, default: 'en' }, }); const taskId = props.taskId; @@ -79,6 +80,7 @@ async function startTask() { grade: _get(userData.value, 'studentData.grade'), birthMonth: userDateObj.getMonth() + 1, birthYear: userDateObj.getFullYear(), + language: props.language, }; const gameParams = { ...appKit._taskInfo.variantParams }; diff --git a/src/router/index.js b/src/router/index.js index 3c062735d..70b021b75 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -97,42 +97,42 @@ const routes = [ path: '/game/fluency-arf', name: 'Fluency-ARF', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-arf' }, + props: { taskId: 'fluency-arf', language: 'en' }, meta: { pageTitle: 'Fluency-ARF' }, }, { path: '/game/fluency-arf-es', name: 'Fluency-ARF-ES', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-arf-es' }, + props: { taskId: 'fluency-arf-es', language: 'es' }, meta: { pageTitle: 'Fluency-ARF ES' }, }, { path: '/game/fluency-calf', name: 'Fluency-CALF', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-calf' }, + props: { taskId: 'fluency-calf', language: 'en' }, meta: { pageTitle: 'Fluency-CALF' }, }, { path: '/game/fluency-calf-es', name: 'Fluency-CALF-ES', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-calf-es' }, + props: { taskId: 'fluency-calf-es', language: 'es' }, meta: { pageTitle: 'Fluency-CALF ES' }, }, { path: '/game/fluency-alpaca', name: 'Fluency-Alpaca', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-alpaca' }, + props: { taskId: 'fluency-alpaca', language: 'en' }, meta: { pageTitle: 'Fluency-Alpaca' }, }, { path: '/game/fluency-alpaca-es', name: 'Fluency-Alpaca-ES', component: () => import('../components/tasks/TaskFluency.vue'), - props: { taskId: 'fluency-alpaca-es' }, + props: { taskId: 'fluency-alpaca-es', language: 'es' }, meta: { pageTitle: 'Fluency-Alpaca ES' }, }, { From 0d1397a032cf442961370b807a929b3c41ca4f89 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 6 Mar 2024 15:13:07 -0800 Subject: [PATCH 02/12] update fluency test --- .../roam-fluency/fluencyHelpers.js | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/cypress/support/helper-functions/roam-fluency/fluencyHelpers.js b/cypress/support/helper-functions/roam-fluency/fluencyHelpers.js index 1bc696aff..dd09d3db0 100644 --- a/cypress/support/helper-functions/roam-fluency/fluencyHelpers.js +++ b/cypress/support/helper-functions/roam-fluency/fluencyHelpers.js @@ -1,6 +1,5 @@ const timeout = Cypress.env('timeout'); const participantId = '123456789'; -const practiceNumber = '1'; const questionInput = '42'; function typeEnter() { @@ -16,20 +15,14 @@ function playFluencyIntro() { // Click textbox and enter random participantId cy.get('#input-0', { timeout: timeout }).type(`${participantId} {enter}`); - typeEnter(); - - // Input any number - cy.get('#practice_number', { timeout: timeout }).type(practiceNumber); - - // Click enter + waitTimeout(); typeEnter(); waitTimeout(); - // Click enter - typeEnter(); + // Click enter + cy.get('body').type('1 {enter}'); waitTimeout(); - // Click enter typeEnter(); waitTimeout(); @@ -37,10 +30,20 @@ function playFluencyIntro() { cy.get('body').type('{backspace}'); waitTimeout(); - // Enter x2 - cy.get('body').type('x2 {enter}'); + // Input example number, enter x1 + cy.get('#practice_number').type('10'); waitTimeout(); + cy.get('#practice_number').type('{enter}'); + typeEnter(); + waitTimeout(); + + // Enter x2 + //cy.get("body").type("x2 {enter}"); + typeEnter(); + typeEnter(); + //waitTimeout(); + // Type 4, enter x2 cy.get('#question_input_key').type('4'); waitTimeout(); @@ -80,7 +83,6 @@ function checkGameComplete(endText) { cy.get('body').type('{enter}'); }); cy.log('Game complete.'); - cy.get('body', { timeout: timeout }).type('{enter}'); } else { cy.log('Continuing game...'); playFluencyLoop(); From 80b577e8ed858a551b3d9fd820c27bf5b78028e4 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 6 Mar 2024 15:55:21 -0800 Subject: [PATCH 03/12] update roam fluency package --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index b86d68e87..8f6679587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "roar-dashboard", "version": "1.7.1", "dependencies": { - "@bdelab/roam-fluency": "^1.10.0", + "@bdelab/roam-fluency": "^1.10.1", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", @@ -1560,9 +1560,9 @@ } }, "node_modules/@bdelab/roam-fluency": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.0.tgz", - "integrity": "sha512-Ri9iOeDd4/6WS4WP3TSNZOFlcgk5QL2Vny8g9GrQBAG0SCYYL1N5VEYKROEkRpHrE7+V1fg/f0fff0e8Oq1+dQ==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.1.tgz", + "integrity": "sha512-gzTvVFeVyNL1tUp0ZxrbglqNOiCgF+IqvqwCFdPpQYX6VXTcPRi98Nu4YlMhDaIAtsOs57wXlAWQl5NmrrxPsg==", "dependencies": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -12426,9 +12426,9 @@ } }, "node_modules/fkill/node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dependencies": { "path-key": "^4.0.0" }, @@ -21153,9 +21153,9 @@ } }, "node_modules/pid-port/node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dependencies": { "path-key": "^4.0.0" }, @@ -23963,9 +23963,9 @@ } }, "node_modules/taskkill/node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dependencies": { "path-key": "^4.0.0" }, diff --git a/package.json b/package.json index 5ff9493fd..d90699c18 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "version": "npm run format && git add -A" }, "dependencies": { - "@bdelab/roam-fluency": "^1.10.0", + "@bdelab/roam-fluency": "^1.10.1", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", From d0b2b66e623737b4bc6683bc8fcc61d69f4bac88 Mon Sep 17 00:00:00 2001 From: Kyle Date: Thu, 7 Mar 2024 09:34:08 -0800 Subject: [PATCH 04/12] update swr test --- cypress/e2e/participant/default-tests/playSWR.cy.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cypress/e2e/participant/default-tests/playSWR.cy.js b/cypress/e2e/participant/default-tests/playSWR.cy.js index f214d8ba4..ad6ed3cc2 100644 --- a/cypress/e2e/participant/default-tests/playSWR.cy.js +++ b/cypress/e2e/participant/default-tests/playSWR.cy.js @@ -12,7 +12,9 @@ describe('Testing playthrough of SWR as a participant', () => { cy.get('.p-tabview').contains('ROAR - Word'); cy.visit(`/game/swr`); - cy.get('.jspsych-btn', { timeout: timeout }).should('be.visible').click(); + cy.get('.jspsych-btn', { timeout: 3 * timeout }) + .should('be.visible') + .click(); // handles error where full screen throws a permissions error cy.wait(0.1 * timeout); From 1cb839fbbeb1a07a37f39856ae75df56000522c5 Mon Sep 17 00:00:00 2001 From: Kyle Date: Thu, 7 Mar 2024 13:59:44 -0800 Subject: [PATCH 05/12] format and update fluency package --- package-lock.json | 92 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 85 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f6679587..5b0e36e90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "roar-dashboard", "version": "1.7.1", "dependencies": { - "@bdelab/roam-fluency": "^1.10.1", + "@bdelab/roam-fluency": "^1.10.4", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", @@ -1560,9 +1560,9 @@ } }, "node_modules/@bdelab/roam-fluency": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.1.tgz", - "integrity": "sha512-gzTvVFeVyNL1tUp0ZxrbglqNOiCgF+IqvqwCFdPpQYX6VXTcPRi98Nu4YlMhDaIAtsOs57wXlAWQl5NmrrxPsg==", + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.4.tgz", + "integrity": "sha512-o8ubNbQNEMUrCb76gPQkhrluEfP9TCsN9tdGypoKvzBkZBZ2ZQmjVTHlg2hpTzF+r3HTZmp7Meg186L8XplmuQ==", "dependencies": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -5871,11 +5871,11 @@ } }, "node_modules/@sentry/rollup-plugin": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-2.14.2.tgz", - "integrity": "sha512-6cnU3RM35ED3vRkTO2pCHYGXWXkIYGTqHB75O1kMdLfSXKElY5u9bKVApC/8oIJuXg7b/l5j7reBMB5bAlsG+w==", + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-2.14.3.tgz", + "integrity": "sha512-e7V/+7BAzQW6q1oyV9SAulnf2Iw0PIaORcLNQ3hCu3k7T3EC0lHKn+09p5vW/os0fc7KZaPzwrr3chZoIayeWA==", "dependencies": { - "@sentry/bundler-plugin-core": "2.14.2", + "@sentry/bundler-plugin-core": "2.14.3", "unplugin": "1.0.1" }, "engines": { @@ -5885,6 +5885,82 @@ "rollup": ">=3.2.0" } }, + "node_modules/@sentry/rollup-plugin/node_modules/@sentry/babel-plugin-component-annotate": { + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.14.3.tgz", + "integrity": "sha512-h0ONVTe8j3Ma2g5SMsl9ynmLZdCf+CupLF7PQ7n06K0L8dDtrHqo8yjsWaZSJf4InGrJ9HC4MaOSItbFjiTFLw==", + "engines": { + "node": ">= 14" + } + }, + "node_modules/@sentry/rollup-plugin/node_modules/@sentry/bundler-plugin-core": { + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.14.3.tgz", + "integrity": "sha512-iEtMdAPFUAYngvYhkfbgY8m3zB439u+5tvovj9rBXHGMr3nEB5fzZLOcVuiL47GEuUvMjDdrubl9MDGZ0c1IuQ==", + "dependencies": { + "@babel/core": "^7.18.5", + "@sentry/babel-plugin-component-annotate": "2.14.3", + "@sentry/cli": "^2.22.3", + "dotenv": "^16.3.1", + "find-up": "^5.0.0", + "glob": "^9.3.2", + "magic-string": "0.27.0", + "unplugin": "1.0.1" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@sentry/rollup-plugin/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@sentry/rollup-plugin/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@sentry/rollup-plugin/node_modules/magic-string": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", + "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.13" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@sentry/rollup-plugin/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@sentry/vite-plugin": { "version": "2.14.2", "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-2.14.2.tgz", diff --git a/package.json b/package.json index d90699c18..c840824dc 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "version": "npm run format && git add -A" }, "dependencies": { - "@bdelab/roam-fluency": "^1.10.1", + "@bdelab/roam-fluency": "^1.10.4", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", From 60dc396c1c9509afa929476b24d06644fcb452fc Mon Sep 17 00:00:00 2001 From: Kyle Date: Thu, 7 Mar 2024 14:32:26 -0800 Subject: [PATCH 06/12] update TaskFluency with default prop --- src/components/tasks/TaskFluency.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tasks/TaskFluency.vue b/src/components/tasks/TaskFluency.vue index 538992501..105c19d95 100644 --- a/src/components/tasks/TaskFluency.vue +++ b/src/components/tasks/TaskFluency.vue @@ -17,7 +17,7 @@ import _get from 'lodash/get'; import { fetchDocById } from '@/helpers/query/utils'; const props = defineProps({ - taskId: { type: String, required: true, default: 'fluency' }, + taskId: { type: String, required: true, default: 'fluency-arf' }, language: { type: String, required: true, default: 'en' }, }); From bb1d7141c7703446f08cac5a1a8e4b4bd7a6dc69 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 09:25:25 -0700 Subject: [PATCH 07/12] format and update fluency package --- package-lock.json | 735 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 3 +- 2 files changed, 673 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea3c580a0..77184d4a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "roar-dashboard", "version": "1.7.1", "dependencies": { - "@bdelab/roam-fluency": "^1.10.4", + "@bdelab/roam-fluency": "^1.10.5", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", @@ -17,6 +17,7 @@ "@bdelab/roar-swr": "^1.8.4", "@bdelab/roar-utils": "^1.0.18", "@bdelab/roar-vocab": "^1.6.11", + "@esbuild/linux-x64": "^0.20.1", "@sentry/browser": "^7.103.0", "@sentry/integrations": "^7.103.0", "@sentry/vite-plugin": "^2.14.2", @@ -1560,9 +1561,9 @@ } }, "node_modules/@bdelab/roam-fluency": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.4.tgz", - "integrity": "sha512-o8ubNbQNEMUrCb76gPQkhrluEfP9TCsN9tdGypoKvzBkZBZ2ZQmjVTHlg2hpTzF+r3HTZmp7Meg186L8XplmuQ==", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.5.tgz", + "integrity": "sha512-qDkIjiz3ViiVjDmrEuAAyph4qQ7mfO/zHian3G5WzPkn3KFvJlE0e9UWkLgym9YnQCjMg0CcaZC/u8BfJVYgtQ==", "dependencies": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -4237,6 +4238,335 @@ "ms": "^2.1.1" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", + "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "cpu": [ + "x64" + ], + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "dev": true, @@ -5161,11 +5491,11 @@ "license": "MIT" }, "node_modules/@ljharb/through": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.12.tgz", - "integrity": "sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==", + "version": "2.3.13", + "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz", + "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==", "dependencies": { - "call-bind": "^1.0.5" + "call-bind": "^1.0.7" }, "engines": { "node": ">= 0.4" @@ -8570,12 +8900,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "license": "MIT", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10470,15 +10806,19 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "license": "MIT", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -10843,6 +11183,25 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { "version": "1.4.1", "license": "MIT" @@ -10882,6 +11241,21 @@ "@esbuild/win32-x64": "0.18.20" } }, + "node_modules/esbuild/node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/esc-exit": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/esc-exit/-/esc-exit-3.0.1.tgz", @@ -12709,14 +13083,19 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "license": "MIT", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -12945,10 +13324,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -23028,13 +23408,16 @@ "license": "ISC" }, "node_modules/set-function-length": { - "version": "1.1.1", - "license": "MIT", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -26911,9 +27294,9 @@ } }, "@bdelab/roam-fluency": { - "version": "1.9.14", - "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.9.14.tgz", - "integrity": "sha512-Pi/Fwf5yVg8DSNQq4KQouTZtVNVyo6OUjS3IqR+j3tv1ULMCOCeLVm8wwd7hj03PD2LjlMtjrNw7Ubugnh9Krw==", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/@bdelab/roam-fluency/-/roam-fluency-1.10.5.tgz", + "integrity": "sha512-qDkIjiz3ViiVjDmrEuAAyph4qQ7mfO/zHian3G5WzPkn3KFvJlE0e9UWkLgym9YnQCjMg0CcaZC/u8BfJVYgtQ==", "requires": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -28580,9 +28963,9 @@ } }, "@bdelab/roar-vocab": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/@bdelab/roar-vocab/-/roar-vocab-1.6.10.tgz", - "integrity": "sha512-yAp3/8q1llKNGeY+voRa0FffQIDwN+/VnsSk64s5IafGhL65DNyPmUCyPUlBwYjQo/CfkAo7uDrIvFSAJCHDxw==", + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/@bdelab/roar-vocab/-/roar-vocab-1.6.11.tgz", + "integrity": "sha512-o0wB5yR9HLeki0dttK5EvvsCp/WymkD0BTAN/KBqf05OXppwqLSc85T0+U53FDQWURiKIdDS47YuIonxOf4YvQ==", "requires": { "@babel/core": "^7.19.0", "@babel/preset-env": "^7.19.0", @@ -29042,6 +29425,137 @@ } } }, + "@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", + "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==" + }, + "@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "optional": true + }, "@eslint-community/eslint-utils": { "version": "4.4.0", "dev": true, @@ -29672,11 +30186,11 @@ "version": "2.0.4" }, "@ljharb/through": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.12.tgz", - "integrity": "sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==", + "version": "2.3.13", + "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz", + "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==", "requires": { - "call-bind": "^1.0.5" + "call-bind": "^1.0.7" } }, "@mdit-vue/plugin-component": { @@ -30120,12 +30634,69 @@ } }, "@sentry/rollup-plugin": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-2.14.2.tgz", - "integrity": "sha512-6cnU3RM35ED3vRkTO2pCHYGXWXkIYGTqHB75O1kMdLfSXKElY5u9bKVApC/8oIJuXg7b/l5j7reBMB5bAlsG+w==", + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-2.14.3.tgz", + "integrity": "sha512-e7V/+7BAzQW6q1oyV9SAulnf2Iw0PIaORcLNQ3hCu3k7T3EC0lHKn+09p5vW/os0fc7KZaPzwrr3chZoIayeWA==", "requires": { - "@sentry/bundler-plugin-core": "2.14.2", + "@sentry/bundler-plugin-core": "2.14.3", "unplugin": "1.0.1" + }, + "dependencies": { + "@sentry/babel-plugin-component-annotate": { + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.14.3.tgz", + "integrity": "sha512-h0ONVTe8j3Ma2g5SMsl9ynmLZdCf+CupLF7PQ7n06K0L8dDtrHqo8yjsWaZSJf4InGrJ9HC4MaOSItbFjiTFLw==" + }, + "@sentry/bundler-plugin-core": { + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.14.3.tgz", + "integrity": "sha512-iEtMdAPFUAYngvYhkfbgY8m3zB439u+5tvovj9rBXHGMr3nEB5fzZLOcVuiL47GEuUvMjDdrubl9MDGZ0c1IuQ==", + "requires": { + "@babel/core": "^7.18.5", + "@sentry/babel-plugin-component-annotate": "2.14.3", + "@sentry/cli": "^2.22.3", + "dotenv": "^16.3.1", + "find-up": "^5.0.0", + "glob": "^9.3.2", + "magic-string": "0.27.0", + "unplugin": "1.0.1" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + } + }, + "magic-string": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", + "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.13" + } + }, + "minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "@sentry/vite-plugin": { @@ -32076,11 +32647,15 @@ "dev": true }, "call-bind": { - "version": "1.0.5", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -33315,11 +33890,13 @@ } }, "define-data-property": { - "version": "1.1.1", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "requires": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" } }, "define-lazy-prop": { @@ -33553,6 +34130,19 @@ "entities": { "version": "2.2.0" }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-module-lexer": { "version": "1.4.1" }, @@ -33581,6 +34171,14 @@ "@esbuild/win32-arm64": "0.18.20", "@esbuild/win32-ia32": "0.18.20", "@esbuild/win32-x64": "0.18.20" + }, + "dependencies": { + "@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "optional": true + } } }, "esc-exit": { @@ -34266,9 +34864,9 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==" }, "npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "requires": { "path-key": "^4.0.0" } @@ -34764,8 +35362,11 @@ "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==" }, "get-intrinsic": { - "version": "1.2.2", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", @@ -34925,9 +35526,11 @@ "version": "3.0.0" }, "has-property-descriptors": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" } }, "has-proto": { @@ -40999,9 +41602,9 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==" }, "npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "requires": { "path-key": "^4.0.0" } @@ -42125,12 +42728,16 @@ "version": "2.0.0" }, "set-function-length": { - "version": "1.1.1", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "requires": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" } }, "setimmediate": { @@ -42707,9 +43314,9 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==" }, "npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "requires": { "path-key": "^4.0.0" } diff --git a/package.json b/package.json index c840824dc..c05317077 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "version": "npm run format && git add -A" }, "dependencies": { - "@bdelab/roam-fluency": "^1.10.4", + "@bdelab/roam-fluency": "^1.10.5", "@bdelab/roar-firekit": "^4.8.6", "@bdelab/roar-letter": "^1.6.7", "@bdelab/roar-multichoice": "^1.9.4", @@ -33,6 +33,7 @@ "@bdelab/roar-swr": "^1.8.4", "@bdelab/roar-utils": "^1.0.18", "@bdelab/roar-vocab": "^1.6.11", + "@esbuild/linux-x64": "^0.20.1", "@sentry/browser": "^7.103.0", "@sentry/integrations": "^7.103.0", "@sentry/vite-plugin": "^2.14.2", From a0780dba44be39eca2109b3ca6ada639c5128592 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 10:15:22 -0700 Subject: [PATCH 08/12] format and update fluency package --- .../default-tests/playFluency-ARF.cy.js | 6 +-- .../roam-fluency/playFluency-ARF-3G.cy.js | 2 +- .../playFluency-ARF-HighLatency.cy.js | 2 +- cypress/e2e/participant/playPA.cy.js | 43 ------------------- 4 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 cypress/e2e/participant/playPA.cy.js diff --git a/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js b/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js index bfdcea87e..d17c2dc35 100644 --- a/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js +++ b/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js @@ -14,7 +14,7 @@ describe('Test playthrough of Fluency as a participant', () => { cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.p-tabview').contains('ROAM - Fluency ARF'); + cy.get('.p-tabview').contains('ROAM - Single-Digit'); cy.visit(`/game/fluency-arf`); // Click jspsych button to begin @@ -28,8 +28,6 @@ describe('Test playthrough of Fluency as a participant', () => { cy.visit('/'); cy.wait(0.2 * timeout); cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.tabview-nav-link-label') - .contains('ROAM - Fluency ARF') - .should('have.attr', 'data-game-status', 'complete'); + cy.get('.tabview-nav-link-label').contains('ROAM - Fluency ARF').should('exist'); }); }); diff --git a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js index 6390a7003..9118006ce 100644 --- a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js +++ b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js @@ -11,7 +11,7 @@ describe('Test playthrough of Fluency as a participant', () => { cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.p-tabview', { timeout: timeout }).contains('ROAM - Fluency ARF'); + cy.get('.p-tabview', { timeout: timeout }).contains('ROAM - Single-Digit'); cy.visit(`/game/fluency-arf`); // Click jspsych button to begin diff --git a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js index a9c09107a..9ac0c5bc6 100644 --- a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js +++ b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js @@ -11,7 +11,7 @@ describe('Test playthrough of Fluency as a participant', () => { cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.p-tabview', { timeout: timeout }).contains('ROAM - Fluency ARF'); + cy.get('.p-tabview', { timeout: timeout }).contains('ROAM - Single-Digit'); cy.visit(`/game/fluency-arf`); // Click jspsych button to begin diff --git a/cypress/e2e/participant/playPA.cy.js b/cypress/e2e/participant/playPA.cy.js deleted file mode 100644 index edd9e5d3c..000000000 --- a/cypress/e2e/participant/playPA.cy.js +++ /dev/null @@ -1,43 +0,0 @@ -import { playPA } from '../../support/helperFunctions/roar-pa/paHelpers'; - -const timeout = Cypress.env('timeout'); -const startText = 'In this game we are going to look for words that BEGIN with the same sound.'; -const endBlockText = { - endText1: "Let's go help my friends now!", - endText2: 'We have one last friend to help!', - endText3: 'You have helped me and all my friends!', -}; -const breakBlockText = { - breakText1: "Great job! So many bananas! Let's get a few more!", - breakText2: 'Look at all those carrots!', - breakText3: "You are doing great! I am almost ready to go out and swim! Let's get a few more crabs.", -}; - -describe('Testing playthrough of ROAR-Phoneme as a participant', () => { - it(`ROAR-Phoneme Playthrough Test`, () => { - cy.login(Cypress.env('participantUsername'), Cypress.env('participantPassword')); - cy.visit('/'); - - cy.get('.p-dropdown-trigger', { timeout: 2 * timeout }).click(); - cy.get('.p-dropdown-item', { timeout: 2 * timeout }) - .contains(Cypress.env('testRoarAppsAdministration')) - .click(); - - // cy.get(".p-tabview").contains(pa.name); - cy.visit('/game/pa'); - - playPA(startText, endBlockText, breakBlockText); - - cy.visit('/'); - cy.get('.p-dropdown-trigger', { timeout: 2 * timeout }) - .should('be.visible') - .click(); - cy.get('.p-dropdown-item', { timeout: 2 * timeout }) - .contains(Cypress.env('testRoarAppsAdministration')) - .should('exist') - .click(); - cy.get('.tabview-nav-link-label', { timeout: 2 * timeout }) - .contains('ROAR-Phoneme') - .should('have.attr', 'data-game-status', 'complete'); - }); -}); From 1ad7bb2ed6b784c2ca8844b005dcb28845f13994 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 10:20:55 -0700 Subject: [PATCH 09/12] format and update fluency package --- src/pages/IndividualReport.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/IndividualReport.vue b/src/pages/IndividualReport.vue index 8952369ed..adabe3c3a 100644 --- a/src/pages/IndividualReport.vue +++ b/src/pages/IndividualReport.vue @@ -79,7 +79,7 @@ :expanded="expanded" /> -
+
@@ -228,19 +228,18 @@ const exportToPdf = async () => { } const supportGraphic = document.getElementById('support-graphic'); if (supportGraphic !== null) { - yCounter = await addElementToPdf(supportGraphic, doc, yCounter); + await addElementToPdf(supportGraphic, doc, yCounter); } doc.save(`IndividualScoreReport_${studentFirstName.value}${studentLastName.value}.pdf`), (exportLoading.value = false); - - return; }; const tasks = computed(() => taskData?.value?.map((assignment) => assignment.taskId)); const formattedTasks = computed(() => { return ( + // eslint-disable-next-line vue/no-side-effects-in-computed-properties tasks?.value .sort((a, b) => { if (Object.keys(taskDisplayNames).includes(a) && Object.keys(taskDisplayNames).includes(b)) { From e2f30e6b41a2ebed07db6df2e349e6bb538608f1 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 10:28:23 -0700 Subject: [PATCH 10/12] Format --- src/components/NavBar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 69b6da6d8..48e300c6a 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -144,6 +144,7 @@ const toggleMenu = (event) => { }; import ROARLogo from '@/assets/RoarLogo.vue'; +import LanguageSelector from './LanguageSelector.vue'; From 8c41ee13cdb2a7ec3e823f8e0b901c9b67fe8710 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 10:29:02 -0700 Subject: [PATCH 11/12] Format --- src/components/NavBar.vue | 4 ++-- src/pages/LEVANTE/RegisterUsers.vue | 1 - src/router/index.js | 2 +- src/router/sidebarActions.js | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 87508fb66..c0c2f914d 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -83,9 +83,9 @@ const isAtHome = computed(() => { const dropDownActions = computed(() => { const rawActions = getSidebarActions({ - isSuperAdmin: isSuperAdmin.value, + isSuperAdmin: isSuperAdmin.value, isAdmin: isAdmin.value, - includeHomeLink: !isAtHome.value + includeHomeLink: !isAtHome.value, }); return rawActions.map((action) => { return { diff --git a/src/pages/LEVANTE/RegisterUsers.vue b/src/pages/LEVANTE/RegisterUsers.vue index e95d387c0..caef1fb38 100644 --- a/src/pages/LEVANTE/RegisterUsers.vue +++ b/src/pages/LEVANTE/RegisterUsers.vue @@ -227,7 +227,6 @@ function getKeyByValue(object, value) { return Object.keys(object).find((key) => object[key] === value); } - async function submitUsers() { // Reset error users activeSubmit.value = true; diff --git a/src/router/index.js b/src/router/index.js index af1a15407..84bc7edd5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -325,7 +325,7 @@ const router = createRouter({ router.beforeEach(async (to) => { // Don't allow routing to LEVANTE pages if not in LEVANTE instance if (import.meta.env.MODE !== 'LEVANTE' && to.meta?.project === 'LEVANTE') { - return { path: "/"} + return { path: '/' }; } const store = useAuthStore(); diff --git a/src/router/sidebarActions.js b/src/router/sidebarActions.js index 2b8d1fb19..6a1b4bf6b 100644 --- a/src/router/sidebarActions.js +++ b/src/router/sidebarActions.js @@ -64,7 +64,7 @@ const sidebarActionOptions = [ }, ]; -export const getSidebarActions = ({isSuperAdmin = false, isAdmin = false, includeHomeLink = true}) => { +export const getSidebarActions = ({ isSuperAdmin = false, isAdmin = false, includeHomeLink = true }) => { if (import.meta.env.MODE === 'LEVANTE') { return sidebarActionOptions.filter((action) => { if (action.project === 'LEVANTE' || action.project === 'ALL') { From ffc7480e831e3d8bb0699fd9d12aad7dbdda57b9 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 11 Mar 2024 11:03:33 -0700 Subject: [PATCH 12/12] update fluency tests --- cypress/e2e/participant/default-tests/playFluency-ARF.cy.js | 2 +- .../network-tests/roam-fluency/playFluency-ARF-3G.cy.js | 5 ++--- .../roam-fluency/playFluency-ARF-HighLatency.cy.js | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js b/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js index d17c2dc35..bdbea210b 100644 --- a/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js +++ b/cypress/e2e/participant/default-tests/playFluency-ARF.cy.js @@ -28,6 +28,6 @@ describe('Test playthrough of Fluency as a participant', () => { cy.visit('/'); cy.wait(0.2 * timeout); cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.tabview-nav-link-label').contains('ROAM - Fluency ARF').should('exist'); + cy.get('.tabview-nav-link-label').contains('ROAM - Single-Digit').should('exist'); }); }); diff --git a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js index 9118006ce..bd395a901 100644 --- a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js +++ b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-3G.cy.js @@ -21,12 +21,11 @@ describe('Test playthrough of Fluency as a participant', () => { playFluency(endText); + // Check if game is marked as complete on the dashboard // Check if game is marked as complete on the dashboard cy.visit('/'); cy.wait(0.2 * timeout); cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.tabview-nav-link-label', { timeout: timeout }) - .contains('ROAM - Fluency ARF') - .should('have.attr', 'data-game-status', 'complete'); + cy.get('.tabview-nav-link-label').contains('ROAM - Single-Digit').should('exist'); }); }); diff --git a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js index 9ac0c5bc6..6475ff1e7 100644 --- a/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js +++ b/cypress/e2e/participant/network-tests/roam-fluency/playFluency-ARF-HighLatency.cy.js @@ -21,12 +21,11 @@ describe('Test playthrough of Fluency as a participant', () => { playFluency(endText); + // Check if game is marked as complete on the dashboard // Check if game is marked as complete on the dashboard cy.visit('/'); cy.wait(0.2 * timeout); cy.selectAdministration(Cypress.env('testRoarAppsAdministration')); - cy.get('.tabview-nav-link-label', { timeout: timeout }) - .contains('ROAM - Fluency ARF') - .should('have.attr', 'data-game-status', 'complete'); + cy.get('.tabview-nav-link-label').contains('ROAM - Single-Digit').should('exist'); }); });