diff --git a/patched-vscode/package.json b/patched-vscode/package.json index b7d6b285..fd855d51 100644 --- a/patched-vscode/package.json +++ b/patched-vscode/package.json @@ -149,7 +149,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "38.7.1", + "electron": "40.6.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", diff --git a/patched-vscode/src/vs/workbench/contrib/files/browser/fileActions.ts b/patched-vscode/src/vs/workbench/contrib/files/browser/fileActions.ts index 46513848..3d5a5fcb 100644 --- a/patched-vscode/src/vs/workbench/contrib/files/browser/fileActions.ts +++ b/patched-vscode/src/vs/workbench/contrib/files/browser/fileActions.ts @@ -60,7 +60,7 @@ import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { Categories } from 'vs/platform/action/common/actionCommonCategories'; import { ILocalizedString } from 'vs/platform/action/common/action'; import { VSBuffer } from 'vs/base/common/buffer'; -import { getPathForFile } from '../../../../platform/dnd/browser/dnd.js'; +import { getPathForFile } from '../../../../platform/dnd/browser/dnd'; export const NEW_FILE_COMMAND_ID = 'explorer.newFile'; export const NEW_FILE_LABEL = nls.localize2('newFile', "New File..."); diff --git a/patched-vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/patched-vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index a330f9dd..5cf13eed 100644 --- a/patched-vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/patched-vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -31,7 +31,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService import { ICommandService } from 'vs/platform/commands/common/commands'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { CodeDataTransfers, containsDragType, getPathForFile } from '../../../../platform/dnd/browser/dnd.js'; +import { CodeDataTransfers, containsDragType, getPathForFile } from '../../../../platform/dnd/browser/dnd'; import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; diff --git a/patched-vscode/yarn.lock b/patched-vscode/yarn.lock index 4d02c39b..04ea9592 100644 --- a/patched-vscode/yarn.lock +++ b/patched-vscode/yarn.lock @@ -4732,9 +4732,9 @@ form-data@^3.0.0: mime-types "^2.1.12" form-data@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4" - integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow== + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" @@ -10665,9 +10665,9 @@ write@1.0.3: mkdirp "^0.5.1" ws@^7.2.0: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" - integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== xml2js@^0.4.19: version "0.4.23" diff --git a/patches/electron-update.patch b/patches/electron-update.patch index 72c65592..8229aa14 100644 --- a/patches/electron-update.patch +++ b/patches/electron-update.patch @@ -7,7 +7,7 @@ Index: sagemaker-code-editor/vscode/package.json "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "29.4.0", -+ "electron": "38.7.1", ++ "electron": "40.6.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0",