npm fixed

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

@@ -45,23 +45,23 @@ module.exports = {
         loaders: [
             {
                 test: /\.ts$/,
-                loaders: ['awesome-typescript', 'angular2-router-loader', 'angular2-template-loader', 'tslint']
+                loaders: ['awesome-typescript-loader', 'angular2-router-loader', 'angular2-template-loader', 'tslint-loader']
             }, {
                 test: /\.html$/,
-                loader: 'raw'
+                loader: 'raw-loader'
             }, {
                 test: /\.(woff|woff2|ttf|eot)(\?.*$|$)/,
-                loader: 'file?name=assets/[name].[hash].[ext]'
+                loader: 'file-loader?name=assets/[name].[hash].[ext]'
             }, {
                 test: /\.(png|jpe?g|gif|svg|ico)(\?.*$|$)/,
-                loader: 'file?name=assets/[name].[hash].[ext]'
+                loader: 'file-loader?name=assets/[name].[hash].[ext]'
             }, {
                 test: /\.css$/,
-                loader: ExtractTextPlugin.extract({ fallbackLoader: 'style', loader: 'css?sourceMap' })
+                loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader?sourceMap' })
             }, {
                 test: /\.scss$/,
                 exclude: helpers.root('app', 'theme'),
-                loaders: ['raw', 'sass']
+                loaders: ['raw-loader', 'sass-loader']
             }
         ]
     },

src/Squidex/app-config/webpack.run.dev.js

@@ -41,7 +41,7 @@ module.exports = webpackMerge(runConfig, {
             {
                 test: /\.scss$/,
                 include: helpers.root('app', 'theme'),
-                loaders: ['style', 'css', 'sass?sourceMap']
+                loaders: ['style-loader', 'css-loader', 'sass-loader?sourceMap']
             }
         ]
     },

src/Squidex/app-config/webpack.run.prod.js

