Skip to content

Commit

Permalink
Upgrade to Typings as TSD has been deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
jpoon committed Feb 18, 2016
1 parent b57af0d commit f5e3f0c
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 27 deletions.
12 changes: 5 additions & 7 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var gulp = require('gulp'),
tslint = require('gulp-tslint'),
tsd = require('gulp-tsd'),
typings = require('gulp-typings'),
shell = require('gulp-shell'),
mocha = require('gulp-mocha'),
soften = require('gulp-soften'),
Expand All @@ -11,12 +11,10 @@ var paths = {
tests_ts: "test/**/*.ts"
};

gulp.task('tsd', function (callback) {
gulp.task('typings', function () {
// reinstall typescript definitions
return gulp.src('./gulp_tsd.json').pipe(tsd({
command: 'reinstall',
config: './tsd.json'
}, callback));
return gulp.src('./typings.json')
.pipe(typings());
});

gulp.task('fix-whitespace', function() {
Expand All @@ -42,5 +40,5 @@ gulp.task('compile', shell.task([
'node ./node_modules/vscode/bin/compile -p ./',
]));

gulp.task('init', ['tsd']);
gulp.task('init', ['typings']);
gulp.task('default', ['tslint', 'compile']);
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"color": "#a5c9a2",
"theme": "light"
},
"license" : "MIT",
"license": "MIT",
"keywords": [
"vim",
"vi",
"vscodevim",
"vsc-vim"
],
"repository": {
"repository": {
"type": "git",
"url": "https://github.com/VSCodeVim/Vim.git"
},
Expand Down Expand Up @@ -149,15 +149,15 @@
"devDependencies": {
"gulp": "^3.9.0",
"gulp-mocha": "^2.2.0",
"gulp-soften": "^0.0.1",
"gulp-shell": "^0.5.1",
"gulp-tsd": "^0.0.4",
"gulp-tslint": "^3.6.0",
"gulp-soften": "^0.0.1",
"gulp-trimlines": "^1.0.0",
"gulp-tslint": "^3.6.0",
"gulp-typescript": "^2.9.2",
"tsd": "^0.6.5",
"gulp-typings": "^1.1.0",
"tslint": "^3.2.1",
"typescript": "^1.6.2",
"typings": "^0.6.8",
"vscode": "0.10.x"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/action/deleteAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class DeleteAction {
let isEOL = motion.position.isLineEnd();

await TextEditor.delete(range);

if (isEOL) {
return motion.left().move();
} else {
Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"sourceMap": true
},
"exclude": [
"node_modules"
"node_modules",
"typings/browser.d.ts",
"typings/browser"
]
}
12 changes: 0 additions & 12 deletions tsd.json

This file was deleted.

6 changes: 6 additions & 0 deletions typings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "vim",
"ambientDependencies": {
"lodash": "github:DefinitelyTyped/DefinitelyTyped/lodash/lodash.d.ts#36c6ce86fb64bafb28ec95dc78c6b98228b45c8d"
}
}

0 comments on commit f5e3f0c

Please sign in to comment.