diff --git a/build/package/LICENSE b/build/package/LICENSE index 5c2ce40b3..fe4aad6b5 100644 --- a/build/package/LICENSE +++ b/build/package/LICENSE @@ -402,7 +402,7 @@ conditions of the following licenses. OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- 'vscode-debugadapter' in extension/dist/ext/extension.js +- '@vscode/debugadapter' in extension/dist/ext/extension.js This product bundles 'VS Code Debug Adapter' from the above files. These files are available under the MIT License: @@ -431,7 +431,7 @@ conditions of the following licenses. FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- 'vscode-debugprotocol' in extension/dist/ext/extension.js +- '@vscode/debugprotocol' in extension/dist/ext/extension.js This product bundles 'VS Code Debug Protocol' from the above files. These files are available under the MIT License: @@ -7191,8 +7191,8 @@ conditions of the following licenses. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- 'vscode-debugadapter-testsupport' in extension/dist/ext/extension.js - This product bundles 'vscode-debugadapter-testsupport' from the above files. +- '@vscode/debugadapter-testsupport' in extension/dist/ext/extension.js + This product bundles '@vscode/debugadapter-testsupport' from the above files. This package is available under the MIT LICENSE: Copyright (c) Microsoft Corporation diff --git a/package.json b/package.json index d2ac09457..53ecd90de 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "omega-edit": "0.9.34", "unzip-stream": "0.3.1", "uuid": "^9.0.0", - "vscode-debugadapter": "1.51.0", + "@vscode/debugadapter": "1.51.0", "wait-port": "^0.3.0", "xdg-app-paths": "8.2.0" }, @@ -59,8 +59,8 @@ "prettier": "2.8.3", "ts-loader": "8.1.0", "typescript": "4.3.5", - "vsce": "2.15.0", - "vscode-debugadapter-testsupport": "1.51.0", + "@vscode/vsce": "2.15.0", + "@vscode/debugadapter-testsupport": "1.51.0", "webpack": "5.75.0", "webpack-cli": "4.10.0" }, diff --git a/src/adapter/daffodilDebug.ts b/src/adapter/daffodilDebug.ts index 4236bf596..5dcb2c0e0 100644 --- a/src/adapter/daffodilDebug.ts +++ b/src/adapter/daffodilDebug.ts @@ -22,8 +22,8 @@ import { Source, Handles, Breakpoint, -} from 'vscode-debugadapter' -import { DebugProtocol } from 'vscode-debugprotocol' +} from '@vscode/debugadapter' +import { DebugProtocol } from '@vscode/debugprotocol' import { basename } from 'path' import { DaffodilRuntime, diff --git a/src/tests/suite/adapter.test.ts b/src/tests/suite/adapter.test.ts index f4d91d124..e13786e2f 100644 --- a/src/tests/suite/adapter.test.ts +++ b/src/tests/suite/adapter.test.ts @@ -17,8 +17,9 @@ import * as assert from 'assert' import * as path from 'path' -import { DebugClient } from 'vscode-debugadapter-testsupport' +import { DebugClient } from '@vscode/debugadapter-testsupport' import { TEST_SCHEMA, PROJECT_ROOT } from './common' +import { setup } from 'mocha' suite('Daffodil Debug Adapter', () => { const DEBUG_ADAPTER = path.join(PROJECT_ROOT, 'out/adapter/debugAdapter.js') diff --git a/yarn.lock b/yarn.lock index 4ca19d1ba..cdeb0d766 100644 --- a/yarn.lock +++ b/yarn.lock @@ -233,6 +233,26 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== +"@vscode/debugadapter-testsupport@1.51.0": + version "1.51.0" + resolved "https://registry.yarnpkg.com/@vscode/debugadapter-testsupport/-/debugadapter-testsupport-1.51.0.tgz#6311ef18bab254d6bbc2be583da9eec0b857d449" + integrity sha512-dRrJaSjT+4ay8VinylRZycjc5F+LptI5e0EL5kN+8Ap2KsIYAWzOsAxP/2f4DGN8QvE8gaPw2khtMZLrQYR5rQ== + dependencies: + "@vscode/debugprotocol" "1.51.0" + +"@vscode/debugadapter@1.51.0": + version "1.51.0" + resolved "https://registry.yarnpkg.com/@vscode/debugadapter/-/debugadapter-1.51.0.tgz#f4da557067714d259887107f19fe23f680302688" + integrity sha512-D8LFrLb/Jkb4ObydLqPd0extCxK5CJBwZdhbKDPpCOePV1kiInXDi3ve48Srb70ccbVEzfpXnD3j0rNSmRalqQ== + dependencies: + "@vscode/debugprotocol" "1.51.0" + mkdirp "^1.0.4" + +"@vscode/debugprotocol@1.51.0": + version "1.51.0" + resolved "https://registry.yarnpkg.com/@vscode/debugprotocol/-/debugprotocol-1.51.0.tgz#1d28a8581f8ea74b8e2fd465d4448717589a0ae3" + integrity sha512-39ShbKzI+0r53haLZQVEhY4XhdMJVSqfcliaDFigQjqiWattno5Ex0jXq2WRHrAtPf+W5Un9/HtED0K3pAiqZg== + "@vscode/test-electron@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.1.5.tgz#ac98f8f445ea4590753f5fa0c7f6e4298f08c3b7" @@ -243,6 +263,32 @@ rimraf "^3.0.2" unzipper "^0.10.11" +"@vscode/vsce@2.15.0": + version "2.15.0" + resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.15.0.tgz#fe48873d2204dcd5912d1384a889112cb219da65" + integrity sha512-c+qS5KSX4jO3RuGqeNQHqci4+WrcmLxHAwiWTR3PDR6wXzV1fQJxybueUOojXcqvsJR3W2AeROrpf+302ZkTfg== + dependencies: + azure-devops-node-api "^11.0.1" + chalk "^2.4.2" + cheerio "^1.0.0-rc.9" + commander "^6.1.0" + glob "^7.0.6" + hosted-git-info "^4.0.2" + keytar "^7.7.0" + leven "^3.1.0" + markdown-it "^12.3.2" + mime "^1.3.4" + minimatch "^3.0.3" + parse-semver "^1.1.1" + read "^1.0.7" + semver "^5.1.0" + tmp "^0.2.1" + typed-rest-client "^1.8.4" + url-join "^4.0.1" + xml2js "^0.4.23" + yauzl "^2.3.1" + yazl "^2.2.2" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -2307,52 +2353,6 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -vsce@2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/vsce/-/vsce-2.15.0.tgz#4a992e78532092a34a755143c6b6c2cabcb7d729" - integrity sha512-P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw== - dependencies: - azure-devops-node-api "^11.0.1" - chalk "^2.4.2" - cheerio "^1.0.0-rc.9" - commander "^6.1.0" - glob "^7.0.6" - hosted-git-info "^4.0.2" - keytar "^7.7.0" - leven "^3.1.0" - markdown-it "^12.3.2" - mime "^1.3.4" - minimatch "^3.0.3" - parse-semver "^1.1.1" - read "^1.0.7" - semver "^5.1.0" - tmp "^0.2.1" - typed-rest-client "^1.8.4" - url-join "^4.0.1" - xml2js "^0.4.23" - yauzl "^2.3.1" - yazl "^2.2.2" - -vscode-debugadapter-testsupport@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.51.0.tgz#d60c4d9e2b70d094d9449abffdf3745898e698a4" - integrity sha512-rb8tfn7J3kxLi1rRhEyG5ggGkFcJH2WrYYrq6Vb1tDAcHoFXF580M1dAA2jPOrc0I14GuWxMnndvfGkfG10VxA== - dependencies: - vscode-debugprotocol "1.51.0" - -vscode-debugadapter@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.51.0.tgz#ef600c3aa165523645887ec15df1443ba7d68aa6" - integrity sha512-mObaXD5/FH/z6aL2GDuyCLbnwLsYRCAJWgFid01vKW9Y5Si8OvINK+Tn+Yl/lRUbetjNuZW3j1euMEz6z8Yzqg== - dependencies: - mkdirp "^1.0.4" - vscode-debugprotocol "1.51.0" - -vscode-debugprotocol@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.51.0.tgz#c03168dac778b6c24ce17b3511cb61e89c11b2df" - integrity sha512-dzKWTMMyebIMPF1VYMuuQj7gGFq7guR8AFya0mKacu+ayptJfaRuM0mdHCqiOth4FnRP8mPhEroFPx6Ift8wHA== - wait-port@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-0.3.1.tgz#d4309654b88a82333459eb264bc278e0be998d37"