@@ -57,11 +57,11 @@ module.exports = webpackMerge(runConfig, {
             {
                 test: /\.scss$/,
                 include: helpers.root('app', 'theme'),
-                loader: ExtractTextPlugin.extract({ fallbackLoader: 'style', loader: 'css!sass?sourceMap' })
+                loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader!sass-loader?sourceMap' })
             }, {
                 test: /\.scss$/,
                 exclude: helpers.root('app', 'theme'),
-                loaders: ['raw', helpers.root('app-config', 'clean-css-loader'), 'sass']
+                loaders: ['raw-loader', helpers.root('app-config', 'clean-css-loader'), 'sass-loader']
             }, { 
                 test: /\.ts/, 
                 loaders: ['@ngtools/webpack'] 
@@ -70,7 +70,7 @@ module.exports = webpackMerge(runConfig, {
     },
 
     plugins: [
-        new webpack.NoErrorsPlugin(),
+        new webpack.NoEmitOnErrorsPlugin(),
         new webpack.DefinePlugin({ 'process.env': { 'ENV': JSON.stringify(ENV) } }),
 
         /*

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

@@ -12,12 +12,12 @@ module.exports = webpackMerge(testConfig, {
             {
                 test: /\.ts$/,
                 include: [/\.(e2e|spec)\.ts$/],
-                loaders: ['awesome-typescript']
+                loaders: ['awesome-typescript-loader']
             },
             {
                 test: /\.ts$/,
                 exclude: [/\.(e2e|spec)\.ts$/],
-                loaders: ['istanbul-instrumenter-loader', helpers.root('app-config', 'fix-coverage-loader'), 'awesome-typescript', 'angular2-router-loader', 'angular2-template-loader']
+                loaders: ['istanbul-instrumenter-loader', helpers.root('app-config', 'fix-coverage-loader'), 'awesome-typescript-loader', 'angular2-router-loader', 'angular2-template-loader']
             }
         ]
     }

src/Squidex/app/features/content/pages/contents/contents-page.component.ts

@@ -164,7 +164,7 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
 
     private load() {
         this.appName()
-            .switchMap(app => this.contentsService.getContents(app, this.schema.name, this.pageSize, this.currentPage * this.pageSize, this.currentQuery))
+            .switchMap(app => this.contentsService.getContents(app, this.schema.name, this.pageSize, this.currentPage *this.pageSize, this.currentQuery))
                .subscribe(dtos => {
                     this.contentItems = ImmutableArray.of(dtos.items);
                     this.contentTotal = dtos.total;
@@ -196,8 +196,8 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
     private updatePaging() {
         const totalPages = Math.ceil(this.contentTotal / this.pageSize);
 
-        this.itemFirst = this.currentPage * this.pageSize + 1;
+        this.itemFirst = this.currentPage *this.pageSize + 1;
-        this.itemLast = Math.min(this.contentTotal, (this.currentPage + 1) * this.pageSize);
+        this.itemLast = Math.min(this.contentTotal, (this.currentPage + 1) *this.pageSize);
 
         this.canGoNext = this.currentPage < totalPages - 1;
         this.canGoPrev = this.currentPage > 0;

src/Squidex/app/framework/angular/slider.component.ts

@@ -79,7 +79,7 @@ export class SliderComponent implements ControlValueAccessor {
 
         const relativeValue = this.getRelativeX(event);
 
-        this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step;
+        this.value = Math.round((relativeValue *(this.max - this.min) + this.min) / this.step) *this.step;
 
         this.updateThumbPosition();
         this.updateTouched();
@@ -89,7 +89,7 @@ export class SliderComponent implements ControlValueAccessor {
     }
 
     public onThumbMouseDown(event: MouseEvent): boolean {
-        this.centerStartOffset = event.offsetX - this.thumb.nativeElement.clientWidth * 0.5;
+        this.centerStartOffset = event.offsetX - this.thumb.nativeElement.clientWidth *0.5;
 
         this.startValue = this.value;
 
@@ -117,7 +117,7 @@ export class SliderComponent implements ControlValueAccessor {
 
         const relativeValue = this.getRelativeX(event);
 
-        this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step;
+        this.value = Math.round((relativeValue *(this.max - this.min) + this.min) / this.step) *this.step;
 
         this.updateThumbPosition();
         this.updateTouched();
@@ -175,7 +175,7 @@ export class SliderComponent implements ControlValueAccessor {
     private updateThumbPosition() {
         const relativeValue = Math.min(1, Math.max(0, (this.value - this.min) / (this.max - this.min)));
 
-        this.renderer.setElementStyle(this.thumb.nativeElement, 'left', relativeValue * 100 + '%');
+        this.renderer.setElementStyle(this.thumb.nativeElement, 'left', relativeValue *100 + '%');
     }
 
     private releaseMouseHandlers() {

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

@@ -33,7 +33,7 @@ export class PanelService {
 
     private update(renderer: Renderer) {
         let currentPosition = 0;
-        let currentLayer = this.elements.length * 10;
+        let currentLayer = this.elements.length *10;
 
         for (let element of this.elements) {
             const width = element.getBoundingClientRect().width;

src/Squidex/app/framework/utils/date-helper.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import * as moment from 'moment';
+import *as moment from 'moment';
 
 import { DateHelper } from './../';
 

src/Squidex/app/framework/utils/date-helper.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import * as moment from 'moment';
+import *as moment from 'moment';
 
 export module DateHelper {
     let momentInstance: any;

src/Squidex/app/framework/utils/date-time.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import * as moment from 'moment';
+import *as moment from 'moment';
 
 export class DateTime {
     public get raw(): Date {
@@ -89,7 +89,7 @@ export class DateTime {
 
         const date = new Date(parseInt(value.substr(6), 10));
         const time = (date.getTime());
-        const offs = (date.getTimezoneOffset() + off * 60) * 60000;
+        const offs = (date.getTimezoneOffset() + off *60) *60000;
 
         date.setTime(time + offs);
 
@@ -154,7 +154,7 @@ export class DateTime {
     }
 
     public firstOfWeek(): DateTime {
-        const weekStart = new Date(this.value.valueOf() - (this.weekDay - 1) * 86400000);
+        const weekStart = new Date(this.value.valueOf() - (this.weekDay - 1) *86400000);
 
         return new DateTime(weekStart);
     }
@@ -192,7 +192,7 @@ export class DateTime {
     public addHours(value: number): DateTime {
         const clone = this.cloneDate();
 
-        clone.setTime(clone.getTime() + (value * 60 * 60 * 1000));
+        clone.setTime(clone.getTime() + (value *60 *60 *1000));
 
         return new DateTime(clone);
     }
@@ -200,7 +200,7 @@ export class DateTime {
     public addMinutes(value: number): DateTime {
         const clone = this.cloneDate();
 
-        clone.setTime(clone.getTime() + (value * 60 * 1000));
+        clone.setTime(clone.getTime() + (value *60 *1000));
 
         return new DateTime(clone);
     }
@@ -208,7 +208,7 @@ export class DateTime {
     public addSeconds(value: number): DateTime {
         const clone = this.cloneDate();
 
-        clone.setTime(clone.getTime() + (value * 1000));
+        clone.setTime(clone.getTime() + (value *1000));
 
         return new DateTime(clone);
     }

src/Squidex/app/framework/utils/duration.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import * as moment from 'moment';
+import *as moment from 'moment';
 
 import { DateTime } from './date-time';
 

src/Squidex/app/framework/utils/immutable-array.spec.ts

@@ -92,7 +92,7 @@ describe('ImmutableArray', () => {
 
     it('should replace all by predicate', () => {
         const array_1 = ImmutableArray.of([1, 2, 3, 4]);
-        const array_2 = array_1.replaceAll((i: number) => i % 2 === 0, i => i * 2);
+        const array_2 = array_1.replaceAll((i: number) => i % 2 === 0, i => i *2);
 
         expect(array_2.values).toEqual([1, 4, 3, 8]);
     });
@@ -113,7 +113,7 @@ describe('ImmutableArray', () => {
 
     it('should map items', () => {
         const array_1 = ImmutableArray.of([1, 2, 3, 4]);
-        const array_2 = array_1.map((i: number) => i * 2);
+        const array_2 = array_1.map((i: number) => i *2);
 
         expect(array_2.values).toEqual([2, 4, 6, 8]);
     });

src/Squidex/app/framework/utils/math-helper.spec.ts

@@ -31,21 +31,21 @@ describe('MathHelper', () => {
 
     it('should convert to rad', () => {
         expect(MathHelper.toRad(0)).toBe(0);
-        expect(MathHelper.toRad(180)).toBe(Math.PI * 1);
+        expect(MathHelper.toRad(180)).toBe(Math.PI *1);
-        expect(MathHelper.toRad(360)).toBe(Math.PI * 2);
+        expect(MathHelper.toRad(360)).toBe(Math.PI *2);
     });
 
     it('should convert to degree', () => {
         expect(MathHelper.toDegree(0)).toBe(0);
-        expect(MathHelper.toDegree(Math.PI * 1)).toBe(180);
+        expect(MathHelper.toDegree(Math.PI *1)).toBe(180);
-        expect(MathHelper.toDegree(Math.PI * 2)).toBe(360);
+        expect(MathHelper.toDegree(Math.PI *2)).toBe(360);
     });
 
     it('should adjust invalid degrees', () => {
-        expect(MathHelper.toPositiveDegree(36.5 - (1 * 360))).toBe(36.5);
+        expect(MathHelper.toPositiveDegree(36.5 - (1 *360))).toBe(36.5);
-        expect(MathHelper.toPositiveDegree(36.5 - (2 * 360))).toBe(36.5);
+        expect(MathHelper.toPositiveDegree(36.5 - (2 *360))).toBe(36.5);
-        expect(MathHelper.toPositiveDegree(36.5 + (1 * 360))).toBe(36.5);
+        expect(MathHelper.toPositiveDegree(36.5 + (1 *360))).toBe(36.5);
-        expect(MathHelper.toPositiveDegree(36.5 + (2 * 360))).toBe(36.5);
+        expect(MathHelper.toPositiveDegree(36.5 + (2 *360))).toBe(36.5);
     });
 
     it('should calculate simple sin', () => {

src/Squidex/app/framework/utils/math-helper.ts

@@ -39,15 +39,15 @@ export module MathHelper {
     }
 
     export function s4(): string {
-        return Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
+        return Math.floor((1 + Math.random()) *0x10000).toString(16).substring(1);
     }
 
     export function toRad(degree: number): number {
-        return degree * Math.PI / 180;
+        return degree *Math.PI / 180;
     }
 
     export function toDegree(rad: number): number {
-        return rad * 180 / Math.PI;
+        return rad *180 / Math.PI;
     }
 
     export function simpleCos(degree: number): number {
@@ -63,11 +63,11 @@ export module MathHelper {
     }
 
     export function roundToMultipleOf(value: number, factor: number): number {
-        return Math.round(value / factor) * factor;
+        return Math.round(value / factor) *factor;
     }
 
     export function roundToMultipleOfTwo(value: number): number {
-        return Math.round(value / 2) * 2;
+        return Math.round(value / 2) *2;
     }
 
     export function toPositiveDegree(degree: number): number {

src/Squidex/app/theme/vendor.scss

@@ -1,7 +1,7 @@
 @import '_bootstrap-vars.scss';
 
 // Bootstrap
-@import './../../node_modules/bootstrap/scss/bootstrap-flex.scss';
+@import './../../node_modules/bootstrap/scss/bootstrap.scss';
 
 // Bootstrap Overrides
 @import '_bootstrap.scss';

src/Squidex/package.json

@@ -14,68 +14,68 @@
     "build:clean": "rimraf wwwroot/build"
   },
   "dependencies": {
-    "@angular/common": "2.4.1",
+    "@angular/common": "2.4.5",
-    "@angular/compiler": "2.4.1",
+    "@angular/compiler": "2.4.5",
-    "@angular/core": "2.4.1",
+    "@angular/core": "2.4.5",
-    "@angular/forms": "2.4.1",
+    "@angular/forms": "2.4.5",
-    "@angular/http": "2.4.1",
+    "@angular/http": "2.4.5",
-    "@angular/platform-browser": "2.4.1",
+    "@angular/platform-browser": "2.4.5",
-    "@angular/platform-browser-dynamic": "2.4.1",
+    "@angular/platform-browser-dynamic": "2.4.5",
-    "@angular/router": "3.4.1",
+    "@angular/router": "3.4.5",
-    "babel-polyfill": "^6.20.0",
+    "babel-polyfill": "^6.22.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.2",
+    "rxjs": "5.0.3",
-    "zone.js": "^0.7.4"
+    "zone.js": "^0.7.6"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "2.4.1",
+    "@angular/compiler-cli": "2.4.5",
-    "@angular/tsc-wrapped": "0.5.0",
+    "@angular/tsc-wrapped": "0.5.1",
-    "@ngtools/webpack": "^1.1.9",
+    "@ngtools/webpack": "^1.2.4",
     "@types/core-js": "^0.9.35",
-    "@types/jasmine": "^2.5.38",
+    "@types/jasmine": "^2.5.41",
-    "@types/mousetrap": "^1.5.32",
+    "@types/mousetrap": "^1.5.33",
-    "@types/node": "^6.0.51",
+    "@types/node": "^7.0.4",
     "angular2-router-loader": "^0.3.4",
     "angular2-template-loader": "^0.6.0",
-    "awesome-typescript-loader": "^3.0.0-beta.17",
+    "awesome-typescript-loader": "^3.0.0-beta.18",
     "cpx": "^1.5.0",
     "css-loader": "^0.26.1",
     "exports-loader": "^0.6.3",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
-    "file-loader": "^0.9.0",
+    "file-loader": "^0.10.0",
     "html-loader": "^0.4.4",
-    "html-webpack-plugin": "^2.24.1",
+    "html-webpack-plugin": "^2.26.0",
     "istanbul-instrumenter-loader": "^0.2.0",
     "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
+    "karma": "^1.4.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.1",
-    "karma-htmlfile-reporter": "^0.3.4",
+    "karma-htmlfile-reporter": "^0.3.5",
-    "karma-jasmine": "^1.0.2",
+    "karma-jasmine": "^1.1.0",
-    "karma-mocha-reporter": "^2.2.1",
+    "karma-mocha-reporter": "^2.2.2",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^1.8.0",
+    "karma-webpack": "^2.0.2",
-    "node-sass": "^4.1.1",
+    "node-sass": "^4.4.0",
     "null-loader": "^0.1.1",
-    "phantomjs-prebuilt": "^2.1.13",
+    "phantomjs-prebuilt": "^2.1.14",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4",
     "sass-lint": "^1.10.2",
-    "sass-loader": "^4.0.2",
+    "sass-loader": "^4.1.1",
     "style-loader": "^0.13.1",
-    "tslint": "^4.0.2",
+    "tslint": "^4.4.2",
-    "tslint-loader": "^3.2.0",
+    "tslint-loader": "^3.3.0",
     "typemoq": "^1.1.0",
-    "typescript": "2.0.10",
+    "typescript": "2.1.5",
     "underscore": "^1.8.3",
-    "webpack": "2.1.0-beta.25",
+    "webpack": "2.2.0",
-    "webpack-dev-server": "2.1.0-beta.10",
+    "webpack-dev-server": "2.2.0",
-    "webpack-merge": "^2.0.0"
+    "webpack-merge": "^2.6.0"
   }
 }