ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-22 00:13:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into Adding-new-project-on-enter

Browse Source
This commit is contained in:
Piotr Pekala
2019-02-27 04:10:09 -08:00
parent bc7eda33b3 19d450d5cd
commit f866de520a
8 changed files with 144 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -4,8 +4,8 @@ version: 1.0.{build}
skip_branch_with_pr: true skip_branch_with_pr: true
cache: cache:
- node_modules - node_modules -> .appveyor.yml,package.json,yarn.lock
- '%LOCALAPPDATA%/Yarn' - '%LOCALAPPDATA%\Yarn -> .appveyor.yml,package.json,yarn.lock'
platform: platform:
- x64 - x64

2
local-server.js
View File

@ -191,7 +191,7 @@ async function run(server, options) {
notifyStatus({ notifyStatus({
serverName: server.name, serverName: server.name,
status: 'errored', status: 'errored',
message: `Server errored: '${errorMessage}` message: `Server errored: '${err}`
}); });
}); });

4
package.json
View File

@ -68,6 +68,7 @@
"rxjs-compat": "^6.4.0", "rxjs-compat": "^6.4.0",
"typeface-roboto": "^0.0.54", "typeface-roboto": "^0.0.54",
"yargs": "^13.2.1", "yargs": "^13.2.1",
"tree-kill": "^1.2.1",
"zone.js": "^0.8.29" "zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
@ -81,7 +82,7 @@
"@types/node": "~11.9.5", "@types/node": "~11.9.5",
"codelyzer": "~4.5.0", "codelyzer": "~4.5.0",
"electron": "4.0.6", "electron": "4.0.6",
"electron-builder": "^20.38.2", "electron-builder": "20.38.2",
"jasmine-core": "~3.3.0", "jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"jquery": "^3.3.1", "jquery": "^3.3.1",
@ -97,7 +98,6 @@
"prettier": "^1.16.4", "prettier": "^1.16.4",
"protractor": "~5.4.2", "protractor": "~5.4.2",
"replace": "^1.0.1", "replace": "^1.0.1",
"tree-kill": "^1.2.1",
"ts-mockito": "^2.3.1", "ts-mockito": "^2.3.1",
"ts-node": "~8.0.2", "ts-node": "~8.0.2",
"tslint": "~5.13.0", "tslint": "~5.13.0",

4
src/app/cartography/components/drawing-adding/drawing-adding.component.ts
View File

