Skip to content

Commit

Permalink
dep(types): update typescript, remove typings in favor of @types (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
cnishina authored Aug 23, 2016
1 parent d6597e8 commit fe85c94
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 32 deletions.
6 changes: 1 addition & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ gulp.task('format', () => {
format.format('file', clangFormat)).pipe(gulp.dest('.'));
});

gulp.task('typings', function(done) {
runSpawn(done, 'node', ['node_modules/typings/dist/bin.js', 'install']);
});

gulp.task('tsc', function(done) {
runSpawn(done, 'node', ['node_modules/typescript/bin/tsc']);
});

gulp.task('prepublish', function(done) {
runSequence(['typings', 'format'], 'tsc', 'copy', done);
runSequence('format', 'tsc', 'copy', done);
});

gulp.task('default',['prepublish']);
Expand Down
18 changes: 15 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"protractor",
"webdriver",
"webdriverjs",
"selenium"
"selenium",
"selenium-webdriver"
],
"repository": {
"type": "git",
Expand All @@ -37,12 +38,23 @@
"rimraf": "^2.5.2"
},
"devDependencies": {
"@types/adm-zip": "^0.4.29",
"@types/chalk": "^0.4.28",
"@types/form-data": "0.0.30",
"@types/glob": "^5.0.29",
"@types/ini": "^1.3.28",
"@types/jasmine": "^2.2.32",
"@types/minimatch": "^2.0.28",
"@types/minimist": "^1.1.28",
"@types/node": "^6.0.37",
"@types/q": "0.0.29",
"@types/request": "0.0.29",
"@types/rimraf": "0.0.27",
"clang-format": "^1.0.35",
"gulp": "^3.9.1",
"gulp-clang-format": "^1.0.23",
"jasmine": "^2.4.1",
"run-sequence": "^1.1.5",
"typescript": "^1.8.7",
"typings": "^1.0.4"
"typescript": "^2.0.0"
}
}
2 changes: 0 additions & 2 deletions spec/files/downloader_spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/// <reference path = "../../typings/index.d.ts"/>

import {Downloader} from '../../lib/files';

describe('downloader', () => {
Expand Down
2 changes: 0 additions & 2 deletions spec/files/fileManager_spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/// <reference path = "../../typings/index.d.ts"/>

import * as fs from 'fs';
import * as path from 'path';
import {Binary, AndroidSDK, ChromeDriver, IEDriver, Appium, StandAlone} from '../../lib/binaries';
Expand Down
2 changes: 0 additions & 2 deletions spec/webdriver_spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/// <reference path = "../typings/index.d.ts"/>

import * as child_process from 'child_process';
import * as path from 'path';
import {cli} from '../lib/webdriver';
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
},
"exclude": [
"built",
"node_modules",
"typings/globals"
"node_modules"
]
}
16 changes: 0 additions & 16 deletions typings.json

This file was deleted.

0 comments on commit fe85c94

Please sign in to comment.