From 504012859ecafb71b32ad569969acccfbb33d1a7 Mon Sep 17 00:00:00 2001 From: anwalkers Date: Wed, 13 Jul 2016 13:31:21 -0700 Subject: [PATCH 1/2] typings clean up --- templates/Angular2Spa/tsd.json | 15 -------- .../url-workaround/index.d.ts} | 0 templates/Angular2Spa/typings.json | 8 +++++ .../es6-shim/index.d.ts} | 9 ++--- .../typings/globals/es6-shim/typings.json | 8 +++++ .../require/index.d.ts} | 35 ++----------------- .../typings/globals/require/typings.json | 8 +++++ .../typings/globals/url-workaround/index.d.ts | 5 +++ .../globals/url-workaround/typings.json | 8 +++++ templates/Angular2Spa/typings/index.d.ts | 3 ++ templates/Angular2Spa/typings/tsd.d.ts | 3 -- 11 files changed, 46 insertions(+), 56 deletions(-) delete mode 100644 templates/Angular2Spa/tsd.json rename templates/Angular2Spa/{typings/url-workaround.d.ts => typings-local/url-workaround/index.d.ts} (100%) create mode 100644 templates/Angular2Spa/typings.json rename templates/Angular2Spa/typings/{es6-shim/es6-shim.d.ts => globals/es6-shim/index.d.ts} (99%) create mode 100644 templates/Angular2Spa/typings/globals/es6-shim/typings.json rename templates/Angular2Spa/typings/{requirejs/require.d.ts => globals/require/index.d.ts} (84%) create mode 100644 templates/Angular2Spa/typings/globals/require/typings.json create mode 100644 templates/Angular2Spa/typings/globals/url-workaround/index.d.ts create mode 100644 templates/Angular2Spa/typings/globals/url-workaround/typings.json create mode 100644 templates/Angular2Spa/typings/index.d.ts delete mode 100644 templates/Angular2Spa/typings/tsd.d.ts diff --git a/templates/Angular2Spa/tsd.json b/templates/Angular2Spa/tsd.json deleted file mode 100644 index b39437eb..00000000 --- a/templates/Angular2Spa/tsd.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": { - "requirejs/require.d.ts": { - "commit": "dade4414712ce84e3c63393f1aae407e9e7e6af7" - }, - "es6-shim/es6-shim.d.ts": { - "commit": "c0d876601e0f8236fd6b57626eb62c4e485f1563" - } - } -} diff --git a/templates/Angular2Spa/typings/url-workaround.d.ts b/templates/Angular2Spa/typings-local/url-workaround/index.d.ts similarity index 100% rename from templates/Angular2Spa/typings/url-workaround.d.ts rename to templates/Angular2Spa/typings-local/url-workaround/index.d.ts diff --git a/templates/Angular2Spa/typings.json b/templates/Angular2Spa/typings.json new file mode 100644 index 00000000..a4e45bab --- /dev/null +++ b/templates/Angular2Spa/typings.json @@ -0,0 +1,8 @@ +{ + "name": "WebApplicationBasic", + "globalDependencies": { + "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#c0d876601e0f8236fd6b57626eb62c4e485f1563", + "require": "github:DefinitelyTyped/DefinitelyTyped/requirejs/require.d.ts#dade4414712ce84e3c63393f1aae407e9e7e6af7", + "url-workaround": "file:typings-local/url-workaround/index.d.ts" + } +} diff --git a/templates/Angular2Spa/typings/es6-shim/es6-shim.d.ts b/templates/Angular2Spa/typings/globals/es6-shim/index.d.ts similarity index 99% rename from templates/Angular2Spa/typings/es6-shim/es6-shim.d.ts rename to templates/Angular2Spa/typings/globals/es6-shim/index.d.ts index 41f22997..072ebc43 100644 --- a/templates/Angular2Spa/typings/es6-shim/es6-shim.d.ts +++ b/templates/Angular2Spa/typings/globals/es6-shim/index.d.ts @@ -1,8 +1,5 @@ -// Type definitions for es6-shim v0.31.2 -// Project: https://github.com/paulmillr/es6-shim -// Definitions by: Ron Buckton -// Definitions: https://github.com/borisyankov/DefinitelyTyped - +// Generated by typings +// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/c0d876601e0f8236fd6b57626eb62c4e485f1563/es6-shim/es6-shim.d.ts declare type PropertyKey = string | number | symbol; interface IteratorResult { @@ -665,4 +662,4 @@ declare module "es6-shim" { function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean; function setPrototypeOf(target: any, proto: any): boolean; } -} +} \ No newline at end of file diff --git a/templates/Angular2Spa/typings/globals/es6-shim/typings.json b/templates/Angular2Spa/typings/globals/es6-shim/typings.json new file mode 100644 index 00000000..11729f7d --- /dev/null +++ b/templates/Angular2Spa/typings/globals/es6-shim/typings.json @@ -0,0 +1,8 @@ +{ + "resolution": "main", + "tree": { + "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/c0d876601e0f8236fd6b57626eb62c4e485f1563/es6-shim/es6-shim.d.ts", + "raw": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#c0d876601e0f8236fd6b57626eb62c4e485f1563", + "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/c0d876601e0f8236fd6b57626eb62c4e485f1563/es6-shim/es6-shim.d.ts" + } +} diff --git a/templates/Angular2Spa/typings/requirejs/require.d.ts b/templates/Angular2Spa/typings/globals/require/index.d.ts similarity index 84% rename from templates/Angular2Spa/typings/requirejs/require.d.ts rename to templates/Angular2Spa/typings/globals/require/index.d.ts index e9cdb3e8..661b04cc 100644 --- a/templates/Angular2Spa/typings/requirejs/require.d.ts +++ b/templates/Angular2Spa/typings/globals/require/index.d.ts @@ -1,34 +1,5 @@ -// Type definitions for RequireJS 2.1.20 -// Project: http://requirejs.org/ -// Definitions by: Josh Baldwin -// Definitions: https://github.com/borisyankov/DefinitelyTyped - -/* -require-2.1.8.d.ts may be freely distributed under the MIT license. - -Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/require.d.ts - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -*/ - +// Generated by typings +// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/dade4414712ce84e3c63393f1aae407e9e7e6af7/requirejs/require.d.ts declare module 'module' { var mod: { config: () => any; @@ -394,4 +365,4 @@ interface RequireDefine { // Ambient declarations for 'require' and 'define' declare var requirejs: Require; declare var require: Require; -declare var define: RequireDefine; +declare var define: RequireDefine; \ No newline at end of file diff --git a/templates/Angular2Spa/typings/globals/require/typings.json b/templates/Angular2Spa/typings/globals/require/typings.json new file mode 100644 index 00000000..dcf97ee5 --- /dev/null +++ b/templates/Angular2Spa/typings/globals/require/typings.json @@ -0,0 +1,8 @@ +{ + "resolution": "main", + "tree": { + "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/dade4414712ce84e3c63393f1aae407e9e7e6af7/requirejs/require.d.ts", + "raw": "github:DefinitelyTyped/DefinitelyTyped/requirejs/require.d.ts#dade4414712ce84e3c63393f1aae407e9e7e6af7", + "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/dade4414712ce84e3c63393f1aae407e9e7e6af7/requirejs/require.d.ts" + } +} diff --git a/templates/Angular2Spa/typings/globals/url-workaround/index.d.ts b/templates/Angular2Spa/typings/globals/url-workaround/index.d.ts new file mode 100644 index 00000000..ea3a5dba --- /dev/null +++ b/templates/Angular2Spa/typings/globals/url-workaround/index.d.ts @@ -0,0 +1,5 @@ +// Generated by typings +// Source: typings-local/url-workaround/index.d.ts +declare module 'url' { + export interface Url {} +} \ No newline at end of file diff --git a/templates/Angular2Spa/typings/globals/url-workaround/typings.json b/templates/Angular2Spa/typings/globals/url-workaround/typings.json new file mode 100644 index 00000000..30c25008 --- /dev/null +++ b/templates/Angular2Spa/typings/globals/url-workaround/typings.json @@ -0,0 +1,8 @@ +{ + "resolution": "main", + "tree": { + "src": "D:\\github\\JavaScriptServices\\templates\\Angular2Spa\\typings-local\\url-workaround\\index.d.ts", + "raw": "file:typings-local/url-workaround/index.d.ts", + "typings": "D:\\github\\JavaScriptServices\\templates\\Angular2Spa\\typings-local\\url-workaround\\index.d.ts" + } +} diff --git a/templates/Angular2Spa/typings/index.d.ts b/templates/Angular2Spa/typings/index.d.ts new file mode 100644 index 00000000..ab4d4e19 --- /dev/null +++ b/templates/Angular2Spa/typings/index.d.ts @@ -0,0 +1,3 @@ +/// +/// +/// diff --git a/templates/Angular2Spa/typings/tsd.d.ts b/templates/Angular2Spa/typings/tsd.d.ts deleted file mode 100644 index c5cfdc2b..00000000 --- a/templates/Angular2Spa/typings/tsd.d.ts +++ /dev/null @@ -1,3 +0,0 @@ - -/// -/// From 25eceefe5e76d690da2d8bb5d326d31177f13434 Mon Sep 17 00:00:00 2001 From: anwalkers Date: Wed, 13 Jul 2016 15:03:26 -0700 Subject: [PATCH 2/2] publish include for tsd.json to typings.json --- templates/Angular2Spa/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Angular2Spa/project.json b/templates/Angular2Spa/project.json index 1ce5f413..4db04906 100755 --- a/templates/Angular2Spa/project.json +++ b/templates/Angular2Spa/project.json @@ -90,7 +90,7 @@ "typings", "Views", "tsconfig.json", - "tsd.json", + "typings.json", "web.config", "webpack.*.js", "wwwroot"