diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 76e81a9..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "web/vendor/foliate-js"] - path = web/vendor/foliate-js - url = git@github.com:john-okeefe/foliate-js.git diff --git a/package.json b/package.json index c876690..2a6c3da 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "pdfjs-dist": "^5.6.205", "@techstark/opencv-js": "^4.12.0-release.1", "@tensorflow/tfjs": "^4.22.0", - "@tensorflow-models/coco-ssd": "^2.2.3" + "@tensorflow-models/coco-ssd": "^2.2.3", + "@bookhoard/foliate-js": "github:john-okeefe/foliate-js#bookhoard-panel-detection" }, "devDependencies": { "@tailwindcss/forms": "^0.5.11", diff --git a/scripts/setup-git-hooks.sh b/scripts/setup-git-hooks.sh deleted file mode 100755 index 1c587fa..0000000 --- a/scripts/setup-git-hooks.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# One-time setup for git hooks on this machine -echo "🔒 Installing pre-push safety hook to prevent pushing with uncommitted submodule changes..." -# Create hooks directory -mkdir -p .git/hooks -# Create pre-push hook -cat >.git/hooks/pre-push <<'EOF' -#!/bin/bash -# Prevent pushing if submodules have uncommitted changes -uncommitted=$(git submodule foreach --quiet 'if [ "$(git status --porcelain)" != "" ]; then echo $name; fi') -if [ -n "$uncommitted" ]; then - echo "❌ ERROR: Submodules have uncommitted changes:" - echo "$uncommitted" - echo "Commit submodules first (or use git sc-commit)" - exit 1 -fi -EOF -# Make hook executable -chmod +x .git/hooks/pre-push -# Add git alias for submodule commit -git config --global alias.sc-commit '!sh -c "git submodule foreach \"git add -A && git commit -m \\\"$1\\\" && git push\"" -' -echo "✅ Git hooks and alias installed!" -echo " - Pre-push hook: Checks for uncommitted submodule changes" -echo " - Alias: 'git sc-commit' to commit and push all submodules" diff --git a/vite.config.ts b/vite.config.ts index 5a9d364..c951ac5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -3,7 +3,7 @@ export default defineConfig({ resolve: { alias: { "@": "/web/src", - "foliate-js": "/web/vendor/foliate-js", + "foliate-js": "/node_modules/@bookhoard/foliate-js", // Updated path }, }, base: "/static/", diff --git a/web/vendor/foliate-js b/web/vendor/foliate-js deleted file mode 160000 index 9a9dcce..0000000 --- a/web/vendor/foliate-js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a9dccebb1369a521e978158791f8d4a8201014b