markupr 2.1.8

package/scripts/one-click-clean-test.sh

@@ -0,0 +1,147 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT_DIR"
+
+RUN_MODE="foreground"
+DEV_MODE=0
+FULL_WIPE=0
+SKIP_CHECKS=0
+
+for arg in "$@"; do
+  case "$arg" in
+    --detached) RUN_MODE="detached" ;;
+    --dev) DEV_MODE=1 ;;
+    --full-wipe) FULL_WIPE=1 ;;
+    --skip-checks) SKIP_CHECKS=1 ;;
+    *)
+      echo "Unknown option: $arg"
+      echo "Usage: $0 [--dev] [--detached] [--full-wipe] [--skip-checks]"
+      exit 1
+      ;;
+  esac
+done
+
+echo "==> Stopping old markupr processes"
+PATTERNS=(
+  "markupr.app/Contents/MacOS/markupr"
+  "markupr.app/Contents/MacOS/FeedbackFlow"
+  "FeedbackFlow.app/Contents/MacOS/FeedbackFlow"
+  "electron-vite dev"
+  "dist/main/index.mjs"
+)
+
+for pattern in "${PATTERNS[@]}"; do
+  pkill -f "$pattern" 2>/dev/null || true
+done
+
+sleep 1
+
+for pattern in "${PATTERNS[@]}"; do
+  if pgrep -f "$pattern" >/dev/null 2>&1; then
+    echo "force killing remaining process pattern: $pattern"
+    pkill -9 -f "$pattern" 2>/dev/null || true
+  fi
+done
+
+sleep 1
+
+echo "==> Removing previous installed artifacts"
+TARGETS=(
+  "/Applications/markupr.app"
+  "/Applications/FeedbackFlow.app"
+  "$HOME/Applications/markupr.app"
+  "$HOME/Applications/FeedbackFlow.app"
+  "$HOME/Library/Preferences/com.eddiesanjuan.markupr.plist"
+  "$HOME/Library/Preferences/com.markupr.app.plist"
+  "$HOME/Library/Preferences/com.eddiesanjuan.feedbackflow.plist"
+  "$HOME/Library/Preferences/com.feedbackflow.app.plist"
+  "$HOME/Library/Caches/com.eddiesanjuan.markupr"
+  "$HOME/Library/Caches/com.markupr.app"
+  "$HOME/Library/Caches/com.eddiesanjuan.feedbackflow"
+  "$HOME/Library/Caches/com.feedbackflow.app"
+  "$HOME/Library/Saved Application State/com.eddiesanjuan.markupr.savedState"
+  "$HOME/Library/Saved Application State/com.eddiesanjuan.feedbackflow.savedState"
+)
+
+if [[ "$FULL_WIPE" -eq 1 ]]; then
+  TARGETS+=(
+    "$HOME/Library/Application Support/feedbackflow"
+    "$HOME/Library/Application Support/markupr"
+    "$HOME/Library/Logs/feedbackflow"
+    "$HOME/Library/Logs/markupr"
+  )
+fi
+
+for target in "${TARGETS[@]}"; do
+  if [[ -e "$target" ]]; then
+    rm -rf "$target" || true
+    echo "removed: $target"
+  else
+    echo "absent:  $target"
+  fi
+done
+
+if [[ "$SKIP_CHECKS" -eq 0 ]]; then
+  echo "==> Running validation"
+  ./scripts/manual-polish-test.sh --checks-only
+fi
+
+if [[ "$DEV_MODE" -eq 1 ]]; then
+  if [[ "$RUN_MODE" == "foreground" ]]; then
+    echo "==> Launching markupr (dev) in foreground"
+    npm run dev
+    exit 0
+  fi
+
+  echo "==> Launching markupr (dev) in detached mode"
+  mkdir -p "$HOME/Library/Logs/markupr"
+  LOG_FILE="$HOME/Library/Logs/markupr/dev-run.log"
+  : > "$LOG_FILE"
+
+  nohup npm run dev >"$LOG_FILE" 2>&1 &
+  PID=$!
+  sleep 2
+
+  if ps -p "$PID" >/dev/null 2>&1; then
+    echo "Launched successfully (PID: $PID)"
+    echo "Log file: $LOG_FILE"
+  else
+    echo "Launch failed. Check log file: $LOG_FILE"
+    exit 1
+  fi
+
+  exit 0
+fi
+
+echo "==> Building production app"
+npm run build
+npx electron-builder --mac --arm64 --dir --config electron-builder.yml
+
+APP_SRC=""
+if [[ -d "$ROOT_DIR/release/mac-arm64/markupr.app" ]]; then
+  APP_SRC="$ROOT_DIR/release/mac-arm64/markupr.app"
+elif [[ -d "$ROOT_DIR/release/mac-arm64" ]]; then
+  APP_SRC="$(find "$ROOT_DIR/release/mac-arm64" -maxdepth 1 -type d -name '*.app' | head -n 1)"
+fi
+
+if [[ -z "$APP_SRC" ]]; then
+  APP_SRC="$(find "$ROOT_DIR/release" -maxdepth 3 -type d -name '*.app' | sort -r | head -n 1)"
+fi
+
+if [[ -z "$APP_SRC" ]]; then
+  echo "Build succeeded but no .app bundle was found in release/"
+  exit 1
+fi
+
+APP_DEST="/Applications/markupr.app"
+echo "==> Installing fresh app bundle"
+rm -rf "$APP_DEST"
+cp -R "$APP_SRC" "$APP_DEST"
+xattr -dr com.apple.quarantine "$APP_DEST" 2>/dev/null || true
+
+echo "==> Launching installed app"
+open -na "$APP_DEST"
+echo "Launched: $APP_DEST"
+echo "Tip: run with --full-wipe only when you explicitly want to clear downloaded models/data."

