Skip to content

Commit 40a9bc9

Browse files
jkurijkuri
committed
chore(release): 0.2.0
1 parent 5c242a1 commit 40a9bc9

19 files changed

+162
-152
lines changed

‎package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bleenco/angular-webpack-seed",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"main": "index.js",
55
"scripts": {
66
"start": "webpack-dev-server --env.client --env.serve --progress",
@@ -43,8 +43,6 @@
4343
"@angular/platform-browser-dynamic": "^4.0.0",
4444
"@angular/platform-server": "^4.0.0",
4545
"@angular/router": "^4.0.0",
46-
"@angularclass/universal-express": "^1.0.1",
47-
"@angularclass/universal-transfer-state": "^1.0.11",
4846
"core-js": "^2.4.1",
4947
"express": "^4.15.2",
5048
"rxjs": "^5.2.0",
@@ -80,7 +78,6 @@
8078
"webpack": "^2.3.1",
8179
"webpack-dev-server": "^2.4.2",
8280
"webpack-dll-bundles-plugin": "^1.0.0-beta.5",
83-
"webpack-merge": "^4.1.0",
84-
"webpack-node-externals": "^1.5.4"
81+
"webpack-merge": "^4.1.0"
8582
}
8683
}

‎src/api/app.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/api/data.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/app/+lazy/lazy.module.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/app/app.component.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<h1>Angular Webpack Seed</h1>
2-
<a routerLink="/">Home</a>
3-
<a routerLink="/lazy">Lazy</a>
4-
<router-outlet></router-outlet>
2+
3+
<div>
4+
<a routerLink="/">Home</a>
5+
<a routerLink="/lazy">Lazy</a>
6+
</div>
7+
8+
<div>
9+
<router-outlet></router-outlet>
10+
</div>

‎src/app/app.component.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { TransferState } from '@angularclass/universal-transfer-state';
32

43
@Component({
54
selector: 'app-root',
65
templateUrl: 'app.component.html'
76
})
8-
export class AppComponent implements OnInit {
9-
constructor(private cache: TransferState) {}
10-
11-
ngOnInit() {
12-
this.cache.set('cached', true);
13-
}
14-
}
7+
export class AppComponent { }

‎src/app/app.module.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,21 @@ import { HttpModule } from '@angular/http';
55
import { RouterModule } from '@angular/router';
66
import { FormsModule } from '@angular/forms';
77
import { AppComponent } from './app.component';
8-
import { HomeViewComponent } from './home/home-view.component';
9-
import { TransferHttpModule } from '@angularclass/universal-transfer-state/browser';
10-
8+
import { AppHomeComponent } from './components/app-home';
119

1210
@NgModule({
1311
imports: [
1412
CommonModule,
15-
HttpModule,
1613
FormsModule,
17-
TransferHttpModule,
1814
RouterModule.forRoot([
19-
{ path: '', component: HomeViewComponent, pathMatch: 'full'},
20-
{ path: 'lazy', loadChildren: './+lazy/lazy.module#LazyModule'}
15+
{ path: '', component: AppHomeComponent, pathMatch: 'full'},
16+
{ path: 'lazy', loadChildren: './components/+lazy/lazy.module#LazyModule' }
2117
])
2218
],
2319
providers: [
24-
{ provide: APP_BASE_HREF, useValue: '/'}
20+
{ provide: APP_BASE_HREF, useValue: '/' }
2521
],
26-
declarations: [ AppComponent, HomeViewComponent ],
22+
declarations: [ AppComponent, AppHomeComponent ],
2723
exports: [ AppComponent ]
2824
})
2925
export class AppModule {}

‎src/app/browser-app.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ import { NgModule } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { AppComponent } from './app.component';
44
import { AppModule } from './app.module';
5-
import { BrowserTransferStateModule } from '@angularclass/universal-transfer-state/browser';
65

76
@NgModule({
87
bootstrap: [ AppComponent ],
98
imports: [
109
BrowserModule.withServerTransition({
1110
appId: 'my-app-id'
1211
}),
13-
BrowserTransferStateModule,
1412
AppModule
1513
]
1614
})

‎src/app/components/+lazy/lazy.module.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { NgModule, Component } from '@angular/core';
2+
import { RouterModule } from '@angular/router';
3+
4+
5+
@Component({
6+
selector: 'app-lazy-view',
7+
template: `<h3>i'm lazy</h3>`
8+
})
9+
export class AppLazyViewComponent {}
10+
11+
@NgModule({
12+
declarations: [ AppLazyViewComponent ],
13+
imports: [
14+
RouterModule.forChild([
15+
{ path: '', component: AppLazyViewComponent, pathMatch: 'full' }
16+
])
17+
]
18+
})
19+
export class LazyModule { }

‎src/app/components/app-home/app-home.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<input type="text" [(ngModel)]="value" placeholder="Write here...">
2+
<p>{{ value }}</p>

‎src/app/components/app-home/app-home.component.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import 'rxjs/add/operator/first';
3+
4+
@Component({
5+
selector: 'app-home',
6+
templateUrl: 'app-home.component.html'
7+
})
8+
export class AppHomeComponent {
9+
value: string;
10+
}

‎src/app/components/app-home/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './app-home.component';

