diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-05 20:28:43 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-05 20:28:43 +0900 |
| commit | d6d0b9659fb03bfb464defdbcf191e7d699b09fa (patch) | |
| tree | c30f3f50c7ba88fa5fbe3efd3daf623145bf7109 | |
| parent | refactor(client): use css module (diff) | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-d6d0b9659fb03bfb464defdbcf191e7d699b09fa.tar.gz sharkey-d6d0b9659fb03bfb464defdbcf191e7d699b09fa.tar.bz2 sharkey-d6d0b9659fb03bfb464defdbcf191e7d699b09fa.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
| -rw-r--r-- | .devcontainer/devcontainer.json | 4 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | .devcontainer/init.sh | 1 | ||||
| -rw-r--r-- | .vscode/extensions.json | 1 | ||||
| -rw-r--r-- | .vscode/settings.json | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 59d3959462..6accd43476 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 6ec3c86a4a..8f8c5a13ab 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 450c3920c3..bcad3e6d85 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 6b0c1540fb..baca8db246 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 6a0497946d..baffbe18ec 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 |