package/scripts/postinstall.mjs

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+
+function isRailwayEnvironment() {
+  return Object.keys(process.env).some((key) => key.startsWith('RAILWAY_'));
+}
+
+function run(command, args) {
+  const commandLabel = [command, ...args].join(' ');
+  console.log(`[postinstall] Running: ${commandLabel}`);
+
+  const result = spawnSync(command, args, {
+    stdio: 'inherit',
+    env: process.env,
+    shell: process.platform === 'win32',
+  });
+
+  if (result.error) {
+    console.error(`[postinstall] Failed to execute "${commandLabel}":`, result.error);
+    process.exit(1);
+  }
+
+  if (result.status !== 0) {
+    console.error(`[postinstall] Command failed: ${commandLabel} (exit ${result.status ?? 1})`);
+    process.exit(result.status ?? 1);
+  }
+}
+
+if (process.env.MARKUPR_SKIP_ELECTRON_POSTINSTALL === '1' || isRailwayEnvironment()) {
+  console.log('[postinstall] Skipping Electron native rebuild in Railway/skip mode.');
+  process.exit(0);
+}
+
+run('npx', ['electron-builder', 'install-app-deps']);
+run('npx', ['electron-rebuild']);

package/scripts/setup-markupr.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT_DIR"
+
+SKIP_INSTALL=0
+SKIP_CHECKS=0
+
+for arg in "$@"; do
+  case "$arg" in
+    --skip-install)
+      SKIP_INSTALL=1
+      ;;
+    --skip-checks)
+      SKIP_CHECKS=1
+      ;;
+    *)
+      echo "Unknown option: $arg"
+      echo "Usage: scripts/setup-markupr.sh [--skip-install] [--skip-checks]"
+      exit 1
+      ;;
+  esac
+done
+
+if ! command -v node >/dev/null 2>&1; then
+  echo "Node.js is required (>=18)."
+  exit 1
+fi
+
+NODE_MAJOR="$(node -p "process.versions.node.split('.')[0]")"
+if [[ "$NODE_MAJOR" -lt 18 ]]; then
+  echo "Node.js 18+ is required. Detected: $(node -v)"
+  exit 1
+fi
+
+if [[ "$SKIP_INSTALL" -eq 0 ]]; then
+  if [[ -d node_modules ]]; then
+    echo "Dependencies already present. Skipping install."
+  else
+    echo "Installing dependencies..."
+    npm install
+  fi
+fi
+
+if [[ "$SKIP_CHECKS" -eq 0 ]]; then
+  echo "Running typecheck..."
+  npm run typecheck
+fi
+
+echo
+echo "markupr setup complete."
+echo "Next:"
+echo "  1) npm run dev"
+echo "  2) ./scripts/one-click-clean-test.sh --skip-checks"

package/setup

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+COMMAND="${1:-}"
+shift || true
+
+case "$COMMAND" in
+  markupr)
+    exec "$ROOT_DIR/scripts/setup-markupr.sh" "$@"
+    ;;
+  *)
+    echo "Usage: ./setup markupr [--skip-install] [--skip-checks]"
+    exit 1
+    ;;
+esac