Upgraded to 0.2.0

- upgraded to modernWebDevBuild 0.3.x (closes #51) - upgraded babel dependencies (closes #50) - upgraded to Angular 2 beta 1 (closes #49) - added jasmine imports in the provided unit test (closes #48) - switched from tsd to typings (closes #38)
dsebastien · Jan 10, 2016 · 3274e7c · 3274e7c
1 parent f9d117a
commit 3274e7c
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 75 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,3 +1,13 @@
+* 0.2.0
+  * now supports Angular 2 beta 1
+  * now uses modernWebDevBuild 0.3.x: https://github.com/dsebastien/modernWebDevBuild/releases/tag/0.3.0
+  * switched from tsd to typings for TypeScript typings management (new kid in town)
+    * typings supports typings on DefinitelyTyped but has a lot more to offer
+    * check out the following links
+      * https://github.com/typings/typings
+      * https://angularclass.com/the-state-of-typescript-packages/
+  * upgraded babel dependencies
+  * added Jasmine imports in the provided unit tests
 * 0.1.4
   * added a update check: you will be notified whenever a new version of the generator is available
     * you can disable the update check by passing the following flag: `--no-update-notifier`

diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ Here's some high level information about these:
 * tsconfig.json: TypeScript compiler configuration. Contains all compiler options, code style rules and file selection/exclusion rules (bypassed by the gulp-typescript plugin!)
   * http://json.schemastore.org/tsconfig
   * https://github.com/Microsoft/TypeScript/wiki/tsconfig.json
-* tsd.json: tsd configuration file: list of TypeScript type definitions files to retrieve
+* typings.json: typings configuration file: list of TypeScript type definitions files to retrieve
 * tslint.json: TypeScript code style configuration (more information: https://www.npmjs.com/package/tslint)
 * Makefile: for \*NIX afficionados
 

diff --git a/app/templates/applicationFiles/app/service-worker.js b/app/templates/applicationFiles/app/service-worker.js
@@ -1 +1,2 @@
-// This file is intentionally without code.
+// This file is intentionally without code
+//
diff --git a/app/templates/applicationFiles/app/test/sanity_test.spec.ts b/app/templates/applicationFiles/app/test/sanity_test.spec.ts
@@ -1,3 +1,11 @@
+/// <reference path="../../typings/main.d.ts" />
+// FIXME remove reference once there is a solution to
+// https://github.com/ivogabe/gulp-typescript/issues/190
+// https://github.com/typings/typings/issues/69
+// https://github.com/dsebastien/modernWebDevBuild/issues/76
+
+import {describe, xdescribe, it, xit} from "jasmine";
+
 describe("sanity checks", () => {
 	it("should be able to test", () => {
 		expect(true).toBe(true);

diff --git a/app/templates/projectFiles/jspm.conf.js b/app/templates/projectFiles/jspm.conf.js
@@ -1,14 +1,14 @@
 System.config({
   defaultJSExtensions: true,
-  transpiler: "none",
+  transpiler: false,
   paths: {
 	"github:*": "jspm_packages/github/*",
 	"npm:*": "jspm_packages/npm/*"
   },
 
   map: {
-	"angular2": "npm:[email protected].0",
-	"babel": "npm:babel-core@6.3.21",
+	"angular2": "npm:[email protected].1",
+	"babel": "npm:babel-core@6.4.0",
 	"babel-runtime": "npm:[email protected]",
 	"core-js": "npm:[email protected]",
 	"normalize.css": "github:necolas/[email protected]",
@@ -17,7 +17,7 @@ System.config({
 	  "assert": "npm:[email protected]"
 	},
 	"github:jspm/[email protected]": {
-	  "buffer": "npm:buffer@3.5.5"
+	  "buffer": "npm:buffer@3.6.0"
 	},
 	"github:jspm/[email protected]": {
 	  "constants-browserify": "npm:[email protected]"
@@ -85,7 +85,7 @@ System.config({
 	  "path": "github:jspm/[email protected]",
 	  "process": "github:jspm/[email protected]"
 	},
-	"npm:[email protected].0": {
+	"npm:[email protected].1": {
 	  "crypto": "github:jspm/[email protected]",
 	  "es6-promise": "npm:[email protected]",
 	  "es6-shim": "npm:[email protected]",
@@ -94,9 +94,9 @@ System.config({
 	  "rxjs": "npm:[email protected]",
 	  "zone.js": "npm:[email protected]"
 	},
-	"npm:asn1.js@4.2.1": {
+	"npm:asn1.js@4.3.0": {
 	  "assert": "github:jspm/[email protected]",
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "buffer": "github:jspm/[email protected]",
 	  "inherits": "npm:[email protected]",
 	  "minimalistic-assert": "npm:[email protected]",
@@ -113,18 +113,18 @@ System.config({
 	  "line-numbers": "npm:[email protected]",
 	  "repeating": "npm:[email protected]"
 	},
-	"npm:babel-core@6.3.21": {
+	"npm:babel-core@6.4.0": {
 	  "babel-code-frame": "npm:[email protected]",
-	  "babel-generator": "npm:babel-generator@6.3.21",
-	  "babel-helpers": "npm:babel-helpers@6.3.13",
+	  "babel-generator": "npm:babel-generator@6.4.2",
+	  "babel-helpers": "npm:babel-helpers@6.4.0",
 	  "babel-messages": "npm:[email protected]",
 	  "babel-register": "npm:[email protected]",
 	  "babel-runtime": "npm:[email protected]",
 	  "babel-template": "npm:[email protected]",
-	  "babel-traverse": "npm:[email protected].24",
-	  "babel-types": "npm:babel-types@6.3.24",
-	  "babylon": "npm:babylon@6.3.21",
-	  "convert-source-map": "npm:[email protected].2",
+	  "babel-traverse": "npm:[email protected].26",
+	  "babel-types": "npm:babel-types@6.4.1",
+	  "babylon": "npm:babylon@6.4.2",
+	  "convert-source-map": "npm:[email protected].3",
 	  "debug": "npm:[email protected]",
 	  "fs": "github:jspm/[email protected]",
 	  "json5": "npm:[email protected]",
@@ -142,10 +142,10 @@ System.config({
 	  "systemjs-json": "github:systemjs/[email protected]",
 	  "util": "github:jspm/[email protected]"
 	},
-	"npm:babel-generator@6.3.21": {
+	"npm:babel-generator@6.4.2": {
 	  "babel-messages": "npm:[email protected]",
 	  "babel-runtime": "npm:[email protected]",
-	  "babel-types": "npm:babel-types@6.3.24",
+	  "babel-types": "npm:babel-types@6.4.1",
 	  "buffer": "github:jspm/[email protected]",
 	  "detect-indent": "npm:[email protected]",
 	  "is-integer": "npm:[email protected]",
@@ -154,7 +154,7 @@ System.config({
 	  "source-map": "npm:[email protected]",
 	  "trim-right": "npm:[email protected]"
 	},
-	"npm:babel-helpers@6.3.13": {
+	"npm:babel-helpers@6.4.0": {
 	  "babel-runtime": "npm:[email protected]",
 	  "babel-template": "npm:[email protected]"
 	},
@@ -163,7 +163,7 @@ System.config({
 	  "util": "github:jspm/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "babel-core": "npm:babel-core@6.3.21",
+	  "babel-core": "npm:babel-core@6.4.0",
 	  "babel-runtime": "npm:[email protected]",
 	  "core-js": "npm:[email protected]",
 	  "fs": "github:jspm/[email protected]",
@@ -183,32 +183,32 @@ System.config({
 	},
 	"npm:[email protected]": {
 	  "babel-runtime": "npm:[email protected]",
-	  "babel-traverse": "npm:[email protected].24",
-	  "babel-types": "npm:babel-types@6.3.24",
-	  "babylon": "npm:babylon@6.3.21",
+	  "babel-traverse": "npm:[email protected].26",
+	  "babel-types": "npm:babel-types@6.4.1",
+	  "babylon": "npm:babylon@6.4.2",
 	  "lodash": "npm:[email protected]"
 	},
-	"npm:[email protected].24": {
+	"npm:[email protected].26": {
 	  "babel-code-frame": "npm:[email protected]",
 	  "babel-messages": "npm:[email protected]",
 	  "babel-runtime": "npm:[email protected]",
-	  "babel-types": "npm:babel-types@6.3.24",
-	  "babylon": "npm:babylon@6.3.21",
+	  "babel-types": "npm:babel-types@6.4.1",
+	  "babylon": "npm:babylon@6.4.2",
 	  "debug": "npm:[email protected]",
-	  "globals": "npm:globals@8.15.0",
+	  "globals": "npm:globals@8.18.0",
 	  "invariant": "npm:[email protected]",
 	  "lodash": "npm:[email protected]",
 	  "process": "github:jspm/[email protected]",
 	  "repeating": "npm:[email protected]"
 	},
-	"npm:babel-types@6.3.24": {
+	"npm:babel-types@6.4.1": {
 	  "babel-runtime": "npm:[email protected]",
-	  "babel-traverse": "npm:[email protected].24",
+	  "babel-traverse": "npm:[email protected].26",
 	  "esutils": "npm:[email protected]",
 	  "lodash": "npm:[email protected]",
 	  "to-fast-properties": "npm:[email protected]"
 	},
-	"npm:babylon@6.3.21": {
+	"npm:babylon@6.4.2": {
 	  "babel-runtime": "npm:[email protected]",
 	  "fs": "github:jspm/[email protected]",
 	  "process": "github:jspm/[email protected]"
@@ -243,14 +243,14 @@ System.config({
 	  "inherits": "npm:[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "buffer": "github:jspm/[email protected]",
 	  "constants": "github:jspm/[email protected]",
 	  "crypto": "github:jspm/[email protected]",
 	  "randombytes": "npm:[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "browserify-rsa": "npm:[email protected]",
 	  "buffer": "github:jspm/[email protected]",
 	  "create-hash": "npm:[email protected]",
@@ -265,7 +265,7 @@ System.config({
 	  "buffer": "github:jspm/[email protected]",
 	  "systemjs-json": "github:systemjs/[email protected]"
 	},
-	"npm:buffer@3.5.5": {
+	"npm:buffer@3.6.0": {
 	  "base64-js": "npm:[email protected]",
 	  "child_process": "github:jspm/[email protected]",
 	  "fs": "github:jspm/[email protected]",
@@ -290,7 +290,7 @@ System.config({
 	"npm:[email protected]": {
 	  "systemjs-json": "github:systemjs/[email protected]"
 	},
-	"npm:[email protected].2": {
+	"npm:[email protected].3": {
 	  "buffer": "github:jspm/[email protected]",
 	  "fs": "github:jspm/[email protected]",
 	  "path": "github:jspm/[email protected]"
@@ -305,7 +305,7 @@ System.config({
 	  "buffer": "github:jspm/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "buffer": "github:jspm/[email protected]",
 	  "crypto": "github:jspm/[email protected]",
 	  "elliptic": "npm:[email protected]"
@@ -360,15 +360,15 @@ System.config({
 	  "systemjs-json": "github:systemjs/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "buffer": "github:jspm/[email protected]",
 	  "crypto": "github:jspm/[email protected]",
 	  "miller-rabin": "npm:[email protected]",
 	  "randombytes": "npm:[email protected]",
 	  "systemjs-json": "github:systemjs/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "brorand": "npm:[email protected]",
 	  "hash.js": "npm:[email protected]",
 	  "inherits": "npm:[email protected]",
@@ -389,7 +389,7 @@ System.config({
 	  "buffer": "github:jspm/[email protected]",
 	  "process": "github:jspm/[email protected]"
 	},
-	"npm:globals@8.15.0": {
+	"npm:globals@8.18.0": {
 	  "systemjs-json": "github:systemjs/[email protected]"
 	},
 	"npm:[email protected]": {
@@ -434,7 +434,7 @@ System.config({
 	  "util": "github:jspm/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "brorand": "npm:[email protected]"
 	},
 	"npm:[email protected]": {
@@ -445,7 +445,7 @@ System.config({
 	  "process": "github:jspm/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "asn1.js": "npm:asn1.js@4.2.1",
+	  "asn1.js": "npm:asn1.js@4.3.0",
 	  "browserify-aes": "npm:[email protected]",
 	  "buffer": "github:jspm/[email protected]",
 	  "create-hash": "npm:[email protected]",
@@ -475,7 +475,7 @@ System.config({
 	  "assert": "github:jspm/[email protected]"
 	},
 	"npm:[email protected]": {
-	  "bn.js": "npm:[email protected].1",
+	  "bn.js": "npm:[email protected].2",
 	  "browserify-rsa": "npm:[email protected]",
 	  "buffer": "github:jspm/[email protected]",
 	  "create-hash": "npm:[email protected]",

diff --git a/app/templates/projectFiles/tsconfig.json b/app/templates/projectFiles/tsconfig.json
@@ -14,7 +14,7 @@
 	"inlineSources": false,
 	"sourceMap": false,
 	"outDir": "./.tmp",
-	"project": "./app",
+	"rootDir": "./app",
 	"moduleResolution": "node",
 	"listFiles": false
   },
@@ -32,12 +32,10 @@
 	"placeOpenBraceOnNewLineForFunctions": false,
 	"placeOpenBraceOnNewLineForControlBlocks": false
   },
-  "filesGlob": [
-	"./typings/*.d.ts",
-	"./app/**/*.ts"
-  ],
   "exclude": [
 	"node_modules",
-	"jspm_packages"
+	"jspm_packages",
+	"typings/browser",
+	"typings/browser.d.ts"
   ]
 }
diff --git a/app/templates/projectFiles/tsd.json b/app/templates/projectFiles/tsd.json
diff --git a/app/templates/projectFiles/typings.json b/app/templates/projectFiles/typings.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+	"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d2dd0dbfc70f5bd50aab635156620b3a2578a48d"
+  },
+  "devDependencies": {},
+  "ambientDependencies": {}
+}
diff --git a/app/templates/projectFiles/typings/README.md b/app/templates/projectFiles/typings/README.md
@@ -1,7 +1,9 @@
 This folder should only contain TypeScript type definitions (.d.ts) files.
-Type definition files should be installed using `tsd install <name> --save`; once that command is issued:
-* tsd.json will be updated
+Type definition files should be installed using `typings install ... --save`; once that command is issued:
+* typings.json will be updated
 * the typings will be downloaded below this folder
-* references to these typings files will be added to `tsd.d.ts`
+* references to these typings files will be added to both `main.d.ts` and `browser.d.ts`
 
 All type definition files in this folder will automatically be picked up by the TypeScript compiler.
+
+For more details about the typings CLI, check out the official docs: https://github.com/typings/typings
diff --git a/app/templates/projectFiles/typings/tsd.d.ts b/app/templates/projectFiles/typings/tsd.d.ts
diff --git a/app/templates/projectTemplates/package.json b/app/templates/projectTemplates/package.json
@@ -20,12 +20,11 @@
     "dependencies": {
       "babel-runtime": "npm:babel-runtime@^6.3.13",
       "rxjs": "npm:rxjs@^5.0.0-beta.0",
-      "angular2": "npm:angular2@^2.0.0-beta.0",
+      "angular2": "npm:angular2@^2.0.0-beta.1",
       "normalize.css": "github:necolas/normalize.css@^3.0.3"
     },
     "devDependencies": {
-      "babel": "npm:babel-core@^6.3.13",
-      "core-js": "npm:core-js@^1.1.4"
+      "babel": "npm:babel-core@^6.4.0"
     }
   },
   "dependencies": {
@@ -34,20 +33,20 @@
     "zone.js": "0.5.10",
     "es6-shim": "0.33.3",
     "rxjs": "5.0.0-beta.0",
-    "angular2": "2.0.0-beta.0"
+    "angular2": "2.0.0-beta.1"
   },
   "devDependencies": {
-    "babel-core": "6.3.x",
-    "babel-plugin-transform-es2015-modules-commonjs": "6.3.x",
+    "babel-core": "6.4.x",
+    "babel-plugin-transform-es2015-modules-commonjs": "6.4.x",
     "babel-preset-es2015": "6.3.x",
     "gulp": "3.9.x",
     "jspm": "0.16.x",
     "nodemon": "1.8.x",
     "typescript": "1.7.3",
-    "modern-web-dev-build": "0.2.x",
+    "modern-web-dev-build": "0.3.x",
     "jasmine-core": "2.4.x",
     "karma-jasmine": "0.3.x",
-    "tsd": "0.6.5"
+    "typings": "0.5.x"
   },
   "engines": {
     "node": ">=4.2.1",
@@ -61,11 +60,10 @@
     "start": "npm run serve",
     "serve": "nodemon --watch gulpfile.js --watch gulpfile.babel.js --watch package.json --watch .jshintrc --watch .jscsrc --watch tsconfig.json --watch tslint.json --watch jspm.conf.js --exec gulp serve",
     "serve-dist": "nodemon --watch gulpfile.js --watch gulpfile.babel.js --watch package.json --watch .jshintrc --watch .jscsrc --watch tsconfig.json --watch tslint.json --watch jspm.conf.js --exec gulp serve-dist",
-    "update": "npm install --no-optional && jspm update && jspm dl-loader && npm run tsd",
+    "update": "npm install --no-optional && jspm update && jspm dl-loader && npm run typings",
     "outdated": "npm outdated",
     "help": "gulp help",
-    "tsd": "tsd reinstall --save --overwrite",
-    "tsd-update": "tsd update --save --overwrite",
-    "setup": "npm install --no-optional && jspm install && jspm dl-loader && npm run tsd"
+    "typings": "typings install",
+    "setup": "npm install --no-optional && jspm install && jspm dl-loader && npm run typings"
   }
 }