Merge branches 'master' and 'master' of https://github.com/moizKachwala/Angular2-expressjs-mongoose-gulp-node-typescript

Author: moizKachwala

README.md

@@ -24,6 +24,12 @@ It also uses Gulp for running task and TsLint.The seed application is built over
     npm run start        <= start the Nodemon and watch for changes.
 ```
 
+## Global packages
+```
+    npm install ts-node -g
+    npm install typescript-node -g
+```
+
 ## Directory Structure
 
 ```
@@ -51,9 +57,12 @@ angular2-MEAN
     │    │    ├── app.component.css
     │    │    ├── app.component.ts
     │    │    ├── app.html
+    │    │    ├── app.module.ts
+    │    │    ├── app.routing.ts
     │    │    ├── main.ts
     │    ├── typings
     │    ├── index.html
+    │    │    ├── systemjs.config.js
     │    ├── tsconfig.json
     │    ├── typings.json
     ├── server
@@ -142,4 +151,4 @@ angular2-MEAN
 
 ## License
 
-MIT
+MIT

gulpfile.ts

@@ -6,15 +6,15 @@
 "use strict";
 
 const gulp = require("gulp"),
-        del = require("del"),
-        tsc = require("gulp-typescript"),
-        sourcemaps = require('gulp-sourcemaps'),
-        tsProject = tsc.createProject("tsconfig.json"),
-        tslint = require('gulp-tslint'),
-        concat = require('gulp-concat'),
-        runSequence = require('run-sequence'),
-        nodemon = require('gulp-nodemon'),
-        gulpTypings = require("gulp-typings");
+    del = require("del"),
+    tsc = require("gulp-typescript"),
+    sourcemaps = require('gulp-sourcemaps'),
+    tsProject = tsc.createProject("tsconfig.json"),
+    tslint = require('gulp-tslint'),
+    concat = require('gulp-concat'),
+    runSequence = require('run-sequence'),
+    nodemon = require('gulp-nodemon'),
+    gulpTypings = require("gulp-typings");
 
 /**
  * Remove build directory.
@@ -89,17 +89,6 @@ gulp.task("libs", () => {
         .pipe(gulp.dest("dist/client/libs"));
 });
 
-/**
- * Watch for changes in TypeScript, HTML and CSS files.
- */
-gulp.task('watch', function () {
-    gulp.watch(["client/**/*.ts"], ['compile']).on('change', function (e) {
-        console.log('TypeScript file ' + e.path + ' has been changed. Compiling.');
-    });
-    gulp.watch(["client/**/*.html", "client/**/*.css"], ['clientResources']).on('change', function (e) {
-        console.log('Resource file ' + e.path + ' has been changed. Updating.');
-    });
-});
 
 /**
  * Install typings for server and client.
@@ -135,3 +124,37 @@ gulp.task('start', function () {
 gulp.task("build", function (callback) {
     runSequence('clean', 'build:server', 'build:client', 'clientResources', 'libs', callback);
 });
+
+/**
+ * Watch for changes in TypeScript, HTML and CSS files.
+ */
+gulp.task('watch', function () {
+    gulp.watch(["client/**/*.ts"], ['compile']).on('change', function (e) {
+        console.log('TypeScript file ' + e.path + ' has been changed. Compiling.');
+    });
+    gulp.watch(["client/**/*.html", "client/**/*.css"], ['clientResources']).on('change', function (e) {
+        console.log('Resource file ' + e.path + ' has been changed. Updating.');
+    });
+    gulp.watch(["server/src/**/*.ts"], ['compile']).on('change', function (e) {
+        console.log('TypeScript file ' + e.path + ' has been changed. Compiling.');
+    });
+});
+
+/**
+ * Build the project.
+ * 1. Clean the build directory
+ * 2. Build Express server
+ * 3. Build the Angular app
+ * 4. Copy the resources
+ * 5. Copy the dependencies.
+ */
+
+gulp.task("build", function (callback) {
+    runSequence('clean', 'build:server', 'build:client', 'clientResources', 'libs', callback);
+});
+
+
+gulp.task('default', function() {
+    runSequence( 'build:server', 'build:client', 'clientResources', 'libs','watch','start');
+
+});