Merge remote-tracking branch 'upstream/master' into fix/upgrade-jquery

# Conflicts:
#	.github/workflows/po-to-json-validation.yml
#	index.html

Author: the-shreyash

.eslintignore

@@ -6,3 +6,6 @@
 *.md text eol=lf
 *.yml text eol=lf
 *.yaml text eol=lf
+# Mark locale files as generated - hides them from PR diffs by default
+# These files are auto-generated from PO files via convert_po_to_json.py
+locales/*.json linguist-generated=true

.eslintrc.json

@@ -1,47 +1,48 @@
 name: ESLint
 
 on:
-  pull_request:
-    branches: [master]
+    pull_request:
+        branches: [master]
 
 jobs:
-  lint:
-    name: Lint updated JavaScript files with ESLint
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
-
-      - name: Get changed JavaScript files
-        id: get_files
-        run: |
-          CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} -- '*.js')
-          echo "files<<EOF" >> $GITHUB_ENV
-          echo "$CHANGED_FILES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run ESLint on changed files
-        if: env.files != ''
-        run: |
-          echo "Linting the following files:"
-          echo "$files"
-          echo "$files" | xargs npx eslint
-      - name: Run Prettier check on changed files
-        if: env.files != ''
-        run: |
-          echo "Checking formatting for the following files:"
-          echo "$files"
-          echo "$files" | xargs npx prettier --check
+    lint:
+        name: Lint updated JavaScript files with ESLint
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+                  ref: ${{ github.event.pull_request.head.sha }}
+
+            - name: Set up Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20.x
+                  cache: "npm"
+
+            - name: Get changed JavaScript files
+              id: get_files
+              run: |
+                  CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} -- '*.js')
+                  echo "files<<EOF" >> $GITHUB_ENV
+                  echo "$CHANGED_FILES" >> $GITHUB_ENV
+                  echo "EOF" >> $GITHUB_ENV
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Run ESLint on changed files
+              if: env.files != ''
+              run: |
+                  echo "Linting the following files:"
+                  echo "$files"
+                  echo "$files" | xargs npx eslint
+            - name: Run Prettier check on changed files
+              if: env.files != ''
+              run: |
+                  echo "Checking formatting for the following files:"
+                  echo "$files"
+                  echo "$files" | xargs npx prettier --check

.gitattributes

@@ -15,7 +15,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [18.x, 20.x]
+                node-version: [20.x, 22.x]
 
         steps:
             - name: Checkout code

.github/workflows/linter.yml

@@ -1,12 +1,12 @@
-name: Auto-convert PO to JSON and commit
+name: Convert PO to JSON and verify changes
 
 on:
   push:
     paths:
       - 'po/**/*.po'
 
 jobs:
-  convert-and-commit:
+  convert-and-verify:
     runs-on: ubuntu-latest
 
     steps:
@@ -30,7 +30,7 @@ jobs:
           echo "$(cat changed_po_files.txt)" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Run conversion script
+      - name: Convert PO files to JSON
         if: steps.find_po.outputs.po_files != ''
         run: |
           mkdir -p locales
@@ -39,18 +39,13 @@ jobs:
             python3 convert_po_to_json.py "$po_file" "locales"
           done < changed_po_files.txt
 
-      - name: Commit and push updated JSON
+      - name: Verify JSON conversion changes
         if: steps.find_po.outputs.po_files != ''
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          
-          git add locales/*.json
-
-          if git diff --cached --quiet; then
-            echo "✅ No JSON changes to commit."
+          if ! git diff --quiet locales/; then
+            echo "❌ Generated translation JSON files have changes that need to be committed."
+            echo "Please run the PO-to-JSON conversion locally and commit the generated files in locales/."
+            exit 1
           else
-            git commit -m "chore(i18n): auto-update JSON files from updated PO files"
-            git push origin ${{ github.ref }}
-            echo "🚀 Pushed updated JSON files."
+            echo "✅ Translation JSON files are verified and up to date."
           fi

.github/workflows/node.js.yml

@@ -0,0 +1,43 @@
+name: E2E Test
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches:
+      - master
+
+jobs:
+  e2e:
+    name: Run Cypress E2E Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Run Cypress E2E Tests
+        uses: cypress-io/github-action@v6
+        with:
+          install-command: npm ci
+          start: npm start
+          wait-on: 'http://127.0.0.1:3000'
+          wait-on-timeout: 120
+          browser: chrome
+          config: video=false
+
+      - name: Upload Cypress Screenshots on Failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cypress-screenshots
+          path: cypress/screenshots
+          if-no-files-found: ignore

…thub/workflows/po-to-json-autocommit.yml …thub/workflows/po-to-json-validation.yml.github/workflows/po-to-json-autocommit.yml renamed to .github/workflows/po-to-json-validation.yml .github/workflows/po-to-json-autocommit.yml renamed to .github/workflows/po-to-json-validation.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install Dependencies
         run: npm install

.github/workflows/pr-cypress-e2e.yml

@@ -3,6 +3,9 @@ node_modules/
 coverage/
 .DS_Store
 **/.DS_Store
+Docs/architecture/dependency-analysis-report.json
+Docs/architecture/dev_architecture.html
+!Docs/architecture/*.svg
 
 # Lighthouse CI
-.lighthouseci/
+.lighthouseci/