From 8c5816b7fdc08c0d129a3674f6a48fbef2ed3f09 Mon Sep 17 00:00:00 2001 From: Evan <115374841+evanwporter@users.noreply.github.com> Date: Sun, 29 Dec 2024 12:31:04 -0800 Subject: [PATCH 1/6] Update launch.json --- .vscode/launch.json | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0b6b9a649..be2a8b68e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,38 +2,12 @@ "version": "0.2.0", "configurations": [ { - "name": "Debug Main Process", - "type": "node", + "name": "Debug Tauri (MSVC)", + "type": "cppvsdbg", "request": "launch", + "program": "${workspaceRoot}/src-tauri/target/debug/openhome.exe", "cwd": "${workspaceRoot}", - "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite", - "windows": { - "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd" - }, - "runtimeArgs": ["--sourcemap"], - "env": { - "REMOTE_DEBUGGING_PORT": "9222" - } + "preLaunchTask": "ui:dev" }, - { - "name": "Debug Renderer Process", - "port": 9222, - "request": "attach", - "type": "chrome", - "webRoot": "${workspaceFolder}/src/renderer", - "timeout": 60000, - "presentation": { - "hidden": true - } - } - ], - "compounds": [ - { - "name": "Debug All", - "configurations": ["Debug Main Process", "Debug Renderer Process"], - "presentation": { - "order": 1 - } - } ] } From 76e09bf595acd64f9dd9a5daf187ed437bafe6cd Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 29 Dec 2024 12:32:14 -0800 Subject: [PATCH 2/6] Update tasks.json --- .vscode/tasks.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..c5e9102d7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,26 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build:debug", + "type": "cargo", + "command": "build" + }, + { + "label": "ui:dev", + "type": "shell", + "isBackground": true, + "command": "npm", + "args": ["run", "dev"], + "problemMatcher": ["$rustc"] + }, + { + "label": "dev", + "dependsOn": ["build:debug", "ui:dev"], + "group": { + "kind": "build", + "isDefault": true + } + }, + ] +} From d4f2013d742295d101d6e60ba151f9f6c2fbb3fd Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 29 Dec 2024 16:37:12 -0800 Subject: [PATCH 3/6] Fixed it --- .vscode/launch.json | 16 ++++++++++---- .vscode/tasks.json | 52 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index be2a8b68e..86472e071 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,12 +2,20 @@ "version": "0.2.0", "configurations": [ { - "name": "Debug Tauri (MSVC)", + "name": "Tauri Development Debug (MSVC)", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceRoot}/src-tauri/target/debug/openhome.exe", + "program": "${workspaceRoot}/src-tauri/target/debug/OpenHome.exe", "cwd": "${workspaceRoot}", - "preLaunchTask": "ui:dev" + "preLaunchTask": "dev" }, - ] + { + "name": "Tauri Production Debug (MSVC)", + "type": "cppvsdbg", + "request": "launch", + "program": "${workspaceRoot}/src-tauri/target/release/OpenHome.exe", + "cwd": "${workspaceRoot}", + "preLaunchTask": "build" + } + ], } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c5e9102d7..9529cdcdf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,26 +1,62 @@ { "version": "2.0.0", "tasks": [ - { - "label": "build:debug", - "type": "cargo", - "command": "build" - }, { "label": "ui:dev", "type": "shell", - "isBackground": true, "command": "npm", "args": ["run", "dev"], - "problemMatcher": ["$rustc"] + "isBackground": true, + "problemMatcher": { + "owner": "custom", + "pattern": [ + { + "regexp": ".", + "file": 1, + "location": 2, + "message": 3 + } + ], + "background": { + "activeOnStart": true, + "beginsPattern": ".", + "endsPattern": "." + } + } + }, + { + "label": "ui:build", + "type": "shell", + "command": "npm", + "args": ["run", "build"] + }, + { + "label": "backend:build:debug", + "type": "shell", + "command": "cargo", + "args": ["build", "--manifest-path=./src-tauri/Cargo.toml", "--no-default-features"] + }, + { + "label": "backend:build:release", + "type": "shell", + "command": "cargo", + "args": ["build", "--release", "--manifest-path=./src-tauri/Cargo.toml"] }, { "label": "dev", - "dependsOn": ["build:debug", "ui:dev"], + "dependsOn": ["ui:dev", "backend:build:debug"], "group": { "kind": "build", "isDefault": true } }, + { + "label": "build", + "dependsOn": ["ui:build", "backend:build:release"], + "group": { + "kind": "build", + "isDefault": false + } + } ] } From 83b993a1fd1a13d68cc8e8525d62cbd0135428db Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 29 Dec 2024 16:38:28 -0800 Subject: [PATCH 4/6] renamed `ui` to `frontend` --- .vscode/tasks.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9529cdcdf..3608af6f0 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "version": "2.0.0", "tasks": [ { - "label": "ui:dev", + "label": "frontend:dev", "type": "shell", "command": "npm", "args": ["run", "dev"], @@ -25,7 +25,7 @@ } }, { - "label": "ui:build", + "label": "frontend:build", "type": "shell", "command": "npm", "args": ["run", "build"] @@ -44,7 +44,7 @@ }, { "label": "dev", - "dependsOn": ["ui:dev", "backend:build:debug"], + "dependsOn": ["frontend:dev", "backend:build:debug"], "group": { "kind": "build", "isDefault": true @@ -52,7 +52,7 @@ }, { "label": "build", - "dependsOn": ["ui:build", "backend:build:release"], + "dependsOn": ["frontend:build", "backend:build:release"], "group": { "kind": "build", "isDefault": false From e69fdd200c0bdb793ea8694d1f2cadfea7f6a613 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 29 Dec 2024 16:40:34 -0800 Subject: [PATCH 5/6] Got rid of problem matcher --- .vscode/tasks.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3608af6f0..dcf3ecd0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,22 +7,6 @@ "command": "npm", "args": ["run", "dev"], "isBackground": true, - "problemMatcher": { - "owner": "custom", - "pattern": [ - { - "regexp": ".", - "file": 1, - "location": 2, - "message": 3 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": ".", - "endsPattern": "." - } - } }, { "label": "frontend:build", From 580998de9d50e6f71847c24fe7e85b2e69b02bc6 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 30 Dec 2024 13:35:03 -0800 Subject: [PATCH 6/6] Fixed vscode settings --- .vscode/launch.json | 10 +--------- .vscode/tasks.json | 21 +-------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 86472e071..17aadaa0b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,15 +7,7 @@ "request": "launch", "program": "${workspaceRoot}/src-tauri/target/debug/OpenHome.exe", "cwd": "${workspaceRoot}", - "preLaunchTask": "dev" + "preLaunchTask": "frontend:dev" }, - { - "name": "Tauri Production Debug (MSVC)", - "type": "cppvsdbg", - "request": "launch", - "program": "${workspaceRoot}/src-tauri/target/release/OpenHome.exe", - "cwd": "${workspaceRoot}", - "preLaunchTask": "build" - } ], } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index dcf3ecd0c..b74c9b5e6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,12 +7,7 @@ "command": "npm", "args": ["run", "dev"], "isBackground": true, - }, - { - "label": "frontend:build", - "type": "shell", - "command": "npm", - "args": ["run", "build"] + "problemMatcher": "$tsc" }, { "label": "backend:build:debug", @@ -20,12 +15,6 @@ "command": "cargo", "args": ["build", "--manifest-path=./src-tauri/Cargo.toml", "--no-default-features"] }, - { - "label": "backend:build:release", - "type": "shell", - "command": "cargo", - "args": ["build", "--release", "--manifest-path=./src-tauri/Cargo.toml"] - }, { "label": "dev", "dependsOn": ["frontend:dev", "backend:build:debug"], @@ -33,14 +22,6 @@ "kind": "build", "isDefault": true } - }, - { - "label": "build", - "dependsOn": ["frontend:build", "backend:build:release"], - "group": { - "kind": "build", - "isDefault": false - } } ] }