Revert typescript to 2.0.10

Still have a problem about AoT related with component inheritance. It
will be fixed in another commit.

Author: akirasosa

config/karma.conf.js

@@ -8,21 +8,21 @@ module.exports = function (config) {
       {pattern: './config/spec-bundle.js', watched: false},
     ],
     preprocessors: {
-      // './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
-      './config/spec-bundle.js': ['webpack', 'sourcemap'],
+      './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
+      // './config/spec-bundle.js': ['webpack', 'sourcemap'],
     },
     webpack: testWebpackConfig,
-    // coverageReporter: {
-    //   type: 'in-memory'
-    // },
-    // remapCoverageReporter: {
-    //   'text-summary': null,
-    //   html: './coverage/html',
-    //   lcovonly: './coverage/lcov.info',
-    // },
+    coverageReporter: {
+      type: 'in-memory'
+    },
+    remapCoverageReporter: {
+      'text-summary': null,
+      html: './coverage/html',
+      lcovonly: './coverage/lcov.info',
+    },
     webpackMiddleware: {stats: 'errors-only'},
-    // reporters: ['mocha', 'coverage', 'remap-coverage'],
-    reporters: ['mocha'],
+    reporters: ['mocha', 'coverage', 'remap-coverage'],
+    // reporters: ['mocha'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

config/webpack.common.js

@@ -2,7 +2,8 @@ const webpack = require('webpack');
 const helpers = require('./helpers');
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const { CheckerPlugin } = require('awesome-typescript-loader');
+// const { CheckerPlugin } = require('awesome-typescript-loader');
+const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = {
@@ -47,7 +48,8 @@ module.exports = {
       template: 'src/index.html',
       chunksSortMode: 'dependency',
     }),
-    new CheckerPlugin(),
+    // new CheckerPlugin(),
+    new ForkCheckerPlugin(),
     new webpack.ContextReplacementPlugin(
       // The (\\|\/) piece accounts for path separators in *nix and Windows
       /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,

config/webpack.test.js

@@ -2,7 +2,7 @@ const path = require('path');
 const helpers = require('./helpers');
 const webpack = require('webpack');
 
-const { CheckerPlugin } = require('awesome-typescript-loader');
+// const {CheckerPlugin} = require('awesome-typescript-loader');
 const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
 
 const ENV = process.env.ENV = process.env.NODE_ENV = 'test';
@@ -48,18 +48,18 @@ module.exports = {
       },
       {test: /\.css$/, loader: 'raw-loader'},
       {test: /\.html$/, loader: 'raw-loader'},
-      // {
-      //   enforce: 'post',
-      //   test: /\.(js|ts)$/,
-      //   loader: 'istanbul-instrumenter-loader',
-      //   include: [
-      //     helpers.root('src'),
-      //   ],
-      //   exclude: [
-      //     /\.(e2e|spec)\.ts$/,
-      //     /node_modules/
-      //   ]
-      // },
+      {
+        enforce: 'post',
+        test: /\.(js|ts)$/,
+        loader: 'istanbul-instrumenter-loader',
+        include: [
+          helpers.root('src'),
+        ],
+        exclude: [
+          /\.(e2e|spec)\.ts$/,
+          /node_modules/
+        ]
+      },
     ]
   },
   plugins: [
@@ -81,7 +81,7 @@ module.exports = {
         },
       },
     }),
