Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 79 additions & 103 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/devcontainer-worker/src/devcontainerWorkerModule.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as DevContainerCli from '@lvce-editor/devcontainer-node/devcontainer-cli'
import * as ContainerFileSystem from './parts/ContainerFileSystem/ContainerFileSystem.ts'
import * as ContainerTerminal from './parts/ContainerTerminal/ContainerTerminal.ts'
import * as ContainerTerminalSession from './parts/ContainerTerminalSession/ContainerTerminalSession.ts'
import * as DevContainer from './parts/DevContainer/DevContainer.ts'
import * as DevContainerCommandType from './parts/DevContainerCommandType/DevContainerCommandType.ts'
import * as DevContainerNodeClient from './parts/DevContainerNodeClient/DevContainerNodeClient.ts'
Expand Down Expand Up @@ -76,6 +77,7 @@ const getTerminalSpawnOptions = (
}

export const commandMap = {
'DevContainer.disposeTerminal': ContainerTerminalSession.dispose,
'DevContainer.getDockerInstallCommand': () =>
GetDockerInstallCommand.getDockerInstallCommand(process.platform),
'DevContainer.getProgress': Progress.getProgress,
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/helpers/testContainerTerminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const testContainerTerminal = async (
'sh',
[
'-c',
'pid=$(cat "/container-workspace/sub folder/terminal-shell-pid"); state=$(awk \'{print $3}\' "/proc/$pid/stat" 2>/dev/null || true); if [ -z "$state" ] || [ "$state" = Z ]; then printf disposed; else printf alive; fi',
'pid=$(cat "/container-workspace/sub folder/terminal-shell-pid"); for attempt in $(seq 1 50); do state=$(awk \'{print $3}\' "/proc/$pid/stat" 2>/dev/null || true); if [ -z "$state" ] || [ "$state" = Z ]; then printf disposed; exit; fi; sleep 0.1; done; printf alive',
],
'disposed',
)
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type-check": "tsc"
},
"devDependencies": {
"@lvce-editor/static-server": "0.115.5",
"@lvce-editor/static-server": "0.120.5",
"@lvce-editor/test-with-playwright": "22.36.3",
"@lvce-editor/test-worker": "17.21.0",
"@playwright/test": "1.63.0"
Expand Down
3 changes: 0 additions & 3 deletions packages/e2e/src/devcontainer.terminal-disposal.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import type { Test } from '@lvce-editor/test-worker'
import { testContainerTerminal } from '../helpers/testContainerTerminal.ts'

// Requires the renderer's disposeCommand support in the published server.
export const skip = 1

export const test: Test = async (context) => {
await testContainerTerminal(
context,
Expand Down
7 changes: 6 additions & 1 deletion packages/extension/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"onCommand:devcontainer.showLogs",
"onFileSystem:devcontainer-logs",
"onCommand:devcontainer.installDocker",
"onCommand:devcontainer.getTerminalSpawnOptions"
"onCommand:devcontainer.getTerminalSpawnOptions",
"onCommand:devcontainer.disposeTerminal"
],
"commands": [
{
Expand Down Expand Up @@ -71,6 +72,10 @@
{
"id": "devcontainer.getTerminalSpawnOptions",
"internal": true
},
{
"id": "devcontainer.disposeTerminal",
"internal": true
}
],
"fileSystemProviders": [
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@lvce-editor/server": "0.115.5",
"@lvce-editor/static-server": "0.115.5",
"@lvce-editor/server": "0.120.5",
"@lvce-editor/static-server": "0.120.5",
"@lvce-editor/test-worker": "17.21.0"
}
}
Loading