From 5be56b0773df86e2823ab3af733fc60794b4a00b Mon Sep 17 00:00:00 2001 From: Kitty Cat Date: Sat, 28 Sep 2024 16:25:32 -0400 Subject: [PATCH 1/4] chore: remove Dockerfile for devcontainer --- .devcontainer/Dockerfile | 1 - .devcontainer/compose.yml | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index b6ebcf6ad3..0000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/devcontainers/javascript-node:0-18 diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 8ef5722f2b..d358401aec 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,9 +1,7 @@ services: app: - build: - context: . - dockerfile: Dockerfile - + image: mcr.microsoft.com/devcontainers/javascript-node:0-18 + volumes: - ../:/workspace:cached - node_modules:/workspace/node_modules From 4dee3535879d482d4c53f7866b1c54c2d66d9b96 Mon Sep 17 00:00:00 2001 From: Kitty Cat Date: Sun, 29 Sep 2024 22:31:41 -0400 Subject: [PATCH 2/4] chore: update devcontainer base image --- .devcontainer/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index d358401aec..d342bc9c60 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,6 +1,6 @@ services: app: - image: mcr.microsoft.com/devcontainers/javascript-node:0-18 + image: mcr.microsoft.com/devcontainers/javascript-node:20 volumes: - ../:/workspace:cached From 2f8bab656ce3c56876a279ff4af8ab52926c3771 Mon Sep 17 00:00:00 2001 From: Kitty Cat Date: Mon, 30 Sep 2024 10:19:13 -0400 Subject: [PATCH 3/4] chore: fix tests in devcontainer --- .devcontainer/devcontainer.yml | 2 +- .devcontainer/init.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml index d35cdab0d0..449d95e693 100644 --- a/.devcontainer/devcontainer.yml +++ b/.devcontainer/devcontainer.yml @@ -6,7 +6,7 @@ #───┘ URL └───────────────────────────────────────────────────── # Final accessible URL seen by a user. -url: http://127.0.0.1:3000/ +url: http://cherrypick.local/ # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE # URL SETTINGS AFTER THAT! diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh index e02a533c15..d8007c63f9 100755 --- a/.devcontainer/init.sh +++ b/.devcontainer/init.sh @@ -4,7 +4,7 @@ set -xe sudo chown node node_modules sudo apt-get update -sudo apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb +sudo apt-get -y install ffmpeg libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb git config --global --add safe.directory /workspace git submodule update --init corepack install @@ -12,6 +12,7 @@ corepack enable pnpm config set store-dir /home/node/.local/share/pnpm/store pnpm install --frozen-lockfile cp .devcontainer/devcontainer.yml .config/default.yml +[ ! -L .config/test.yml ] && ln -s default.yml .config/test.yml pnpm build pnpm migrate pnpm exec cypress install From 9aa98ebb314d86a9fd15e14bd497c7a1274a3631 Mon Sep 17 00:00:00 2001 From: Kitty Cat Date: Mon, 30 Sep 2024 12:28:57 -0400 Subject: [PATCH 4/4] chore: add vscode launch and build profiles --- .vscode/launch.json | 17 +++++++++++++++++ .vscode/settings.json | 3 ++- .vscode/tasks.json | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..48c295029f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,17 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "CherryPick", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}/packages/backend/built/boot/entry.js" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 0ceec23acd..1f564bdbf9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,5 +11,6 @@ "editor.codeActionsOnSave": { "source.fixAll": "explicit" }, - "editor.formatOnSave": false + "editor.formatOnSave": false, + "npm.packageManager": "pnpm" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000000..bae6605fee --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,16 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "build", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [], + "label": "pnpm: build", + "detail": "pnpm build-pre && pnpm -r build && pnpm build-assets" + } + ] +}