From 207d6606c7fa622ea2829f25e46c5cdbe6d03dff Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 15 Jul 2022 20:41:16 +0000 Subject: [PATCH] chore: create separate run config for vite dev --- .vscode/launch.json | 34 ++++++++++++++++++++++++--- .vscode/tasks.json | 33 ++++++++++++++++++++++++-- docker/configs/settings_local.py | 2 -- docker/configs/settings_local_vite.py | 6 +++++ docker/scripts/app-init.sh | 11 +++++++++ ietf/.gitignore | 1 + vite.config.js | 5 +--- 7 files changed, 81 insertions(+), 11 deletions(-) create mode 100644 docker/configs/settings_local_vite.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 8176b43958..8dfc1b9b7a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,7 +15,30 @@ "0.0.0.0:8000", "--settings=settings_local" ], - "django": true + "django": true, + "presentation": { + "hidden": false, + "group": "main", + "order": 1 + } + }, + { + "name": "Run Server in Vite Dev Mode", + "type": "python", + "request": "launch", + "python": "/usr/local/bin/python", + "program": "${workspaceFolder}/ietf/manage.py", + "args": [ + "runserver", + "0.0.0.0:8000", + "--settings=settings_local_vite" + ], + "django": true, + "presentation": { + "hidden": false, + "group": "main", + "order": 1 + } }, { "name": "Run Server with Debug Toolbar", @@ -28,7 +51,12 @@ "0.0.0.0:8000", "--settings=settings_local_debug" ], - "django": true + "django": true, + "presentation": { + "hidden": false, + "group": "main", + "order": 1 + } } ] -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 70f6bc4a23..5490af335c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -69,7 +69,7 @@ "${workspaceFolder}/ietf/manage.py", "test", "--settings=settings_local_sqlitetest", - "--pattern=tests_js.py", + "--pattern=tests_js.py" ], "group": "test", "presentation": { @@ -103,7 +103,14 @@ "label": "Run SMTP Debugging Server", "type": "shell", "command": "/usr/local/bin/python", - "args": ["-m", "smtpd", "-n", "-c", "DebuggingServer", "localhost:2025"], + "args": [ + "-m", + "smtpd", + "-n", + "-c", + "DebuggingServer", + "localhost:2025" + ], "presentation": { "echo": true, "reveal": "always", @@ -165,6 +172,28 @@ "clear": false }, "problemMatcher": [] + }, + { + "label": "Run Vite Dev Server", + "type": "shell", + "command": "yarn", + "args": [ + "dev" + ], + "isBackground": true, + "presentation": { + "group": "main", + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": false, + "clear": false + }, + "runOptions": { + "instanceLimit": 1 + }, + "problemMatcher": [] } ] } diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py index 67d8f3e09b..2b3d541387 100644 --- a/docker/configs/settings_local.py +++ b/docker/configs/settings_local.py @@ -74,5 +74,3 @@ SLIDE_STAGING_PATH = 'test/staging/' DE_GFM_BINARY = '/usr/local/bin/de-gfm' - -DJANGO_VITE_DEV_MODE = True diff --git a/docker/configs/settings_local_vite.py b/docker/configs/settings_local_vite.py new file mode 100644 index 0000000000..7fb12a003d --- /dev/null +++ b/docker/configs/settings_local_vite.py @@ -0,0 +1,6 @@ +# Copyright The IETF Trust 2007-2019, All Rights Reserved +# -*- coding: utf-8 -*- + +from ietf.settings_local import * # pyflakes:ignore + +DJANGO_VITE_DEV_MODE = True diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh index 7bb88da09d..aa53a8dfdb 100755 --- a/docker/scripts/app-init.sh +++ b/docker/scripts/app-init.sh @@ -59,6 +59,17 @@ else fi fi +if [ ! -f "$WORKSPACEDIR/ietf/settings_local_vite.py" ]; then + echo "Setting up a default settings_local_vite.py ..." + cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py +else + echo "Using existing ietf/settings_local_vite.py file" + if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py; then + echo "NOTE: Differences detected compared to docker/configs/settings_local_vite.py!" + echo "We'll assume you made these deliberately." + fi +fi + # Create data directories echo "Creating data directories..." diff --git a/ietf/.gitignore b/ietf/.gitignore index c82387caef..7874eed3b8 100644 --- a/ietf/.gitignore +++ b/ietf/.gitignore @@ -2,4 +2,5 @@ /settings_local.py /settings_local_debug.py /settings_local_sqlitetest.py +/settings_local_vite.py /ietfdb.sql.gz diff --git a/vite.config.js b/vite.config.js index 88adf92c42..c9bc1fa3db 100644 --- a/vite.config.js +++ b/vite.config.js @@ -19,9 +19,6 @@ export default defineConfig({ ], publicDir: 'ietf/static/public', server: { - host: true, - watch: { - usePolling: true - } + host: true } })