‎src/app/home/home-view.component.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/app/server-app.module.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { NgModule } from '@angular/core';
22
import { ServerModule } from '@angular/platform-server';
33
import { AppComponent } from './app.component';
44
import { AppModule } from './app.module';
5-
import { ServerTransferStateModule, TransferState } from '@angularclass/universal-transfer-state/server';
6-
import { UniversalOnInit } from '@angularclass/universal-express';
5+
import { UniversalOnInit } from '../universal';
76
import { BrowserModule } from '@angular/platform-browser';
87

98
@NgModule({
@@ -13,16 +12,9 @@ import { BrowserModule } from '@angular/platform-browser';
1312
appId: 'my-app-id'
1413
}),
1514
ServerModule,
16-
ServerTransferStateModule,
1715
AppModule
1816
]
1917
})
2018
export class ServerAppModule implements UniversalOnInit {
21-
22-
constructor(private transferState: TransferState) { }
23-
24-
// Gotcha
25-
universalOnInit() {
26-
this.transferState.inject();
27-
}
19+
universalOnInit() { }
2820
}

‎src/main.server.aot.ts

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1+
import 'core-js/es6/reflect';
2+
import 'core-js/es7/reflect';
13
import 'zone.js/dist/zone-node';
2-
import 'reflect-metadata';
34
import 'rxjs';
45
import * as express from 'express';
56
import { platformServer, renderModuleFactory } from '@angular/platform-server';
67
import { ServerAppModuleNgFactory } from './ngfactory/app/server-app.module.ngfactory';
7-
import { universalExpressEngine } from '@angularclass/universal-express';
8+
import { universalExpressEngine } from './universal';
89
import { ROUTES } from './routes';
9-
import { App } from './api/app';
1010
import { enableProdMode } from '@angular/core';
11+
1112
enableProdMode();
13+
1214
const app = express();
13-
const api = new App();
1415
const port = 8000;
15-
const baseUrl = `http://localhost:${ port }`;
1616

1717
app.engine('html', universalExpressEngine({
1818
ngModule: ServerAppModuleNgFactory
@@ -24,22 +24,13 @@ app.set('views', 'dist');
2424
app.use('/', express.static('dist', { index: false }));
2525

2626
ROUTES.forEach(route => {
27-
app.get(route, (req, res) => {
28-
console.time(`GET: ${req.originalUrl}`);
29-
res.render('index', {
30-
req: req,
31-
res: res
32-
});
33-
console.timeEnd(`GET: ${req.originalUrl}`);
27+
app.get(route, (req: express.Request, res: express.Response) => {
28+
console.time(`GET: ${ req.originalUrl }`);
29+
res.render('index', { req: req, res: res });
30+
console.timeEnd(`GET: ${ req.originalUrl }`);
3431
});
3532
});
3633

37-
app.get('/data', (req, res) => {
38-
console.time(`GET: ${req.originalUrl}`);
39-
res.json(api.getData());
40-
console.timeEnd(`GET: ${req.originalUrl}`);
41-
});
42-
43-
app.listen(8000, () => {
44-
console.log(`Listening at ${baseUrl}`);
34+
app.listen(port, () => {
35+
console.log(`Listening on http://localhost:${port}`);
4536
});

‎src/main.server.ts

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import './styles';
1+
import 'core-js/es6/reflect';
2+
import 'core-js/es7/reflect';
23
import 'zone.js/dist/zone-node';
3-
import 'reflect-metadata';
44
import 'rxjs';
55
import * as express from 'express';
66
import { platformServer, renderModuleFactory } from '@angular/platform-server';
77
import { ServerAppModule } from './app/server-app.module';
8-
import { universalExpressEngine } from '@angularclass/universal-express';
8+
import { universalExpressEngine } from './universal';
99
import { ROUTES } from './routes';
10-
import { App } from './api/app';
1110
import { enableProdMode } from '@angular/core';
11+
1212
enableProdMode();
13+
1314
const app = express();
1415
const port = 8000;
15-
const api = new App();
16-
const baseUrl = `http://localhost:${ port }`;
1716

1817
app.engine('html', universalExpressEngine({
1918
ngModule: ServerAppModule
@@ -25,22 +24,13 @@ app.set('views', 'dist');
2524
app.use('/', express.static('dist', { index: false }));
2625

2726
ROUTES.forEach(route => {
28-
app.get(route, (req, res) => {
27+
app.get(route, (req: express.Request, res: express.Response) => {
2928
console.time(`GET: ${ req.originalUrl }`);
30-
res.render('index', {
31-
req: req,
32-
res: res
33-
});
29+
res.render('index', { req: req, res: res });
3430
console.timeEnd(`GET: ${ req.originalUrl }`);
3531
});
3632
});
3733

38-
app.get('/data', (req, res) => {
39-
console.time(`GET: ${req.originalUrl}`);
40-
res.json(api.getData());
41-
console.timeEnd(`GET: ${req.originalUrl}`);
42-
});
43-
44-
app.listen(8000, () => {
45-
console.log(`Listening at ${baseUrl}`);
34+
app.listen(port, () => {
35+
console.log(`Listening on http://localhost:${port}`);
4636
});

0 commit comments

Comments
 (0)