Skip to content

Commit

Permalink
Revert "feat: hmr for windows"
Browse files Browse the repository at this point in the history
This reverts commit ad9e570.
  • Loading branch information
Topvennie committed Mar 23, 2024
1 parent ad9e570 commit 4ddee95
Show file tree
Hide file tree
Showing 7 changed files with 1,225 additions and 693 deletions.
3 changes: 0 additions & 3 deletions .dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ DJANGO_CAS_PORT=8080 # Port for the CAS server. Should be 8080 if DJANGO_DOMAIN_
DJANGO_DB_ENGINE=django.db.backends.sqlite3 # Database engine
DJANGO_REDIS_HOST=${REDIS_IP} # Redis configuration
DJANGO_REDIS_PORT=${REDIS_PORT}

# Vite & Vue
FRONTEND_CMD="" # Command to start the frontend server
14 changes: 2 additions & 12 deletions development.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,21 @@

backend=false
frontend=false
windows_hmr=false
build=false

while getopts ":bfcw" opt; do
while getopts ":bfc" opt; do
case ${opt} in
b )
backend=true
;;
f )
frontend=true
;;
w )
windows_hmr=true
;;
c )
build=true
;;
\? )
echo "Usage: $0 [-b] [-f] [-w] [-c]"
echo "Usage: $0 [-b] [-f] [-c]"
exit 1
;;
esac
Expand All @@ -38,12 +34,6 @@ if ! [ -f .env ]; then
echo "Created environment file"
fi

if [ "$windows_hmr" = true ]; then
sed -i "s/^FRONTEND_CMD=.*/FRONTEND_CMD=\"npm run watch\"/" .env
else
sed -i "s/^FRONTEND_CMD=.*/FRONTEND_CMD=\"npm run host\"/" .env
fi

echo "Checking for existing SSL certificates..."

if [ ! -f "data/nginx/ssl/private.key" ] || [ ! -f "data/nginx/ssl/certificate.crt" ]; then
Expand Down
2 changes: 1 addition & 1 deletion development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ services:
build:
context: $FRONTEND_DIR
dockerfile: Dockerfile.dev
command: bash -c "npm install && ${FRONTEND_CMD}"
command: bash -c "npm install && npm run host"
expose:
- 5173
volumes:
Expand Down
Loading

0 comments on commit 4ddee95

Please sign in to comment.