From c819d15386f11f6f4423eeb20ff37c58736443f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jovan=20Kruni=C4=87?= Date: Thu, 31 Jan 2019 11:16:30 +0100 Subject: [PATCH] build: upgrade to ionic 4 (update dependencies) Closes #35 --- angular.json | 68 +++-- package-lock.json | 261 ++++++++++++------ package.json | 6 +- .../data/detail/data-detail.component.ts | 9 +- .../settings/settings.provider.spec.ts | 25 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 7 files changed, 240 insertions(+), 133 deletions(-) diff --git a/angular.json b/angular.json index 3fd44629..3f622533 100644 --- a/angular.json +++ b/angular.json @@ -2,6 +2,7 @@ "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json", "version": 1, "defaultProject": "app", + "newProjectRoot": "projects", "projects": { "app": { "root": "", @@ -13,14 +14,12 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "progress": false, "outputPath": "www", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.app.json", - "assets": [ - { + "assets": [{ "glob": "**/*", "input": "src/assets", "output": "assets" @@ -31,8 +30,7 @@ "output": "./svg" } ], - "styles": [ - { + "styles": [{ "input": "src/theme/variables.scss" }, { @@ -43,12 +41,10 @@ }, "configurations": { "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], + "fileReplacements": [{ + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + }], "optimization": true, "outputHashing": "all", "sourceMap": false, @@ -57,7 +53,15 @@ "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": true + "buildOptimizer": true, + "budgets": [{ + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + }] + }, + "ci": { + "progress": false } } }, @@ -69,6 +73,9 @@ "configurations": { "production": { "browserTarget": "app:build:production" + }, + "ci": { + "progress": false } } }, @@ -87,8 +94,7 @@ "karmaConfig": "src/karma.conf.js", "styles": [], "scripts": [], - "assets": [ - { + "assets": [{ "glob": "favicon.ico", "input": "src/", "output": "/" @@ -99,22 +105,23 @@ "output": "/assets" } ] + }, + "configurations": { + "ci": { + "progress": false, + "watch": false + } } }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] + "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], + "exclude": ["**/node_modules/**"] } }, "ionic-cordova-build": { - "builder": "@ionic/ng-toolkit:cordova-build", + "builder": "@ionic/angular-toolkit:cordova-build", "options": { "browserTarget": "app:build" }, @@ -125,7 +132,7 @@ } }, "ionic-cordova-serve": { - "builder": "@ionic/ng-toolkit:cordova-serve", + "builder": "@ionic/angular-toolkit:cordova-serve", "options": { "cordovaBuildTarget": "app:ionic-cordova-build", "devServerTarget": "app:serve" @@ -148,28 +155,31 @@ "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "app:serve" + }, + "configurations": { + "ci": { + "devServerTarget": "app:serve:ci" + } } }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] + "exclude": ["**/node_modules/**"] } } } } }, "cli": { - "defaultCollection": "@ionic/schematics-angular" + "defaultCollection": "@ionic/angular-toolkit" }, "schematics": { - "@ionic/schematics-angular:component": { + "@ionic/angular-toolkit:component": { "styleext": "scss" }, - "@ionic/schematics-angular:page": { + "@ionic/angular-toolkit:page": { "styleext": "scss" } } diff --git a/package-lock.json b/package-lock.json index 6948ac68..31a29266 100644 --- a/package-lock.json +++ b/package-lock.json @@ -98,6 +98,22 @@ "requires": { "tslib": "^1.9.0" } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } } } }, @@ -118,12 +134,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", "dev": true - }, - "typescript": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", - "dev": true } } }, @@ -2373,40 +2383,39 @@ "dev": true }, "@openstapps/api": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-0.0.1.tgz", - "integrity": "sha512-q648jjYnR49VFO/pUcwbPvTkybq7/FlWL8d6wSgCPTao7LZQed7kgwfbR9dIHyiIf/tMsq8eoIMoXuyU03kNbw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-0.1.0.tgz", + "integrity": "sha512-HurKFCcjVEyJUVOK1p/c5pCtncmujcILHeAXHI6AGUM1gbR0hCwTgD5YfseIJ9/WsmBhqh9hCcif3eLF2e1a7g==", "requires": { - "@openstapps/core": "0.0.2", - "@openstapps/logger": "0.0.3", + "@openstapps/core": "0.3.0", + "@openstapps/logger": "0.0.5", "@types/cli-progress": "1.8.0", - "@types/node": "10.12.10", + "@types/node": "10.12.18", "@types/request": "2.48.1", "@types/uuid": "3.4.4", "async-pool-native": "0.1.0", - "cli-progress": "2.1.0", + "cli-progress": "2.1.1", "commander": "2.19.0", - "moment": "2.22.2", + "moment": "2.24.0", "request": "2.88.0", "uuid": "3.3.2" }, "dependencies": { - "@openstapps/logger": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@openstapps/logger/-/logger-0.0.3.tgz", - "integrity": "sha512-Q1kghyVNIXepfuLcdy2gFygI6jpxTBV0oqwM46hqzST4w/DNmDnzpScVQNQf5C0PhLUihPNhpjLnu6i7ujIX3g==", + "@openstapps/core": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.3.0.tgz", + "integrity": "sha512-ljGYPWXiG4JMV2ZaJQmYK6hQbiXlRPAZwYzcMBTI5m/9Y6tXudawiCDP8EFcZj6OXCQ2tnkEP7Bhwic7flu2Eg==", "requires": { - "@types/circular-json": "0.4.0", - "@types/node": "10.12.10", - "@types/nodemailer": "4.6.5", - "circular-json": "0.5.9", - "nodemailer": "4.7.0" + "@types/geojson": "1.0.6", + "@types/json-patch": "0.0.30", + "json-patch": "0.7.0", + "jsonschema": "1.2.4" } }, "@types/node": { - "version": "10.12.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.10.tgz", - "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w==" + "version": "10.12.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", + "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==" }, "nodemailer": { "version": "4.7.0", @@ -2416,17 +2425,25 @@ } }, "@openstapps/configuration": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.0.2.tgz", - "integrity": "sha512-4FXtufJ/RdA2Lq+bypxqQO8jJHuOYPjKd5H5UZ6xNVkecDRuvklV+gRcyyHmhSJGt/vlPzytNAj2PfqhPphc9A==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.5.1.tgz", + "integrity": "sha512-jTKOdHTCRnFQ+XfRJot0zSkX0ZcZGN2CNHRdZ0VMqHLu4wpVOG9wdznDtRsM50JRxv3CWjSTuFYZjspVIWWa4g==", "requires": { - "tslint": "5.11.0" + "@types/node": "10.12.15", + "commander": "2.19.0", + "tslint": "5.12.0", + "tslint-eslint-rules": "5.4.0" }, "dependencies": { + "@types/node": { + "version": "10.12.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz", + "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA==" + }, "tslint": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", - "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.0.tgz", + "integrity": "sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==", "requires": { "babel-code-frame": "^6.22.0", "builtin-modules": "^1.1.1", @@ -2445,9 +2462,9 @@ } }, "@openstapps/core": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.0.2.tgz", - "integrity": "sha512-gr2HnsbSwyKI68CAjSdYGftuO1ADwwlJaAxXRv7j8hQLvYuMzs40GwXxwmx6ZzDMMiNPFd0OrkmOxoIAVhhZEA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.4.0.tgz", + "integrity": "sha512-9qo8fxDriXt1izF6v/JczsI4tQn5AjWQQ2UmQNocm/8H+MyWL9YRED6QtaNQEHDZA2YtyRziEOGU9kxmvsK3Xw==", "requires": { "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", @@ -2483,14 +2500,6 @@ "@angular-devkit/core": "7.3.4", "@angular-devkit/schematics": "7.3.4", "typescript": "3.2.4" - }, - "dependencies": { - "typescript": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", - "dev": true - } } }, "@schematics/update": { @@ -2613,9 +2622,9 @@ } }, "@types/selenium-webdriver": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.15.tgz", - "integrity": "sha512-5nh8/K2u9p4bk95GGCJB7KBvewaB0TUziZ9DTr+mR2I6RoO4OJVqx7rxK83hs2J1tomwtCGkhiW+Dy8EUnfB+Q==", + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz", + "integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==", "dev": true }, "@types/source-list-map": { @@ -4254,9 +4263,9 @@ } }, "cli-progress": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-2.1.0.tgz", - "integrity": "sha512-mY0GFIADTooScUe8ERTiQjJoOvXv1z0SzA8gzKO8imLqB7tBwEnNN10gWHcKoltDL4gLdi1GGoPEbxxbvJtR4A==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-2.1.1.tgz", + "integrity": "sha512-TSJw3LY9ZRSis7yYzQ7flIdtQMbacd9oYoiFphJhI4SzgmqF0zErO+uNv0lbUjk1L4AGfHQJ4OVYYzW+JV66KA==", "requires": { "colors": "^1.1.2", "string-width": "^2.1.1" @@ -4463,11 +4472,11 @@ "dev": true }, "compressible": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz", - "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", + "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", "requires": { - "mime-db": ">= 1.38.0 < 2" + "mime-db": ">= 1.36.0 < 2" }, "dependencies": { "mime-db": { @@ -5298,6 +5307,27 @@ "buffer-indexof": "^1.0.0" } }, + "doctrine": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", + "requires": { + "esutils": "^1.1.6", + "isarray": "0.0.1" + }, + "dependencies": { + "esutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", + "integrity": "sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + } + } + }, "dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", @@ -5612,9 +5642,9 @@ } }, "es6-promise": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", - "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", + "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==", "dev": true }, "es6-promisify": { @@ -8471,25 +8501,55 @@ } }, "jszip": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz", - "integrity": "sha512-4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz", + "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==", "dev": true, "requires": { - "lie": "~3.3.0", + "core-js": "~2.3.0", + "es6-promise": "~3.0.2", + "lie": "~3.1.0", "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" + "readable-stream": "~2.0.6" }, "dependencies": { - "lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "core-js": { + "version": "2.3.0", + "resolved": "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", + "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=", + "dev": true + }, + "es6-promise": { + "version": "3.0.2", + "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { - "immediate": "~3.0.5" + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "string_decoder": "~0.10.x", + "util-deprecate": "~1.0.1" } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true } } }, @@ -9429,9 +9489,9 @@ } }, "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "moniker": { "version": "0.1.2", @@ -9982,9 +10042,9 @@ } }, "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=" }, "once": { "version": "1.4.0", @@ -10397,9 +10457,9 @@ } }, "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz", + "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==", "dev": true }, "parallel-transform": { @@ -11771,12 +11831,6 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, "set-value": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", @@ -12227,9 +12281,9 @@ } }, "source-map-support": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", - "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", + "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -12953,6 +13007,16 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "source-map-support": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", + "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } } } }, @@ -13396,6 +13460,31 @@ "tsutils": "^2.27.2" } }, + "tslint-eslint-rules": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz", + "integrity": "sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==", + "requires": { + "doctrine": "0.7.2", + "tslib": "1.9.0", + "tsutils": "^3.0.0" + }, + "dependencies": { + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" + }, + "tsutils": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.7.0.tgz", + "integrity": "sha512-n+e+3q7Jx2kfZw7tjfI9axEIWBY0sFMOlC+1K70X0SeXpO/UYSB+PN+E9tIJNqViB7oiXQdqD7dNchnvoneZew==", + "requires": { + "tslib": "^1.8.1" + } + } + } + }, "tsutils": { "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", diff --git a/package.json b/package.json index 921b52ac..48468db6 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,9 @@ "@ionic/storage": "2.2.0", "@ngx-translate/core": "11.0.1", "@ngx-translate/http-loader": "4.0.0", - "@openstapps/api": "0.0.1", - "@openstapps/configuration": "0.0.2", - "@openstapps/core": "0.0.2", + "@openstapps/api": "0.1.0", + "@openstapps/configuration": "0.5.1", + "@openstapps/core": "0.4.0", "@openstapps/logger": "0.0.5", "cordova-android": "8.0.0", "cordova-browser": "6.0.0", diff --git a/src/app/modules/data/detail/data-detail.component.ts b/src/app/modules/data/detail/data-detail.component.ts index 29511f02..a69b5873 100644 --- a/src/app/modules/data/detail/data-detail.component.ts +++ b/src/app/modules/data/detail/data-detail.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -14,11 +14,11 @@ */ import {Component} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; -import {SCThings} from '@openstapps/core'; +import {SCThingOriginType, SCThings, SCThingType} from '@openstapps/core'; @Component({ selector: 'stapps-data-detail', - templateUrl: 'data-detail.html' + templateUrl: 'data-detail.html', }) export class DataDetailComponent { item: SCThings; @@ -29,8 +29,9 @@ export class DataDetailComponent { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, - type: 'dish', + type: SCThingType.Dish, uid: '', }; } diff --git a/src/app/modules/settings/settings.provider.spec.ts b/src/app/modules/settings/settings.provider.spec.ts index 95594665..1a3f6636 100644 --- a/src/app/modules/settings/settings.provider.spec.ts +++ b/src/app/modules/settings/settings.provider.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -13,7 +13,7 @@ * this program. If not, see . */ import {TestBed} from '@angular/core/testing'; -import {SCSetting} from '@openstapps/core'; +import {SCSetting, SCThingOriginType, SCThingType} from '@openstapps/core'; import {StorageModule} from '../storage/storage.module'; import {StorageProvider} from '../storage/storage.provider'; import {SettingsProvider} from './settings.provider'; @@ -159,6 +159,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -170,7 +171,7 @@ describe('SettingsProvider', () => { name: 'Username', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -185,6 +186,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -196,7 +198,7 @@ describe('SettingsProvider', () => { name: 'Password', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -211,6 +213,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -222,7 +225,7 @@ describe('SettingsProvider', () => { name: 'Age', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -238,6 +241,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -253,7 +257,7 @@ describe('SettingsProvider', () => { name: 'Group', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -269,6 +273,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -282,7 +287,7 @@ describe('SettingsProvider', () => { name: 'Language', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -298,6 +303,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -313,7 +319,7 @@ describe('SettingsProvider', () => { name: 'Position', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, { @@ -329,6 +335,7 @@ describe('SettingsProvider', () => { origin: { indexed: '2018-09-11T12:30:00Z', name: 'Dummy', + type: SCThingOriginType.Remote, }, translations: { de: { @@ -342,7 +349,7 @@ describe('SettingsProvider', () => { name: 'Numbers', }, }, - type: 'setting', + type: SCThingType.Setting, uid: '', }, ]; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1a395de5..f3512ab4 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ccf6daa4..7ecd7f19 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3.