Merge pull request #17 from opiepj/bugfix/webpack

fix build errors.

Author: opiepj

src/app/components/app.html

@@ -1,7 +1,7 @@
 <header>
   <div layout="row" class="top-nav ac-default-theme">
     <img src="angular-shield.png" alt="Angular2" height="54" width="54">
-    <span class="logo">{{ name | capitalize }} + Webpack</span>
+    <span class="logo">{{ name | capitalize }} + Patrcik + Webpack</span>
     <ul>
       <li class="l-left">
         <a [router-link]=" ['/home'] "class="top-nav-button ac-default-theme">Home</a>
@@ -10,10 +10,7 @@
         <a [router-link]=" ['/dashboard'] "class="top-nav-button ac-default-theme">Dashboard</a>
       </li>
       <li class="l-left">
-        <a [router-link]=" ['/todo'] "class="top-nav-button ac-default-theme">Todo</a>
-      </li>
-      <li class="l-left">
-        <a [router-link]=" ['/rxjs-examples', 'search'] "class="top-nav-button ac-default-theme">RxJs Examples</a>
+        <a [router-link]=" ['/example-modules', 'search'] "class="top-nav-button ac-default-theme">Example Modules</a>
       </li>
     </ul>
   </div>

src/app/components/example-modules/example-modules.ts

@@ -5,7 +5,7 @@ import {Component, View, CSSClass} from 'angular2/angular2';
 import {RouteConfig, routerDirectives} from 'angular2/router';
 // Modules
 import {Tictactoe} from './tictactoe-module/tictactoe';
-import {Search} from '.search-module/search';
+import {Search} from './search-module/search';
 // View
 let template = require('./example-modules.html');
 let styles = require('./example-modules.css')

src/app/components/example-modules/search-module/directives/autosuggest.ts

@@ -3,7 +3,7 @@
 // Angular 2
 import {Directive, View, EventEmitter, ElementRef, LifecycleEvent} from 'angular2/angular2';
 
-import {Github} from './Github';
+import {Github} from '../services/github';
 // RxJs
 import * as Rx from 'rx';
 

src/app/components/example-modules/tictactoe-module/directives/board.ts

@@ -3,8 +3,8 @@
 // Angular 2
 import {Component, View, EventEmitter, coreDirectives} from 'angular2/angular2';
 
-let styles   = require('./styles/board.css');
-let template = require('./views/board.html');
+let styles   = require('../styles/board.css');
+let template = require('../views/board.html');
 
 @Component({
   selector: 'board',

src/app/pipes/pipes.ts

@@ -8,12 +8,11 @@ import {Pipes} from 'angular2/change_detection';
  * App Pipes
  */
 import {capitalize} from './Capitalize/Capitalize-Pipe';
-import {rxAsync} from './RxPipe';
+import {rxAsync} from './rx/rxpipe';
 
 export var appPipes = [
   Pipes.extend({
     'async': rxAsync,
     'capitalize': capitalize
-    // add more pipes to this Map
   })
 ];

src/public/angularjs-logo_patrick.png

@@ -7,15 +7,15 @@ var NODE_ENV = process.env.NODE_ENV || 'development';
 // Node
 var webpack = require('webpack');
 var path = require('path');
-var pkg  = require('./package.json');
+var pkg = require('./package.json');
 
 // Webpack Plugins
 var OccurenceOrderPlugin = webpack.optimize.OccurenceOrderPlugin;
-var CommonsChunkPlugin   = webpack.optimize.CommonsChunkPlugin;
+var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
 var UglifyJsPlugin = webpack.optimize.UglifyJsPlugin;
-var DedupePlugin   = webpack.optimize.DedupePlugin;
-var DefinePlugin   = webpack.DefinePlugin;
-var BannerPlugin   = webpack.BannerPlugin;
+var DedupePlugin = webpack.optimize.DedupePlugin;
+var DefinePlugin = webpack.DefinePlugin;
+var BannerPlugin = webpack.BannerPlugin;
 
 
 /*
@@ -54,15 +54,6 @@ var config = {
        */
 
       './src/app/bootstrap'
-    ],
-    'app-simple': [
-      // Simple Version of App
-
-      /*
-       * include any 3rd party js lib here
-       */
-
-      './src/app-simple/bootstrap'
     ]
   },
 
