test(@ngtools/webpack): move server stuff to normal test app

Author: FrozenPandaz

tests/e2e/assets/webpack/test-app/app/main.server.aot.ts

@@ -0,0 +1,5 @@
+import 'core-js/es7/reflect';
+import {platformServer} from '@angular/platform-server';
+import {ServerAppModuleNgFactory} from './ngfactory/app/server-app.module.ngfactory';
+
+platformServer().bootstrapModuleFactory(ServerAppModuleNgFactory);

tests/e2e/assets/webpack/test-app/app/main.server.jit.ts

@@ -0,0 +1,5 @@
+import 'core-js/es7/reflect';
+import {platformDynamicServer} from '@angular/platform-dynamic-server';
+import {ServerAppModule} from './server-app.module';
+
+platformDynamicServer().bootstrapModule(ServerAppModule);

tests/e2e/assets/webpack/test-app/app/server-app.module.ts

@@ -0,0 +1,13 @@
+import { NgModule, Component } from '@angular/core';
+import { ServerModule  } from '@angular/platform-server';
+import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [
+    AppModule,
+    ServerModule
+  ],
+  bootstrap: [AppComponent]
+})
+export class ServerAppModule { }

tests/e2e/assets/webpack/test-app/package.json

@@ -2,26 +2,27 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "^2.3.1",
-    "@angular/compiler": "^2.3.1",
-    "@angular/compiler-cli": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/http": "^2.3.1",
-    "@angular/platform-browser": "^2.3.1",
-    "@angular/platform-browser-dynamic": "^2.3.1",
-    "@angular/platform-server": "^2.3.1",
-    "@angular/router": "^3.3.1",
+    "@angular/animations": "^4.0.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/compiler-cli": "^4.0.0",
+    "@angular/core": "^4.0.0",
+    "@angular/http": "^4.0.0",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/platform-server": "^4.0.0",
+    "@angular/router": "^4.0.0",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^2.4.1",
-    "rxjs": "^5.0.1",
-    "zone.js": "^0.7.2"
+    "rxjs": "^5.3.0",
+    "zone.js": "^0.8.9"
   },
   "devDependencies": {
     "node-sass": "^3.7.0",
     "performance-now": "^0.2.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^3.2.0",
-    "typescript": "~2.0.3",
-    "webpack": "2.2.0"
+    "typescript": "^2.3.2",
+    "webpack": "2.2.1"
   }
 }

tests/e2e/assets/webpack/test-server-app/webpack.config.js tests/e2e/assets/webpack/test-app/webpack.server.config.js

@@ -4,12 +4,11 @@ module.exports = {
   resolve: {
     extensions: ['.ts', '.js']
   },
-  target: 'web',
-  entry: './app/main.ts',
+  entry: './app/main.server.aot.ts',
   output: {
     path: './dist',
     publicPath: 'dist/',
-    filename: 'app.main.js'
+    filename: 'app.server.main.js'
   },
   plugins: [
     new ngToolsWebpack.AotPlugin({
@@ -23,8 +22,5 @@ module.exports = {
       { test: /\.html$/, loader: 'raw-loader' },
       { test: /\.ts$/, loader: '@ngtools/webpack' }
     ]
-  },
-  devServer: {
-    historyApiFallback: true
   }
 };

tests/e2e/assets/webpack/test-server-app/app/app.component.html

@@ -6,15 +6,17 @@ import {expectFileToMatch} from '../../../utils/fs';
 
 export default function(skipCleaning: () => void) {
   return Promise.resolve()
-    .then(() => createProjectFromAsset('webpack/test-server-app'))
-    .then(() => exec(normalize('node_modules/.bin/webpack')))
-    .then(() => expectFileToMatch('dist/app.main.js',
+    .then(() => createProjectFromAsset('webpack/test-app'))
+    .then(() => exec(normalize('node_modules/.bin/webpack'),
+      '--config',
+      'webpack.server.config.js'))
+    .then(() => expectFileToMatch('dist/app.server.main.js',
       new RegExp('.bootstrapModuleFactory'))
-    .then(() => expectFileToMatch('dist/app.main.js',
+    .then(() => expectFileToMatch('dist/app.server.main.js',
       new RegExp('MyInjectable.ctorParameters = .*'
                + 'type: .*ViewContainerRef.*'
                + 'type: undefined, decorators.*Inject.*args: .*DOCUMENT.*'))
-    .then(() => expectFileToMatch('dist/app.main.js',
+    .then(() => expectFileToMatch('dist/app.server.main.js',
       new RegExp('AppComponent.ctorParameters = .*MyInjectable'))
     .then(() => skipCleaning());
 }