From 273c4a8f9a36c1c0155b9eb10b42d6d22195abb9 Mon Sep 17 00:00:00 2001 From: Braun Patrik Date: Mon, 14 Mar 2016 11:07:08 +0100 Subject: [PATCH] changing tsd to typings --- backend/NetworkManager.ts | 2 +- backend/server.ts | 2 +- common/Utils.ts | 2 +- common/event/Event.ts | 2 +- common/event/Event2Args.ts | 2 +- common/event/EventLimit.ts | 2 +- frontend/app/app.component.ts | 2 +- frontend/app/gallery/gallery.component.ts | 2 +- frontend/app/login/login.component.ts | 2 +- frontend/app/login/login.service.spec.ts | 2 +- frontend/app/login/login.service.ts | 2 +- frontend/app/model/authentication.service.ts | 2 +- frontend/app/model/network.service.ts | 2 +- frontend/main.ts | 2 +- package.json | 7 ++--- tsd.json | 33 -------------------- typings.json | 14 +++++++++ 17 files changed, 31 insertions(+), 51 deletions(-) delete mode 100644 tsd.json create mode 100644 typings.json diff --git a/backend/NetworkManager.ts b/backend/NetworkManager.ts index b335328f..3326d826 100644 --- a/backend/NetworkManager.ts +++ b/backend/NetworkManager.ts @@ -1,4 +1,4 @@ -/// +/// import * as _socketIo from 'socket.io'; diff --git a/backend/server.ts b/backend/server.ts index a0a239ee..6293e88e 100644 --- a/backend/server.ts +++ b/backend/server.ts @@ -1,4 +1,4 @@ -/// +/// import * as _express from 'express'; import * as _debug from 'debug'; diff --git a/common/Utils.ts b/common/Utils.ts index d8970e21..75e2c819 100644 --- a/common/Utils.ts +++ b/common/Utils.ts @@ -1,4 +1,4 @@ -/// +/// export class Utils { diff --git a/common/event/Event.ts b/common/event/Event.ts index 566fb298..2193b310 100644 --- a/common/event/Event.ts +++ b/common/event/Event.ts @@ -1,4 +1,4 @@ -/// +/// function isFunction(functionToCheck) { var getType = {}; diff --git a/common/event/Event2Args.ts b/common/event/Event2Args.ts index 609c07d4..41b3236d 100644 --- a/common/event/Event2Args.ts +++ b/common/event/Event2Args.ts @@ -1,4 +1,4 @@ -/// +/// export class Event2Args { private handlers: { (data?: T,data2?: M): void; }[] = []; diff --git a/common/event/EventLimit.ts b/common/event/EventLimit.ts index 460ee10c..e60d879f 100644 --- a/common/event/EventLimit.ts +++ b/common/event/EventLimit.ts @@ -1,4 +1,4 @@ -/// +/// export class EventLimit { diff --git a/frontend/app/app.component.ts b/frontend/app/app.component.ts index 345d7a2e..5e58ecfd 100644 --- a/frontend/app/app.component.ts +++ b/frontend/app/app.component.ts @@ -1,4 +1,4 @@ -/// +/// import { Component } from 'angular2/core'; import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from 'angular2/router'; diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts index f14597ba..15cc0ab7 100644 --- a/frontend/app/gallery/gallery.component.ts +++ b/frontend/app/gallery/gallery.component.ts @@ -1,4 +1,4 @@ -/// +/// import { Component } from 'angular2/core'; diff --git a/frontend/app/login/login.component.ts b/frontend/app/login/login.component.ts index b61ecc90..42ee9d3f 100644 --- a/frontend/app/login/login.component.ts +++ b/frontend/app/login/login.component.ts @@ -1,4 +1,4 @@ -/// +/// import { Component, OnInit } from 'angular2/core'; import {LoginCredential} from '../../../common/entities/LoginCredential'; diff --git a/frontend/app/login/login.service.spec.ts b/frontend/app/login/login.service.spec.ts index 7f1c2713..8ece6f9a 100644 --- a/frontend/app/login/login.service.spec.ts +++ b/frontend/app/login/login.service.spec.ts @@ -1,4 +1,4 @@ -/// +/// import { it, diff --git a/frontend/app/login/login.service.ts b/frontend/app/login/login.service.ts index 109b6440..88ae44d3 100644 --- a/frontend/app/login/login.service.ts +++ b/frontend/app/login/login.service.ts @@ -1,4 +1,4 @@ -/// +/// import {Injectable} from 'angular2/core'; import {NetworkService} from "../model/network.service"; diff --git a/frontend/app/model/authentication.service.ts b/frontend/app/model/authentication.service.ts index 342dee0d..ce5c2e6e 100644 --- a/frontend/app/model/authentication.service.ts +++ b/frontend/app/model/authentication.service.ts @@ -1,4 +1,4 @@ -/// +/// import * as io from 'socket.io-client'; import {Injectable} from 'angular2/core'; diff --git a/frontend/app/model/network.service.ts b/frontend/app/model/network.service.ts index a2e7a417..a553f424 100644 --- a/frontend/app/model/network.service.ts +++ b/frontend/app/model/network.service.ts @@ -1,4 +1,4 @@ -/// +/// import * as io from 'socket.io-client'; import {Injectable} from 'angular2/core'; diff --git a/frontend/main.ts b/frontend/main.ts index 8724c165..3c39be4f 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -1,4 +1,4 @@ -/// +/// import { bootstrap } from 'angular2/platform/browser'; import {AppComponent} from "./app/app.component.ts"; diff --git a/package.json b/package.json index 6a99e7eb..99e3d63f 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "homepage": "https://github.com/bpatrik/PiGallery2", "license": "MIT", "scripts": { - "build": "tsd reinstall && webpack frontend/webpack.config.js -P && tsc -p backend", - "pretest": "tsd reinstall", + "build": "typings install && webpack frontend/webpack.config.js -P && tsc -p backend", + "pretest": "typings install", "test": "karma start ./karma.conf.js", "start": "node ./backend/server" }, @@ -60,8 +60,7 @@ "source-map-loader": "^0.1.5", "style-loader": "^0.13.0", "ts-helper": "0.0.1", - "ts-node": "^0.5.5", - "tsd": "^0.6.5", + "ts-node": "^0.6.1", "tslint": "^3.5.0", "tslint-loader": "^2.1.3", "typedoc": "^0.3.12", diff --git a/tsd.json b/tsd.json deleted file mode 100644 index 002bc4f4..00000000 --- a/tsd.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": { - "express/express.d.ts": { - "commit": "0d622d857f97d44ea7dcad2b3edec1f23c48fe9e" - }, - "node/node.d.ts": { - "commit": "0d622d857f97d44ea7dcad2b3edec1f23c48fe9e" - }, - "debug/debug.d.ts": { - "commit": "0d622d857f97d44ea7dcad2b3edec1f23c48fe9e" - }, - "mime/mime.d.ts": { - "commit": "0d622d857f97d44ea7dcad2b3edec1f23c48fe9e" - }, - "serve-static/serve-static.d.ts": { - "commit": "0d622d857f97d44ea7dcad2b3edec1f23c48fe9e" - }, - "socket.io/socket.io.d.ts": { - "commit": "d22516f9f089de107d7e7d5938566377370631f6" - }, - "socket.io-client/socket.io-client.d.ts": { - "commit": "d22516f9f089de107d7e7d5938566377370631f6" - }, - "jasmine/jasmine.d.ts": { - "commit": "d22516f9f089de107d7e7d5938566377370631f6" - } - } -} diff --git a/typings.json b/typings.json new file mode 100644 index 00000000..0c6558e8 --- /dev/null +++ b/typings.json @@ -0,0 +1,14 @@ +{ + "name": "PiGallery2", + "version": false, + "ambientDependencies": { + "express": "github:DefinitelyTyped/DefinitelyTyped/express/express.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", + "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", + "debug": "github:DefinitelyTyped/DefinitelyTyped/debug/debug.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", + "mime": "github:DefinitelyTyped/DefinitelyTyped/mime/mime.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", + "serve-static": "github:DefinitelyTyped/DefinitelyTyped/serve-static/serve-static.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", + "socket.io": "github:DefinitelyTyped/DefinitelyTyped/socket.io/socket.io.d.ts#d22516f9f089de107d7e7d5938566377370631f6", + "socket.io-client": "github:DefinitelyTyped/DefinitelyTyped/socket.io-client/socket.io-client.d.ts#d22516f9f089de107d7e7d5938566377370631f6", + "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d22516f9f089de107d7e7d5938566377370631f6" + } +}