resolved merge conflicts

Author: sphurthy

.github/workflows/deploy.yml

@@ -62,4 +62,4 @@ jobs:
           domain: ${{ vars.SURGE_DOMAIN }}
           project: './build'
           login: ${{ secrets.SURGE_LOGIN }}
-          token: ${{ secrets.SURGE_TOKEN }}
+          token: ${{ secrets.SURGE_TOKEN }}

.github/workflows/pull_request_test.yml

@@ -53,6 +53,6 @@ jobs:
     - name: Install Dependencies
       run: yarn install --frozen-lockfile
     - name: Run Unit Tests for Changed Files Only
-      run: yarn run test:changed
+      run: NODE_OPTIONS="--max-old-space-size=4096" yarn run test:changed
     - name: Run Lint
-      run: yarn run lint
+      run: yarn run lint

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
         run: yarn install
 
       - name: Run tests
-        run: yarn test
+        run: NODE_OPTIONS="--max-old-space-size=4096" yarn test
 
       - name: Upload test results
         if: failure()

.gitignore

@@ -2,7 +2,6 @@
 
 # dependencies
 /node_modules
-package-lock.json
 # testing
 /coverage
 *.code-snippets
@@ -31,4 +30,6 @@ yarn-error.log*
 
 **\ **
 
-/public/tinymce/
+/public/tinymce/Community/
+Community/
+public/tinymce/

.husky-disabled/pre-commit

@@ -7,11 +7,14 @@ if [ -f .nvmrc ]; then
   nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
 fi
 
-. "$(dirname "$0")/_/husky.sh"
-
 echo ""
 echo "🛡️  Husky pre-commit hook triggered"
 
+if git rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1; then
+  echo "ℹ️  Merge commit detected. Skipping lint-staged auto-fix on the merged file set."
+  exit 0
+fi
+
 # Block plain .css files (except .module.css and index.css)
 for file in $(git diff --cached --name-only --diff-filter=ACM | grep '\.css$'); do
   case "$file" in
@@ -42,4 +45,4 @@ if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx|css)$'; then
   fi
 else
   echo "ℹ️  No JS/TS/CSS files to lint. Skipping lint-staged."
-fi
+fi

.husky/pre-commit

@@ -3,24 +3,71 @@
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 # Use Node 20 if available (or install if needed)
-if [ -f .nvmrc ]; then
+if command -v nvm >/dev/null 2>&1 && [ -f .nvmrc ]; then
   nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
 fi
 
-. "$(dirname "$0")/_/husky.sh"
+if git rev-parse --abbrev-ref @{upstream} >/dev/null 2>&1; then
+  changed_files=$(git diff --name-only --diff-filter=d @{upstream}...HEAD)
+else
+  echo "ℹ️  No upstream branch set. Skipping pre-push checks."
+  exit 0
+fi
+
+# Skip checks if any outgoing commit is a merge commit
+if git log @{upstream}..HEAD --merges --oneline | grep -q .; then
+  echo "ℹ️  Outgoing commits include a merge commit. Skipping lint/test checks."
+  exit 0
+fi
+
+if [ -z "$changed_files" ]; then
+  echo "ℹ️  No outgoing changes to validate. Skipping pre-push checks."
+  exit 0
+fi
+
+# Skip checks if any outgoing commit is a merge commit
+if git log @{upstream}..HEAD --merges --oneline | grep -q .; then
+  echo "ℹ️  Outgoing commits include a merge commit. Skipping lint/test checks."
+  exit 0
+fi
+
+if ! printf '%s\n' "$changed_files" | grep -qvE '^\.husky/'; then
+  echo "ℹ️  Only Husky hook changes detected. Skipping full test and lint checks."
+  exit 0
+fi
+
+existing_files=$(printf '%s\n' "$changed_files" | while IFS= read -r f; do
+  [ -n "$f" ] && [ -e "$f" ] && printf '%s\n' "$f"
+done)
+
+js_files=$(printf '%s\n' "$existing_files" | grep -E '\.(js|jsx|ts|tsx)$' || true)
+style_files=$(printf '%s\n' "$existing_files" | grep -E '\.(css|scss|sass)$' || true)
+
+test_status=0
+lint_status=0
+style_status=0
 
-echo "🧪 Running tests before push..."
-npm run test -- --bail=1
-test_status=$?
+if [ -n "$js_files" ]; then
+  echo "🧪 Running related tests before push..."
+  echo "$js_files" | tr ' ' '\n' | xargs npx vitest related --run
+  test_status=$?
+
+  echo "🧹 Running ESLint on changed files before push..."
+  echo "$js_files" | tr ' ' '\n' | xargs npx eslint
+  lint_status=$?
+fi
+
+if [ -n "$style_files" ]; then
+  echo "🎨 Running Stylelint on changed files before push..."
+  echo "$style_files" | tr ' ' '\n' | xargs npx stylelint
+  style_status=$?
+fi
 
-echo "🧹 Running lint before push..."
-npm run lint
-lint_status=$?
 
 # Block push if either fails
-if [ $test_status -ne 0 ] || [ $lint_status -ne 0 ]; then
-  echo "❌ Push blocked: Lint or test failed."
+if [ $test_status -ne 0 ] || [ $lint_status -ne 0 ] || [ $style_status -ne 0 ]; then
+  echo "❌ Push blocked: changed-file validation failed."
   exit 1
 fi
 
-echo "✅ All checks passed. Proceeding with push..."
+echo "✅ All checks passed. Proceeding with push..."

.husky/pre-push

@@ -1,7 +1,6 @@
 *.png
 *.svg
 src/actions/**
-src/App.css
 src/config.json
 
 src/languages/**

.prettierignore

@@ -1,10 +1,27 @@
-{
-  "ignoreFiles": [
-    "build/**/*.css",
-    "public/**/*.css",
-    "node_modules/**/*.css"
-  ],
-  "rules": {
-    "no-duplicate-selectors": true
-  }
+{
+  "extends": ["stylelint-config-standard"],
+  "ignoreFiles": [
+    "build/**/*.css",
+    "public/**/*.css",
+    "node_modules/**/*.css"
+  ],
+  "rules": {
+    "no-duplicate-selectors": [true, {
+      "disallowInList": false
+    }],
+    "selector-pseudo-class-no-unknown": [
+      true,
+      { "ignorePseudoClasses": ["global", "local"] }
+    ],
+    "selector-class-pattern": null,
+    "selector-id-pattern": null
+  },
+  "overrides": [
+    {
+      "files": ["**/*.module.css"],
+      "rules": {
+        "no-duplicate-selectors": null
+      }
+    }
+  ]
 }

.stylelintrc

@@ -0,0 +1,2 @@
+# Avoid stale persisted package tarballs in CI/Netlify.
+cache-folder "/tmp/hgn-yarn-cache"