From 64f3076b37bead06c6ef78531711a694aa28b9ae Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Tue, 12 Jul 2016 01:11:10 +0100 Subject: [PATCH] chore: update to ts2.0 beta --- .../blueprints/ng2/files/__path__/typings.d.ts | 1 - addon/ng2/blueprints/ng2/files/e2e/typings.d.ts | 1 - addon/ng2/blueprints/ng2/files/package.json | 8 +++++--- addon/ng2/blueprints/ng2/files/typings.json | 11 ----------- lib/broccoli/angular2-app.js | 1 - package.json | 11 +++++++++-- typings.json | 16 ---------------- 7 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 addon/ng2/blueprints/ng2/files/e2e/typings.d.ts delete mode 100644 addon/ng2/blueprints/ng2/files/typings.json delete mode 100644 typings.json diff --git a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts index a58a428505dd..7f6d5bbec6ae 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts @@ -2,5 +2,4 @@ // https://github.com/typings/typings // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html -/// <% if(!isMobile) { %>declare var module: { id: string };<% } %> diff --git a/addon/ng2/blueprints/ng2/files/e2e/typings.d.ts b/addon/ng2/blueprints/ng2/files/e2e/typings.d.ts deleted file mode 100644 index 9c2f2d0252ef..000000000000 --- a/addon/ng2/blueprints/ng2/files/e2e/typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index 3a2d00c2ff7a..e8561c53655b 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -5,7 +5,6 @@ "angular-cli": {}, "scripts": { "start": "ng serve", - "postinstall": "typings install", "lint": "tslint \"<%= sourceDir %>/**/*.ts\"", "test": "ng test", "pree2e": "webdriver-manager update", @@ -31,10 +30,14 @@ "@angular/platform-server": "2.0.0-rc.4", "@angular/service-worker": "0.2.0", "@angular/app-shell": "0.0.0", + "@types/node": "^4.0.27-alpha", "angular2-broccoli-prerender": "0.11.0", "angular2-universal":"0.100.5", "angular2-universal-polyfills": "0.4.1", "preboot": "2.0.10",<% } %> + "@types/es6-shim": "0.0.27-alpha", + "@types/jasmine": "^2.2.28-alpha", + "@types/protractor": "^1.5.15-alpha", "angular-cli": "<%= version %>", "codelyzer": "0.0.20", "ember-cli-inject-live-reload": "1.4.0", @@ -46,7 +49,6 @@ "protractor": "3.3.0", "ts-node": "0.5.5", "tslint": "3.11.0", - "typescript": "1.8.10", - "typings": "0.8.1"<%= stylePackage %> + "typescript": "^2.0.0"<%= stylePackage %> } } diff --git a/addon/ng2/blueprints/ng2/files/typings.json b/addon/ng2/blueprints/ng2/files/typings.json deleted file mode 100644 index 21f9888ab067..000000000000 --- a/addon/ng2/blueprints/ng2/files/typings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ambientDevDependencies": { - "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459", - "jasmine": "registry:dt/jasmine#2.2.0+20160412134438", - "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654" - }, - "ambientDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"<% if (isMobile) {%>, - "node": "registry:dt/node#4.0.0+20160509154515" <% } %> - } -} diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js index 8402e5c7e576..0e6ebb82d701 100644 --- a/lib/broccoli/angular2-app.js +++ b/lib/broccoli/angular2-app.js @@ -90,7 +90,6 @@ class Angular2App extends BroccoliPlugin { _buildInputTree() { const inputTreeArray = [ new BroccoliFunnel(this._sourceDir, { destDir: this._sourceDir }), - new BroccoliFunnel('typings', { destDir: 'typings' }), this._getConfigTree() ]; diff --git a/package.json b/package.json index 3aa0fb95d0da..3c313257911e 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { + "@types/chalk": "^0.4.27-alpha", "broccoli": "^1.0.0-beta.7", "broccoli-caching-writer": "^2.2.1", "broccoli-concat": "^2.2.0", @@ -54,8 +55,7 @@ "silent-error": "^1.0.0", "symlink-or-copy": "^1.0.3", "systemjs-builder": "0.15.20", - "typescript": "^1.8.10", - "typings": "^0.8.1" + "typescript": "^2.0.0" }, "ember-addon": { "paths": [ @@ -63,6 +63,13 @@ ] }, "devDependencies": { + "@types/assertion-error": "^1.0.28-alpha", + "@types/chai": "^3.4.27-alpha", + "@types/glob": "^5.0.28-alpha", + "@types/minimatch": "^2.0.27-alpha", + "@types/node": "^4.0.27-alpha", + "@types/shelljs": "^0.3.26-alpha", + "@types/through": "0.0.26-alpha", "chai": "^3.5.0", "conventional-changelog": "^1.1.0", "eslint": "^2.8.0", diff --git a/typings.json b/typings.json deleted file mode 100644 index e9093d1857fc..000000000000 --- a/typings.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": {}, - "devDependencies": { - "chalk": "github:typings/typed-chalk#a7e422c5455e70292e5675a727d43a7b05fc3e58" - }, - "ambientDevDependencies": { - "assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#800a7047cf275cc9f695cbd116748cd408a09d6d", - "chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#9c25433c84251bfe72bf0030a95edbbb2c81c9d5", - "glob": "github:DefinitelyTyped/DefinitelyTyped/glob/glob.d.ts#a14d724826174d1669d4df04c80f4838b7e71fdf", - "minimatch": "github:DefinitelyTyped/DefinitelyTyped/minimatch/minimatch.d.ts#a3900b896f7b3361b79f9b503224777619907d53", - "mocha": "github:DefinitelyTyped/DefinitelyTyped/mocha/mocha.d.ts#d6dd320291705694ba8e1a79497a908e9f5e6617", - "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729", - "shelljs": "github:DefinitelyTyped/DefinitelyTyped/shelljs/shelljs.d.ts#ce14ae27a020194da3d35aa3468ca1e9e5296316", - "through": "github:DefinitelyTyped/DefinitelyTyped/through/through.d.ts#4ffee4a839f36d4f13ea7b0bc03ed2ca853e79d5" - } -}