@@ -73,12 +64,12 @@ var config = {
     // filename: '[name].[hash].js',
     sourceMapFilename: '[name].js.map',
     chunkFilename: '[id].chunk.js'
-    // publicPath: 'http://mycdn.com/'
+      // publicPath: 'http://mycdn.com/'
   },
 
   resolve: {
     root: __dirname,
-    extensions: ['','.ts','.js','.json'],
+    extensions: ['', '.ts', '.js', '.json'],
     alias: {
       // we can switch between development and production
       // 'angular2': 'node_modules/angular2/ts',
@@ -105,16 +96,28 @@ var config = {
   module: {
     loaders: [
       // Support for *.json files.
-      { test: /\.json$/,  loader: 'json' },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
 
       // Support for CSS as raw text
-      { test: /\.css$/,   loader: 'raw' },
+      {
+        test: /\.css$/,
+        loader: 'raw'
+      },
 
       // support for .html as raw text
-      { test: /\.html$/,  loader: 'raw' },
+      {
+        test: /\.html$/,
+        loader: 'raw'
+      },
 
       // Support for .ts files.
-      { test: /\.ts$/,    loader: 'typescript-simple?ignoreWarnings[]=2345', exclude: [
+      {
+        test: /\.ts$/,
+        loader: 'typescript-simple?ignoreWarnings[]=2345',
+        exclude: [
           /\.spec\.ts$/,
           /\.e2e\.ts$/,
           /web_modules/,
@@ -130,7 +133,10 @@ var config = {
 
   // plugins: plugins, // see below
   context: __dirname,
-  stats: { colors: true, reasons: true }
+  stats: {
+    colors: true,
+    reasons: true
+  }
 };
 
 
@@ -150,50 +156,51 @@ var commons_chunks_plugins = [
 //
 var environment_plugins = {
 
-  all: [
+    all: [
     new DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
-      'VERSION': pkg.version
-    }),
+        'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
+        'VERSION': pkg.version
+      }),
     new OccurenceOrderPlugin(),
     new DedupePlugin(),
   ],
 
-  production: [
+    production: [
     new UglifyJsPlugin({
-      compress: {
-        warnings: false,
-        drop_debugger: false
-      },
-      output: {
-        comments: false
-      },
-      beautify: false
-    }),
-    new BannerPlugin(getBanner(), {entryOnly: true})
+        compress: {
+          warnings: false,
+          drop_debugger: false
+        },
+        output: {
+          comments: false
+        },
+        beautify: false
+      }),
+    new BannerPlugin(getBanner(), {
+        entryOnly: true
+      })
   ],
 
-  development: [
+    development: [
     /* Dev Plugin */
     // new webpack.HotModuleReplacementPlugin(),
   ]
 
-}//env
+  } //env
 
 if (NODE_ENV === 'production') {
   // replace filename `.js` with `.min.js`
   config.output.filename = config.output.filename.replace('.js', '.min.js');
   config.output.sourceMapFilename = config.output.sourceMapFilename.replace('.js', '.min.js');
-  commons_chunks_plugins = commons_chunks_plugins.map(function(chunk) {
+  commons_chunks_plugins = commons_chunks_plugins.map(function (chunk) {
     return chunk.filename.replace('.js', '.min.js');
   });
-}
-else if (NODE_ENV === 'development') {
+} else if (NODE_ENV === 'development') {
   // any development actions here
 }
 
 // create CommonsChunkPlugin instance for each config
-var combine_common_chunks = commons_chunks_plugins.map(function(config) {
+var combine_common_chunks = commons_chunks_plugins.map(function (config) {
   return new CommonsChunkPlugin(config);
 });
 
@@ -205,15 +212,15 @@ module.exports = config;
 
 // Helper functions
 function getBanner() {
-  return 'Angular2 Webpack Starter v'+ pkg.version +' by @gdi2990 from @AngularClass';
+  return 'Angular2.0 App v' + pkg.version;
 }
 
 function root(args) {
   args = sliceArgs(arguments, 0);
   return path.join.apply(path, [__dirname].concat(args));
 }
+
 function rootNode(args) {
   args = sliceArgs(arguments, 0);
   return root.apply(path, ['node_modules'].concat(args));
 }
-