Merge pull request #391 from GNS3/deps-2019-04

Update dependencies, Fixes: #373
This commit is contained in:
ziajka
2019-04-29 13:20:54 +02:00
committed by GitHub
46 changed files with 920 additions and 878 deletions

View File

@ -38,23 +38,23 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^7.2.7", "@angular/animations": "^7.2.14",
"@angular/cdk": "^7.3.3", "@angular/cdk": "^7.3.7",
"@angular/common": "^7.2.7", "@angular/common": "^7.2.14",
"@angular/compiler": "^7.2.7", "@angular/compiler": "^7.2.14",
"@angular/core": "^7.2.7", "@angular/core": "^7.2.14",
"@angular/forms": "^7.2.7", "@angular/forms": "^7.2.14",
"@angular/http": "^7.2.7", "@angular/http": "^7.2.14",
"@angular/material": "^7.3.3", "@angular/material": "^7.3.7",
"@angular/platform-browser": "^7.2.7", "@angular/platform-browser": "^7.2.14",
"@angular/platform-browser-dynamic": "^7.2.7", "@angular/platform-browser-dynamic": "^7.2.14",
"@angular/router": "^7.2.7", "@angular/router": "^7.2.14",
"angular-persistence": "^1.0.1", "angular-persistence": "^1.0.1",
"angular2-hotkeys": "^2.1.4", "angular2-hotkeys": "^2.1.4",
"angular2-indexeddb": "^1.2.3", "angular2-indexeddb": "^1.2.3",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"command-exists": "^1.2.8", "command-exists": "^1.2.8",
"core-js": "^2.6.5", "core-js": "^3.0.1",
"css-tree": "^1.0.0-alpha.29", "css-tree": "^1.0.0-alpha.29",
"d3-ng2-service": "^2.1.0", "d3-ng2-service": "^2.1.0",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
@ -62,47 +62,47 @@
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"ng2-file-upload": "^1.3.0", "ng2-file-upload": "^1.3.0",
"ngx-electron": "^2.1.1", "ngx-electron": "^2.1.1",
"node-fetch": "^2.3.0", "node-fetch": "^2.4.1",
"notosans-fontface": "^1.1.0", "notosans-fontface": "^1.1.0",
"raven-js": "^3.27.0", "raven-js": "^3.27.0",
"rxjs": "^6.4.0", "rxjs": "^6.5.1",
"rxjs-compat": "^6.4.0", "rxjs-compat": "^6.5.1",
"tree-kill": "^1.2.1", "tree-kill": "^1.2.1",
"typeface-roboto": "^0.0.54", "typeface-roboto": "^0.0.54",
"yargs": "^13.2.1", "yargs": "^13.2.2",
"zone.js": "^0.8.29" "zone.js": "^0.9.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.13.3", "@angular-devkit/build-angular": "~0.13.8",
"@angular/cli": "^7.3.3", "@angular/cli": "^7.3.8",
"@angular/compiler-cli": "^7.2.7", "@angular/compiler-cli": "^7.2.14",
"@angular/language-service": "^7.2.7", "@angular/language-service": "^7.2.14",
"@sentry/cli": "^1.40.0", "@sentry/cli": "^1.41.2",
"@sentry/electron": "^0.16.0", "@sentry/electron": "^0.17.1",
"@types/jasmine": "~3.3.9", "@types/jasmine": "~3.3.12",
"@types/jasminewd2": "~2.0.6", "@types/jasminewd2": "~2.0.6",
"@types/node": "~11.9.5", "@types/node": "~11.13.8",
"codelyzer": "~4.5.0", "codelyzer": "~5.0.1",
"electron": "4.0.6", "electron": "5.0.0",
"electron-builder": "20.38.2", "electron-builder": "20.39.0",
"jasmine-core": "~3.3.0", "jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"jquery": "^3.3.1", "jquery": "^3.4.0",
"karma": "~4.0.0", "karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-cli": "~2.0.0", "karma-cli": "~2.0.0",
"karma-coverage-istanbul-reporter": "^2.0.5", "karma-coverage-istanbul-reporter": "^2.0.5",
"karma-jasmine": "~2.0.1", "karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0", "karma-jasmine-html-reporter": "^1.4.2",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
"node-sass": "^4.11.0", "node-sass": "^4.12.0",
"popper.js": "^1.14.7", "popper.js": "^1.15.0",
"prettier": "^1.16.4", "prettier": "^1.17.0",
"protractor": "~5.4.2", "protractor": "~5.4.2",
"replace": "^1.0.1", "replace": "^1.1.0",
"ts-mockito": "^2.3.1", "ts-mockito": "^2.3.1",
"ts-node": "~8.0.2", "ts-node": "~8.1.0",
"tslint": "~5.13.0", "tslint": "~5.16.0",
"tslint-config-prettier": "^1.18.0", "tslint-config-prettier": "^1.18.0",
"typescript": "<3.3.0" "typescript": "<3.3.0"
}, },

View File

