From 32ebcd2ee4bbe30293d535f809048126fb781dfd Mon Sep 17 00:00:00 2001 From: Sebastien Date: Sun, 3 Apr 2016 17:16:09 +0200 Subject: [PATCH] Updated (closes #97 and closes #98) --- CHANGELOG.MD | 3 + app/index.es2015.js | 2 +- app/templates/projectFiles/jspm.conf.js | 143 ++++++-------------- app/templates/projectTemplates/package.json | 38 +++--- package.json | 65 ++++----- 5 files changed, 101 insertions(+), 150 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index e9e52e9..e014a0a 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,3 +1,6 @@ +* 0.5.4 + * now supports Angular 2 beta 13 + * fixed an issue with a dependency of babel (#97) * 0.5.3 * now supports Angular 2 beta 9 * 0.5.2 diff --git a/app/index.es2015.js b/app/index.es2015.js index 3104ef1..6d63b8d 100644 --- a/app/index.es2015.js +++ b/app/index.es2015.js @@ -3,7 +3,7 @@ const packageJSON = require("../package.json"); import yeoman from "yeoman-generator"; -import yosay from "yosay"; +import yosay from "yosay"; import chalk from "chalk"; import updateNotifier from "update-notifier"; import stringLength from "string-length"; diff --git a/app/templates/projectFiles/jspm.conf.js b/app/templates/projectFiles/jspm.conf.js index 562c9ee..f5232d3 100644 --- a/app/templates/projectFiles/jspm.conf.js +++ b/app/templates/projectFiles/jspm.conf.js @@ -7,9 +7,9 @@ System.config({ }, map: { - "angular2": "npm:angular2@2.0.0-beta.9", - "babel": "npm:babel-core@6.5.0", - "babel-runtime": "npm:babel-runtime@6.5.0", + "angular2": "npm:angular2@2.0.0-beta.13", + "babel": "npm:babel-core@6.7.4", + "babel-runtime": "npm:babel-runtime@6.6.1", "normalize.css": "github:necolas/normalize.css@3.0.3", "rxjs": "npm:rxjs@5.0.0-beta.2", "github:jspm/nodelibs-assert@0.1.0": { @@ -84,21 +84,14 @@ System.config({ "path": "github:jspm/nodelibs-path@0.1.0", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:angular2@2.0.0-beta.9": { - "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "es6-promise": "npm:es6-promise@3.1.2", - "es6-shim": "npm:es6-shim@0.33.13", - "process": "github:jspm/nodelibs-process@0.1.2", + "npm:angular2@2.0.0-beta.13": { "reflect-metadata": "npm:reflect-metadata@0.1.2", "rxjs": "npm:rxjs@5.0.0-beta.2", - "zone.js": "npm:zone.js@0.5.15" - }, - "npm:ansi-styles@2.2.0": { - "color-convert": "npm:color-convert@1.0.0" + "zone.js": "npm:zone.js@0.6.8" }, "npm:asn1.js@4.5.2": { "assert": "github:jspm/nodelibs-assert@0.1.0", - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "inherits": "npm:inherits@2.0.1", @@ -108,52 +101,22 @@ System.config({ "npm:assert@1.3.0": { "util": "npm:util@0.10.3" }, - "npm:babel-code-frame@6.7.2": { - "babel-runtime": "npm:babel-runtime@5.8.35", - "chalk": "npm:chalk@1.1.1", + "npm:babel-code-frame@6.7.4": { + "babel-runtime": "npm:babel-runtime@5.8.38", + "chalk": "npm:chalk@1.1.3", "esutils": "npm:esutils@2.0.2", - "js-tokens": "npm:js-tokens@1.0.2", - "line-numbers": "npm:line-numbers@0.2.0", + "js-tokens": "npm:js-tokens@1.0.3", "repeating": "npm:repeating@1.1.3" }, - "npm:babel-core@6.5.0": { - "babel-code-frame": "npm:babel-code-frame@6.7.2", - "babel-generator": "npm:babel-generator@6.7.2", - "babel-helpers": "npm:babel-helpers@6.6.0", - "babel-messages": "npm:babel-messages@6.7.2", - "babel-register": "npm:babel-register@6.7.2", - "babel-runtime": "npm:babel-runtime@5.8.35", - "babel-template": "npm:babel-template@6.7.0", - "babel-traverse": "npm:babel-traverse@6.7.3", - "babel-types": "npm:babel-types@6.7.2", - "babylon": "npm:babylon@6.7.0", - "convert-source-map": "npm:convert-source-map@1.2.0", - "debug": "npm:debug@2.2.0", - "fs": "github:jspm/nodelibs-fs@0.1.2", - "json5": "npm:json5@0.4.0", - "lodash": "npm:lodash@3.10.1", - "minimatch": "npm:minimatch@2.0.10", - "module": "github:jspm/nodelibs-module@0.1.0", - "path": "github:jspm/nodelibs-path@0.1.0", - "path-exists": "npm:path-exists@1.0.0", - "path-is-absolute": "npm:path-is-absolute@1.0.0", - "private": "npm:private@0.1.6", - "process": "github:jspm/nodelibs-process@0.1.2", - "shebang-regex": "npm:shebang-regex@1.0.0", - "slash": "npm:slash@1.0.0", - "source-map": "npm:source-map@0.5.3", - "systemjs-json": "github:systemjs/plugin-json@0.1.0", - "util": "github:jspm/nodelibs-util@0.1.0" - }, - "npm:babel-core@6.7.2": { - "babel-code-frame": "npm:babel-code-frame@6.7.2", + "npm:babel-core@6.7.4": { + "babel-code-frame": "npm:babel-code-frame@6.7.4", "babel-generator": "npm:babel-generator@6.7.2", "babel-helpers": "npm:babel-helpers@6.6.0", "babel-messages": "npm:babel-messages@6.7.2", "babel-register": "npm:babel-register@6.7.2", - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "babel-template": "npm:babel-template@6.7.0", - "babel-traverse": "npm:babel-traverse@6.7.3", + "babel-traverse": "npm:babel-traverse@6.7.4", "babel-types": "npm:babel-types@6.7.2", "babylon": "npm:babylon@6.7.0", "convert-source-map": "npm:convert-source-map@1.2.0", @@ -176,7 +139,7 @@ System.config({ }, "npm:babel-generator@6.7.2": { "babel-messages": "npm:babel-messages@6.7.2", - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "babel-types": "npm:babel-types@6.7.2", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "detect-indent": "npm:detect-indent@3.0.1", @@ -187,17 +150,17 @@ System.config({ "trim-right": "npm:trim-right@1.0.1" }, "npm:babel-helpers@6.6.0": { - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "babel-template": "npm:babel-template@6.7.0" }, "npm:babel-messages@6.7.2": { - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "util": "github:jspm/nodelibs-util@0.1.0" }, "npm:babel-register@6.7.2": { - "babel-core": "npm:babel-core@6.7.2", - "babel-runtime": "npm:babel-runtime@5.8.35", - "core-js": "npm:core-js@2.1.5", + "babel-core": "npm:babel-core@6.7.4", + "babel-runtime": "npm:babel-runtime@5.8.38", + "core-js": "npm:core-js@2.2.1", "fs": "github:jspm/nodelibs-fs@0.1.2", "home-or-tmp": "npm:home-or-tmp@1.0.0", "lodash": "npm:lodash@3.10.1", @@ -207,24 +170,24 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2", "source-map-support": "npm:source-map-support@0.2.10" }, - "npm:babel-runtime@5.8.35": { + "npm:babel-runtime@5.8.38": { "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:babel-runtime@6.5.0": { - "core-js": "npm:core-js@1.2.6", + "npm:babel-runtime@6.6.1": { + "core-js": "npm:core-js@2.2.1", "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:babel-template@6.7.0": { - "babel-runtime": "npm:babel-runtime@5.8.35", - "babel-traverse": "npm:babel-traverse@6.7.3", + "babel-runtime": "npm:babel-runtime@5.8.38", + "babel-traverse": "npm:babel-traverse@6.7.4", "babel-types": "npm:babel-types@6.7.2", "babylon": "npm:babylon@6.7.0", "lodash": "npm:lodash@3.10.1" }, - "npm:babel-traverse@6.7.3": { - "babel-code-frame": "npm:babel-code-frame@6.7.2", + "npm:babel-traverse@6.7.4": { + "babel-code-frame": "npm:babel-code-frame@6.7.4", "babel-messages": "npm:babel-messages@6.7.2", - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "babel-types": "npm:babel-types@6.7.2", "babylon": "npm:babylon@6.7.0", "debug": "npm:debug@2.2.0", @@ -235,18 +198,18 @@ System.config({ "repeating": "npm:repeating@1.1.3" }, "npm:babel-types@6.7.2": { - "babel-runtime": "npm:babel-runtime@5.8.35", - "babel-traverse": "npm:babel-traverse@6.7.3", + "babel-runtime": "npm:babel-runtime@5.8.38", + "babel-traverse": "npm:babel-traverse@6.7.4", "esutils": "npm:esutils@2.0.2", "lodash": "npm:lodash@3.10.1", - "to-fast-properties": "npm:to-fast-properties@1.0.1" + "to-fast-properties": "npm:to-fast-properties@1.0.2" }, "npm:babylon@6.7.0": { - "babel-runtime": "npm:babel-runtime@5.8.35", + "babel-runtime": "npm:babel-runtime@5.8.38", "fs": "github:jspm/nodelibs-fs@0.1.2", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:bn.js@4.11.0": { + "npm:bn.js@4.11.1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0" }, "npm:brace-expansion@1.1.3": { @@ -279,14 +242,14 @@ System.config({ "inherits": "npm:inherits@2.0.1" }, "npm:browserify-rsa@4.0.1": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "constants": "github:jspm/nodelibs-constants@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "randombytes": "npm:randombytes@2.0.3" }, "npm:browserify-sign@4.0.0": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "browserify-rsa": "npm:browserify-rsa@4.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -309,8 +272,8 @@ System.config({ "isarray": "npm:isarray@1.0.0", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:chalk@1.1.1": { - "ansi-styles": "npm:ansi-styles@2.2.0", + "npm:chalk@1.1.3": { + "ansi-styles": "npm:ansi-styles@2.2.1", "escape-string-regexp": "npm:escape-string-regexp@1.0.5", "has-ansi": "npm:has-ansi@2.0.0", "process": "github:jspm/nodelibs-process@0.1.2", @@ -331,13 +294,7 @@ System.config({ "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0" }, - "npm:core-js@1.2.6": { - "fs": "github:jspm/nodelibs-fs@0.1.2", - "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.2", - "systemjs-json": "github:systemjs/plugin-json@0.1.0" - }, - "npm:core-js@2.1.5": { + "npm:core-js@2.2.1": { "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", "process": "github:jspm/nodelibs-process@0.1.2", @@ -347,7 +304,7 @@ System.config({ "buffer": "github:jspm/nodelibs-buffer@0.1.0" }, "npm:create-ecdh@4.0.0": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "elliptic": "npm:elliptic@6.2.3" @@ -402,7 +359,7 @@ System.config({ "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, "npm:diffie-hellman@5.0.2": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "miller-rabin": "npm:miller-rabin@4.0.0", @@ -410,18 +367,12 @@ System.config({ "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, "npm:elliptic@6.2.3": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "brorand": "npm:brorand@1.0.5", "hash.js": "npm:hash.js@1.0.3", "inherits": "npm:inherits@2.0.1", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:es6-promise@3.1.2": { - "process": "github:jspm/nodelibs-process@0.1.2" - }, - "npm:es6-shim@0.33.13": { - "process": "github:jspm/nodelibs-process@0.1.2" - }, "npm:evp_bytestokey@1.0.0": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -463,20 +414,17 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:line-numbers@0.2.0": { - "left-pad": "npm:left-pad@0.0.3" - }, "npm:lodash@3.10.1": { "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:loose-envify@1.1.0": { - "js-tokens": "npm:js-tokens@1.0.2", + "js-tokens": "npm:js-tokens@1.0.3", "process": "github:jspm/nodelibs-process@0.1.2", "stream": "github:jspm/nodelibs-stream@0.1.0", "util": "github:jspm/nodelibs-util@0.1.0" }, "npm:miller-rabin@4.0.0": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "brorand": "npm:brorand@1.0.5" }, "npm:minimatch@2.0.10": { @@ -523,7 +471,7 @@ System.config({ "assert": "github:jspm/nodelibs-assert@0.1.0" }, "npm:public-encrypt@4.0.0": { - "bn.js": "npm:bn.js@4.11.0", + "bn.js": "npm:bn.js@4.11.1", "browserify-rsa": "npm:browserify-rsa@4.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -626,8 +574,7 @@ System.config({ "npm:vm-browserify@0.0.4": { "indexof": "npm:indexof@0.0.1" }, - "npm:zone.js@0.5.15": { - "es6-promise": "npm:es6-promise@3.1.2", + "npm:zone.js@0.6.8": { "process": "github:jspm/nodelibs-process@0.1.2" } } diff --git a/app/templates/projectTemplates/package.json b/app/templates/projectTemplates/package.json index b214c3c..eca8f2d 100644 --- a/app/templates/projectTemplates/package.json +++ b/app/templates/projectTemplates/package.json @@ -18,35 +18,35 @@ "jspm": { "configFile": "jspm.conf.js", "dependencies": { - "angular2": "npm:angular2@2.0.0-beta.9", - "babel-runtime": "npm:babel-runtime@6.5.0", + "angular2": "npm:angular2@2.0.0-beta.13", + "babel-runtime": "npm:babel-runtime@6.6.1", "normalize.css": "github:necolas/normalize.css@3.0.3", "rxjs": "npm:rxjs@5.0.0-beta.2" }, "devDependencies": { - "babel": "npm:babel-core@6.5.0" + "babel": "npm:babel-core@6.7.4" } }, "dependencies": { - "babel-runtime": "6.5.x", - "reflect-metadata": "0.1.x", - "zone.js": "0.5.x", - "es6-shim": "0.33.x", + "babel-runtime": "^6.6.1", + "reflect-metadata": "^0.1.3", + "zone.js": "^0.6.6", + "es6-shim": "^0.35.0", "rxjs": "5.0.0-beta.2", - "angular2": "2.0.0-beta.9" + "angular2": "2.0.0-beta.13" }, "devDependencies": { - "babel-core": "6.5.x", - "babel-plugin-transform-es2015-modules-commonjs": "6.5.x", - "babel-preset-es2015": "6.5.x", - "gulp": "3.9.x", - "jspm": "0.16.x", - "nodemon": "1.8.x", - "typescript": "1.8.x", - "modern-web-dev-build": "0.5.x", - "jasmine-core": "2.4.x", - "karma-jasmine": "0.3.x", - "typings": "0.x" + "babel-core": "^6.7.4", + "babel-plugin-transform-es2015-modules-commonjs": "^6.7.0", + "babel-preset-es2015": "^6.6.0", + "gulp": "^3.9.1", + "jspm": "^0.16.31", + "nodemon": "^1.9.1", + "typescript": "^1.8.9", + "modern-web-dev-build": "^0.5.3", + "jasmine-core": "^2.4.1", + "karma-jasmine": "^0.3.8", + "typings": "^0.7.9" }, "engines": { "node": ">=4.2.6", diff --git a/package.json b/package.json index 3435270..bebb3b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-modern-web-dev", - "version": "0.5.3", + "version": "0.5.4", "description": "Modern Web Development Yeoman Generator: Gulp, ES2015, TypeScript, Angular 2, SASS, Minification, Bundling, Sourcemaps, ...", "author": { "name": "Sebastien Dubois", @@ -37,39 +37,40 @@ "init" ], "dependencies": { - "yeoman-generator": "0.22.x", - "yosay": "1.1.x", - "chalk": "1.1.x", - "babel-runtime": "6.5.x", - "update-notifier": "0.6.x", - "string-length": "1.0.x" + "yeoman-generator": "^0.22.5", + "yosay": "^1.1.0", + "chalk": "^1.1.3", + "babel-runtime": "^6.6.1", + "update-notifier": "^0.6.3", + "string-length": "^1.0.1" }, "devDependencies": { - "yeoman-assert": "2.1.x", - "yeoman-test": "1.0.x", - "babel-core": "6.5.x", - "babel-plugin-transform-es2015-modules-commonjs": "6.5.x", - "babel-preset-es2015": "6.5.x", - "del": "2.2.x", - "gulp": "3.9.x", - "gulp-babel": "6.1.x", - "gulp-changed": "1.3.x", - "gulp-debug": "2.1.x", - "gulp-help": "1.6.x", - "gulp-if": "2.0.x", - "gulp-jscs": "3.0.x", - "gulp-jscs-stylish": "1.3.x", - "gulp-jshint": "1.12.x", - "gulp-nice-package": "1.1.x", - "gulp-notify": "2.2.x", - "gulp-plumber": "1.0.x", - "gulp-rename": "1.2.x", - "gulp-size": "2.0.x", - "gulp-util": "3.0.x", - "jshint-stylish": "2.1.x", - "mocha": "2.3.x", - "require-dir": "0.3.x", - "run-sequence": "1.1.x" + "yeoman-assert": "^2.1.1", + "yeoman-test": "^1.1.0", + "babel-core": "^6.7.4", + "babel-plugin-transform-es2015-modules-commonjs": "^6.7.0", + "babel-preset-es2015": "^6.6.0", + "del": "^2.2.0", + "gulp": "^3.9.1", + "gulp-babel": "^6.1.2", + "gulp-changed": "^1.3.0", + "gulp-debug": "^2.1.2", + "gulp-help": "^1.6.1", + "gulp-if": "^2.0.0", + "gulp-jscs": "^3.0.2", + "gulp-jscs-stylish": "^1.3.0", + "jshint": "^2.9.1", + "gulp-jshint": "^2.0.0", + "gulp-nice-package": "^1.1.0", + "gulp-notify": "^2.2.0", + "gulp-plumber": "^1.1.0", + "gulp-rename": "^1.2.2", + "gulp-size": "^2.1.0", + "gulp-util": "^3.0.7", + "jshint-stylish": "^2.1.0", + "mocha": "^2.4.5", + "require-dir": "^0.3.0", + "run-sequence": "^1.1.5" }, "main": "app/index.js", "files": [