Skip to content

Commit d026a03

Browse files
author
Tajudeen
committed
Fix macOS blank screen TrustedTypes error and improve debug script
1 parent 78d61a3 commit d026a03

2 files changed

Lines changed: 30 additions & 6 deletions

File tree

‎debug_macos_app.sh‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,12 @@ echo ""
183183
# Redirect both stdout and stderr to log file and terminal
184184
echo "Starting ${APP_NAME}..." | tee -a "${LOG_FILE}"
185185
echo "Timestamp: $(date)" | tee -a "${LOG_FILE}"
186-
echo "Command: ${EXECUTABLE} --enable-logging --log-level=0 --enable-logging=stderr" | tee -a "${LOG_FILE}"
186+
DEBUG_ARGS=(--enable-logging --log-level=0 --enable-logging=stderr)
187+
echo "Command: ELECTRON_RUN_AS_NODE=0 ${EXECUTABLE} ${DEBUG_ARGS[*]}" | tee -a "${LOG_FILE}"
187188
echo "" | tee -a "${LOG_FILE}"
188189

189190
# Launch in background and capture output
190-
"${EXECUTABLE}" \
191-
--enable-logging \
192-
--log-level=0 \
193-
--enable-logging=stderr \
194-
2>&1 | tee -a "${LOG_FILE}" &
191+
ELECTRON_RUN_AS_NODE=0 "${EXECUTABLE}" "${DEBUG_ARGS[@]}" 2>&1 | tee -a "${LOG_FILE}" &
195192

196193
APP_PID=$!
197194

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html
2+
index 3cb64e9359f6..b674cda1033d 100644
3+
--- a/src/vs/code/electron-browser/workbench/workbench.html
4+
+++ b/src/vs/code/electron-browser/workbench/workbench.html
5+
@@
6+
- trusted-types
7+
- amdLoader
8+
+ trusted-types
9+
+ vscode-bootstrapImportMap
10+
+ amdLoader
11+
cellRendererEditorText
12+
collapsedCellPreview
13+
defaultWorkerFactory
14+
diff --git a/src/vs/code/electron-browser/workbench/workbench-dev.html b/src/vs/code/electron-browser/workbench/workbench-dev.html
15+
index 778996c57c5a..b151cd7a3530 100644
16+
--- a/src/vs/code/electron-browser/workbench/workbench-dev.html
17+
+++ b/src/vs/code/electron-browser/workbench/workbench-dev.html
18+
@@
19+
- trusted-types
20+
- amdLoader
21+
+ trusted-types
22+
+ vscode-bootstrapImportMap
23+
+ amdLoader
24+
cellRendererEditorText
25+
collapsedCellPreview
26+
defaultWorkerFactory
27+

0 commit comments

Comments
 (0)