From 4dd8f1419d78ab85c07c8b3e4f58f7d869433e64 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Wed, 8 Dec 2021 18:26:26 -0800
Subject: [PATCH] Various updates to vscode environment

---
 .devcontainer.json    | 13 +++++++++----
 .jsbeautify           |  5 +++++
 .vscode/settings.json | 39 ++++++++++++++++++++++++++++++++++++++-
 README.md             |  2 +-
 4 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 .jsbeautify

diff --git a/.devcontainer.json b/.devcontainer.json
index 6b54477..2e50fd1 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -10,8 +10,13 @@
     "ms-python.python",
     "sibiraj-s.vscode-scss-formatter",
     "esbenp.prettier-vscode",
-    "batisteo.vscode-django"
-  ],
-  "python.formatting.provider": "black",
-  "editor.formatOnSave": true
+    "batisteo.vscode-django",
+    "dbaeumer.vscode-eslint",
+    "ms-python.vscode-pylance",
+    "hookyqr.beautify",
+    "bradlc.vscode-tailwindcss",
+    "ms-azuretools.vscode-docker",
+    "csstools.postcss",
+    "knisterpeter.vscode-github"
+  ]
 }
diff --git a/.jsbeautify b/.jsbeautify
new file mode 100644
index 0000000..945349b
--- /dev/null
+++ b/.jsbeautify
@@ -0,0 +1,5 @@
+{
+  "indent_size": 2,
+  "end_with_newline": true,
+  "wrap_attributes": "force-aligned"
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 00d69ab..dd78368 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,11 +5,48 @@
     "**/templates/**/*.html": "django-html",
     "**/templates/**/*": "django-txt"
   },
+  "beautify.language": {
+    "html": ["htm", "html", "django-html"]
+  },
   "python.formatting.provider": "black",
   "python.pythonPath": "/usr/local/bin/python",
   "python.linting.pylintArgs": [
     "--load-plugins",
     "pylint_django",
     "--disable=C0111"
-  ]
+  ],
+  "python.testing.unittestEnabled": true,
+  "python.languageServer": "Pylance",
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.python",
+    "editor.formatOnSave": true
+  },
+  "[javascript]": {
+    "editor.tabSize": 2
+  },
+  "[django-html]": {
+    "editor.tabSize": 2,
+    "editor.wordWrap": "on",
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "HookyQR.beautify"
+  },
+  "[html]": {
+    "editor.tabSize": 2,
+    "editor.quickSuggestions": {
+      "strings": true
+    }
+  },
+  "tailwindCSS.includeLanguages": {
+    "django-html": "html"
+  },
+  "python.testing.unittestArgs": [
+    "-v",
+    "-s",
+    "./{{ project_name }}",
+    "-p",
+    "test_*.py"
+  ],
+  "python.testing.pytestEnabled": false,
+  "python.testing.nosetestsEnabled": false,
+  "python.analysis.typeCheckingMode": "basic"
 }
diff --git a/README.md b/README.md
index d3fdc1a..31bd819 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This is how I set up Django projects to get up and running as quick as possible.
 
 To get started (replace `myapp` with the name of your app):
 
-    $ docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app django django-admin.py startproject --template https://github.com/bfirsh/django-docker-heroku-template/tarball/master --name .gitignore,.dockerignore,Dockerfile,README.md,app.json,package.json,script/clean myapp
+    $ docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app django django-admin.py startproject --template https://github.com/bfirsh/django-docker-heroku-template/tarball/master --name .gitignore,.dockerignore,Dockerfile,README.md,app.json,package.json,script/clean,.vscode/settings.json myapp
     $ cd myapp
     $ chmod +x ./manage.py script/*