fix(build): hopefully fix the prod & aot build errors (#753)

* fix(dependencies): fix versions

* fix(build): get initial.scss back, updat some dependencies, fix resolve-url-loader warning

* fix(build): fix out, update travis build

* fix(build): revert sass-loader

* fix(build): pin sass-loader at 4.1.1

* fix(build): remove cache from travis

.travis.yml

@@ -5,12 +5,6 @@ language: node_js
 node_js:
   - "6"
 
-cache:
-  directories:
-    - node_modules
-    - $HOME/.npm
-    - $HOME/.cache/yarn
-
 addons:
   apt:
     sources:
@@ -30,8 +24,7 @@ install:
   - yarn
 
 script:
-  - yarn run build:prod
-  - yarn run build:aot
+  - yarn run build:ci
 
 notifications:
   slack: akveo:q559HckfZMSyZRb803aiLcjH

config/webpack.common.js

@@ -162,9 +162,9 @@ module.exports = function (options) {
 
         {
           test: /initial\.scss$/,
-          loader: ExtractTextPlugin.extract({
-            fallbackLoader: 'style-loader',
-            loader: 'css-loader!sass-loader?sourceMap'
+          use: ExtractTextPlugin.extract({
+            fallback: 'style-loader',
+            use: 'css-loader!sass-loader?sourceMap'
           })
         },
 

config/webpack.dev.js

@@ -119,6 +119,7 @@ module.exports = function (options) {
               name: 'zone.js',
               path: 'zone.js/dist/long-stack-trace-zone.js'
             },
+            'ts-helpers',
           ],
           vendor: [
             '@angular/platform-browser',

package.json

@@ -28,7 +28,6 @@
     "core-js": "2.4.1",
     "easy-pie-chart": "2.1.7",
     "font-awesome": "4.7.0",
-    "font-awesome-sass-loader": "1.0.3",
     "fullcalendar": "2.9.1",
     "google-maps": "3.2.1",
     "http-server": "0.9.0",
@@ -45,10 +44,10 @@
     "ng2-completer": "1.1.0",
     "ng2-smart-table": "0.5.3-0",
     "ng2-tree": "2.0.0-alpha.3",
-    "ngx-uploader": "2.1.6",
-    "normalize.css": "5.0.0",
+    "ngx-uploader": "2.2.0",
+    "normalize.css": "4.2.0",
     "reflect-metadata": "0.1.9",
-    "rxjs": "5.1.1",
+    "rxjs": "5.0.2",
     "tether": "1.4.0",
     "zone.js": "0.7.7"
   },
@@ -59,7 +58,7 @@
     "@types/hammerjs": "2.0.34",
     "@types/jquery ": "2.0.40",
     "@types/jquery.slimscroll": "1.3.30",
-    "@types/lodash": "4.14.52",
+    "@types/lodash": "ts2.0",
     "@types/node": "6.0.63",
     "@types/source-map": "0.5.0",
     "@types/uglify-js": "2.6.28",
@@ -68,7 +67,7 @@
     "angular2-template-loader": "0.6.0",
     "assets-webpack-plugin": "3.5.1",
     "awesome-typescript-loader": "3.0.4",
-    "bootstrap-loader": "2.0.0-beta.18",
+    "bootstrap-loader": "2.0.0-beta.21",
     "codelyzer": "2.0.0",
     "copy-webpack-plugin": "4.0.1",
     "css-loader": "0.26.1",
@@ -81,34 +80,35 @@
     "extract-text-webpack-plugin": "2.0.0-rc.3",
     "file-loader": "0.10.0",
     "find-root": "1.0.0",
+    "font-awesome-sass-loader": "1.0.3",
     "gh-pages": "0.12.0",
     "html-webpack-plugin": "2.28.0",
     "imports-loader": "0.7.0",
     "json-loader": "0.5.4",
     "ng-router-loader": "2.1.0",
-    "ngc-webpack": "1.1.0",
+    "ngc-webpack": "1.2.0",
     "node-sass": "4.5.0",
     "npm-run-all": "4.0.1",
     "optimize-js-plugin": "0.0.4",
-    "postcss-loader": "1.3.0",
+    "postcss-loader": "1.3.1",
     "raw-loader": "0.5.1",
     "resolve-url-loader": "1.6.1",
     "rimraf": "2.5.4",
-    "sass-loader": "6.0.0",
+    "sass-loader": "4.1.1",
     "script-ext-html-webpack-plugin": "1.7.1",
     "source-map-loader": "0.1.6",
     "string-replace-loader": "1.0.5",
     "style-loader": "0.13.1",
     "to-string-loader": "1.1.5",
+    "ts-helpers": "1.1.2",
     "ts-node": "2.1.0",
-    "tslib": "1.5.0",
     "tslint": "4.4.2",
     "typedoc": "0.5.6",
-    "typescript": "2.1.6",
+    "typescript": "2.0.10",
     "url-loader": "0.5.7",
     "webpack": "2.2.0",
-    "webpack-dev-middleware": "1.10.0",
-    "webpack-dev-server": "2.3.0",
+    "webpack-dev-middleware": "1.9.0",
+    "webpack-dev-server": "2.2.0",
     "webpack-dll-bundles-plugin": "1.0.0-beta.5",
     "webpack-merge": "2.6.1"
   },
@@ -163,7 +163,8 @@
     "electron:start": "electron build",
     "build:aot:prod": "npm run clean:dist && npm run clean:aot && webpack --config config/webpack.prod.js  --progress --profile --bail",
     "build:aot": "npm run build:aot:prod",
-    "clean:aot": "npm run rimraf -- compiled"
+    "clean:aot": "npm run rimraf -- compiled",
+    "build:ci": "npm run build:prod && npm run build:aot"
   },
   "repository": {
     "type": "git",

src/polyfills.browser.ts

@@ -28,6 +28,9 @@ import 'core-js/es6/reflect';
 import 'core-js/es7/reflect';
 import 'zone.js/dist/zone';
 
+// Typescript emit helpers polyfill
+import 'ts-helpers';
+
 if ('production' === ENV) {
   // Production
 

tsconfig.json

@@ -9,7 +9,6 @@
     "sourceMap": true,
     "noEmit": true,
     "noEmitHelpers": true,
-    "importHelpers": true,
     "strictNullChecks": false,
     "lib": [
       "dom",

tsconfig.webpack.json

@@ -9,7 +9,6 @@
     "sourceMap": true,
     "noEmit": true,
     "noEmitHelpers": true,
-    "importHelpers": true,
     "strictNullChecks": false,
     "lib": [
       "es2015",