Skip to content

Commit

Permalink
Merge pull request #3 from UnravelTEC/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
species authored Aug 30, 2020
2 parents 13992f2 + 98c2bba commit 511fab9
Show file tree
Hide file tree
Showing 51 changed files with 16,080 additions and 9,291 deletions.
11 changes: 9 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/Web",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -34,6 +35,12 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
Expand All @@ -48,7 +55,7 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"buildOptimizer": false
}
}
},
Expand Down Expand Up @@ -104,7 +111,7 @@
"defaultProject": "Web",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
}
}
File renamed without changes.
22,694 changes: 13,665 additions & 9,029 deletions package-lock.json

Large diffs are not rendered by default.

68 changes: 35 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,48 +12,50 @@
"e2e": "cypress run"
},
"dependencies": {
"@angular/animations": "^7.2.3",
"@angular/cdk": "^7.3.0",
"@angular/common": "^6.0.3",
"@angular/compiler": "^6.0.3",
"@angular/core": "^6.0.3",
"@angular/forms": "^6.0.3",
"@angular/http": "^6.0.3",
"@angular/material": "^7.3.0",
"@angular/platform-browser": "^6.0.3",
"@angular/platform-browser-dynamic": "^6.0.3",
"@angular/router": "^6.0.3",
"@types/dygraphs": "^1.1.8",
"@types/file-saver": "^2.0.0",
"@types/lodash-es": "^4.17.1",
"@angular/animations": "^9.1.9",
"@angular/cdk": "^9.2.4",
"@angular/common": "^9.1.9",
"@angular/compiler": "^9.1.9",
"@angular/core": "^9.1.9",
"@angular/forms": "^9.1.9",
"@angular/material": "^9.2.4",
"@angular/platform-browser": "^9.1.9",
"@angular/platform-browser-dynamic": "^9.1.9",
"@angular/router": "^9.1.9",
"@asymmetrik/ngx-leaflet": "^8.0.0",
"@types/dygraphs": "^1.1.11",
"@types/file-saver": "^2.0.1",
"@types/leaflet": "^1.5.17",
"@types/lodash-es": "^4.17.3",
"@types/paho-mqtt": "^1.0.4",
"chart.js": "^2.9.2",
"core-js": "^2.6.3",
"chart.js": "^2.9.3",
"core-js": "^2.6.11",
"dygraphs": "^2.1.0",
"file-saver": "^2.0.0",
"hammerjs": "^2.0.8",
"lodash-es": "^4.17.11",
"file-saver": "^2.0.2",
"leaflet": "^1.6.0",
"lodash-es": "^4.17.15",
"material-design-icons": "^3.0.1",
"ng-beautiful-gauges": "^6.0.3",
"ng2-charts": "2.0.3",
"npm": "^6.7.0",
"ng-beautiful-gauges": "^6.0.4",
"ng2-charts": "^2.3.2",
"npm": "^6.14.7",
"paho-mqtt": "^1.1.0",
"rxjs": "^6.0.0",
"zone.js": "^0.8.29"
"rxjs": "^6.5.5",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.6.8",
"@angular/cli": "~6.0.8",
"@angular/compiler-cli": "^6.0.3",
"@angular/language-service": "^6.0.3",
"@bahmutov/add-typescript-to-cypress": "^2.0.0",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"cypress": "^3.1.4",
"@angular-devkit/build-angular": "~0.901.7",
"@angular/cli": "~9.1.7",
"@angular/compiler-cli": "^9.1.9",
"@angular/language-service": "^9.1.9",
"@bahmutov/add-typescript-to-cypress": "^2.1.2",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"cypress": "^3.8.3",
"jest": "^23.5.0",
"jest-preset-angular": "^6.0.2",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
"typescript": "~3.8.3"
}
}
Loading

0 comments on commit 511fab9

Please sign in to comment.