Skip to content
This repository has been archived by the owner on Jun 15, 2020. It is now read-only.

Commit

Permalink
Upgraded to Angular 2 beta 8 (closes #93)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsebastien committed Mar 4, 2016
1 parent 6d3a0b2 commit 7f8b5df
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 74 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* 0.5.2
* now supports Angular 2 beta 8
* 0.5.1
* fixed issue with the example unit test (wrong jasmine typings) (closed #88)
* removed Makefile (not maintained)
Expand Down
152 changes: 81 additions & 71 deletions app/templates/projectFiles/jspm.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ System.config({
},

map: {
"angular2": "npm:[email protected].7",
"angular2": "npm:[email protected].8",
"babel": "npm:[email protected]",
"babel-runtime": "npm:[email protected]",
"normalize.css": "github:necolas/[email protected]",
Expand Down Expand Up @@ -84,7 +84,7 @@ System.config({
"path": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]"
},
"npm:[email protected].7": {
"npm:[email protected].8": {
"crypto": "github:jspm/[email protected]",
"es6-promise": "npm:[email protected]",
"es6-shim": "npm:[email protected]",
Expand All @@ -93,18 +93,22 @@ System.config({
"rxjs": "npm:[email protected]",
"zone.js": "npm:[email protected]"
},
"npm:[email protected]": {
"npm:[email protected]": {
"color-convert": "npm:[email protected]"
},
"npm:[email protected]": {
"assert": "github:jspm/[email protected]",
"bn.js": "npm:[email protected].3",
"bn.js": "npm:[email protected].5",
"buffer": "github:jspm/[email protected]",
"fs": "github:jspm/[email protected]",
"inherits": "npm:[email protected]",
"minimalistic-assert": "npm:[email protected]",
"vm": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"util": "npm:[email protected]"
},
"npm:babel-code-frame@6.5.0": {
"npm:babel-code-frame@6.6.0": {
"babel-runtime": "npm:[email protected]",
"chalk": "npm:[email protected]",
"esutils": "npm:[email protected]",
Expand All @@ -113,17 +117,17 @@ System.config({
"repeating": "npm:[email protected]"
},
"npm:[email protected]": {
"babel-code-frame": "npm:babel-code-frame@6.5.0",
"babel-generator": "npm:babel-generator@6.5.0",
"babel-helpers": "npm:babel-helpers@6.5.0",
"babel-messages": "npm:babel-messages@6.5.0",
"babel-register": "npm:babel-register@6.5.2",
"babel-code-frame": "npm:babel-code-frame@6.6.0",
"babel-generator": "npm:babel-generator@6.6.4",
"babel-helpers": "npm:babel-helpers@6.6.0",
"babel-messages": "npm:babel-messages@6.6.0",
"babel-register": "npm:babel-register@6.6.0",
"babel-runtime": "npm:[email protected]",
"babel-template": "npm:babel-template@6.5.0",
"babel-traverse": "npm:babel-traverse@6.5.0",
"babel-types": "npm:babel-types@6.5.2",
"babylon": "npm:babylon@6.5.2",
"convert-source-map": "npm:convert-source-map@1.1.3",
"babel-template": "npm:babel-template@6.6.4",
"babel-traverse": "npm:babel-traverse@6.6.4",
"babel-types": "npm:babel-types@6.6.4",
"babylon": "npm:babylon@6.6.4",
"convert-source-map": "npm:convert-source-map@1.2.0",
"debug": "npm:[email protected]",
"fs": "github:jspm/[email protected]",
"json5": "npm:[email protected]",
Expand All @@ -141,18 +145,18 @@ System.config({
"systemjs-json": "github:systemjs/[email protected]",
"util": "github:jspm/[email protected]"
},
"npm:babel-core@6.5.2": {
"babel-code-frame": "npm:babel-code-frame@6.5.0",
"babel-generator": "npm:babel-generator@6.5.0",
"babel-helpers": "npm:babel-helpers@6.5.0",
"babel-messages": "npm:babel-messages@6.5.0",
"babel-register": "npm:babel-register@6.5.2",
"npm:babel-core@6.6.4": {
"babel-code-frame": "npm:babel-code-frame@6.6.0",
"babel-generator": "npm:babel-generator@6.6.4",
"babel-helpers": "npm:babel-helpers@6.6.0",
"babel-messages": "npm:babel-messages@6.6.0",
"babel-register": "npm:babel-register@6.6.0",
"babel-runtime": "npm:[email protected]",
"babel-template": "npm:babel-template@6.5.0",
"babel-traverse": "npm:babel-traverse@6.5.0",
"babel-types": "npm:babel-types@6.5.2",
"babylon": "npm:babylon@6.5.2",
"convert-source-map": "npm:convert-source-map@1.1.3",
"babel-template": "npm:babel-template@6.6.4",
"babel-traverse": "npm:babel-traverse@6.6.4",
"babel-types": "npm:babel-types@6.6.4",
"babylon": "npm:babylon@6.6.4",
"convert-source-map": "npm:convert-source-map@1.2.0",
"debug": "npm:[email protected]",
"fs": "github:jspm/[email protected]",
"json5": "npm:[email protected]",
Expand All @@ -170,10 +174,10 @@ System.config({
"systemjs-json": "github:systemjs/[email protected]",
"util": "github:jspm/[email protected]"
},
"npm:babel-generator@6.5.0": {
"babel-messages": "npm:babel-messages@6.5.0",
"npm:babel-generator@6.6.4": {
"babel-messages": "npm:babel-messages@6.6.0",
"babel-runtime": "npm:[email protected]",
"babel-types": "npm:babel-types@6.5.2",
"babel-types": "npm:babel-types@6.6.4",
"buffer": "github:jspm/[email protected]",
"detect-indent": "npm:[email protected]",
"is-integer": "npm:[email protected]",
Expand All @@ -182,18 +186,18 @@ System.config({
"source-map": "npm:[email protected]",
"trim-right": "npm:[email protected]"
},
"npm:babel-helpers@6.5.0": {
"npm:babel-helpers@6.6.0": {
"babel-runtime": "npm:[email protected]",
"babel-template": "npm:babel-template@6.5.0"
"babel-template": "npm:babel-template@6.6.4"
},
"npm:babel-messages@6.5.0": {
"npm:babel-messages@6.6.0": {
"babel-runtime": "npm:[email protected]",
"util": "github:jspm/[email protected]"
},
"npm:babel-register@6.5.2": {
"babel-core": "npm:babel-core@6.5.2",
"npm:babel-register@6.6.0": {
"babel-core": "npm:babel-core@6.6.4",
"babel-runtime": "npm:[email protected]",
"core-js": "npm:core-js@1.2.6",
"core-js": "npm:core-js@2.1.3",
"fs": "github:jspm/[email protected]",
"home-or-tmp": "npm:[email protected]",
"lodash": "npm:[email protected]",
Expand All @@ -210,39 +214,39 @@ System.config({
"core-js": "npm:[email protected]",
"process": "github:jspm/[email protected]"
},
"npm:babel-template@6.5.0": {
"npm:babel-template@6.6.4": {
"babel-runtime": "npm:[email protected]",
"babel-traverse": "npm:babel-traverse@6.5.0",
"babel-types": "npm:babel-types@6.5.2",
"babylon": "npm:babylon@6.5.2",
"babel-traverse": "npm:babel-traverse@6.6.4",
"babel-types": "npm:babel-types@6.6.4",
"babylon": "npm:babylon@6.6.4",
"lodash": "npm:[email protected]"
},
"npm:babel-traverse@6.5.0": {
"babel-code-frame": "npm:babel-code-frame@6.5.0",
"babel-messages": "npm:babel-messages@6.5.0",
"npm:babel-traverse@6.6.4": {
"babel-code-frame": "npm:babel-code-frame@6.6.0",
"babel-messages": "npm:babel-messages@6.6.0",
"babel-runtime": "npm:[email protected]",
"babel-types": "npm:babel-types@6.5.2",
"babylon": "npm:babylon@6.5.2",
"babel-types": "npm:babel-types@6.6.4",
"babylon": "npm:babylon@6.6.4",
"debug": "npm:[email protected]",
"globals": "npm:[email protected]",
"invariant": "npm:[email protected]",
"lodash": "npm:[email protected]",
"process": "github:jspm/[email protected]",
"repeating": "npm:[email protected]"
},
"npm:babel-types@6.5.2": {
"npm:babel-types@6.6.4": {
"babel-runtime": "npm:[email protected]",
"babel-traverse": "npm:babel-traverse@6.5.0",
"babel-traverse": "npm:babel-traverse@6.6.4",
"esutils": "npm:[email protected]",
"lodash": "npm:[email protected]",
"to-fast-properties": "npm:[email protected]"
},
"npm:babylon@6.5.2": {
"npm:babylon@6.6.4": {
"babel-runtime": "npm:[email protected]",
"fs": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]"
},
"npm:[email protected].3": {
"npm:[email protected].5": {
"buffer": "github:jspm/[email protected]"
},
"npm:[email protected]": {
Expand Down Expand Up @@ -274,16 +278,16 @@ System.config({
"des.js": "npm:[email protected]",
"inherits": "npm:[email protected]"
},
"npm:[email protected].0": {
"bn.js": "npm:[email protected].3",
"npm:[email protected].1": {
"bn.js": "npm:[email protected].5",
"buffer": "github:jspm/[email protected]",
"constants": "github:jspm/[email protected]",
"crypto": "github:jspm/[email protected]",
"randombytes": "npm:[email protected].2"
"randombytes": "npm:[email protected].3"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"browserify-rsa": "npm:[email protected].0",
"bn.js": "npm:[email protected].5",
"browserify-rsa": "npm:[email protected].1",
"buffer": "github:jspm/[email protected]",
"create-hash": "npm:[email protected]",
"create-hmac": "npm:[email protected]",
Expand All @@ -306,11 +310,11 @@ System.config({
"process": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"ansi-styles": "npm:ansi-styles@2.1.0",
"escape-string-regexp": "npm:[email protected].4",
"ansi-styles": "npm:ansi-styles@2.2.0",
"escape-string-regexp": "npm:[email protected].5",
"has-ansi": "npm:[email protected]",
"process": "github:jspm/[email protected]",
"strip-ansi": "npm:[email protected].0",
"strip-ansi": "npm:[email protected].1",
"supports-color": "npm:[email protected]"
},
"npm:[email protected]": {
Expand All @@ -322,7 +326,7 @@ System.config({
"npm:[email protected]": {
"systemjs-json": "github:systemjs/[email protected]"
},
"npm:convert-source-map@1.1.3": {
"npm:convert-source-map@1.2.0": {
"buffer": "github:jspm/[email protected]",
"fs": "github:jspm/[email protected]",
"path": "github:jspm/[email protected]"
Expand All @@ -333,11 +337,17 @@ System.config({
"process": "github:jspm/[email protected]",
"systemjs-json": "github:systemjs/[email protected]"
},
"npm:[email protected]": {
"fs": "github:jspm/[email protected]",
"path": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]",
"systemjs-json": "github:systemjs/[email protected]"
},
"npm:[email protected]": {
"buffer": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"bn.js": "npm:[email protected].5",
"buffer": "github:jspm/[email protected]",
"crypto": "github:jspm/[email protected]",
"elliptic": "npm:[email protected]"
Expand All @@ -349,7 +359,7 @@ System.config({
"fs": "github:jspm/[email protected]",
"inherits": "npm:[email protected]",
"ripemd160": "npm:[email protected]",
"sha.js": "npm:[email protected].4"
"sha.js": "npm:[email protected].5"
},
"npm:[email protected]": {
"buffer": "github:jspm/[email protected]",
Expand All @@ -368,7 +378,7 @@ System.config({
"inherits": "npm:[email protected]",
"pbkdf2": "npm:[email protected]",
"public-encrypt": "npm:[email protected]",
"randombytes": "npm:[email protected].2"
"randombytes": "npm:[email protected].3"
},
"npm:[email protected]": {
"fs": "github:jspm/[email protected]",
Expand All @@ -392,15 +402,15 @@ System.config({
"systemjs-json": "github:systemjs/[email protected]"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"bn.js": "npm:[email protected].5",
"buffer": "github:jspm/[email protected]",
"crypto": "github:jspm/[email protected]",
"miller-rabin": "npm:[email protected]",
"randombytes": "npm:[email protected].2",
"randombytes": "npm:[email protected].3",
"systemjs-json": "github:systemjs/[email protected]"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"bn.js": "npm:[email protected].5",
"brorand": "npm:[email protected]",
"hash.js": "npm:[email protected]",
"inherits": "npm:[email protected]",
Expand Down Expand Up @@ -466,7 +476,7 @@ System.config({
"util": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"bn.js": "npm:[email protected].5",
"brorand": "npm:[email protected]"
},
"npm:[email protected]": {
Expand All @@ -483,7 +493,7 @@ System.config({
"process": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"asn1.js": "npm:asn1.js@4.4.0",
"asn1.js": "npm:asn1.js@4.5.1",
"browserify-aes": "npm:[email protected]",
"buffer": "github:jspm/[email protected]",
"create-hash": "npm:[email protected]",
Expand Down Expand Up @@ -513,18 +523,18 @@ System.config({
"assert": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"bn.js": "npm:[email protected].3",
"browserify-rsa": "npm:[email protected].0",
"bn.js": "npm:[email protected].5",
"browserify-rsa": "npm:[email protected].1",
"buffer": "github:jspm/[email protected]",
"create-hash": "npm:[email protected]",
"crypto": "github:jspm/[email protected]",
"parse-asn1": "npm:[email protected]",
"randombytes": "npm:[email protected].2"
"randombytes": "npm:[email protected].3"
},
"npm:[email protected]": {
"process": "github:jspm/[email protected]"
},
"npm:[email protected].2": {
"npm:[email protected].3": {
"buffer": "github:jspm/[email protected]",
"crypto": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]"
Expand Down Expand Up @@ -556,7 +566,7 @@ System.config({
"buffer": "github:jspm/[email protected]",
"process": "github:jspm/[email protected]"
},
"npm:[email protected].4": {
"npm:[email protected].5": {
"buffer": "github:jspm/[email protected]",
"fs": "github:jspm/[email protected]",
"inherits": "npm:[email protected]",
Expand Down Expand Up @@ -590,7 +600,7 @@ System.config({
"npm:[email protected]": {
"buffer": "github:jspm/[email protected]"
},
"npm:[email protected].0": {
"npm:[email protected].1": {
"ansi-regex": "npm:[email protected]"
},
"npm:[email protected]": {
Expand Down
4 changes: 2 additions & 2 deletions app/templates/projectTemplates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"jspm": {
"configFile": "jspm.conf.js",
"dependencies": {
"angular2": "npm:[email protected].7",
"angular2": "npm:[email protected].8",
"babel-runtime": "npm:[email protected]",
"normalize.css": "github:necolas/[email protected]",
"rxjs": "npm:[email protected]"
Expand All @@ -33,7 +33,7 @@
"zone.js": "0.5.x",
"es6-shim": "0.33.x",
"rxjs": "5.0.0-beta.2",
"angular2": "2.0.0-beta.7"
"angular2": "2.0.0-beta.8"
},
"devDependencies": {
"babel-core": "6.5.x",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-modern-web-dev",
"version": "0.5.1",
"version": "0.5.2",
"description": "Modern Web Development Yeoman Generator: Gulp, ES2015, TypeScript, Angular 2, SASS, Minification, Bundling, Sourcemaps, ...",
"author": {
"name": "Sebastien Dubois",
Expand Down

0 comments on commit 7f8b5df

Please sign in to comment.