Packages updated

src/Squidex/app-config/webpack.test.coverage.js

@@ -17,7 +17,7 @@ module.exports = webpackMerge(testConfig, {
             {
                 test: /\.ts$/,
                 exclude: [/\.(e2e|spec)\.ts$/],
-                loaders: ['istanbul-instrumenter-loader', helpers.root('app-config', 'fix-coverage-loader'), 'awesome-typescript', helpers.root('app-config', 'auto-loader') + '?[file].html=template&[file].scss=styles']
+                loaders: ['istanbul-instrumenter-loader', helpers.root('app-config', 'fix-coverage-loader'), 'awesome-typescript', 'angular2-router-loader', 'angular2-template-loader']
             }
         ]
     }

src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts

@@ -158,7 +158,7 @@ export class SchemaPageComponent extends AppComponentBase implements OnDestroy,
 
             const properties = createProperties(this.addFieldForm.get('type').value);
 
-            const dto = new AddFieldDto(this.addFieldForm.get('name').value, properties);
+            const requestDto = new AddFieldDto(this.addFieldForm.get('name').value, properties);
 
             const reset = () => {
                 this.addFieldForm.get('name').reset();
@@ -166,7 +166,7 @@ export class SchemaPageComponent extends AppComponentBase implements OnDestroy,
             };
 
             this.appName()
