Skip to content

Tsd to typings #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ before_install:
- export CXX=/usr/bin/g++-4.9
install:
- npm install
- ./node_modules/.bin/typings install
- ./node_modules/.bin/bower install
before_script:
- git config --global user.name "Lorem Ipsum"
- git config --global user.email [email protected]
Expand Down
18 changes: 2 additions & 16 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ var addsrc = require('gulp-add-src');
var filter = require('gulp-filter');
var print = require('gulp-print');
var del = require('del');
var bower = require('gulp-bower');
var tsd = require('gulp-tsd');
var typescript = require('gulp-typescript');
var sass = require('gulp-sass');
var electron = require('electron-connect').server.create();
Expand Down Expand Up @@ -63,7 +61,7 @@ gulp.task('build:src', gulp.parallel(function() {
return gulp.src('src/**/*.ts')
.pipe(filter(needToCompile))
.pipe(print(showBuild('tsc')))
.pipe(addsrc('./typings/tsd.d.ts'))
.pipe(addsrc('./typings/main.d.ts'))
.pipe(typescript({ target: 'es5',
module: 'commonjs',
sourceMap: true }))
Expand All @@ -86,7 +84,7 @@ gulp.task('build:test', gulp.parallel(function() {
return gulp.src('test/**/*.ts')
.pipe(filter(needToCompile))
.pipe(print(showBuild('tsc')))
.pipe(addsrc('./typings/tsd.d.ts'))
.pipe(addsrc('./typings/main.d.ts'))
.pipe(typescript({ target: 'es5',
module: 'commonjs',
sourceMap: true }))
Expand Down Expand Up @@ -123,15 +121,3 @@ gulp.task('serve', function () {
// Reload a page when resources loaded from RendererProcess updates
gulp.watch('build/renderer/**/*.{html,js,css}', electron.reload);
});

gulp.task('install:bower', function() {
return bower();
});

gulp.task('install:tsd', function(callback) {
tsd({ command: 'reinstall',
config: 'tsd.json'
}, callback);
});

gulp.task('install', gulp.series('install:bower', 'install:tsd'));
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "Git-based note app",
"main": "build/browser/main.js",
"scripts": {
"postinstall": "gulp install",
"build": "gulp build",
"watch": "gulp watch",
"serve": "gulp serve",
Expand Down Expand Up @@ -32,20 +31,18 @@
"fs-extra": "^0.26.3",
"gulp": "github:gulpjs/gulp#4.0",
"gulp-add-src": "^0.2.0",
"gulp-bower": "0.0.11",
"gulp-filter": "^3.0.1",
"gulp-mocha": "^2.2.0",
"gulp-print": "^2.0.1",
"gulp-sass": "^2.1.1",
"gulp-task-listing": "^1.0.1",
"gulp-tsd": "0.0.4",
"gulp-typescript": "^2.10.0",
"markdown-it": "^5.0.2",
"markdown-it-emoji": "^1.1.0",
"mocha": "^2.3.4",
"nodegit": "^0.6.3",
"sass": "^0.5.0",
"tsd": "^0.6.5",
"typescript": "^1.7.5"
"typescript": "^1.7.5",
"typings": "^0.6.3"
}
}
39 changes: 0 additions & 39 deletions tsd.json

This file was deleted.

14 changes: 14 additions & 0 deletions typings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"ambientDependencies": {
"angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"chokidar": "github:DefinitelyTyped/DefinitelyTyped/chokidar/chokidar.d.ts#fe563dff3428bac1260d1794e2c2ecf8f097535a",
"es6-promise": "github:DefinitelyTyped/DefinitelyTyped/es6-promise/es6-promise.d.ts#fe563dff3428bac1260d1794e2c2ecf8f097535a",
"fs-extra": "github:DefinitelyTyped/DefinitelyTyped/fs-extra/fs-extra.d.ts#fe563dff3428bac1260d1794e2c2ecf8f097535a",
"github-electron": "github:DefinitelyTyped/DefinitelyTyped/github-electron/github-electron.d.ts#c4826e748ddfc4c3b96dfe9636d6bd1b062baf8b",
"jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"mocha": "github:DefinitelyTyped/DefinitelyTyped/mocha/mocha.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"
}
}