diff --git a/app/templates/applicationFiles/app/core/app.ts b/app/templates/applicationFiles/app/core/app.component.ts similarity index 58% rename from app/templates/applicationFiles/app/core/app.ts rename to app/templates/applicationFiles/app/core/app.component.ts index fab67a6..0932f93 100644 --- a/app/templates/applicationFiles/app/core/app.ts +++ b/app/templates/applicationFiles/app/core/app.component.ts @@ -4,22 +4,16 @@ import {Component} from "@angular/core"; // import Angular 2 Component Router -import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from '@angular/router-deprecated'; +import { ROUTER_DIRECTIVES } from "@angular/router"; // app components import {Home} from "../pages/home/home"; -// app services -//import {appServicesInjectables} from "core/services/services"; - @Component({ selector: "app", templateUrl: "core/app.template.html", //template: "", directives: [ROUTER_DIRECTIVES] }) -@RouteConfig([ - { path: "/", component: Home, name: "Home", data: undefined } // the as serves as alias for links, etc -]) export class App { constructor() { console.log("Application bootstrapped!"); diff --git a/app/templates/applicationFiles/app/core/app.module.ts b/app/templates/applicationFiles/app/core/app.module.ts new file mode 100644 index 0000000..580d857 --- /dev/null +++ b/app/templates/applicationFiles/app/core/app.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { routing } from './app.routing'; + +// app components +import { App } from './app.component'; + +// app services +//import {appServicesInjectables} from "core/services/services"; + + +@NgModule({ + imports: [ + BrowserModule, + routing + ], + declarations: [ + App + ], + providers: [], + bootstrap: [ App ] +}) +export class AppModule { } diff --git a/app/templates/applicationFiles/app/core/app.routing.ts b/app/templates/applicationFiles/app/core/app.routing.ts new file mode 100644 index 0000000..5b4fd3b --- /dev/null +++ b/app/templates/applicationFiles/app/core/app.routing.ts @@ -0,0 +1,10 @@ +import { Routes, RouterModule } from '@angular/router'; + +// app components +import { Home } from '../pages/home/home'; + +const appRoutes: Routes = [ + { path: '/', component: Home } +]; + +export const routing = RouterModule.forRoot(appRoutes); \ No newline at end of file diff --git a/app/templates/applicationFiles/app/core/boot.ts b/app/templates/applicationFiles/app/core/boot.ts index 0271682..a4b2761 100644 --- a/app/templates/applicationFiles/app/core/boot.ts +++ b/app/templates/applicationFiles/app/core/boot.ts @@ -1,31 +1,10 @@ "use strict"; -import "reflect-metadata"; -// import the application -import {App} from "./app"; - -// import Angular 2 -import {bootstrap} from "@angular/platform-browser-dynamic"; -import {provide, enableProdMode} from "@angular/core"; -import {HTTP_PROVIDERS} from "@angular/http"; -import {ELEMENT_PROBE_PROVIDERS} from "@angular/platform-browser"; - -// import Angular 2 Component Router -import {ROUTER_PROVIDERS} from "@angular/router-deprecated"; - -// enable production mode of Angular -// enableProdMode(); // enable for production (also uncomment the import above!) - -// bootstrap our app -console.log("Bootstrapping the App"); - -// in [] is the list of injector bindings. Those bindings are used when an injector is created. Passing these here make the bindings available application-wide -bootstrap(App, [ - //appServicesInjectables, // alternative way of filling the injector with all the classes we want to be able to inject - ROUTER_PROVIDERS, - HTTP_PROVIDERS, - ELEMENT_PROBE_PROVIDERS // remove in production -]).then( - (success:any) => console.log("Bootstrap successful"), - (error:any) => console.error(error) -); +import 'reflect-metadata'; +import { browserDynamicPlatform } from '@angular/platform-browser-dynamic'; +import { enableProdMode } from '@angular/core'; +import { AppModule } from './app.module'; +// if (process.env.ENV === 'production') { +// enableProdMode(); +// } +browserDynamicPlatform().bootstrapModule(AppModule); diff --git a/app/templates/projectFiles/jspm.conf.js b/app/templates/projectFiles/jspm.conf.js index 752e035..ccc60a4 100644 --- a/app/templates/projectFiles/jspm.conf.js +++ b/app/templates/projectFiles/jspm.conf.js @@ -7,16 +7,14 @@ System.config({ }, map: { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/forms": "npm:@angular/forms@0.1.1", - "@angular/http": "npm:@angular/http@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3", - "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3", - "@angular/router": "npm:@angular/router@3.0.0-alpha.7", - "@angular/router-deprecated": "npm:@angular/router-deprecated@2.0.0-rc.2", - "@angular/upgrade": "npm:@angular/upgrade@2.0.0-rc.3", + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", + "@angular/forms": "npm:@angular/forms@0.3.0", + "@angular/http": "npm:@angular/http@2.0.0-rc.5", + "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.5", + "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.5", + "@angular/router": "npm:@angular/router@3.0.0-rc.1", "babel": "npm:babel-core@6.7.4", "babel-runtime": "npm:babel-runtime@6.6.1", "normalize.css": "github:necolas/normalize.css@3.0.3", @@ -95,62 +93,52 @@ System.config({ "path": "github:jspm/nodelibs-path@0.1.0", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/common@2.0.0-rc.3": { - "@angular/core": "npm:@angular/core@2.0.0-rc.3", + "npm:@angular/common@2.0.0-rc.5": { + "@angular/core": "npm:@angular/core@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/compiler@2.0.0-rc.3": { - "@angular/core": "npm:@angular/core@2.0.0-rc.3", + "npm:@angular/compiler@2.0.0-rc.5": { + "@angular/core": "npm:@angular/core@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/core@2.0.0-rc.3": { + "npm:@angular/core@2.0.0-rc.5": { "process": "github:jspm/nodelibs-process@0.1.2", "rxjs": "npm:rxjs@5.0.0-beta.6", "zone.js": "npm:zone.js@0.6.12" }, - "npm:@angular/forms@0.1.1": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", + "npm:@angular/forms@0.3.0": { + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/http@2.0.0-rc.3": { - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3", + "npm:@angular/http@2.0.0-rc.5": { + "@angular/core": "npm:@angular/core@2.0.0-rc.5", + "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.5", "rxjs": "npm:rxjs@5.0.0-beta.6" }, - "npm:@angular/platform-browser-dynamic@2.0.0-rc.3": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3", + "npm:@angular/platform-browser-dynamic@2.0.0-rc.5": { + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", + "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/platform-browser@2.0.0-rc.3": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", + "npm:@angular/platform-browser@2.0.0-rc.5": { + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:@angular/router-deprecated@2.0.0-rc.2": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3" - }, - "npm:@angular/router@3.0.0-alpha.7": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3", - "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3", + "npm:@angular/router@3.0.0-rc.1": { + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", + "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.5", + "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.5", "process": "github:jspm/nodelibs-process@0.1.2", "rxjs": "npm:rxjs@5.0.0-beta.6" }, - "npm:@angular/upgrade@2.0.0-rc.3": { - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3" - }, "npm:asn1.js@4.5.2": { "assert": "github:jspm/nodelibs-assert@0.1.0", "bn.js": "npm:bn.js@4.11.1", diff --git a/app/templates/projectTemplates/package.json b/app/templates/projectTemplates/package.json index dd41ccc..0b1d67b 100644 --- a/app/templates/projectTemplates/package.json +++ b/app/templates/projectTemplates/package.json @@ -18,16 +18,14 @@ "jspm": { "configFile": "jspm.conf.js", "dependencies": { - "@angular/common": "npm:@angular/common@2.0.0-rc.3", - "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.3", - "@angular/core": "npm:@angular/core@2.0.0-rc.3", - "@angular/forms": "npm:@angular/forms@0.1.1", - "@angular/http": "npm:@angular/http@2.0.0-rc.3", - "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.3", - "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.3", - "@angular/router": "npm:@angular/router@3.0.0-alpha.7", - "@angular/router-deprecated": "npm:@angular/router-deprecated@2.0.0-rc.2", - "@angular/upgrade": "npm:@angular/upgrade@2.0.0-rc.3", + "@angular/common": "npm:@angular/common@2.0.0-rc.5", + "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.5", + "@angular/core": "npm:@angular/core@2.0.0-rc.5", + "@angular/forms": "npm:@angular/forms@0.3.0", + "@angular/http": "npm:@angular/http@2.0.0-rc.5", + "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.5", + "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.5", + "@angular/router": "npm:@angular/router@3.0.0-rc.1", "babel-runtime": "npm:babel-runtime@6.6.1", "normalize.css": "github:necolas/normalize.css@3.0.3", "rxjs": "npm:rxjs@5.0.0-beta.6", @@ -41,19 +39,17 @@ "dependencies": { "babel-runtime": "^6.6.1", "reflect-metadata": "^0.1.3", - "zone.js": "^0.6.6", + "zone.js": "^0.6.12", "es6-shim": "^0.35.0", "rxjs": "5.0.0-beta.6", - "@angular/common": "2.0.0-rc.3", - "@angular/compiler": "2.0.0-rc.3", - "@angular/core": "2.0.0-rc.3", - "@angular/forms": "0.1.1", - "@angular/http": "2.0.0-rc.3", - "@angular/platform-browser": "2.0.0-rc.3", - "@angular/platform-browser-dynamic": "2.0.0-rc.3", - "@angular/router": "3.0.0-alpha.7", - "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.3" + "@angular/common": "2.0.0-rc.5", + "@angular/compiler": "2.0.0-rc.5", + "@angular/core": "2.0.0-rc.5", + "@angular/forms": "0.3.0", + "@angular/http": "2.0.0-rc.5", + "@angular/platform-browser": "2.0.0-rc.5", + "@angular/platform-browser-dynamic": "2.0.0-rc.5", + "@angular/router": "3.0.0-rc.1" }, "devDependencies": { "babel-core": "^6.7.4", @@ -62,11 +58,11 @@ "gulp": "^3.9.1", "jspm": "^0.16.31", "nodemon": "^1.9.1", - "typescript": "^1.8.9", + "typescript": "^1.8.10", "modern-web-dev-build": "^0.5.3", "jasmine-core": "^2.4.1", "karma-jasmine": "^0.3.8", - "typings": "^0.7.9" + "typings": "^1.0.4" }, "engines": { "node": ">=4.2.6", diff --git a/package.json b/package.json index 2a4827a..267f113 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-modern-web-dev", - "version": "0.5.5", + "version": "0.5.6", "description": "Modern Web Development Yeoman Generator: Gulp, ES2015, TypeScript, Angular 2, SASS, Minification, Bundling, Sourcemaps, ...", "author": { "name": "Sebastien Dubois", @@ -37,16 +37,17 @@ "init" ], "dependencies": { - "yeoman-generator": "^0.23.0", - "yosay": "^1.1.0", - "chalk": "^1.1.3", "babel-runtime": "^6.6.1", + "chalk": "^1.1.3", + "string-length": "^1.0.1", "update-notifier": "^0.7.0", - "string-length": "^1.0.1" + "yeoman-generator": "^0.23.4", + "yosay": "^1.1.0" }, "devDependencies": { "yeoman-assert": "^2.1.1", "yeoman-test": "^1.1.0", + "babel-register": "^6.9.0", "babel-core": "^6.7.4", "babel-plugin-transform-es2015-modules-commonjs": "^6.7.0", "babel-preset-es2015": "^6.6.0",