-                .switchMap(app => this.schemasService.postField(app, this.schemaName, dto))
+                .switchMap(app => this.schemasService.postField(app, this.schemaName, requestDto))
                 .subscribe(dto => {
                     const newField =
                         new FieldDto(parseInt(dto.id, 10),

src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts

@@ -73,12 +73,13 @@ export class SchemaFormComponent implements OnInit {
             this.createForm.disable();
 
             const name = this.createForm.get('name').value;
-            const dto = new CreateSchemaDto(name);
             const now = DateTime.now();
 
+            const requestDto = new CreateSchemaDto(name);
+
             const me = `subject:${this.authService.user.id}`;
 
-            this.schemas.postSchema(this.appName, dto)
+            this.schemas.postSchema(this.appName, requestDto)
                 .subscribe(dto => {
                     this.createForm.reset();
                     this.created.emit(new SchemaDto(dto.id, name, now, now, me, me));

src/Squidex/app/features/settings/pages/clients/clients-page.component.ts

@@ -94,7 +94,7 @@ export class ClientsPageComponent extends AppComponentBase implements OnInit {
         if (this.addClientForm.valid) {
             this.addClientForm.disable();
 
-            const dto = new CreateAppClientDto(this.addClientForm.get('name').value);
+            const requestDto = new CreateAppClientDto(this.addClientForm.get('name').value);
 
             const reset = () => {
                 this.addClientForm.reset();
@@ -102,7 +102,7 @@ export class ClientsPageComponent extends AppComponentBase implements OnInit {
             };
 
             this.appName()
-                .switchMap(app => this.appClientsService.postClient(app, dto))
+                .switchMap(app => this.appClientsService.postClient(app, requestDto))
                 .subscribe(dto => {
                     this.updateClients(this.appClients.push(dto));
                     reset();

src/Squidex/app/framework/configurations.ts

@@ -5,9 +5,6 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Injectable } from '@angular/core';
-
-@Injectable()
 export class ApiUrlConfig {
     public readonly value: string;
 
@@ -28,27 +25,23 @@ export class ApiUrlConfig {
     }
 }
 
-@Injectable()
+export class CurrencyConfig {
+    constructor(
+        public readonly code: string,
+        public readonly symbol: string,
+        public readonly showAfter: boolean = true
+    ) {
+    }
+}
+
 export class DecimalSeparatorConfig {
     constructor(public readonly value: string) { }
 }
 
-@Injectable()
 export class ProductionModeConfig {
     constructor(public readonly isProductionMode: boolean) { }
 }
 
-@Injectable()
 export class UserReportConfig {
     constructor(public readonly siteId: string) { }
-}
-
-@Injectable()
-export class CurrencyConfig {
-    constructor(
-        public readonly code: string,
-        public readonly symbol: string,
-        public readonly showAfter: boolean = true
-    ) {
-    }
 }

src/Squidex/app/framework/services/title.service.ts

@@ -7,12 +7,13 @@
 
 import { Injectable } from '@angular/core';
 
-@Injectable()
 export class TitlesConfig {
     constructor(
         public readonly value: { [key: string]: string },
-        public readonly prefix?: string,
-        public readonly suffix?: string) { }
+        public readonly prefix: string = null,
+        public readonly suffix: string = null
+    ) {
+    }
 }
 
 export const TitleServiceFactory = (titles: TitlesConfig) => {

src/Squidex/app/shared/components/app-form.component.ts

@@ -64,9 +64,9 @@ export class AppFormComponent implements OnInit {
         if (this.createForm.valid) {
             this.createForm.disable();
 
-            const dto = new CreateAppDto(this.createForm.get('name').value);
+            const request = new CreateAppDto(this.createForm.get('name').value);
 
-            this.appsStore.createApp(dto)
+            this.appsStore.createApp(request)
                 .subscribe(dto => {
                     this.createForm.reset();
                     this.created.emit(dto);

src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Mock } from 'typemoq';
+import { IMock, Mock } from 'typemoq';
 
 import { AppsStoreService } from 'shared';
 
@@ -13,7 +13,7 @@ import { AppMustExistGuard } from './app-must-exist.guard';
 import { RouterMockup } from './router-mockup';
 
 describe('AppMustExistGuard', () => {
-    let appsStore: Mock<AppsStoreService>;
+    let appsStore: IMock<AppsStoreService>;
 
     beforeEach(() => {
         appsStore = Mock.ofType(AppsStoreService);

src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Mock } from 'typemoq';
+import { IMock, Mock } from 'typemoq';
 
 import { AuthService } from 'shared';
 
@@ -13,7 +13,7 @@ import { MustBeAuthenticatedGuard } from './must-be-authenticated.guard';
 import { RouterMockup } from './router-mockup';
 
 describe('MustBeAuthenticatedGuard', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
 
     beforeEach(() => {
         authService = Mock.ofType(AuthService);

src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Mock } from 'typemoq';
+import { IMock, Mock } from 'typemoq';
 
 import { AuthService } from 'shared';
 
@@ -13,7 +13,7 @@ import { MustBeNotAuthenticatedGuard } from './must-be-not-authenticated.guard';
 import { RouterMockup } from './router-mockup';
 
 describe('MustBeNotAuthenticatedGuard', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
 
     beforeEach(() => {
         authService = Mock.ofType(AuthService);

src/Squidex/app/shared/services/app-clients.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { It, Mock, Times } from 'typemoq';
+import { It, IMock, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -20,7 +20,7 @@ import {
 } from './../';
 
 describe('AppClientsService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let appClientsService: AppClientsService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/app-contributors.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { It, Mock, Times } from 'typemoq';
+import { It, IMock, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -17,7 +17,7 @@ import {
 } from './../';
 
 describe('AppContributorsService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let appContributorsService: AppContributorsService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/app-languages.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { It, Mock, Times } from 'typemoq';
+import { It, IMock, Mock, Times } from 'typemoq';
 
 import {
     AddAppLanguageDto,
@@ -19,7 +19,7 @@ import {
 } from './../';
 
 describe('AppLanguagesService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let appLanguagesService: AppLanguagesService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/apps-store.service.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { It, Mock, Times } from 'typemoq';
+import { It, IMock, Mock, Times } from 'typemoq';
 
 import {
     AppDto,
@@ -23,8 +23,8 @@ describe('AppsStoreService', () => {
     const oldApps = [new AppDto('id', 'old-name', now, now, 'Owner')];
     const newApp =   new AppDto('id', 'new-name', now, now, 'Owner');
 
-    let appsService: Mock<AppsService>;
-    let authService: Mock<AuthService>;
+    let appsService: IMock<AppsService>;
+    let authService: IMock<AuthService>;
 
     beforeEach(() => {
         appsService = Mock.ofType(AppsService);

src/Squidex/app/shared/services/apps.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { It, Mock, Times } from 'typemoq';
+import { It, IMock, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -20,7 +20,7 @@ import {
 } from './../';
 
 describe('AppsService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let appsService: AppsService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/history.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { Mock, Times } from 'typemoq';
+import { IMock, Mock, Times } from 'typemoq';
 
 import { DateTime } from 'framework';
 
@@ -19,7 +19,7 @@ import {
 } from './../';
 
 describe('HistoryService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let languageService: HistoryService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/languages.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { Mock, Times } from 'typemoq';
+import { IMock, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -17,7 +17,7 @@ import {
 } from './../';
 
 describe('LanguageService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let languageService: LanguageService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/users-provider.service.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { Mock, Times } from 'typemoq';
+import { IMock, Mock, Times } from 'typemoq';
 
 import {
     AuthService,
@@ -17,8 +17,8 @@ import {
 } from './../';
 
 describe('UsersProviderService', () => {
-    let authService: Mock<AuthService>;
-    let usersService: Mock<UsersService>;
+    let authService: IMock<AuthService>;
+    let usersService: IMock<UsersService>;
     let usersProviderService: UsersProviderService;
 
     beforeEach(() => {

src/Squidex/app/shared/services/users.service.spec.ts

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { Mock, Times } from 'typemoq';
+import { IMock, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -17,7 +17,7 @@ import {
 } from './../';
 
 describe('UsersService', () => {
-    let authService: Mock<AuthService>;
+    let authService: IMock<AuthService>;
     let usersService: UsersService;
 
     beforeEach(() => {

src/Squidex/package.json

@@ -11,28 +11,29 @@
     "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & webpack-dev-server --config app-config/webpack.run.dev.js --inline --hot --port 3000",
     "build": "webpack --config app-config/webpack.run.prod.js --display-error-details",
     "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
-    "build:clean": "rimraf wwwroot/build",
-    "build:detailed": "webpack --config app-config/webpack.run.prod.js --display-error-details"
+    "build:clean": "rimraf wwwroot/build"
   },
   "dependencies": {
-    "@angular/common": "2.2.3",
-    "@angular/compiler": "2.2.3",
-    "@angular/core": "2.2.3",
-    "@angular/forms": "2.2.3",
-    "@angular/http": "2.2.3",
-    "@angular/platform-browser": "2.2.3",
-    "@angular/platform-browser-dynamic": "2.2.3",
-    "@angular/router": "3.2.3",
+    "@angular/common": "2.4.1",
+    "@angular/compiler": "2.4.1",
+    "@angular/core": "2.4.1",
+    "@angular/forms": "2.4.1",
+    "@angular/http": "2.4.1",
+    "@angular/platform-browser": "2.4.1",
+    "@angular/platform-browser-dynamic": "2.4.1",
+    "@angular/router": "3.4.1",
+    "babel-polyfill": "^6.20.0",
     "bootstrap": "^4.0.0-alpha.2",
     "core-js": "^2.4.1",
     "moment": "^2.17.1",
     "mousetrap": "^1.6.0",
     "oidc-client": "^1.2.2",
-    "rxjs": "5.0.0-beta.12",
-    "zone.js": "^0.6.23"
+    "rxjs": "5.0.2",
+    "zone.js": "^0.7.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "2.2.3",
+    "@angular/compiler-cli": "2.4.1",
+    "@angular/tsc-wrapped": "0.5.0",
     "@ngtools/webpack": "^1.1.9",
     "@types/core-js": "^0.9.35",
     "@types/jasmine": "^2.5.38",
@@ -40,7 +41,7 @@
     "@types/node": "^6.0.51",
     "angular2-router-loader": "^0.3.4",
     "angular2-template-loader": "^0.6.0",
-    "awesome-typescript-loader": "^2.2.4",
+    "awesome-typescript-loader": "^3.0.0-beta.17",
     "cpx": "^1.5.0",
     "css-loader": "^0.26.1",
     "exports-loader": "^0.6.3",
@@ -60,7 +61,7 @@
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
-    "node-sass": "^3.4.2",
+    "node-sass": "^4.1.1",
     "null-loader": "^0.1.1",
     "phantomjs-prebuilt": "^2.1.13",
     "raw-loader": "^0.5.1",
@@ -70,11 +71,11 @@
     "style-loader": "^0.13.1",
     "tslint": "^4.0.2",
     "tslint-loader": "^3.2.0",
-    "typemoq": "^0.3.2",
+    "typemoq": "^1.1.0",
     "typescript": "2.0.10",
     "underscore": "^1.8.3",
     "webpack": "2.1.0-beta.25",
     "webpack-dev-server": "2.1.0-beta.10",
-    "webpack-merge": "^0.18.0"
+    "webpack-merge": "^2.0.0"
   }
 }

src/Squidex/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "es2015",
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,