-    new CheckerPlugin(),
+    // new CheckerPlugin(),
   ],
   node: {
     global: true,

package.json

@@ -59,7 +59,7 @@
     "@types/webpack": "^2.0.0",
     "angular2-router-loader": "^0.3.3",
     "angular2-template-loader": "^0.6.0",
-    "awesome-typescript-loader": "^3.0.0-beta.13",
+    "awesome-typescript-loader": "^2.2.4",
     "codelyzer": "^1.0.0-beta.3",
     "coveralls": "^2.11.15",
     "css-loader": "^0.26.0",
@@ -85,7 +85,7 @@
     "ts-helpers": "^1.1.2",
     "tslint": "^3.15.1",
     "tslint-loader": "^2.1.5",
-    "typescript": "~2.1.4",
+    "typescript": "~2.0.10",
     "webpack": ">=2.1.0-beta.27",
     "webpack-dev-server": ">=2.1.0-beta.11",
     "webpack-merge": "^1.0.2"

src/app/core/toast/toast.component.ts

@@ -29,10 +29,13 @@ export class ToastComponent implements OnInit {
   }
 
   private applyStyle(toast): Toast {
-    return {
-      ...toast,
+    // return {
+    //   ...toast,
+    //   styles: [styles.toastBase, styles[toast.level]],
+    // };
+    return Object.assign({}, toast, {
       styles: [styles.toastBase, styles[toast.level]],
-    };
+    });
   }
 
   private addToast(toast) {

src/app/pages/+related-user-list/related-user-list.component.styles.ts

@@ -2,7 +2,8 @@ import {StyleSheet} from "aphrodite";
 import {list_1} from "../../styles/shared.styles";
 
 export const styles = StyleSheet.create({
-  list: {...list_1},
+  // list: {...list_1},
+  list: Object.assign({}, list_1),
   gravatar: {
     float: 'left',
     marginRight: '8px',

src/app/pages/+user-list/user-list.component.styles.ts

@@ -2,7 +2,8 @@ import {StyleSheet} from "aphrodite";
 import {list_1} from "../../styles/shared.styles";
 
 export const styles = StyleSheet.create({
-  list: {...list_1},
+  // list: {...list_1},
+  list: Object.assign({}, list_1),
   gravatar: {
     float: 'left',
     marginRight: '8px',

src/app/pages/home/feed/feed.component.styles.ts

@@ -3,10 +3,13 @@ import {list_1} from "../../../styles/shared.styles";
 import {colors} from "../../../styles/colors.styles";
 
 export const styles = StyleSheet.create({
-  list: {
-    ...list_1,
+  // list: {
+  //   ...list_1,
+  //   lineHeight: '20px',
+  // },
+  list: Object.assign({}, list_1, {
     lineHeight: '20px',
-  },
+  }),
   gravatar: {
     float: 'left',
     marginRight: '8px',

yarn.lock

@@ -319,13 +319,13 @@ autoprefixer@^6.3.1:
     postcss "^5.2.6"
     postcss-value-parser "^3.2.3"
 
-awesome-typescript-loader@^3.0.0-beta.13:
-  version "3.0.0-beta.13"
-  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.0.0-beta.13.tgz#b8b40f97a437d39310b93021611d239015050036"
+awesome-typescript-loader@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-2.2.4.tgz#4185d60c035c25515f9c2a747fa5f69b2a001e9e"
   dependencies:
     colors "^1.1.2"
-    enhanced-resolve "^2.3.0"
-    loader-utils "^0.2.16"
+    enhanced-resolve "^2.2.2"
+    loader-utils "^0.2.6"
     lodash "^4.13.1"
     object-assign "^4.1.0"
     source-map-support "^0.4.0"
@@ -1253,7 +1253,7 @@ [email protected]:
     engine.io-parser "1.2.4"
     ws "1.0.1"
 
-enhanced-resolve@^2.2.0, enhanced-resolve@^2.3.0:
+enhanced-resolve@^2.2.0, enhanced-resolve@^2.2.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
   dependencies:
@@ -2312,7 +2312,7 @@ loader-runner@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
 
-[email protected], loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2:
+[email protected], loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.6, loader-utils@^0.2.7, loader-utils@~0.2.2:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -4177,9 +4177,9 @@ type-is@~1.6.13:
     media-typer "0.3.0"
     mime-types "~2.1.13"
 
-typescript@~2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.4.tgz#b53b69fb841126acb1dd4b397d21daba87572251"
+typescript@~2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
 
 [email protected], uglify-js@^2.6, uglify-js@~2.7.3:
   version "2.7.5"