Merge branch 'main' into joh/vscode-dts

7 files changed, 11 insertions, 7 deletions

diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat
index c2eae24d4d9..2b3c9db3ca3 100644
--- a/scripts/code-cli.bat
+++ b/scripts/code-cli.bat
@@ -24,7 +24,7 @@ set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
 :: Launch Code
-%CODE% --inspect=5874 out\cli.js %~dp0.. %*
+%CODE% --inspect=5874 out\cli.js --ms-enable-electron-run-as-node %~dp0.. %*
 goto end
 
 :builtin
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
index a792c08532e..cdf75ff785c 100755
--- a/scripts/code-cli.sh
+++ b/scripts/code-cli.sh
@@ -34,7 +34,7 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --inspect=5874 "$ROOT/out/cli.js" --ms-enable-electron-run-as-node . "$@"
 }
 
 code "$@"
diff --git a/scripts/code.sh b/scripts/code.sh
index 9caa49b1bf7..08fc867ca12 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -58,7 +58,7 @@ function code-wsl()
 		cd $ROOT
 		export WSLENV=ELECTRON_RUN_AS_NODE/w:VSCODE_DEV/w:$WSLENV
 		local WSL_EXT_ID="ms-vscode-remote.remote-wsl"
-		local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --locate-extension $WSL_EXT_ID)
+		local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID)
 		cd $CWD
 		if [ -n "$WSL_EXT_WLOC" ]; then
 			# replace \r\n with \n in WSL_EXT_WLOC
diff --git a/scripts/node-electron.bat b/scripts/node-electron.bat
index 4ddb95b3cae..c67e2ea607d 100644
--- a/scripts/node-electron.bat
+++ b/scripts/node-electron.bat
@@ -10,9 +10,9 @@ set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
-%CODE% %*
+%CODE% %* --ms-enable-electron-run-as-node
 
 popd
 
 endlocal
-exit /b %errorlevel%
\ No newline at end of file
+exit /b %errorlevel%
diff --git a/scripts/node-electron.sh b/scripts/node-electron.sh
index 0a822b6c383..2bf50817c94 100755
--- a/scripts/node-electron.sh
+++ b/scripts/node-electron.sh
@@ -26,9 +26,11 @@ export VSCODE_DEV=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
-		"$@"
+		"$@" \
+		--ms-enable-electron-run-as-node
 else
 	ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
-		"$@"
+		"$@" \
+		--ms-enable-electron-run-as-node
 fi
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 5210ccc55ac..3da6d3c9e62 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -26,6 +26,7 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 					compile-extension:markdown-language-features^
 					compile-extension:typescript-language-features^
 					compile-extension:vscode-custom-editor-tests^
+					compile-extension:vscode-notebook-tests^
 					compile-extension:emmet^
 					compile-extension:css-language-features-server^
 					compile-extension:html-language-features-server^
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 72e8fdf4d1f..2eb8ce50a73 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -32,6 +32,7 @@ else
 	yarn gulp 	compile-extension:vscode-api-tests \
 				compile-extension:vscode-colorize-tests \
 				compile-extension:vscode-custom-editor-tests \
+				compile-extension:vscode-notebook-tests \
 				compile-extension:markdown-language-features \
 				compile-extension:typescript-language-features \
 				compile-extension:emmet \