@ -58,7 +58,7 @@ describe('DrawingAddedComponent', () => {
component.project = { project_id: 'sampleId' } as Project; component.project = { project_id: 'sampleId' } as Project;
component.selectedDrawing = 'rectangle'; component.selectedDrawing = 'rectangle';
const pointToAddSelectedDataEvent = new AddedDataEvent(0, 0); const pointToAddSelectedDataEvent = new AddedDataEvent(0, 0);
spyOn(mockedDrawingService, 'add').and.returnValue(Observable.of({})); spyOn(mockedDrawingService, 'add').and.returnValue(Observable.of());
mockedDrawingsEventSource.pointToAddSelected.emit(pointToAddSelectedDataEvent); mockedDrawingsEventSource.pointToAddSelected.emit(pointToAddSelectedDataEvent);

View File

@ -57,7 +57,7 @@ describe('DrawingDraggedComponent', () => {
element: mapDrawingElement element: mapDrawingElement
}; };
const drawingDraggedDataEvent = new DraggedDataEvent<MapDrawing>(mapDrawing, 0, 0); const drawingDraggedDataEvent = new DraggedDataEvent<MapDrawing>(mapDrawing, 0, 0);
spyOn(mockedDrawingService, 'updatePosition').and.returnValue(Observable.of({})); spyOn(mockedDrawingService, 'updatePosition').and.returnValue(Observable.of());
mockedDrawingsEventSource.dragged.emit(drawingDraggedDataEvent); mockedDrawingsEventSource.dragged.emit(drawingDraggedDataEvent);

View File

@ -60,7 +60,7 @@ describe('DrawingResizedComponent', () => {
element: mapDrawingElement element: mapDrawingElement
}; };
const drawingResizedDataEvent = new ResizedDataEvent<MapDrawing>(mapDrawing, 0, 0, 100, 100); const drawingResizedDataEvent = new ResizedDataEvent<MapDrawing>(mapDrawing, 0, 0, 100, 100);
spyOn(mockedDrawingService, 'updateSizeAndPosition').and.returnValue(Observable.of({})); spyOn(mockedDrawingService, 'updateSizeAndPosition').and.returnValue(Observable.of());
mockedDrawingsEventSource.resized.emit(drawingResizedDataEvent); mockedDrawingsEventSource.resized.emit(drawingResizedDataEvent);

View File

@ -68,7 +68,7 @@ describe('NodeDraggedComponent', () => {
z: 0 z: 0
}; };
const draggedDataEvent = new DraggedDataEvent<MapNode>(mapNode, 0, 0); const draggedDataEvent = new DraggedDataEvent<MapNode>(mapNode, 0, 0);
spyOn(mockedNodeService, 'updatePosition').and.returnValue(Observable.of({})); spyOn(mockedNodeService, 'updatePosition').and.returnValue(Observable.of());
mockedNodesEventSource.dragged.emit(draggedDataEvent); mockedNodesEventSource.dragged.emit(draggedDataEvent);

View File

@ -63,7 +63,7 @@ describe('NodeLabelDraggedComponent', () => {
nodeId: 'node id' nodeId: 'node id'
}; };
const nodeDraggedDataEvent = new DraggedDataEvent<MapLabel>(mapLabel, 0, 0); const nodeDraggedDataEvent = new DraggedDataEvent<MapLabel>(mapLabel, 0, 0);
spyOn(mockedNodeService, 'updateLabel').and.returnValue(Observable.of({})); spyOn(mockedNodeService, 'updateLabel').and.returnValue(Observable.of());
mockedNodesEventSource.labelDragged.emit(nodeDraggedDataEvent); mockedNodesEventSource.labelDragged.emit(nodeDraggedDataEvent);

View File

@ -59,7 +59,7 @@ describe('TextAddedComponent', () => {
it('should call drawing service when text added', () => { it('should call drawing service when text added', () => {
component.project = { project_id: 'sampleId' } as Project; component.project = { project_id: 'sampleId' } as Project;
const textAddedDataEvent = new TextAddedDataEvent('savedText', 0, 0); const textAddedDataEvent = new TextAddedDataEvent('savedText', 0, 0);
spyOn(mockedDrawingService, 'add').and.returnValue(Observable.of({})); spyOn(mockedDrawingService, 'add').and.returnValue(Observable.of());
mockedDrawingsEventSource.textAdded.emit(textAddedDataEvent); mockedDrawingsEventSource.textAdded.emit(textAddedDataEvent);

View File

@ -55,7 +55,7 @@ describe('TextEditedComponent', () => {
text_decoration: 'sample decoration' text_decoration: 'sample decoration'
}; };
const textEditedDataEvent = new TextEditedDataEvent('id', 'edited text', textElement); const textEditedDataEvent = new TextEditedDataEvent('id', 'edited text', textElement);
spyOn(mockedDrawingService, 'updateText').and.returnValue(Observable.of({})); spyOn(mockedDrawingService, 'updateText').and.returnValue(Observable.of());
mockedDrawingsEventSource.textEdited.emit(textEditedDataEvent); mockedDrawingsEventSource.textEdited.emit(textEditedDataEvent);

View File

@ -14,6 +14,11 @@
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],
// below is fix for angular-cli to support core-js >= 3.0
"paths": {
"core-js/es7/reflect": ["../node_modules/core-js/proposals/reflect-metadata"],
"core-js/es6/*": ["../node_modules/core-js/es/*"]
},
"lib": [ "lib": [
"es2018", "es2018",
"dom" "dom"

1703
yarn.lock

File diff suppressed because it is too large Load Diff