📦 update files/folders

Author: PatrickJS

package.json

@@ -19,9 +19,10 @@
     "build:prod:json": "webpack --config webpack.prod.config.ts --json | webpack-bundle-size-analyzer",
     "ngc": "ngc -p tsconfig.aot.json",
     "prestart": "npm run build",
-    "server": "nodemon dist/server/index.js",
+    "server": "node dist/server/index.js",
+    "server:dev": "nodemon dist/server/index.js",
     "debug:server": "node-nightly --inspect --debug-brk dist/server/index.js",
-    "start": "npm run server",
+    "start": "npm run server:dev",
     "debug:start": "npm run build && npm run debug:server",
     "predebug": "npm run build",
     "debug:build": "node --inspect --debug-brk node_modules/webpack/bin/webpack.js",
@@ -52,15 +53,16 @@
     "angular2-platform-node": "~2.1.0-rc.1",
     "angular2-universal": "~2.1.0-rc.1",
     "angular2-universal-polyfills": "~2.1.0-rc.1",
-    "core-js": "2.4.1",
     "body-parser": "^1.15.2",
     "compression": "^1.6.2",
+    "core-js": "2.4.1",
     "express": "^4.14.0",
     "js.clone": "0.0.3",
     "methods": "~1.1.2",
     "morgan": "^1.7.0",
     "preboot": "~4.5.2",
     "rxjs": "5.0.0-beta.12",
+    "serialize-javascript": "^1.3.0",
     "webfontloader": "^1.6.26",
     "zone.js": "~0.6.26"
   },
@@ -76,7 +78,6 @@
     "@types/node": "^6.0.38",
     "@types/serve-static": "^1.7.27",
     "@types/webfontloader": "^1.6.27",
-    "@ngtools/webpack": "~1.1.7",
     "angular2-template-loader": "^0.4.0",
     "awesome-typescript-loader": "^2.2.4",
     "cookie-parser": "^1.4.3",

src/+app/+home/home.component.ts

@@ -1,6 +1,6 @@
 import { Component, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
 
-import { ModelService } from '../shared/model/model.service';
+import { HomeModel } from './model/home.model';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -11,7 +11,7 @@ import { ModelService } from '../shared/model/model.service';
 })
 export class HomeComponent {
   data: any = {};
-  constructor(public model: ModelService) {
+  constructor(public model: HomeModel) {
 
     // we need the data synchronously for the client to set the server response
     // we create another method so we have more control for testing

src/browser.module.ts

@@ -11,7 +11,7 @@ import { CacheService } from './+app/shared/cache.service';
 
 // Will be merged into @angular/platform-browser in a later release
 // see https://github.com/angular/angular/pull/12322
-import { Meta } from './angular2-meta';
+import { Meta } from '_ng/meta';
 
 export function getLRU() {
   // use LRU for node

src/client.aot.ts

@@ -1,7 +1,7 @@
 // the polyfills must be the first thing imported
-import '_polyfills';
+import '_polyfills/browser';
 import 'ts-helpers';
-import '_workaround'; // temporary until 2.1.1 things are patched in Core
+import '_workaround/browser'; // temporary until 2.1.1 things are patched in Core
 
 // Angular 2
 import { enableProdMode } from '@angular/core';

src/client.ts

@@ -1,7 +1,7 @@
 // the polyfills must be the first thing imported
-import '_polyfills';
+import '_polyfills/browser';
 import 'ts-helpers';
-import '_workaround'; // temporary until 2.1.1 things are patched in Core
+import '_workaround/browser'; // temporary until 2.1.1 things are patched in Core
 
 // Angular 2
 import { enableProdMode } from '@angular/core';

src/node.module.ts

@@ -13,7 +13,7 @@ import * as serialize from 'serialize-javascript';
 
 // Will be merged into @angular/platform-browser in a later release
 // see https://github.com/angular/angular/pull/12322
-import { Meta } from '_ng2/meta';
+import { Meta } from '_ng/meta';
 
 export function getLRU() {
   // return lru || new LRU(10);

src/node_modules/_ng2/meta.ts src/node_modules/_ng/meta.tssrc/node_modules/_ng2/meta.ts renamed to src/node_modules/_ng/meta.ts

@@ -2,9 +2,9 @@
 // The only modules to be imported higher - node modules with es6-promise 3.x or other Promise polyfill dependency
 // (rule of thumb: do it if you have zone.js exception that it has been overwritten)
 // if you are including modules that modify Promise, such as NewRelic,, you must include them before polyfills
-import '_polyfills';
+import '_polyfills/node';
 import 'ts-helpers';
-import '_workaround'; // temporary until 2.1.1 things are patched in Core
+import '_workaround/node'; // temporary until 2.1.1 things are patched in Core
 
 import * as fs from 'fs';
 import * as path from 'path';

src/server.aot.ts

@@ -2,9 +2,9 @@
 // The only modules to be imported higher - node modules with es6-promise 3.x or other Promise polyfill dependency
 // (rule of thumb: do it if you have zone.js exception that it has been overwritten)
 // if you are including modules that modify Promise, such as NewRelic,, you must include them before polyfills
-import '_polyfills';
+import '_polyfills/node';
 import 'ts-helpers';
-import '_workaround'; // temporary until 2.1.1 things are patched in Core
+import '_workaround/node'; // temporary until 2.1.1 things are patched in Core
 
 import * as path from 'path';
 import * as express from 'express';

src/server.ts

@@ -1,4 +1,5 @@
 var webpack = require('webpack');
+var fs = require('fs');
 var path = require('path');
 var clone = require('js.clone');
 var webpackMerge = require('webpack-merge');
@@ -23,8 +24,7 @@ export var commonConfig = {
   // https://webpack.github.io/docs/configuration.html#devtool
   devtool: 'source-map',
   resolve: {
-    extensions: ['.ts', '.js', '.json'],
-    modules: [ root('node_modules') ]
+    extensions: ['.ts', '.js', '.json']
   },
   context: __dirname,
   output: {
@@ -94,7 +94,24 @@ export var serverConfig = {
     ],
   },
   externals: includeClientPackages(
-    /@angularclass|@angular|angular2-|ng2-|ng-|@ng-|angular-|@ngrx|ngrx-|@angular2|ionic|@ionic|-angular2|-ng2|-ng/
+    new RegExp([
+      '@angularclass',
+      '@angular',
+      'angular2-',
+      'ng2-',
+      'ng-',
+      '@ng-',
+      'angular-',
+      '@ngrx',
+      'ngrx-',
+      '@angular2',
+      'ionic',
+      '@ionic',
+      '-angular2',
+      '-ng2',
+      '-ng',
+    ].join('|')),
+    new RegExp( ('^' + getDirectories(root('src/node_modules')).join('|')) )
   ),
   node: {
     global: true,
@@ -115,10 +132,13 @@ export default [
 ];
 
 
-
+export function getDirectories(srcpath) {
+  return fs.readdirSync(srcpath)
+    .filter(file => fs.statSync(path.join(srcpath, file)).isDirectory());
+}
 
 // Helpers
-export function includeClientPackages(packages, localModule?: string[]) {
+export function includeClientPackages(packages: string[] | RegExp, localModule?: string[] | RegExp) {
   return function(context, request, cb) {
     if (localModule instanceof RegExp && localModule.test(request)) {
       return cb();