Merge pull request #16 from opiepj/feature/15-server

opiepj · opiepj · commit 4c6d3683e6af · 2015-08-10T08:34:50.000-07:00
Feature/15 server
diff --git a/README.md b/README.md
@@ -36,26 +36,33 @@ Install the following node modules
 ## Running App
 After installation run `npm run server` to start a local server using `webpack-dev-server` which will watch, build (in-memory), and reload for you. The port will be displayed to you as `http://localhost:3000` (or if you prefer IPv6, if you're using `express` server, then it's `http://[::1]:3000/`).
 
+### server
+```bash
+$ webpack-dev-server
+```
+
+## Other Commands
+
 ### build files
 ```bash
-$ npm run build # or webpack
+$ webpack
 ```
 
 ### watch and build files
 ```bash
-$ npm run watch # or webpack --watch
+$ webpack --watch
 ```
 
 ### run tests
 ```bash
-$ npm run test # or karma start
+$ karma start
 ```
 
 ### run webdriver (E2E)
 ```bash
-$ npm run webdriver-start # or webdriver-manager start
+$ webdriver-manager start
 then
-$ npm rune e2e
+$ npm run e2e
 ```
 
 # Angular 2.0 API
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "angular2-webpack-starter",
+  "name": "angular2.0-App",
   "version": "0.0.0",
-  "description": "An Angular 2 Webpack Starter kit featuring Angular 2 (Router, Http, Forms, Services, Tests, E2E), Karma, Protractor, Jasmine, TypeScript, and Webpack by AngularClass",
+  "description": "An Angular 2.0 sample app using Webpack",
   "main": "",
   "scripts": {
     "build": "npm run build:dev && npm run build:prod",
@@ -27,16 +27,10 @@
     "prestart": "npm install",
     "start": "npm run server"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular-class/angular2-webpack-starter.git"
-  },
-  "author": "gdi2290 <github@gdi2290.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/angular-class/angular2-webpack-starter/issues"
+    "url": "https://github.com/1337programming/angular2.0-App/issues"
   },
-  "homepage": "https://github.com/angular-class/angular2-webpack-starter",
   "dependencies": {
     "angular2": "2.0.0-alpha.34",
     "reflect-metadata": "^0.1.0",
diff --git a/server/express-server.js b/server/express-server.js
@@ -0,0 +1,60 @@
+// Webpack
+var webpack = require('webpack');
+var WebpackDevServer = require('webpack-dev-server');
+var webpackConfig = require('../webpack.config');
+
+// Express
+var express = require('express');
+var history = require('connect-history-api-fallback');
+var morgan = require('morgan');
+var bodyParser = require('body-parser');
+
+// Express App
+var app = express();
+
+// Env
+var PORT = process.env.PORT || 3000;
+var NODE_ENV = process.env.NODE_ENV || 'development';
+
+app.use(morgan('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({
+  extended: true
+}));
+
+// Angular Http content type for POST etc defaults to text/plain at
+app.use(bodyParser.text(), function ngHttpFix(req, next) {
+  try {
+    req.body = JSON.parse(req.body);
+    next();
+  } catch (e) {
+    next();
+  }
+});
+
+// Your middleware
+app.use(history());
+app.use(express.static('src/public'));
+
+// Only use in development
+if (NODE_ENV === 'development') {
+  var server = new WebpackDevServer(webpack(webpackConfig), {
+    publicPath: '/__build__',
+    historyApiFallback: false, // won't work due to order
+    inline: true,
+    quiet: false,
+    noInfo: false,
+    stats: {
+      colors: true
+    }
+  });
+  // Webpack express app that uses socket.io
+  app.use(server.app);
+} else {
+  app.use('/__build__', express.static('__build__'));
+}
+
+
+app.listen(PORT, function () {
+  console.log('Listen on http://localhost:' + PORT + ' in ' + NODE_ENV);
+});
diff --git a/src/public/index.html b/src/public/index.html
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="">
 <head>
-  <title>Angular2 Webpack Starter by @gdi2990 from @AngularClass</title>
+  <title>Angular 2.0 App</title>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="description" content="Angular2 Webpack Starter by @gdi2990 from @AngularClass">
   <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 
   <base href="/">
@@ -38,7 +37,6 @@
   <!-- Angular2 files -->
   <script src="/__build__/angular2.js"></script>
   <!-- App script -->
-  <script src="/__build__/app-simple.js"></script>
-  <!-- TODO: replace /app-simple.js with /app.js -->
+  <script src="/__build__/app.js"></script>
 </body>
 </html>
