Merge upstream/main into main: adopt screen recording features, fix ReactMarkdown image prefix and required asterisk, keep local study configs in global.json, preserve slider label text; regenerate yarn.lock

Author: AbrarNad

.github/workflows/release.yaml

@@ -7,9 +7,14 @@ on:
 
 jobs:
   release:
-    if: github.event.pull_request.merged
+    if: github.event.pull_request.merged && startsWith(github.event.pull_request.title, 'v')
     runs-on: ubuntu-latest
     steps:
+      - name: Ensure PR title matches vx.x.x
+        run: |
+          [[ "${{ github.event.pull_request.title }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]
+        shell: bash
+
       - uses: actions/checkout@v3
         with:
           token: ${{ secrets.PAT }}

eslint.config.js

@@ -40,7 +40,7 @@ export default [{
     },
 
     parser: tsParser,
-    ecmaVersion: 2022,
+    ecmaVersion: 'latest',
     sourceType: 'module',
   },
 

libraryDocGenerator.cjs

@@ -56,7 +56,8 @@ ${libraryConfig.additionalDescription ? `## Additional Description\n\n${libraryC
 const librariesPath = path.join(__dirname, './public/libraries');
 const docsLibrariesPath = path.join(__dirname, './docsLibraries');
 
-const libraries = fs.readdirSync(librariesPath);
+const libraries = fs.readdirSync(librariesPath)
+  .filter(library => !library.startsWith('.') && !library.endsWith('.DS_Store'));
 
 if (!fs.existsSync(docsLibrariesPath)) {
   fs.mkdirSync(docsLibrariesPath);

libraryExampleStudyGenerator.cjs

@@ -15,6 +15,7 @@ const { exec } = require('child_process');
 const librariesPath = path.join(__dirname, './public/libraries');
 const publicPath = path.join(__dirname, './public');
 
+
 // Create example study config template
 const createExampleConfig = (libraryName) => ({
   $schema: 'https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json',
@@ -49,10 +50,16 @@ const createExampleConfig = (libraryName) => ({
 });
 
 // Process each library
-const libraries = fs.readdirSync(librariesPath);
+const libraries = fs.readdirSync(librariesPath)
+  .filter(library => !library.startsWith('.') && !library.endsWith('.DS_Store'));
+
 libraries.forEach((library) => {
   // Skip hidden folders and files, and libraries in skip list
-  if (library.startsWith('.')) return;
+  if (library.startsWith('.')) {
+    // eslint-disable-next-line no-console
+    console.log(`Skipping ${library} library`);
+    return;
+  }
 
   const exampleFolderName = `library-${library}`;
   const examplePath = path.join(publicPath, exampleFolderName);
@@ -69,14 +76,15 @@ libraries.forEach((library) => {
     fs.mkdirSync(assetsPath);
     // eslint-disable-next-line no-console
     console.log(`Created ${exampleFolderName}/assets directory`);
+
+    // Create config.json
+    const configPath = path.join(examplePath, 'config.json');
+    const configContent = createExampleConfig(library);
+    fs.writeFileSync(configPath, JSON.stringify(configContent, null, 2));
+    // eslint-disable-next-line no-console
+    console.log(`Created/Updated ${exampleFolderName}/config.json`);
   }
 
-  // Create config.json
-  const configPath = path.join(examplePath, 'config.json');
-  const configContent = createExampleConfig(library);
-  fs.writeFileSync(configPath, JSON.stringify(configContent, null, 2));
-  // eslint-disable-next-line no-console
-  console.log(`Created/Updated ${exampleFolderName}/config.json`);
 });
 
 // eslint-disable-next-line no-console

package.json

@@ -27,24 +27,25 @@
     "@mantine/modals": "^7.10.1",
     "@mantine/notifications": "^7.12.0",
     "@quentinroy/latin-square": "^1.1.1",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@supabase/supabase-js": "^2.50.3",
-    "@tabler/icons-react": "^3.28.1",
+    "@reduxjs/toolkit": "^2.9.0",
+    "@supabase/supabase-js": "^2.57.4",
+    "@tabler/icons-react": "^3.35.0",
     "@trrack/core": "^1.3.0",
     "@trrack/vis-react": "^1.5.0",
     "@types/crypto-js": "^4.2.2",
     "@types/hjson": "^2.4.6",
-    "@types/lodash": "^4.17.14",
-    "@types/node": "^22.10.7",
-    "@visdesignlab/upset2-react": "^1.0.0-rc6",
+    "@types/lodash": "^4.17.20",
+    "@types/node": "^24.5.2",
+    "@visdesignlab/upset2-react": "^1.0.0",
     "ajv": "^8.17.1",
     "arquero": "^5.4.0",
     "crypto-js": "^4.2.0",
     "d3": "^7.9.0",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.18",
     "eslint-config-airbnb": "^19.0.4",
     "firebase": "^11.2.0",
     "hjson": "^3.2.2",
+    "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2",
@@ -55,46 +56,46 @@
     "react-dom": "^18.3.1",
     "react-markdown": "^9.0.3",
     "react-redux": "^9.2.0",
-    "react-router": "^7.5.2",
+    "react-router": "^7.9.1",
     "react-timer-hook": "^3.0.8",
     "react-vega": "^7.6.0",
     "rehype-raw": "^7.0.0",
-    "remark-gfm": "^4.0.1",
-    "seedrandom": "^3.0.5",
-    "ts-json-schema-generator": "^2.3.0",
-    "typedoc": "^0.27.6",
-    "typedoc-plugin-frontmatter": "^1.1.2",
-    "typedoc-plugin-markdown": "^4.4.1",
+  "remark-gfm": "^4.0.1",
+  "seedrandom": "^3.0.5",
+  "ts-json-schema-generator": "^2.4.0",
+  "typedoc": "^0.28.13",
+  "typedoc-plugin-frontmatter": "^1.3.0",
+  "typedoc-plugin-markdown": "^4.9.0",
     "use-deep-compare-effect": "^1.8.1",
     "uuid": "^11.0.5",
     "vega": "^5.32.0",
     "vega-lite": "^5.23.0",
+    "vite": "^7.1.6",
     "wavesurfer-react": "^3.0.4",
-    "wavesurfer.js": "^7.8.16",
-    "yaml": "^2.8.0"
+    "wavesurfer.js": "^7.10.1",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.5",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.18.0",
-    "@playwright/test": "^1.49.1",
+    "@eslint/compat": "^1.3.2",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.36.0",
+    "@playwright/test": "^1.55.0",
     "@types/d3": "^7.4.0",
-    "@types/react": "^19.0.7",
-    "@types/react-dom": "^19.0.3",
-    "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
-    "@vitejs/plugin-react-swc": "^3.7.2",
-    "eslint": "^9.18.0",
-    "eslint-plugin-import": "^2.31.0",
+    "@types/react": "^19.1.13",
+    "@types/react-dom": "^19.1.9",
+    "@types/uuid": "^11.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.0",
+    "@typescript-eslint/parser": "^8.44.0",
+    "@vitejs/plugin-react-swc": "^4.1.0",
+    "eslint": "^9.36.0",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-react": "^7.37.4",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "globals": "^15.14.0",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "globals": "^16.4.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.4.1",
-    "typescript": "^5.7.3",
-    "vite": "^6.2.7",
+    "lint-staged": "^16.1.6",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4",
     "vitest-localstorage-mock": "^0.1.2"
   }

public/demo-click-accuracy-test/config.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v2.2.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "Dynamic React Stimuli and Provenance Tracking",
     "version": "pilot",

public/demo-dynamic/config.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v2.2.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
       "title": "Dynamic Blocks",
       "version": "pilot",

public/demo-html-input/config.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v2.2.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "Passing Data from reVISit to HTML and back",
     "version": "pilot",

public/demo-html-trrack/config.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v2.2.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "HTML with Trrack library",
     "version": "pilot",

public/demo-html/config.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/dev/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v2.2.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "HTML as a Stimulus",
     "version": "pilot",
@@ -21,7 +21,9 @@
     "withProgressBar": true,
     "autoDownloadStudy": false,
     "withSidebar": true,
-    "windowEventDebounceTime": 200
+    "windowEventDebounceTime": 200,
+    "minHeightSize": 800,
+    "minWidthSize": 400
   },
   "components": {
     "introduction": {