Skip to content

Commit 2e11d2f

Browse files
author
Paul van Brenk
committed
Merge branch 'master' into future
# Conflicts: # Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest # Nodejs/Product/Nodejs/VSPackage.resx # Nodejs/Product/Nodejs/source.extension.vsixmanifest # Nodejs/Product/Npm/IPackageCatalog.cs # Nodejs/Product/Profiling/source.extension.vsixmanifest
2 parents b659776 + 47323a2 commit 2e11d2f

16 files changed

Lines changed: 116 additions & 14 deletions

File tree

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,12 +835,14 @@
835835
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express.typings.json" />
836836
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\serve-static.typings.json" />
837837
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\typings.json" />
838-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mine.typings.json" />
838+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mime.typings.json" />
839+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.typings.json" />
839840
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express-serve-static-core.typings.json" />
840841
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express.typings.json" />
841842
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\serve-static.typings.json" />
842-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mine.typings.json" />
843+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mime.typings.json" />
843844
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\typings.json" />
845+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.typings.json" />
844846
<ZipItem Include="Templates\Files\EmptyJson\EmptyJson.json" />
845847
<ZipItem Include="Templates\Files\EmptyLess\EmptyLess.less" />
846848
<ZipItem Include="Templates\Files\EmptyPug\EmptyPug.pug" />
@@ -1243,6 +1245,10 @@
12431245
<ItemGroup>
12441246
<ZipItem Include="Templates\Files\EmptyTs\EmptyTs.ts" />
12451247
</ItemGroup>
1248+
<ItemGroup>
1249+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.d.ts" />
1250+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.d.ts" />
1251+
</ItemGroup>
12461252
<PropertyGroup>
12471253
<!--
12481254
To specify a different registry root to register your package, uncomment the TargetRegistryRoot

‎Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
33
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3065"/>
4-
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
4+
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3066"/>
55
<ProjectType>JavaScript</ProjectType>
66
<TemplateGroupID>CloudServiceProject</TemplateGroupID>
77
<TemplateID>Microsoft.CloudServiceProject.CloudService_js</TemplateID>
@@ -27,4 +27,4 @@
2727
<Assembly>Microsoft.NodejsTools.ProjectWizard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
2828
<FullClassName>Microsoft.NodejsTools.ProjectWizard.CloudServiceWizard</FullClassName>
2929
</WizardExtension>
30-
</VSTemplate>
30+
</VSTemplate>

‎Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3066"/>
3+
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
44
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3068"/>
55
<Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="406"/>
66
<ProjectType>JavaScript</ProjectType>

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<TypeScriptCompile Include="app.ts" />
3434
<TypeScriptCompile Include="routes\index.ts" />
3535
<TypeScriptCompile Include="routes\user.ts" />
36+
<TypeScriptCompile Include="typings\globals\debug\index.d.ts" />
3637
<TypeScriptCompile Include="typings\globals\express\index.d.ts" />
3738
<TypeScriptCompile Include="typings\globals\express-serve-static-core\index.d.ts" />
3839
<TypeScriptCompile Include="typings\globals\mime\index.d.ts" />

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,16 @@
4343
</Folder>
4444
<Folder Name="mime">
4545
<ProjectItem TargetFileName="index.d.ts">mime.d.ts</ProjectItem>
46-
<ProjectItem TargetFileName="typings.json">mine.typings.json</ProjectItem>
46+
<ProjectItem TargetFileName="typings.json">mime.typings.json</ProjectItem>
4747
</Folder>
4848
<Folder Name="serve-static">
4949
<ProjectItem TargetFileName="index.d.ts">serve-static.d.ts</ProjectItem>
5050
<ProjectItem TargetFileName="typings.json">serve-static.typings.json</ProjectItem>
5151
</Folder>
52+
<Folder Name="debug">
53+
<ProjectItem TargetFileName="index.d.ts">debug.d.ts</ProjectItem>
54+
<ProjectItem TargetFileName="typings.json">debug.typings.json</ProjectItem>
55+
</Folder>
5256
</Folder>
5357
</Folder>
5458
<ProjectItem OpenInEditor="true">app.ts</ProjectItem>

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.d.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Generated by typings
2+
// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts
3+
declare var debug: debug.IDebug;
4+
5+
// Support AMD require
6+
declare module 'debug' {
7+
export = debug;
8+
}
9+
10+
declare namespace debug {
11+
export interface IDebug {
12+
(namespace: string): debug.IDebugger,
13+
coerce: (val: any) => any,
14+
disable: () => void,
15+
enable: (namespaces: string) => void,
16+
enabled: (namespaces: string) => boolean,
17+
18+
names: string[],
19+
skips: string[],
20+
21+
formatters: IFormatters
22+
}
23+
24+
export interface IFormatters {
25+
[formatter: string]: Function
26+
}
27+
28+
export interface IDebugger {
29+
(formatter: any, ...args: any[]): void;
30+
31+
enabled: boolean;
32+
log: Function;
33+
namespace: string;
34+
}
35+
}

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.typings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"resolution": "main",
3+
"tree": {
4+
"src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts",
5+
"raw": "registry:dt/debug#0.0.0+20160317120654",
6+
"typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts"
7+
}
8+
}

Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/mine.typings.json renamed to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/mime.typings.json

File renamed without changes.

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"dependencies": {},
32
"globalDependencies": {
4-
"express": "registry:dt/express#4.0.0+20160708185218",
5-
"express-serve-static-core": "registry:dt/express-serve-static-core#4.0.0+20160829034835",
3+
"debug": "registry:dt/debug#0.0.0+20160317120654",
4+
"express": "registry:dt/express#4.0.0+20160317120654",
5+
"express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160602151406",
66
"mime": "registry:dt/mime#0.0.0+20160316155526",
77
"serve-static": "registry:dt/serve-static#0.0.0+20160606155157"
88
}

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3080"/>
3+
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3081"/>
44
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3082"/>
55
<Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="410"/>
66
<ProjectType>TypeScript</ProjectType>

0 commit comments

Comments
 (0)