diff --git a/client/package.json b/client/package.json index 5ef4cf983..1886a58e7 100644 --- a/client/package.json +++ b/client/package.json @@ -23,64 +23,64 @@ "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"" }, "dependencies": { - "@angular/animations": "^7.1.1", - "@angular/cdk": "^7.1.0", - "@angular/common": "^7.1.1", - "@angular/compiler": "^7.1.1", - "@angular/core": "^7.1.1", - "@angular/forms": "^7.1.1", - "@angular/http": "^7.1.1", - "@angular/material": "^7.1.0", - "@angular/platform-browser": "^7.1.1", - "@angular/platform-browser-dynamic": "^7.1.1", - "@angular/pwa": "^0.12.1", - "@angular/router": "^7.1.1", - "@angular/service-worker": "^7.1.1", - "@ngx-pwa/local-storage": "^7.2.0", + "@angular/animations": "^7.2.2", + "@angular/cdk": "^7.3.0", + "@angular/common": "^7.2.2", + "@angular/compiler": "^7.2.2", + "@angular/core": "^7.2.2", + "@angular/forms": "^7.2.2", + "@angular/http": "^7.2.2", + "@angular/material": "^7.3.0", + "@angular/platform-browser": "^7.2.2", + "@angular/platform-browser-dynamic": "^7.2.2", + "@angular/pwa": "^0.12.3", + "@angular/router": "^7.2.2", + "@angular/service-worker": "^7.2.2", + "@ngx-pwa/local-storage": "^7.4.1", "@ngx-translate/core": "^11.0.1", "@ngx-translate/http-loader": "^4.0.0", - "@tinymce/tinymce-angular": "^2.3.1", - "angular-tree-component": "^8.0.1", - "core-js": "^2.5.4", + "@tinymce/tinymce-angular": "^2.5.0", + "angular-tree-component": "^8.2.0", + "core-js": "^2.6.3", "css-element-queries": "^1.1.1", "file-saver": "^2.0.0", "material-design-icons": "^3.0.1", - "ngx-file-drop": "^5.0.0", - "ngx-mat-select-search": "^1.4.2", + "ngx-file-drop": "^5.0.2", + "ngx-mat-select-search": "^1.5.2", "ngx-papaparse": "^3.0.2", - "pdfmake": "^0.1.40", + "pdfmake": "^0.1.41", "po2json": "^1.0.0-alpha", - "rxjs": "^6.3.3", - "tinymce": "^4.9.0", + "rxjs": "^6.4.0", + "tinymce": "^4.9.2", "uuid": "^3.3.2", - "zone.js": "^0.8.26" + "zone.js": "^0.8.29" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.12.1", - "@angular/cli": "^7.1.0", - "@angular/compiler-cli": "^7.1.1", - "@angular/language-service": "^7.1.1", + "@angular-devkit/build-angular": "^0.12.3", + "@angular/cli": "^7.2.3", + "@angular/compiler-cli": "^7.2.2", + "@angular/language-service": "^7.2.2", "@compodoc/compodoc": "^1.1.7", - "@types/jasmine": "^2.8.12", + "@types/jasmine": "^3.3.8", "@types/jasminewd2": "^2.0.6", - "@types/node": "^10.12.10", - "@types/yargs": "^12.0.1", + "@types/node": "^10.12.19", + "@types/yargs": "^12.0.8", "codelyzer": "~4.5.0", - "husky": "^1.1.4", - "jasmine-core": "~2.99.1", + "husky": "^1.3.1", + "jasmine-core": "~3.3.0", "jasmine-spec-reporter": "~4.2.1", - "karma": "^3.1.1", + "karma": "^4.0.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "^2.0.4", - "karma-jasmine": "~1.1.1", - "karma-jasmine-html-reporter": "^0.2.2", + "karma-jasmine": "~2.0.1", + "karma-jasmine-html-reporter": "^1.4.0", "npm-run-all": "^4.1.5", - "prettier": "^1.15.3", - "protractor": "^5.4.1", - "ts-node": "~7.0.1", - "tslint": "~5.11.0", - "tsutils": "^3.5.1", - "typescript": ">=3.1.1 <3.2", + "prettier": "^1.16.2", + "protractor": "^5.4.2", + "ts-node": "~8.0.2", + "tslint": "~5.12.1", + "tsutils": "^3.7.0", + "typescript": "^3.2", "webpack-bundle-analyzer": "^3.0.3" } } diff --git a/client/src/app/core/services/data-store.service.ts b/client/src/app/core/services/data-store.service.ts index 772622281..ead9c1267 100644 --- a/client/src/app/core/services/data-store.service.ts +++ b/client/src/app/core/services/data-store.service.ts @@ -411,13 +411,4 @@ export class DataStoreService { await this.storageService.set(DataStoreService.cachePrefix + 'DS', this.jsonStore); await this.storageService.set(DataStoreService.cachePrefix + 'maxChangeId', changeId); } - - /** - * Prints the whole dataStore - * @deprecated Shouldn't be used, will be removed later - */ - public printWhole(): void { - console.log('Everything in DataStore: ', this.modelStore); - console.log('changeId', this.maxChangeId); - } } diff --git a/client/src/app/core/services/servertime.service.ts b/client/src/app/core/services/servertime.service.ts index e4623e290..44a0f54c4 100644 --- a/client/src/app/core/services/servertime.service.ts +++ b/client/src/app/core/services/servertime.service.ts @@ -3,7 +3,6 @@ import { Injectable } from '@angular/core'; import { OpenSlidesComponent } from 'app/openslides.component'; import { HttpService } from './http.service'; import { environment } from 'environments/environment.prod'; -import { isNumber } from 'util'; import { BehaviorSubject, Observable } from 'rxjs'; @Injectable({ @@ -46,7 +45,8 @@ export class ServertimeService extends OpenSlidesComponent { private async refreshServertime(): Promise { // servertime is the time in seconds. const servertime = await this.http.get(environment.urlPrefix + '/core/servertime/'); - if (!isNumber(servertime)) { + // isNumber is deprecated: since node v4.0.0 + if (typeof servertime !== 'number') { throw new Error('The returned servertime is not a number'); } this.serverOffsetSubject.next(Math.floor(Date.now() - servertime * 1000)); diff --git a/client/src/app/shared/models/base/base-model.ts b/client/src/app/shared/models/base/base-model.ts index 6458f3ef2..b6f052e5a 100644 --- a/client/src/app/shared/models/base/base-model.ts +++ b/client/src/app/shared/models/base/base-model.ts @@ -3,9 +3,7 @@ import { Deserializable } from './deserializable'; import { Displayable } from './displayable'; import { Identifiable } from './identifiable'; -export interface ModelConstructor> { - new (...args: any[]): T; -} +export type ModelConstructor> = new (...args: any[]) => T; /** * Abstract parent class to set rules and functions for all models. diff --git a/client/src/app/site/common/components/start/start.component.ts b/client/src/app/site/common/components/start/start.component.ts index 72ebbe28b..c65ff9d10 100644 --- a/client/src/app/site/common/components/start/start.component.ts +++ b/client/src/app/site/common/components/start/start.component.ts @@ -70,13 +70,6 @@ export class StartComponent extends BaseComponent implements OnInit { }); } - /** - * function to print datastore - */ - public giveDataStore(): void { - this.DS.printWhole(); - } - /** * test translations in component */