From b06c292be9071b8dcb8221626d2760a5a061a92e Mon Sep 17 00:00:00 2001 From: Tim Haase Date: Sun, 7 Feb 2016 19:45:47 +0100 Subject: [PATCH] Switch from tsd to typings --- .gitignore | 12 ++++--- src/app/app.ts | 2 ++ src/typings.json | 26 ++++++++++++++ src/typings/own.d.ts | 1 + src/typings/own/own.d.ts | 1 - src/typings/typings.d.ts | 4 +-- tsconfig.json | 13 +++++-- tsd.json | 75 ---------------------------------------- 8 files changed, 48 insertions(+), 86 deletions(-) create mode 100644 src/typings.json create mode 100644 src/typings/own.d.ts delete mode 100644 src/typings/own/own.d.ts delete mode 100644 tsd.json diff --git a/.gitignore b/.gitignore index 5b28150..731748f 100644 --- a/.gitignore +++ b/.gitignore @@ -110,12 +110,14 @@ dist/ ### Cordova ### # The hooks directory is deprecated -hooks/** -platforms/** -plugins/** +hooks +platforms +plugins ### Project ### -# This directory will be built from typescript -src/typings/tsd/** +src/typings/browser +src/typings/main +src/typings/browser.d.ts +src/typings/main.d.ts src/modules/config/registration-info.json diff --git a/src/app/app.ts b/src/app/app.ts index a2a6ad0..463d899 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -1,3 +1,5 @@ +/// + import {Test} from './main/main'; import can from 'canjs'; import cordova from 'cordova'; diff --git a/src/typings.json b/src/typings.json new file mode 100644 index 0000000..225fd96 --- /dev/null +++ b/src/typings.json @@ -0,0 +1,26 @@ +{ + "ambientDependencies": { + "BatteryStatus": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/BatteryStatus.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Camera": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Camera.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Contacts": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Contacts.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Device": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Device.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "DeviceMotion": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/DeviceMotion.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "DeviceOrientation": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/DeviceOrientation.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Dialogs": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Dialogs.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "FileSystem": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/FileSystem.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "FileTransfer": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/FileTransfer.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Globalization": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Globalization.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "InAppBrowser": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/InAppBrowser.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Keyboard": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Keyboard.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Media": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Media.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "MediaCapture": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/MediaCapture.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "NetworkInformation": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/NetworkInformation.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Push": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Push.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Splashscreen": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Splashscreen.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "StatusBar": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/StatusBar.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "Vibration": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/Vibration.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "WebSQL": "github:DefinitelyTyped/DefinitelyTyped/cordova/plugins/WebSQL.d.ts#f29bf726a60674dbf24bab06a26403a3871c3f21", + "cordova": "github:DefinitelyTyped/DefinitelyTyped/cordova/cordova.d.ts#ac7f83bdcf1dfd70e70acf7a87cf8e83719dacd6", + "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#cf2a968f0edd7d30773f7d23fe3708fa029d5ab7" + } +} diff --git a/src/typings/own.d.ts b/src/typings/own.d.ts new file mode 100644 index 0000000..e1f56a6 --- /dev/null +++ b/src/typings/own.d.ts @@ -0,0 +1 @@ +/// diff --git a/src/typings/own/own.d.ts b/src/typings/own/own.d.ts deleted file mode 100644 index 3240421..0000000 --- a/src/typings/own/own.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/src/typings/typings.d.ts b/src/typings/typings.d.ts index 3ca7d8e..d180784 100644 --- a/src/typings/typings.d.ts +++ b/src/typings/typings.d.ts @@ -1,2 +1,2 @@ -/// -/// +/// +/// diff --git a/tsconfig.json b/tsconfig.json index 834d9e2..f222254 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,9 +6,16 @@ "allowSyntheticDefaultImports": true, "noImplicitAny": true }, - "files": [ - "./src/app/app.ts", - "./src/app/app.d.ts" + "exclude": [ + "node_modules", + "platforms", + "plugins", + "src/cordova-hooks", + "src/themes", + "src/typings/main", + "src/typings/main.d.ts", + "src/webpack-loaders", + "www" ], "compileOnSave": false, "atom": { diff --git a/tsd.json b/tsd.json deleted file mode 100644 index a9b98c6..0000000 --- a/tsd.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "src/typings/tsd", - "bundle": "src/typings/tsd/tsd.d.ts", - "installed": { - "cordova/cordova.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/BatteryStatus.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/DeviceMotion.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Device.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/DeviceOrientation.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Dialogs.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/FileSystem.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/FileTransfer.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Globalization.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Media.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/InAppBrowser.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/MediaCapture.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/NetworkInformation.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Push.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Splashscreen.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/StatusBar.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Vibration.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/WebSQL.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Keyboard.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Camera.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "cordova/plugins/Contacts.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - }, - "jquery/jquery.d.ts": { - "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" - } - } -}