chore(testing) modified the awesome typescript loader config to output es5 modules and not es6, breaks istanbuls esprima dep. Should look into isparta.

Author: TheLarkInn

addon/ng2/commands/serve.ts

@@ -6,6 +6,7 @@ const PortFinder  = require('portfinder');
 const win         = require('ember-cli/lib/utilities/windows-admin');
 const EOL         = require('os').EOL;
 
+
 PortFinder.basePort = 49152;
 
 const getPort = Promise.denodeify(PortFinder.getPort);
@@ -53,6 +54,8 @@ module.exports = Command.extend({
   ],
 
   run: function(commandOptions: ServeTaskOptions) {
+
+
     commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
 
     return this._checkExpressPort(commandOptions)

addon/ng2/models/webpack-build-common.ts

@@ -13,7 +13,6 @@ export const webpackCommonConfig = {
     extensions: ['', '.ts', '.js'],
     root: ngAppResolve('./src')
   },
-  debug: true,
   context: path.resolve(__dirname, './'),
   entry: {
     main: [ngAppResolve('./src/main.ts')],

addon/ng2/models/webpack-build-production.ts

@@ -23,19 +23,19 @@ export const webpackProdConfigPartial = {
   plugins: [
     new WebpackMd5Hash(),
     new webpack.optimize.DedupePlugin(),
-    // new webpack.optimize.UglifyJsPlugin({
-    //   beautify: false, //prod
-    //   mangle: { screw_ie8 : true }, //prod
-    //   compress: { screw_ie8: true }, //prod
-    //   comments: false //prod
-    // }),
-    // new CompressionPlugin({
-    //     asset: "[path].gz[query]",
-    //     algorithm: "gzip",
-    //     test: /\.js$|\.html$/,
-    //     threshold: 10240,
-    //     minRatio: 0.8
-    // }),
+    new webpack.optimize.UglifyJsPlugin({
+      beautify: false, //prod
+      mangle: { screw_ie8 : true }, //prod
+      compress: { screw_ie8: true }, //prod
+      comments: false //prod
+    }),
+    new CompressionPlugin({
+        asset: "[path].gz[query]",
+        algorithm: "gzip",
+        test: /\.js$|\.html$/,
+        threshold: 10240,
+        minRatio: 0.8
+    }),
     new LoaderOptionsPlugin({
       test: /\.js/,
       minimize: true,

addon/ng2/models/webpack-build-test.ts

@@ -42,15 +42,18 @@ export const webpackTestConfig = {
           {
             loader: 'awesome-typescript-loader',
             query: {
+              useWebpackText: true,
               tsconfig: ngAppResolve('./src/tsconfig.json'),
-              resolveGlobs: false,
+              // resolveGlobs: false,
               module: "commonjs",
               target: "es5",
-              library: "es6",
-              lib: ['es5', 'dom'],
-              useForkChecker: false,
+              lib: ['es6', 'dom'],
+              useForkChecker: true,
               removeComments: true
             }
+          },
+          {
+            loader: 'angular2-template-loader'
           }
         ],
         exclude: [/\.e2e\.ts$/]

addon/ng2/models/webpack-build-utils.ts

@@ -1,7 +1,7 @@
 const path = require('path');
 const autoprefixer = require('autoprefixer');
 
-import {webpackDevConfig, webpackProdConfig, webpackVendorDLLConfig} from './';
+import {webpackDevConfig, webpackProdConfig} from './';
 
 export const ngAppResolve = (resolvePath: string): string => {
   return path.resolve(process.cwd(), resolvePath);
@@ -15,6 +15,16 @@ export const webpackOutputOptions: WebpackProgressPluginOutputOptions = {
   chunkModules: false
 }
 
+export const webpackDevServerOutputOptions = {
+  assets: true,
+  colors: true,
+  version: true,
+  hash: true,
+  timings: true,
+  chunks: false,
+  chunkModules: false
+}
+
 export const postCssConfiguration = () => {
   return {
     defaults: [autoprefixer]
@@ -23,6 +33,5 @@ export const postCssConfiguration = () => {
 
 export const envToConfigMap: any = {
   production: webpackProdConfig,
-  development: webpackDevConfig,
-  vendor: webpackVendorDLLConfig
+  development: webpackDevConfig
 }

addon/ng2/tasks/serve-webpack.ts

@@ -1,4 +1,12 @@
-import {webpackCommonConfig, webpackOutputOptions, webpackDevMaterialConfig, webpackProdMaterialConfig, webpackDevMaterialE2EConfig, webpackDevConfig} from '../models/';
+import {
+  webpackDevServerOutputOptions,
+  webpackOutputOptions,
+  webpackCommonConfig,
+  webpackDevMaterialConfig,
+  webpackProdMaterialConfig,
+  webpackDevMaterialE2EConfig,
+  webpackDevConfig,
+} from '../models/';
 import {ServeTaskOptions} from '../commands/serve';
 
 const path = require('path');
@@ -16,6 +24,9 @@ let lastHash = null;
 
 module.exports = Task.extend({
   run: (commandOptions: ServeTaskOptions) => {
+
+
+
     let webpackCompiler: any;
     if (commandOptions.environment === 'material') {
       webpackDevMaterialConfig.entry.main.unshift(`webpack-dev-server/client?http://localhost:${commandOptions.port}/`);
@@ -39,14 +50,15 @@ module.exports = Task.extend({
     const webpackDevServerConfiguration: IWebpackDevServerConfigurationOptions = {
       contentBase: path.resolve(process.cwd(), './src'),
       historyApiFallback: true,
-      stats: { colors: true },
+      stats: webpackDevServerOutputOptions,
       inline: true
     };
 
     const serveMessage:string = chalk.green(`\n*\n*\n NG Live Development Server is running on http://localhost:${commandOptions.port}.\n*\n*`);
     const server = new WebpackDevServer(webpackCompiler, webpackDevServerConfiguration);
 
     return new Promise((resolve, reject) => {
+      process.stdout.write(chalk.red('\n\n' + chalk.underline.bgYellow('TODO#'), 'Implement ENV Flags for serve builds.\n\n'));
       server.listen(commandOptions.port, "localhost", function(err, stats) {
         if(err) {
           lastHash = null;

custom-typings.d.ts

@@ -15,7 +15,7 @@ interface IWebpackDevServerConfigurationOptions {
   };
   publicPath?: string;
   headers?: { [key:string]: string };
-  stats?: { colors: boolean; };
+  stats?: { [key:string]: boolean };
   inline: boolean;
 }