This repository was archived by the owner on Apr 8, 2020. It is now read-only.
Repository navigation
Update Angular2Spa template to Angular 2.0/TypeScript 2.0, based on @MarkPieszak's PR #321
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { RouterModule } from '@angular/router'; | ||
| import { UniversalModule } from 'angular2-universal'; | ||
| import { AppComponent } from './components/app/app.component' | ||
| import { NavMenuComponent } from './components/navmenu/navmenu.component'; | ||
| import { HomeComponent } from './components/home/home.component'; | ||
| import { FetchDataComponent } from './components/fetchdata/fetchdata.component'; | ||
| import { CounterComponent } from './components/counter/counter.component'; | ||
|
|
||
| @NgModule({ | ||
| bootstrap: [ AppComponent ], | ||
| declarations: [ | ||
| AppComponent, | ||
| NavMenuComponent, | ||
| CounterComponent, | ||
| FetchDataComponent, | ||
| HomeComponent | ||
| ], | ||
| imports: [ | ||
| UniversalModule, | ||
| RouterModule.forRoot([ | ||
| { path: '', redirectTo: 'home', pathMatch: 'full' }, | ||
| { path: 'home', component: HomeComponent }, | ||
| { path: 'counter', component: CounterComponent }, | ||
| { path: 'fetch-data', component: FetchDataComponent }, | ||
| { path: '**', redirectTo: 'home' } | ||
| ]) | ||
| ] | ||
| }) | ||
| export class AppModule { | ||
| } | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'app', | ||
| template: require('./app.component.html') | ||
| }) | ||
| export class AppComponent { | ||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'counter', | ||
| template: require('./counter.component.html') | ||
| }) | ||
| export class CounterComponent { | ||
| public currentCount = 0; | ||
|
|
||
| public incrementCounter() { | ||
| this.currentCount++; | ||
| } | ||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'home', | ||
| template: require('./home.component.html') | ||
| }) | ||
| export class HomeComponent { | ||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'nav-menu', | ||
| template: require('./navmenu.component.html') | ||
| }) | ||
| export class NavMenuComponent { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,28 @@ | ||
| import 'angular2-universal-polyfills'; | ||
| import 'zone.js'; | ||
| import { enableProdMode } from '@angular/core'; | ||
| import { platformNodeDynamic } from 'angular2-universal'; | ||
| import { AppModule } from './app/app.module'; | ||
|
|
||
| enableProdMode(); | ||
| const platform = platformNodeDynamic(); | ||
|
|
||
| export default function (params: any) : Promise<{ html: string, globals?: any }> { | ||
| const requestZone = Zone.current.fork({ | ||
| name: 'angular-universal request', | ||
| properties: { | ||
| baseUrl: '/', | ||
| requestUrl: params.url, | ||
| originUrl: params.origin, | ||
| preboot: false, | ||
| // TODO: Render just the <app> component instead of wrapping it inside an extra HTML document | ||
| // Waiting on https://github.com/angular/universal/issues/347 | ||
| document: '<!DOCTYPE html><html><head></head><body><app></app></body></html>' | ||
| } | ||
| }); | ||
|
|
||
| return requestZone.run<Promise<string>>(() => platform.serializeModule(AppModule)) | ||
|
Contributor
There was a problem hiding this comment. Much cleaner I like it 👍 |
||
| .then(html => { | ||
| return { html: html }; | ||
| }); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,54 @@ | ||
| { | ||
| "name": "Angular2Spa", | ||
| "version": "0.0.0", | ||
| "devDependencies": { | ||
| "@types/body-parser": "0.0.29", | ||
| "@types/compression": "0.0.29", | ||
| "@types/cookie-parser": "^1.3.29", | ||
| "@types/express": "^4.0.32", | ||
| "@types/express-serve-static-core": "^4.0.33", | ||
| "@types/hammerjs": "^2.0.32", | ||
| "@types/mime": "0.0.28", | ||
| "@types/node": "^6.0.38", | ||
| "@types/serve-static": "^1.7.27" | ||
| }, | ||
| "dependencies": { | ||
| "@angular/common": "2.0.0", | ||
| "@angular/compiler": "2.0.0", | ||
| "@angular/core": "2.0.0", | ||
| "@angular/forms": "2.0.0", | ||
| "@angular/http": "2.0.0", | ||
| "@angular/platform-browser": "2.0.0", | ||
| "@angular/platform-browser-dynamic": "2.0.0", | ||
| "@angular/platform-server": "2.0.0", | ||
| "@angular/router": "3.0.0", | ||
| "@types/node": "^6.0.38", | ||
| "angular2-express-engine": "~2.0.7", | ||
| "angular2-platform-node": "~2.0.7", | ||
| "angular2-universal": "~2.0.7", | ||
| "angular2-universal-polyfills": "~2.0.7", | ||
| "aspnet-prerendering": "^1.0.6", | ||
| "aspnet-webpack": "^1.0.11", | ||
| "bootstrap": "^3.3.7", | ||
| "css": "^2.2.1", | ||
| "css-loader": "^0.25.0", | ||
| "es6-shim": "^0.35.1", | ||
| "expose-loader": "^0.7.1", | ||
| "extendify": "^1.0.0", | ||
| "extract-text-webpack-plugin": "^1.0.1", | ||
| "file-loader": "^0.9.0", | ||
| "isomorphic-fetch": "^2.2.1", | ||
| "jquery": "^2.2.1", | ||
| "preboot": "^4.5.2", | ||
| "raw-loader": "^0.5.1", | ||
| "rxjs": "5.0.0-beta.12", | ||
| "style-loader": "^0.13.0", | ||
| "ts-loader": "^0.8.2", | ||
| "typescript": "^2.0.0", | ||
| "url-loader": "^0.5.7", | ||
| "webpack": "^1.12.14", | ||
| "webpack-externals-plugin": "^1.0.0", | ||
| "webpack-hot-middleware": "^2.10.0", | ||
| "zone.js": "^0.6.21" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we leave a Note that
UniversalModuleshould be the first Import? (Just want to prevent common errors that can creep up from this)Also, we should point out that
BrowserModuleHttpModuleJsonpModuleare all automatically included here.(The same goes for the Node versions on the main.server.ts side, NodeModule / NodeHttpModule etc)
Things can error out if they include those. We're working on looking into fixing that.
Patrick also thought it'd be nice to keep the main files separate since that allows someone to have specific platform logic injected for either browser/server, but it's up to you. It's definitely cleaner/simpler this way!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please keep server and client main files separate.
For me they diverged very early in development. And I am pretty sure it will for most users.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added the comment about
UniversalModule(and BrowserModule/HttpModule/JsonpModule)I'd hope that the boot files serve that purpose well enough (this is where you configure DI, after all), and am reluctant to add more duplicate files. Having one root
@NgModulemakes things much clearer, especially given how much tedious config goes into that file. We can monitor this and see if people often report issues that are best solved by having separate root modules.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have logic in main file based on platform? Then we don't need 2 files.
if (server) {
declarations: [......]
} else if (client) {
declarations: [.....]
}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hheexx Yes, just
import { isNode, isBrowser } from 'angular2-universal';and then doif (isNode) { ... }etc.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is sweet. I would add it as a comment so people know.