diff --git a/package.json b/package.json index 679fbf05..48e2de9c 100644 --- a/package.json +++ b/package.json @@ -42,12 +42,12 @@ "private": true, "dependencies": { "@angular/animations": "^12.0.2", - "@angular/cdk": "^11.2.12", + "@angular/cdk": "^12.0.2", "@angular/common": "^12.0.2", "@angular/compiler": "^12.0.2", "@angular/core": "^12.0.2", "@angular/forms": "^12.0.2", - "@angular/material": "^11.2.12", + "@angular/material": "^12.0.2", "@angular/platform-browser": "^12.0.2", "@angular/platform-browser-dynamic": "^12.0.2", "@angular/router": "^12.0.2", @@ -74,8 +74,8 @@ "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", "prettier-plugin-organize-imports": "^2.0.0", - "rxjs": "^6.6.7", - "rxjs-compat": "^6.6.7", + "rxjs": "^6.5.3", + "rxjs-compat": "^6.5.3", "save-svg-as-png": "^1.4.17", "snyk": "^1.589.0", "spark-md5": "^3.0.1", @@ -98,10 +98,10 @@ "@sentry/electron": "^2.4.1", "@types/jasmine": "^3.7.1", "@types/jasminewd2": "^2.0.9", - "@types/node": "15.0.2", + "@types/node": "15.6.1", "codelyzer": "^6.0.2", - "electron": "^12.0.7", - "electron-builder": "22.11.1", + "electron": "^13.0.1", + "electron-builder": "22.10.5", "file-loader": "^6.2.0", "jasmine-core": "~3.7.1", "jasmine-spec-reporter": "~7.0.0", @@ -119,11 +119,11 @@ "replace": "^1.2.1", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.1.1", + "ts-node": "~10.0.0", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.2.4", - "webpack": "5.36.2", + "webpack": "5.38.0", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts index f8bc603f..724f61e5 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts @@ -26,9 +26,7 @@ export class DrawingComponent implements OnInit { ngOnInit() { try { this.drawing.element = this.svgToDrawingConverter.convert(this.drawing.svg); - } catch (error) { - console.log(`Cannot convert due to Error: '${error}'`); - } + } catch (error) {} } OnDragging(evt) { diff --git a/src/app/cartography/widgets/drawings.backup.ts b/src/app/cartography/widgets/drawings.backup.ts index 239768ac..0a255a71 100644 --- a/src/app/cartography/widgets/drawings.backup.ts +++ b/src/app/cartography/widgets/drawings.backup.ts @@ -44,9 +44,7 @@ export class DrawingsWidget implements Widget { layer.drawings.forEach((d: MapDrawing) => { try { d.element = this.svgToDrawingConverter.convert(d.svg); - } catch (error) { - console.log(`Cannot convert due to Error: '${error}'`); - } + } catch (error) {} }); return layer.drawings; }, @@ -81,9 +79,7 @@ export class DrawingsWidget implements Widget { .on('start', (datum: MapDrawing) => { document.body.style.cursor = 'ns-resize'; topEdge = datum.y; - console.log('started'); y = event.sourceEvent.clientY - this.context.getZeroZeroTransformationPoint().y; - // startEvent = event; }) .on('drag', (datum: MapDrawing) => { const evt = event; @@ -91,55 +87,10 @@ export class DrawingsWidget implements Widget { y = event.sourceEvent.clientY - this.context.getZeroZeroTransformationPoint().y; let height = datum.element.height - dy; if (height < 0) { - // height = datum.y - startEvent.y; datum.y += height; height = topEdge - datum.y; - // console.log(topEdge - datum.y); } - console.log('Height', height); datum.element.height = height; - - // datum.element.height -= dy; - // if(datum.element.height < 0) { - // datum.y -= datum.element.height; - // datum.element.height = Math.abs(datum.element.height); - // } - - // if (!isReflectedVertical) { - // if ((datum.element.height + evt.dy) < 0) { - // isReflectedVertical = true; - // y = topEdge; - // console.log(y); - // datum.element.height = Math.abs(datum.element.height + evt.dy); - // console.log(datum.element.height); - // } else { - // datum.element.height += evt.dy; - - // if (datum.element instanceof EllipseElement){ - // (datum.element as EllipseElement).cy = (datum.element as EllipseElement).cy + evt.dy/2 < 0 ? 1 : (datum.element as EllipseElement).cy += evt.dy/2; - // (datum.element as EllipseElement).ry = (datum.element as EllipseElement).ry + evt.dy/2 < 0 ? 1 : (datum.element as EllipseElement).ry += evt.dy/2; - // } - // } - // } else { - // dy = y - (evt.sourceEvent.clientY - this.context.getZeroZeroTransformationPoint().y); - // y = evt.sourceEvent.clientY - this.context.getZeroZeroTransformationPoint().y; - - // if ((datum.element.height + dy) < 0){ - // isReflectedVertical = false; - // y = topEdge; - // console.log(y); - // datum.element.height = Math.abs(datum.element.height + evt.dy); - // console.log(datum.element.height); - // } else { - // datum.y = evt.sourceEvent.clientY - this.context.getZeroZeroTransformationPoint().y; - // datum.element.height += dy; - // if (datum.element instanceof EllipseElement) { - // (datum.element as EllipseElement).cy = (datum.element as EllipseElement).cy + dy/2 < 0 ? 1 : (datum.element as EllipseElement).cy += dy/2; - // (datum.element as EllipseElement).ry = (datum.element as EllipseElement).ry + dy/2 < 0 ? 1 : (datum.element as EllipseElement).ry += dy/2; - // } - // } - // } - this.redrawDrawing(view, datum); }) .on('end', (datum: MapDrawing) => { diff --git a/src/app/cartography/widgets/drawings.ts b/src/app/cartography/widgets/drawings.ts index a4f9a174..2c2e0528 100644 --- a/src/app/cartography/widgets/drawings.ts +++ b/src/app/cartography/widgets/drawings.ts @@ -46,9 +46,7 @@ export class DrawingsWidget implements Widget { layer.drawings.forEach((d: MapDrawing) => { try { d.element = this.svgToDrawingConverter.convert(d.svg); - } catch (error) { - console.log(`Cannot convert due to Error: '${error}'`); - } + } catch (error) {} }); return layer.drawings; }, diff --git a/src/app/components/direct-link/direct-link.component.ts b/src/app/components/direct-link/direct-link.component.ts index cb7e2bcf..6476d749 100644 --- a/src/app/components/direct-link/direct-link.component.ts +++ b/src/app/components/direct-link/direct-link.component.ts @@ -66,7 +66,6 @@ export class DirectLinkComponent implements OnInit { const servers = await this.serverService.findAll(); const server = servers.filter((server) => server.host === this.serverIp && server.port === this.serverPort)[0]; - console.log(servers); if (server) { this.router.navigate(['/server', server.id, 'project', this.projectId]); } else { diff --git a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts index d9d92362..34f2080e 100644 --- a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts +++ b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts @@ -18,9 +18,7 @@ export class CustomAdaptersComponent { public adapters: CustomAdapter[]; public numberOfAdapters: number; - constructor() { - console.log(this.networkTypes); - } + constructor() {} cancelConfigureCustomAdapters() { this.closeConfiguratorEmitter.emit(false); @@ -28,8 +26,6 @@ export class CustomAdaptersComponent { configureCustomAdapters() { this.adapters = []; - console.log(this.customAdapters); - this.customAdapters.adapters.forEach((n) => { this.adapters.push({ adapter_number: n.adapter_number, diff --git a/src/app/services/server.service.ts b/src/app/services/server.service.ts index a5a67e6d..f40f57a3 100644 --- a/src/app/services/server.service.ts +++ b/src/app/services/server.service.ts @@ -63,11 +63,7 @@ export class ServerService { let promise = new Promise((resolve) => { let servers: Server[] = []; this.serverIds.forEach((n) => { - console.log(n); - let server: Server = JSON.parse(localStorage.getItem(n)); - console.log(server); - servers.push(server); }); resolve(servers); diff --git a/yarn.lock b/yarn.lock index 7e9922e2..504a4a3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== +"7zip-bin@~5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" + integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== "@angular-devkit/architect@0.1200.2": version "0.1200.2" @@ -133,12 +133,12 @@ dependencies: tslib "^2.1.0" -"@angular/cdk@^11.2.12": - version "11.2.13" - resolved "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz" - integrity sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug== +"@angular/cdk@^12.0.2": + version "12.0.2" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.0.2.tgz#a942fb5195138291558741a4bff3286a955a3f02" + integrity sha512-1JGayyUJmwaul5YSEgb780aWxk+MLVG5FakVaxz5NtbPZx19ZyOuZqytCh5js11LsBDipF5/kirYhJPBFlMbWQ== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" optionalDependencies: parse5 "^5.0.0" @@ -231,12 +231,12 @@ resolved "https://registry.npmjs.org/@angular/language-service/-/language-service-12.0.2.tgz" integrity sha512-H1aauvtS9qnq0FCdr3J2UROF7+AnOTCksD2AYuGS2/9O8tZLwwNz/UkXfxS3bHYzndYCsNiLPwAW7d0dWIjlqQ== -"@angular/material@^11.2.12": - version "11.2.13" - resolved "https://registry.npmjs.org/@angular/material/-/material-11.2.13.tgz" - integrity sha512-FqFdGSkOtqsmeLyTSousodDGUy2NqbtxCIKv2rwbsIRwHNKB0KpR/UQhA2gMRuGa5hxhMJ0DW0Tf9neMRuLCTg== +"@angular/material@^12.0.2": + version "12.0.2" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-12.0.2.tgz#1191d899a82e8ff336799779bf8c5f61d70e7d06" + integrity sha512-jTH53w4iVNk+3K5ciFyHeRhNNtV6TzeuNTSELeme4l3t5FP3VqFTdE56Q55MrV2RMIzDKLYEpiqSiQf+8ZuGSA== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" "@angular/platform-browser-dynamic@^12.0.2": version "12.0.2" @@ -1228,16 +1228,6 @@ dependencies: cross-spawn "^7.0.1" -"@malept/flatpak-bundler@^0.4.0": - version "0.4.0" - resolved "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz" - integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.0" - lodash "^4.17.15" - tmp-promise "^3.0.2" - "@mattlewis92/dom-autoscroller@^2.4.2": version "2.4.2" resolved "https://registry.npmjs.org/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz" @@ -1826,6 +1816,26 @@ resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz" integrity sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow== +"@tsconfig/node10@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.7.tgz#1eb1de36c73478a2479cc661ef5af1c16d86d606" + integrity sha512-aBvUmXLQbayM4w3A8TrjwrXs4DZ8iduJnuJLLRGdkWlyakCf1q6uHZJBzXoRA/huAEknG5tcUyQxN3A+In5euQ== + +"@tsconfig/node12@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.7.tgz#677bd9117e8164dc319987dd6ff5fc1ba6fbf18b" + integrity sha512-dgasobK/Y0wVMswcipr3k0HpevxFJLijN03A8mYfEPvWvOs14v0ZlYTR4kIgMx8g4+fTyTFv8/jLCIfRqLDJ4A== + +"@tsconfig/node14@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.0.tgz#5bd046e508b1ee90bc091766758838741fdefd6e" + integrity sha512-RKkL8eTdPv6t5EHgFKIVQgsDapugbuOptNd9OOunN/HAkzmmTnZELx1kNCK0rSdUYGmiFMM3rRQMAWiyp023LQ== + +"@tsconfig/node16@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.1.tgz#a6ca6a9a0ff366af433f42f5f0e124794ff6b8f1" + integrity sha512-FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA== + "@types/braces@*": version "3.0.0" resolved "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" @@ -2215,11 +2225,16 @@ resolved "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz" integrity sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw== -"@types/node@*", "@types/node@15.0.2", "@types/node@>=10.0.0": +"@types/node@*", "@types/node@>=10.0.0": version "15.0.2" resolved "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz" integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== +"@types/node@15.6.1": + version "15.6.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz#32d43390d5c62c5b6ec486a9bc9c59544de39a08" + integrity sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA== + "@types/node@^13.7.0": version "13.13.52" resolved "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz" @@ -2330,20 +2345,13 @@ resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.0": +"@types/yargs@^15.0.0", "@types/yargs@^15.0.13": version "15.0.13" resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz" integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" -"@types/yargs@^16.0.0": - version "16.0.3" - resolved "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz" - integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== - dependencies: - "@types/yargs-parser" "*" - "@webassemblyjs/ast@1.11.0": version "1.11.0" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz" @@ -2805,36 +2813,36 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.13: - version "3.5.13" - resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz" - integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== +app-builder-bin@3.5.12: + version "3.5.12" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" + integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== -app-builder-lib@22.11.1: - version "22.11.1" - resolved "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.1.tgz" - integrity sha512-oHpXomred4MeDzdLBMNuBtyEMiskX4wwQE+23CKFMqVfLEzpRwErZW+xegFi8aa/rhAOdED0THSHTcIr5rylIQ== +app-builder-lib@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" + integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== dependencies: - "7zip-bin" "~5.1.1" + "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" "@electron/universal" "1.0.4" - "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.1" - builder-util-runtime "8.7.4" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.1" + electron-publish "22.10.5" fs-extra "^9.1.0" - hosted-git-info "^4.0.0" - is-ci "^3.0.0" + hosted-git-info "^3.0.8" + is-ci "^2.0.0" istextorbinary "^5.12.0" js-yaml "^4.0.0" lazy-val "^1.0.4" minimatch "^3.0.4" - read-config-file "6.1.0" + normalize-package-data "^3.0.0" + read-config-file "6.0.0" sanitize-filename "^1.6.3" semver "^7.3.4" temp-file "^3.3.7" @@ -3359,29 +3367,29 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.4: - version "8.7.4" - resolved "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.4.tgz" - integrity sha512-2vDOwH0cyyCLQwW0Tsrg3RKKQpEcrV70KFun39E8RPzNFBOv9ds9juK8WUnO6ml+xJWKkKTjWLFdF3y+8GbPOw== +builder-util-runtime@8.7.3: + version "8.7.3" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" + integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util@22.11.1: - version "22.11.1" - resolved "https://registry.npmjs.org/builder-util/-/builder-util-22.11.1.tgz" - integrity sha512-3U/ALRUA/neNxGIP/G06sqAiMmCjAgIrRN2wWdAop6s/WKpzYRh+8alFUCLyfSanmxXjnzfJt9dy4TL+HHh6Rw== +builder-util@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" + integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== dependencies: - "7zip-bin" "~5.1.1" + "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" "@types/fs-extra" "^9.0.7" - app-builder-bin "3.5.13" + app-builder-bin "3.5.12" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.4" + builder-util-runtime "8.7.3" chalk "^4.1.0" debug "^4.3.2" fs-extra "^9.1.0" - is-ci "^3.0.0" + is-ci "^2.0.0" js-yaml "^4.0.0" source-map-support "^0.5.19" stat-mode "^1.0.0" @@ -3637,11 +3645,6 @@ ci-info@^2.0.0: resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.1.1: - version "3.2.0" - resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz" - integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== - circular-dependency-plugin@5.2.2: version "5.2.2" resolved "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz" @@ -4848,17 +4851,17 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@22.11.1: - version "22.11.1" - resolved "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.1.tgz" - integrity sha512-FZIIYpEs/ZfKJbRKjTjpQAHJKjRBlgd6QDUEAuC6OuyHUwwrflQay1rNTwp7spqbu9HDHipiQevX/e8dFmkQmw== +dmg-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" + integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== dependencies: - app-builder-lib "22.11.1" - builder-util "22.11.1" - builder-util-runtime "8.7.4" + app-builder-lib "22.10.5" + builder-util "22.10.5" fs-extra "^9.1.0" iconv-lite "^0.6.2" js-yaml "^4.0.0" + sanitize-filename "^1.6.3" optionalDependencies: dmg-license "^1.0.8" @@ -5031,32 +5034,35 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.11.1: - version "22.11.1" - resolved "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.1.tgz" - integrity sha512-IbAhv31idKzTR8KNQ+AIRf9J5vfU+9PzpG2STKHjYYWwGhfhZ5H4YfR0xH8xiwI4gaL1uTrfiq7fnpQxafhF2A== +electron-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" + integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== dependencies: - "@types/yargs" "^16.0.0" - app-builder-lib "22.11.1" - builder-util "22.11.1" - builder-util-runtime "8.7.4" + "@types/yargs" "^15.0.13" + app-builder-lib "22.10.5" + bluebird-lst "^1.0.9" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chalk "^4.1.0" - dmg-builder "22.11.1" + dmg-builder "22.10.5" fs-extra "^9.1.0" - is-ci "^3.0.0" + is-ci "^2.0.0" lazy-val "^1.0.4" - read-config-file "6.1.0" + read-config-file "6.0.0" + sanitize-filename "^1.6.3" update-notifier "^5.1.0" yargs "^16.2.0" -electron-publish@22.11.1: - version "22.11.1" - resolved "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.1.tgz" - integrity sha512-M8aXlIuP0QcGCdSzMvv67m8sZYdRpXFfiGpFbZOXJlO3Io/3jkNvbnUMVfhbamlmYrQKNSRJzB7te/pn+qYneA== +electron-publish@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" + integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== dependencies: "@types/fs-extra" "^9.0.7" - builder-util "22.11.1" - builder-util-runtime "8.7.4" + bluebird-lst "^1.0.9" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chalk "^4.1.0" fs-extra "^9.1.0" lazy-val "^1.0.4" @@ -5067,7 +5073,7 @@ electron-to-chromium@^1.3.723: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz" integrity sha512-Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg== -electron@*, electron@^12.0.7: +electron@*: version "12.0.9" resolved "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz" integrity sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA== @@ -5076,6 +5082,15 @@ electron@*, electron@^12.0.7: "@types/node" "^14.6.2" extract-zip "^1.0.3" +electron@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz#7dd3666f0f966ab83a1f9868d84add2e6205d43a" + integrity sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ== + dependencies: + "@electron/get" "^1.0.1" + "@types/node" "^14.6.2" + extract-zip "^1.0.3" + elfy@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz" @@ -5256,7 +5271,7 @@ escape-string-regexp@^4.0.0: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-scope@^5.1.1: +eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -5648,7 +5663,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -6020,14 +6035,14 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^3.0.4, hosted-git-info@^3.0.7: +hosted-git-info@^3.0.4, hosted-git-info@^3.0.7, hosted-git-info@^3.0.8: version "3.0.8" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz" integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" -hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: +hosted-git-info@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz" integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== @@ -6395,13 +6410,6 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-ci@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz" - integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== - dependencies: - ci-info "^3.1.1" - is-color-stop@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz" @@ -6928,7 +6936,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.0: +json5@^2.1.2: version "2.2.0" resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -8055,6 +8063,16 @@ normalize-package-data@^2.0.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== + dependencies: + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz" @@ -9542,15 +9560,15 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -read-config-file@6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/read-config-file/-/read-config-file-6.1.0.tgz" - integrity sha512-Z3ua8JTbQgrDNDWD0zMtwE2Np+RGeL+Jew5T7bSRfJGcq+t883wExEXNWLQqMaStfRp9Xz6RPsx01/jruhn+tg== +read-config-file@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" + integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== dependencies: dotenv "^8.2.0" dotenv-expand "^5.1.0" - js-yaml "^4.0.0" - json5 "^2.2.0" + js-yaml "^3.13.1" + json5 "^2.1.2" lazy-val "^1.0.4" read-installed@~4.0.3: @@ -9829,7 +9847,7 @@ resolve-url@^0.2.1: resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.20.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.3.3: +resolve@1.20.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.3.3: version "1.20.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -9932,9 +9950,9 @@ rw@1: resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= -rxjs-compat@^6.6.7: +rxjs-compat@^6.5.3: version "6.6.7" - resolved "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.6.7.tgz" + resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.6.7.tgz#6eb4ef75c0a58ea672854a701ccc8d49f41e69cb" integrity sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw== rxjs-tslint@^0.1.8: @@ -9948,7 +9966,7 @@ rxjs-tslint@^0.1.8: typescript ">=2.8.3" yargs "^15.3.1" -rxjs@6.6.7, rxjs@^6.5.3, rxjs@^6.6.0, rxjs@^6.6.6, rxjs@^6.6.7: +rxjs@6.6.7, rxjs@^6.5.3, rxjs@^6.6.0, rxjs@^6.6.6: version "6.6.7" resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== @@ -11264,13 +11282,6 @@ timsort@^0.3.0: resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tmp-promise@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz" - integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== - dependencies: - tmp "^0.2.0" - tmp@0.0.30: version "0.0.30" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz" @@ -11285,7 +11296,7 @@ tmp@0.0.33, tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@0.2.1, tmp@^0.2.0, tmp@^0.2.1: +tmp@0.2.1, tmp@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== @@ -11383,11 +11394,15 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.1.1: - version "9.1.1" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz" - integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== +ts-node@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" + integrity sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg== dependencies: + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.1" arg "^4.1.0" create-require "^1.1.0" diff "^4.0.1" @@ -11775,7 +11790,7 @@ vscode-languageserver-types@^3.16.0: resolved "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz" integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== -watchpack@^2.0.0: +watchpack@^2.0.0, watchpack@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz" integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== @@ -11916,6 +11931,14 @@ webpack-sources@^2.1.1: source-list-map "^2.0.1" source-map "^0.6.1" +webpack-sources@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" + integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ== + dependencies: + source-list-map "^2.0.1" + source-map "^0.6.1" + webpack-subresource-integrity@1.5.2: version "1.5.2" resolved "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz" @@ -11952,6 +11975,35 @@ webpack@5.36.2: watchpack "^2.0.0" webpack-sources "^2.1.1" +webpack@5.38.0: + version "5.38.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.38.0.tgz#bd9f9ef8a8778c7162f598647b7a6e6273cb55e8" + integrity sha512-9jrxzP0C3Q+ypaqaLU0TH3CgcSHR02cqPRCzOKkjiVJZoKSjoVH6Kf4Y1ytJj5NWoXSYydvhoHkaJO//ej2ckA== + dependencies: + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.47" + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/wasm-edit" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + acorn "^8.2.1" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.8.0" + es-module-lexer "^0.4.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.0.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.1" + watchpack "^2.2.0" + webpack-sources "^2.3.0" + websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"