diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 59d39594625fbddc7af51d4cd8211f09be26c21e..6accd434763e8dea26a18c8bd96d8dcab5976865 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,13 +3,15 @@ "dockerComposeFile": "docker-compose.yml", "service": "app", "workspaceFolder": "/workspace", + "features": { + "ghcr.io/devcontainers-contrib/features/pnpm:2": {} + }, "forwardPorts": [3000], "postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh", "customizations": { "vscode": { "extensions": [ "editorconfig.editorconfig", - "eg2.vscode-npm-script", "dbaeumer.vscode-eslint", "Vue.volar", "Vue.vscode-typescript-vue-plugin", diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 6ec3c86a4a4433f4638f9fc804fa4999aad6e268..8f8c5a13ab723f46722312a8429bfa45bad497a2 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -16,7 +16,7 @@ services: - external_network redis: - restart: always + restart: unless-stopped image: redis:7-alpine networks: - internal_network diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh index 450c3920c32094deca5b6c8c8ef696c4f3db2e6d..bcad3e6d852730e4e5e328fe818fb4fd7ea22429 100755 --- a/.devcontainer/init.sh +++ b/.devcontainer/init.sh @@ -4,6 +4,7 @@ set -xe sudo chown -R node /workspace git submodule update --init +pnpm config set store-dir /home/node/.local/share/pnpm/store pnpm install --frozen-lockfile cp .devcontainer/devcontainer.yml .config/default.yml pnpm build diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 6b0c1540fbd272465c2089a8264b0b3be04aa2e1..baca8db24671b15f75492c76270c79fc2a2fd87a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "editorconfig.editorconfig", - "eg2.vscode-npm-script", "dbaeumer.vscode-eslint", "Vue.volar", "Vue.vscode-typescript-vue-plugin", diff --git a/.vscode/settings.json b/.vscode/settings.json index 6a0497946d8d95314a4ca2a0115ada177d5d258c..baffbe18ecdd1a02a21af9477e9b522ef5abc17e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,6 @@ "typescript.tsdk": "node_modules/typescript/lib", "files.associations": { "*.test.ts": "typescript" - } + }, + "jest.autoRun": "off" } \ No newline at end of file