@ -25,8 +25,8 @@ export class DrawingAddingComponent implements OnInit, OnDestroy {
activate() { activate() {
let listener = (event: MouseEvent) => { let listener = (event: MouseEvent) => {
let x = event.pageX - this.context.getZeroZeroTransformationPoint().x; let x = event.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
let y = event.pageY - this.context.getZeroZeroTransformationPoint().y; let y = event.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
this.drawingsEventSource.pointToAddSelected.emit(new AddedDataEvent(x, y)); this.drawingsEventSource.pointToAddSelected.emit(new AddedDataEvent(x, y));
this.deactivate(); this.deactivate();

8
src/app/cartography/components/text-editor/text-editor.component.ts
View File

@ -54,8 +54,8 @@ export class TextEditorComponent implements OnInit, OnDestroy {
this.drawingsEventSource.textAdded.emit( this.drawingsEventSource.textAdded.emit(
new TextAddedDataEvent( new TextAddedDataEvent(
this.temporaryTextElement.nativeElement.innerText.replace(/\n$/, ''), this.temporaryTextElement.nativeElement.innerText.replace(/\n$/, ''),
event.pageX, event.pageX - this.context.transformation.x,
event.pageY event.pageY - this.context.transformation.y
) )
); );
this.deactivateTextAdding(); this.deactivateTextAdding();
@ -92,8 +92,8 @@ export class TextEditorComponent implements OnInit, OnDestroy {
this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute('drawing_id'); this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute('drawing_id');
var transformData = textElements[index].parentElement.getAttribute('transform').split(/\(|\)/); var transformData = textElements[index].parentElement.getAttribute('transform').split(/\(|\)/);
var x = Number(transformData[1].split(/,/)[0]) + this.context.getZeroZeroTransformationPoint().x; var x = Number(transformData[1].split(/,/)[0]) + this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x;
var y = Number(transformData[1].split(/,/)[1]) + this.context.getZeroZeroTransformationPoint().y; var y = Number(transformData[1].split(/,/)[1]) + this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y;
this.leftPosition = x.toString() + 'px'; this.leftPosition = x.toString() + 'px';
this.topPosition = y.toString() + 'px'; this.topPosition = y.toString() + 'px';
this.temporaryTextElement.nativeElement.innerText = elem.text; this.temporaryTextElement.nativeElement.innerText = elem.text;

28
src/app/cartography/widgets/drawings.ts
View File

@ -111,15 +111,15 @@ export class DrawingsWidget implements Widget {
} }
} }
} else { } else {
dy = y - (evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y); dy = y - (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y));
y = evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y; y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
if (datum.element.height + dy < 0) { if (datum.element.height + dy < 0) {
isReflectedVertical = false; isReflectedVertical = false;
y = topEdge; y = topEdge;
datum.element.height = Math.abs(datum.element.height + evt.dy); datum.element.height = Math.abs(datum.element.height + evt.dy);
} else { } else {
datum.y = evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y; datum.y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
datum.element.height += dy; datum.element.height += dy;
if (datum.element instanceof EllipseElement) { if (datum.element instanceof EllipseElement) {
(datum.element as EllipseElement).cy = (datum.element as EllipseElement).cy =
@ -143,7 +143,7 @@ export class DrawingsWidget implements Widget {
let top = drag() let top = drag()
.on('start', (datum: MapDrawing) => { .on('start', (datum: MapDrawing) => {
y = event.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y; y = event.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
bottomEdge = y + datum.element.height; bottomEdge = y + datum.element.height;
document.body.style.cursor = 'ns-resize'; document.body.style.cursor = 'ns-resize';
}) })
@ -151,15 +151,15 @@ export class DrawingsWidget implements Widget {
const evt = event; const evt = event;
if (!isReflectedVertical) { if (!isReflectedVertical) {
dy = y - (evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y); dy = y - (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y));
y = evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y; y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
if (datum.element.height + dy < 0) { if (datum.element.height + dy < 0) {
y = bottomEdge; y = bottomEdge;
isReflectedVertical = true; isReflectedVertical = true;
datum.element.height = Math.abs(datum.element.height + evt.dy); datum.element.height = Math.abs(datum.element.height + evt.dy);
} else { } else {
datum.y = evt.sourceEvent.pageY - this.context.getZeroZeroTransformationPoint().y; datum.y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y);
datum.element.height += dy; datum.element.height += dy;
if (datum.element instanceof EllipseElement) { if (datum.element instanceof EllipseElement) {
(datum.element as EllipseElement).cy = (datum.element as EllipseElement).cy =
@ -207,7 +207,7 @@ export class DrawingsWidget implements Widget {
let isReflectedHorizontal: boolean = false; let isReflectedHorizontal: boolean = false;
let right = drag() let right = drag()
.on('start', (datum: MapDrawing) => { .on('start', (datum: MapDrawing) => {
x = event.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x; x = event.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
leftEdge = x + datum.element.width; leftEdge = x + datum.element.width;
document.body.style.cursor = 'ew-resize'; document.body.style.cursor = 'ew-resize';
}) })
@ -215,15 +215,15 @@ export class DrawingsWidget implements Widget {
const evt = event; const evt = event;
if (!isReflectedHorizontal) { if (!isReflectedHorizontal) {
dx = x - (evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x); dx = x - (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x));
x = evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x; x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
if (datum.element.width + dx < 0) { if (datum.element.width + dx < 0) {
x = leftEdge; x = leftEdge;
isReflectedHorizontal = true; isReflectedHorizontal = true;
datum.element.width = Math.abs(datum.element.width + evt.dx); datum.element.width = Math.abs(datum.element.width + evt.dx);
} else { } else {
datum.x = evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x; datum.x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
datum.element.width += dx; datum.element.width += dx;
if (datum.element instanceof EllipseElement) { if (datum.element instanceof EllipseElement) {
(datum.element as EllipseElement).cx = (datum.element as EllipseElement).cx =
@ -290,15 +290,15 @@ export class DrawingsWidget implements Widget {
datum.element.width = datum.element.width + evt.dx < 0 ? 1 : (datum.element.width += evt.dx); datum.element.width = datum.element.width + evt.dx < 0 ? 1 : (datum.element.width += evt.dx);
} }
} else { } else {
dx = x - (evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x); dx = x - (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x));
x = evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x; x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
if (datum.element.width + dx < 0) { if (datum.element.width + dx < 0) {
x = rightEdge; x = rightEdge;
isReflectedHorizontal = false; isReflectedHorizontal = false;
datum.element.width = Math.abs(datum.element.width + evt.dx); datum.element.width = Math.abs(datum.element.width + evt.dx);
} else { } else {
datum.x = evt.sourceEvent.pageX - this.context.getZeroZeroTransformationPoint().x; datum.x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x);
datum.element.width += dx; datum.element.width += dx;
if (datum.element instanceof EllipseElement) { if (datum.element instanceof EllipseElement) {
(datum.element as EllipseElement).cx = (datum.element as EllipseElement).cx =

6
src/app/components/projects/projects.component.html
View File

@ -37,15 +37,15 @@
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell> <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-cell *matCellDef="let row" style="text-align: right"> <mat-cell *matCellDef="let row" style="text-align: right">
<button mat-icon-button matTooltip="Delete project" (click)="delete(row)" *ngIf="row.status == 'closed'">
<mat-icon aria-label="Delete project">delete</mat-icon>
</button>
<button mat-icon-button matTooltip="Open project" (click)="open(row)" *ngIf="row.status == 'closed'"> <button mat-icon-button matTooltip="Open project" (click)="open(row)" *ngIf="row.status == 'closed'">
<mat-icon aria-label="Open project">play_arrow</mat-icon> <mat-icon aria-label="Open project">play_arrow</mat-icon>
</button> </button>
<button mat-icon-button matTooltip="Close project" (click)="close(row)" *ngIf="row.status == 'opened'"> <button mat-icon-button matTooltip="Close project" (click)="close(row)" *ngIf="row.status == 'opened'">
<mat-icon aria-label="Close project">pause</mat-icon> <mat-icon aria-label="Close project">pause</mat-icon>
</button> </button>
<button mat-icon-button matTooltip="Delete project" (click)="delete(row)" *ngIf="row.status == 'closed'">
<mat-icon aria-label="Open project">delete</mat-icon>
</button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>

141
yarn.lock
View File

@ -1024,12 +1024,47 @@ anymatch@^2.0.0:
micromatch "^3.1.4" micromatch "^3.1.4"
normalize-path "^2.1.1" normalize-path "^2.1.1"
app-builder-bin@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.0.tgz#b4e5d5ee5bcf264818ab9830b95338f9f419de5d"
integrity sha512-7HphDMS2U9MwAA6R7lSU6MASFR/D+VJDb5hQ4Fn2coOMyaRn71QDWPdG0TPnDr88F2I7bsTuHYud28S/yN2lZw==
app-builder-bin@2.6.3: app-builder-bin@2.6.3:
version "2.6.3" version "2.6.3"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.3.tgz#428557e8fd517ef6272b3d85593ebb288c2aed90" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.3.tgz#428557e8fd517ef6272b3d85593ebb288c2aed90"
integrity sha512-JL8C41e6yGIchFsHP/q15aGNedAaUakLhkV6ER0Yxafx08sRnlDnlkAkEIKjX7edg/4i7swpGa6CBv1zX9GgCA== integrity sha512-JL8C41e6yGIchFsHP/q15aGNedAaUakLhkV6ER0Yxafx08sRnlDnlkAkEIKjX7edg/4i7swpGa6CBv1zX9GgCA==
app-builder-lib@20.38.5, app-builder-lib@~20.38.5: app-builder-lib@20.38.2:
version "20.38.2"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.2.tgz#7b5b239ba7ce52cd618a91f5e499068e54a35a95"
integrity sha512-jwysFwaU4ohvHqv5jNCeoZSO0N/8x7W/c0S6TiTb6QUC3U0YVcsN7DPMj7QApHzTvMTO9kxzjUzwA8dbQZVovg==
dependencies:
"7zip-bin" "~4.1.0"
app-builder-bin "2.6.0"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.6"
builder-util "9.6.0"
builder-util-runtime "8.0.2"
chromium-pickle-js "^0.2.0"
debug "^4.1.0"
ejs "^2.6.1"
electron-osx-sign "0.4.11"
electron-publish "20.38.2"
fs-extra-p "^7.0.0"
hosted-git-info "^2.7.1"
is-ci "^1.2.1"
isbinaryfile "^3.0.3"
js-yaml "^3.12.0"
lazy-val "^1.0.3"
minimatch "^3.0.4"
normalize-package-data "^2.4.0"
plist "^3.0.1"
read-config-file "3.2.0"
sanitize-filename "^1.6.1"
semver "^5.6.0"
temp-file "^3.3.2"
app-builder-lib@~20.38.2:
version "20.38.5" version "20.38.5"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.5.tgz#bdfbbc35e10571c6cf1f62daae95991d27686a03" resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.5.tgz#bdfbbc35e10571c6cf1f62daae95991d27686a03"
integrity sha512-vVgM9d9twwlhr+8vNAJOAD9dyVBRk7reuVa1BE1OmvaHb1M+fS8KpvcDKVdBqX9KDHy7zSc57mnIcHgax4/XMA== integrity sha512-vVgM9d9twwlhr+8vNAJOAD9dyVBRk7reuVa1BE1OmvaHb1M+fS8KpvcDKVdBqX9KDHy7zSc57mnIcHgax4/XMA==
@ -1646,6 +1681,16 @@ buffer@^4.3.0:
ieee754 "^1.1.4" ieee754 "^1.1.4"
isarray "^1.0.0" isarray "^1.0.0"
builder-util-runtime@8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz#9d638a266ca3aa25ced1cff4df74c8fd97dd78cf"
integrity sha512-46AjyMQ1/yBvGnXWmqNGlg8te7jCPCs7TJ0zDC2+4vV/t5iZp2dR1H9UfVpcBxlvBq3dlAOmwb9fz1d9xZN1+Q==
dependencies:
bluebird-lst "^1.0.6"
debug "^4.1.0"
fs-extra-p "^7.0.0"
sax "^1.2.4"
builder-util-runtime@8.1.1: builder-util-runtime@8.1.1:
version "8.1.1" version "8.1.1"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50"
@ -1656,7 +1701,7 @@ builder-util-runtime@8.1.1:
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
sax "^1.2.4" sax "^1.2.4"
builder-util-runtime@^8.1.1: builder-util-runtime@^8.0.2, builder-util-runtime@^8.1.1:
version "8.2.0" version "8.2.0"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz#e64c311b4f3643c8ccd8b8e5ba5bfb10801a6826" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz#e64c311b4f3643c8ccd8b8e5ba5bfb10801a6826"
integrity sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg== integrity sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==
@ -1666,7 +1711,25 @@ builder-util-runtime@^8.1.1:
fs-extra-p "^7.0.1" fs-extra-p "^7.0.1"
sax "^1.2.4" sax "^1.2.4"
builder-util@9.6.2, builder-util@~9.6.2: builder-util@9.6.0:
version "9.6.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.0.tgz#ffcc0f713d0f4dfa6bcda2aee83b8fcb1f16f5b6"
integrity sha512-6T4E3aNVndTZ2oCt+22S0wxt47d094MxrADi6S012QumXlDNfSsyu1ffbGN9w0HG+4aubpLzf9apKgMP1yl4Kw==
dependencies:
"7zip-bin" "~4.1.0"
app-builder-bin "2.6.0"
bluebird-lst "^1.0.6"
builder-util-runtime "^8.0.2"
chalk "^2.4.1"
debug "^4.1.0"
fs-extra-p "^7.0.0"
is-ci "^1.2.1"
js-yaml "^3.12.0"
source-map-support "^0.5.9"
stat-mode "^0.2.2"
temp-file "^3.3.2"
builder-util@9.6.2, builder-util@~9.6.0, builder-util@~9.6.2:
version "9.6.2" version "9.6.2"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.2.tgz#3366aefea1b5ce292840be727a094e96fa25802f" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.2.tgz#3366aefea1b5ce292840be727a094e96fa25802f"
integrity sha512-cWl/0/Q851lesMmXp1IjreeAX1QAWA9e+iU2IT61oh+CvMYJnDwao2m9ZCHammdw2zllrwWu4fOC3gvsb/yOCw== integrity sha512-cWl/0/Q851lesMmXp1IjreeAX1QAWA9e+iU2IT61oh+CvMYJnDwao2m9ZCHammdw2zllrwWu4fOC3gvsb/yOCw==
@ -2955,17 +3018,17 @@ dir-glob@^2.0.0:
dependencies: dependencies:
path-type "^3.0.0" path-type "^3.0.0"
dmg-builder@6.5.4: dmg-builder@6.5.2:
version "6.5.4" version "6.5.2"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.4.tgz#18c573a5e777cbb39d84d7eaa84d965e1bb5b01f" resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.2.tgz#cb6e34b793831349f46c7e6415182d90e8c4a386"
integrity sha512-EaEkF8weXez3iAwgYffjcYfumauUh5x+BggMgn/IuihNIA5/WfzRAUR4wMq9aII2zwArlw+rIrX6ZHKbmtkQmA== integrity sha512-eT3qc8IrwfDyq5ddGO807Wya2ltVlIlE0FVf6Aa+HWdlp9JnYayPNGWrQA9xIHpKKlq206JdNZ6LYIn93EAzdg==
dependencies: dependencies:
app-builder-lib "~20.38.5" app-builder-lib "~20.38.2"
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "~9.6.2" builder-util "~9.6.0"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
iconv-lite "^0.4.24" iconv-lite "^0.4.24"
js-yaml "^3.12.1" js-yaml "^3.12.0"
parse-color "^1.0.0" parse-color "^1.0.0"
sanitize-filename "^1.6.1" sanitize-filename "^1.6.1"
@ -3016,7 +3079,7 @@ dotenv-expand@^4.2.0:
resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU= integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
dotenv@^6.2.0: dotenv@^6.1.0, dotenv@^6.2.0:
version "6.2.0" version "6.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
@ -3054,21 +3117,21 @@ ejs@^2.6.1:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
electron-builder@^20.38.5: electron-builder@20.38.2:
version "20.38.5" version "20.38.2"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.5.tgz#31b3913a68b4911afd4cfc7bcd2522c5808040cd" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.2.tgz#e44f086348f70e40bad796b260a7d3542cb93282"
integrity sha512-p88IDHhH2J4hA6KwRBJY+OfVZuFtFIShY3Uh/TwYAfbX0v1RhKZytuGdO8sty2zcWxDYX74xDBv+X9oN6qEIRQ== integrity sha512-uUEzfc/e8J7nAowvFQw4SyHIe4d6VSHO1LmcLy53he4aGXlVklHluhbwa0rxATPdYVNgHmJz7zoVgYYOd/YS+A==
dependencies: dependencies:
app-builder-lib "20.38.5" app-builder-lib "20.38.2"
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "9.6.2" builder-util "9.6.0"
builder-util-runtime "8.1.1" builder-util-runtime "8.0.2"
chalk "^2.4.2" chalk "^2.4.1"
dmg-builder "6.5.4" dmg-builder "6.5.2"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
is-ci "^2.0.0" is-ci "^1.2.1"
lazy-val "^1.0.3" lazy-val "^1.0.3"
read-config-file "3.2.1" read-config-file "3.2.0"
sanitize-filename "^1.6.1" sanitize-filename "^1.6.1"
update-notifier "^2.5.0" update-notifier "^2.5.0"
yargs "^12.0.5" yargs "^12.0.5"
@ -3107,6 +3170,19 @@ electron-osx-sign@0.4.11:
minimist "^1.2.0" minimist "^1.2.0"
plist "^3.0.1" plist "^3.0.1"
electron-publish@20.38.2:
version "20.38.2"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.2.tgz#b0a59ee4435c509caa633f9fed01913addd48e1c"
integrity sha512-GXwnZm9I9l4RjlDwuALpR57aIH38qRzDEYbhLysmrC5T2xlCgyBIfxS5EUNESqKT+9KeJJZcj+eTKMjbz+Qafw==
dependencies:
bluebird-lst "^1.0.6"
builder-util "~9.6.0"
builder-util-runtime "^8.0.2"
chalk "^2.4.1"
fs-extra-p "^7.0.0"
lazy-val "^1.0.3"
mime "^2.4.0"
electron-publish@20.38.5: electron-publish@20.38.5:
version "20.38.5" version "20.38.5"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.5.tgz#c6ed7ea12bc80796b1f36489995f4651f730b1df" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.5.tgz#c6ed7ea12bc80796b1f36489995f4651f730b1df"
@ -4473,7 +4549,7 @@ is-callable@^1.1.4:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
is-ci@^1.0.10: is-ci@^1.0.10, is-ci@^1.2.1:
version "1.2.1" version "1.2.1"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
@ -4704,7 +4780,7 @@ isarray@2.0.1:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
isbinaryfile@^3.0.0, isbinaryfile@^3.0.2: isbinaryfile@^3.0.0, isbinaryfile@^3.0.2, isbinaryfile@^3.0.3:
version "3.0.3" version "3.0.3"
resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
@ -6769,6 +6845,21 @@ read-cache@^1.0.0:
dependencies: dependencies:
pify "^2.3.0" pify "^2.3.0"
read-config-file@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.0.tgz#50a2756a9a128ab9dcbe087e2724c512e3d0ccd1"
integrity sha512-i1QRc5jy4sHm9YBGb6ArA5SU1mDrc5wu2mnm3r9gPnm+LVZhBGbpTCKqAXyvV4TJHnBR3Yaaww+9b3DyRZcfww==
dependencies:
ajv "^6.5.5"
ajv-keywords "^3.2.0"
bluebird-lst "^1.0.6"
dotenv "^6.1.0"
dotenv-expand "^4.2.0"
fs-extra-p "^7.0.0"
js-yaml "^3.12.0"
json5 "^2.1.0"
lazy-val "^1.0.3"
read-config-file@3.2.1: read-config-file@3.2.1:
version "3.2.1" version "3.2.1"
resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.1.tgz#112dc8636121fa71fd524e1a8a5b4470ef7a2732" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.1.tgz#112dc8636121fa71fd524e1a8a5b4470ef7a2732"
@ -7597,7 +7688,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0" source-map-url "^0.4.0"
urix "^0.1.0" urix "^0.1.0"
source-map-support@0.5.10, source-map-support@^0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.9: source-map-support@0.5.10, source-map-support@^0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.9:
version "0.5.10" version "0.5.10"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ== integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==