From e2bfe34b09c867eb9f70dd326c17e112690ddb62 Mon Sep 17 00:00:00 2001 From: Darren Reid Date: Tue, 14 Jun 2016 18:52:46 +1000 Subject: [PATCH 1/2] Update TS templates typings to work with 1.0 --- src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/app.ts | 2 +- src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/deps.ts | 2 +- src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/main.ts | 2 +- src/ServiceStackVS/ProjectTemplates/Aurelia/Host/typings.json | 2 +- .../ProjectTemplates/ReactJSGap/ReactJS/src/app.tsx | 2 +- .../ProjectTemplates/ReactJSGap/ReactJS/src/deps.tsx | 2 +- .../ProjectTemplates/ReactJSGap/ReactJS/src/hello.tsx | 2 +- .../ProjectTemplates/ReactJSGap/ReactJS/typings.json | 2 +- .../ProjectTemplates/TypeScriptReact/Host/src/app.tsx | 2 +- .../ProjectTemplates/TypeScriptReact/Host/src/deps.tsx | 2 +- .../ProjectTemplates/TypeScriptReact/Host/src/hello.tsx | 2 +- .../ProjectTemplates/TypeScriptReact/Host/typings.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/app.ts b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/app.ts index 947dcfab..59337a67 100644 --- a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/app.ts +++ b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/app.ts @@ -1,4 +1,4 @@ -/// +/// import {Router} from 'aurelia-router'; export class App { diff --git a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/deps.ts b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/deps.ts index e05945c2..cfa0e52a 100644 --- a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/deps.ts +++ b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/deps.ts @@ -1,4 +1,4 @@ -/// +/// import {Aurelia} from 'aurelia-framework'; import {HttpClient} from "aurelia-http-client"; diff --git a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/main.ts b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/main.ts index de7fe1a3..15fbcaac 100644 --- a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/main.ts +++ b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/src/main.ts @@ -1,4 +1,4 @@ -/// +/// import {Aurelia} from 'aurelia-framework'; diff --git a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/typings.json b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/typings.json index dc531482..cca9d29f 100644 --- a/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/typings.json +++ b/src/ServiceStackVS/ProjectTemplates/Aurelia/Host/typings.json @@ -1,5 +1,5 @@ { - "ambientDependencies": { + "globalDependencies": { "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c", "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8", "ss-utils": "github:DefinitelyTyped/DefinitelyTyped/ss-utils/ss-utils.d.ts#229cb92825ec05c986dff721018b7130126f09a9" diff --git a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/app.tsx b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/app.tsx index 02f8a53b..5b74a04a 100644 --- a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/app.tsx +++ b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/app.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as ReactDOM from 'react-dom'; import * as React from 'react'; diff --git a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/deps.tsx b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/deps.tsx index 34677930..85e8c2a0 100644 --- a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/deps.tsx +++ b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/deps.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as React from 'react'; import { render } from 'react-dom'; diff --git a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/hello.tsx b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/hello.tsx index 59db81e8..6467261a 100644 --- a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/hello.tsx +++ b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/src/hello.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as React from 'react'; import * as ReactDOM from 'react-dom'; diff --git a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/typings.json b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/typings.json index 832a207a..a65a9059 100644 --- a/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/typings.json +++ b/src/ServiceStackVS/ProjectTemplates/ReactJSGap/ReactJS/typings.json @@ -1,5 +1,5 @@ { - "ambientDependencies": { + "globalDependencies": { "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c", "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8", "react": "github:DefinitelyTyped/DefinitelyTyped/react/react.d.ts#f407264835650f5f38d4bb2c515a79e7a835916b", diff --git a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/app.tsx b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/app.tsx index 6b918e2e..464e6229 100644 --- a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/app.tsx +++ b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/app.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as ReactDOM from 'react-dom'; import * as React from 'react'; diff --git a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/deps.tsx b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/deps.tsx index 34677930..85e8c2a0 100644 --- a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/deps.tsx +++ b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/deps.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as React from 'react'; import { render } from 'react-dom'; diff --git a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/hello.tsx b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/hello.tsx index 59db81e8..6467261a 100644 --- a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/hello.tsx +++ b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/src/hello.tsx @@ -1,7 +1,7 @@ // A '.tsx' file enables JSX support in the TypeScript compiler, // for more information see the following page on the TypeScript wiki: // https://github.com/Microsoft/TypeScript/wiki/JSX -/// +/// import * as React from 'react'; import * as ReactDOM from 'react-dom'; diff --git a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/typings.json b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/typings.json index 832a207a..a65a9059 100644 --- a/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/typings.json +++ b/src/ServiceStackVS/ProjectTemplates/TypeScriptReact/Host/typings.json @@ -1,5 +1,5 @@ { - "ambientDependencies": { + "globalDependencies": { "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c", "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8", "react": "github:DefinitelyTyped/DefinitelyTyped/react/react.d.ts#f407264835650f5f38d4bb2c515a79e7a835916b", From ef31f84dec02c132fb8ed7871b0e1a62e1caca64 Mon Sep 17 00:00:00 2001 From: Darren Reid Date: Tue, 14 Jun 2016 22:39:58 +1000 Subject: [PATCH 2/2] Bump version Still issues with resolving aurelia internal deps on build... --- src/ServiceStackVS/source.extension.vsixmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceStackVS/source.extension.vsixmanifest b/src/ServiceStackVS/source.extension.vsixmanifest index c81e0845..dcec128b 100644 --- a/src/ServiceStackVS/source.extension.vsixmanifest +++ b/src/ServiceStackVS/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + ServiceStackVS Templates and tools for use with the ServiceStack framework. https://github.com/ServiceStack/ServiceStackVS