merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 88 insertions, 53 deletions

diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json
index cf2835051..ff2682b46 100644
--- a/vid-webpack-master/package.json
+++ b/vid-webpack-master/package.json
@@ -5,85 +5,120 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4201",
-    "build": "ng build --no-progress --no-aot",
+    "build": "ng build --no-progress --no-aot --output-hashing all",
     "build.prod": "ng build",
-    "test": "ng test --c --single-run",
-    "lint": "ng lint --type-check --fix",
+    "test": "jest",
+    "test:jest": "jest",
+    "test:jest:pipeline": "jest --silent --ci --reporters=default --reporters=jest-junit",
+    "test:jest:watch": "jest --watch",
+    "test:jest:coverage": "jest --ci --reporters=default --reporters=jest-junit --coverage --silent",
+    "test:jest:snapshot": "jest --ci --reporters=default --reporters=jest-junit --coverage -u",
+    "test:watch": "jest --clearCache && jest --watch",
     "coverage": "ng test --code-coverage",
-    "coverage-console": "ng test --c --single-run",
+    "verify": "cypress verify",
     "e2e": "ng e2e",
     "build-watch": "ng build --watch",
     "cypress:open": "cypress open",
-    "cypress:open:dev": "cypress open --config baseUrl=http://localhost:8080/vid ",
-    "cypress:run": "cypress run"
+    "cypress": "cypress open --config baseUrl=http://localhost:8080/vid ",
+    "cypress:run": "cypress run",
+    "cypress:headless": "cypress run --config baseUrl=http://localhost:8080/vid",
+    "format": "prettier",
+    "format:fix": "pretty-quick --staged",
+    "lint": "ng lint"
   },
   "private": true,
   "dependencies": {
-    "@angular-redux/store": "^7.1.1",
-    "@angular/animations": "5.2.0",
-    "@angular/cdk": "2.0.0-beta.12",
-    "@angular/common": "5.2.0",
-    "@angular/compiler": "5.2.0",
-    "@angular/core": "5.2.0",
-    "@angular/forms": "5.2.0",
-    "@angular/http": "5.2.0",
-    "@angular/platform-browser": "5.2.0",
-    "@angular/platform-browser-dynamic": "5.2.0",
-    "@angular/router": "5.2.0",
-    "@angularclass/hmr": "2.1.3",
-    "@angularclass/hmr-loader": "3.0.4",
+    "@angular-redux/store": "^9.0.0",
+    "@angular/animations": "^7.1.4",
+    "@angular/cdk": "^7.2.2",
+    "@angular/common": "^7.1.4",
+    "@angular/compiler": "^7.1.4",
+    "@angular/core": "^7.1.4",
+    "@angular/forms": "^7.1.4",
+    "@angular/http": "^7.1.4",
+    "@angular/material": "7.2.2",
+    "@angular/platform-browser": "^7.1.4",
+    "@angular/platform-browser-dynamic": "^7.1.4",
+    "@angular/platform-server": "^7.1.4",
+    "@angular/router": "^7.1.4",
     "@harmowatch/ngx-redux-core": "0.2.2",
     "@nicky-lenaers/ngx-scroll-to": "^0.6.1",
+    "@turf/turf": "^5.1.6",
     "@types/lodash": "4.14.91",
     "angular-svg-icon": "^5.0.0",
     "angular-tree-component": "7.0.1",
     "angular2-datatable": "0.6.0",
     "angular2-multiselect-dropdown": "2.5.0",
+    "angular5-csv": "^0.2.10",
     "bootstrap": "^4.1.2",
-    "core-js": "2.4.1",
+    "core-js": "^2.6.1",
     "font-awesome": "^4.7.0",
+    "install": "^0.12.2",
+    "jest-image-snapshot": "2.8.1",
+    "jest-preset-angular": "6.0.2",
     "ng-multiselect-dropdown": "0.1.3",
     "ng2-bootstrap-modal": "1.0.1",
     "ngx-bootstrap": "^2.0.2",
-    "ngx-contextmenu": "4.1.2",
+    "ngx-contextmenu": "^5.1.1",
     "ngx-datatable": "1.0.3",
     "ngx-moment": "^2.0.0-rc.0",
     "ngx-tooltip": "0.0.9",
-    "redux": "^3.7.2",
-    "redux-observable": "^0.18.0",
-    "rxjs": "5.5.6",
-    "sdc-ui": "^1.6.29-angular5",
+    "npm": "^6.4.1",
+    "redux": "^4.0.1",
+    "redux-observable": "^1.0.0",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
+    "slnodejs": "^2.1.124",
     "tslib": "1.9.x",
-    "zone.js": "0.8.19"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.2",
-    "@angular/compiler-cli": "5.2.0",
-    "@angular/language-service": "5.2.0",
-    "@bahmutov/add-typescript-to-cypress": "^2.0.0",
+    "@angular-builders/jest": "^7.1.2",
+    "@angular-devkit/build-angular": "^0.11.4",
+    "@angular/cli": "^7.1.4",
+    "@angular/compiler-cli": "^7.1.4",
+    "@angular/language-service": "^7.1.4",
+    "@babel/preset-env": "^7.2.3",
+    "@bahmutov/add-typescript-to-cypress": "2.0.0",
     "@types/chai": "^4.1.3",
-    "@types/cypress": "^1.1.3",
-    "@types/jasmine": "2.8.3",
-    "@types/jasminewd2": "2.0.2",
-    "@types/mocha": "^5.2.0",
-    "@types/node": "6.0.60",
-    "codelyzer": "4.0.1",
-    "cypress": "^2.1.0",
-    "jasmine-core": "2.5.2",
-    "jasmine-spec-reporter": "4.2.1",
-    "karma": "2.0.2",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-coverage-istanbul-reporter": "2.0.1",
-    "karma-istanbul-threshold": "1.2.2",
-    "karma-jasmine": "1.1.2",
-    "karma-jasmine-html-reporter": "1.1.0",
-    "karma-junit-reporter": "^1.2.0",
-    "karma-phantomjs-launcher": "1.0.4",
-    "karma-remap-istanbul": "0.6.0",
-    "karma-spec-reporter": "0.0.32",
-    "protractor": "5.1.2",
-    "ts-node": "4.1.0",
-    "tslint": "5.9.1",
-    "typescript": "2.5.3"
+    "@types/cypress": "1.1.3",
+    "@types/jest": "24.0.6",
+    "@types/jest-each": "0.3.4",
+    "@types/node": "^10.12.18",
+    "angular2-template-loader": "^0.6.2",
+    "babel-jest": "24.1.0",
+    "codelyzer": "^4.5.0",
+    "cypress": "^3.1.0",
+    "hammerjs": "2.0.8",
+    "husky": "^1.3.1",
+    "istanbul-reports": "^2.0.1",
+    "jest": "24.1.0",
+    "jest-each": "24.0.0",
+    "jest-junit": "6.3.0",
+    "jest-sonar-reporter": "2.0.0",
+    "ngx-wallaby-jest": "0.0.1",
+    "npm-run-all": "^4.1.5",
+    "onap-ui-angular": "5.1.71",
+    "onap-ui-common": "1.0.86",
+    "prettier": "1.16.4",
+    "pretty-quick": "^1.10.0",
+    "ts-mockito": "2.3.1",
+    "ts-node": "~5.0.1",
+    "tslint": "^5.12.0",
+    "typescript": "^3.1.6",
+    "wallaby-webpack": "^3.9.11",
+    "webpack": "^4.28.2"
+  },
+  "jest-junit": {
+    "outputDirectory": "./coverage",
+    "outputName": "./test-results-jest.xml"
+  },
+  "jest": {
+    "preset": "jest-preset-angular",
+    "setupFilesAfterEnv": ["<rootDir>/src/setupJest.ts"],
+    "transform": {
+      "^.+\\.(ts|html)$": "<rootDir>/node_modules/jest-preset-angular/preprocessor.js",
+      "^.+\\.js$": "babel-jest"
+    }
   }
 }