From fff3dba10e01772360afc1652641d144240428f3 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 18 Nov 2021 00:38:41 +0000 Subject: [PATCH 1/5] chore: rebase --- .devcontainer.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devcontainer.json diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 000000000..25cf513b4 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,27 @@ +// For format details, see https://aka.ms/vscode-remote/devcontainer.json +{ + "name": "cal-itp/benefits", + "dockerComposeFile": ["./localhost/docker-compose.yml"], + "service": "dev", + "runServices": ["dev", "docs", "server"], + "workspaceFolder": "/home/calitp/app", + "postStartCommand": ["/bin/bash", "bin/init.sh"], + "postAttachCommand": ["/bin/bash", "localhost/bin/init.sh"], + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.defaultProfile.linux": "bash", + "terminal.integrated.profiles.linux": { + "bash": { + "path": "/bin/bash" + } + } + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "batisteo.vscode-django", + "eamodio.gitlens", + "ms-python.python", + "ms-python.vscode-pylance", + "esbenp.prettier-vscode" + ] +} From 86c79ab891010aa9f72f36b0e562abf7676bc5f5 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 17 Nov 2021 23:46:46 +0000 Subject: [PATCH 2/5] chore(devcontainer): configure Prettier only for js, css --- .vscode/settings.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index ec69d16ce..947fde1ea 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,15 @@ { "editor.formatOnSave": true, + "editor.defaultFormatter": null, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": null + }, "files.encoding": "utf8", "files.eol": "\n", "files.insertFinalNewline": true, From 1ea8250d67648455ef35a5c3a43cb56c96510d04 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 18 Nov 2021 00:05:15 +0000 Subject: [PATCH 3/5] chore(devcontainer): configure autosave for JS/CSS, but not HTML --- .vscode/settings.json | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 947fde1ea..a26320df4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,22 +1,27 @@ { - "editor.formatOnSave": true, - "editor.defaultFormatter": null, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, "[css]": { + "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "editor.defaultFormatter": null, + "editor.formatOnSave": false, "[html]": { - "editor.defaultFormatter": null + "editor.formatOnSave": false }, "files.encoding": "utf8", "files.eol": "\n", "files.insertFinalNewline": true, "files.trimFinalNewlines": true, "files.trimTrailingWhitespace": true, + "[javascript]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "python.formatting.provider": "black", "python.linting.flake8Enabled": true, "python.linting.enabled": true, - "python.languageServer": "Pylance" + "python.languageServer": "Pylance", + "[python]": { + "editor.formatOnSave": true + } } From 26ba5f4ae01ec41c01702990f6a218e53b54e146 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 18 Nov 2021 00:40:35 +0000 Subject: [PATCH 4/5] chore: fix rebase --- .devcontainer.json | 27 --------------------------- .devcontainer/devcontainer.json | 1 + 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 .devcontainer.json diff --git a/.devcontainer.json b/.devcontainer.json deleted file mode 100644 index 25cf513b4..000000000 --- a/.devcontainer.json +++ /dev/null @@ -1,27 +0,0 @@ -// For format details, see https://aka.ms/vscode-remote/devcontainer.json -{ - "name": "cal-itp/benefits", - "dockerComposeFile": ["./localhost/docker-compose.yml"], - "service": "dev", - "runServices": ["dev", "docs", "server"], - "workspaceFolder": "/home/calitp/app", - "postStartCommand": ["/bin/bash", "bin/init.sh"], - "postAttachCommand": ["/bin/bash", "localhost/bin/init.sh"], - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.defaultProfile.linux": "bash", - "terminal.integrated.profiles.linux": { - "bash": { - "path": "/bin/bash" - } - } - }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "batisteo.vscode-django", - "eamodio.gitlens", - "ms-python.python", - "ms-python.vscode-pylance", - "esbenp.prettier-vscode" - ] -} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 40b869c65..6cfa3d5d9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -34,5 +34,6 @@ "eamodio.gitlens", "ms-python.python", "ms-python.vscode-pylance", + "esbenp.prettier-vscode" ] } From f394595fb741b4175179ba3f8fbf7b875f0e2c4e Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 18 Nov 2021 01:10:56 +0000 Subject: [PATCH 5/5] chore: add json files --- .vscode/settings.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index a26320df4..628bfc319 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,6 +17,10 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[json]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "python.formatting.provider": "black", "python.linting.flake8Enabled": true, "python.linting.enabled": true,