Merge pull request #1566 from paulvanbrenk/expressTemplate

Express template
microsoft · May 9, 2017 · 8202572 · 8202572
2 parents 7f48ae7 + 52f001b
commit 8202572
Show file tree

Hide file tree

Showing 17 changed files with 131 additions and 29 deletions.
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -1060,12 +1060,14 @@
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\serve-static.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\typings.json" />
-    <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mine.typings.json" />
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mime.typings.json" />
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express-serve-static-core.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\serve-static.typings.json" />
-    <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mine.typings.json" />
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mime.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\typings.json" />
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.typings.json" />
     <ZipItem Include="Templates\Files\EmptyJson\EmptyJson.json" />
     <ZipItem Include="Templates\Files\EmptyLess\EmptyLess.less" />
     <ZipItem Include="Templates\Files\EmptyPug\EmptyPug.pug" />
@@ -1470,6 +1472,10 @@
   <ItemGroup>
     <ZipItem Include="Templates\Files\EmptyTs\EmptyTs.ts" />
   </ItemGroup>
+  <ItemGroup>
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.d.ts" />
+    <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.d.ts" />
+  </ItemGroup>
   <PropertyGroup>
     <!--
     To specify a different registry root to register your package, uncomment the TargetRegistryRoot

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate
@@ -1,7 +1,7 @@
 <VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
     <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3065"/>
-    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3066"/>
     <ProjectType>JavaScript</ProjectType>
     <TemplateGroupID>CloudServiceProject</TemplateGroupID>
     <TemplateID>Microsoft.CloudServiceProject.CloudService_js</TemplateID>

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate
@@ -1,6 +1,6 @@
 <VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3066"/>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
     <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3068"/>
     <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="406"/>
     <ProjectType>JavaScript</ProjectType>

diff --git a/...js/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj b/...js/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj
@@ -33,6 +33,7 @@
     <TypeScriptCompile Include="app.ts" />
     <TypeScriptCompile Include="routes\index.ts" />
     <TypeScriptCompile Include="routes\user.ts" />
+    <TypeScriptCompile Include="typings\globals\debug\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\express\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\express-serve-static-core\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\mime\index.d.ts" />

diff --git a/...Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate b/...Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate
@@ -43,12 +43,16 @@
           </Folder>
           <Folder Name="mime">
             <ProjectItem TargetFileName="index.d.ts">mime.d.ts</ProjectItem>
-            <ProjectItem TargetFileName="typings.json">mine.typings.json</ProjectItem>
+            <ProjectItem TargetFileName="typings.json">mime.typings.json</ProjectItem>
           </Folder>
           <Folder Name="serve-static">
             <ProjectItem TargetFileName="index.d.ts">serve-static.d.ts</ProjectItem>
             <ProjectItem TargetFileName="typings.json">serve-static.typings.json</ProjectItem>
           </Folder>
+          <Folder Name="debug">
+            <ProjectItem TargetFileName="index.d.ts">debug.d.ts</ProjectItem>
+            <ProjectItem TargetFileName="typings.json">debug.typings.json</ProjectItem>
+          </Folder>
         </Folder>
       </Folder>
       <ProjectItem OpenInEditor="true">app.ts</ProjectItem>

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.d.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.d.ts
@@ -0,0 +1,35 @@
+// Generated by typings
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts
+declare var debug: debug.IDebug;
+
+// Support AMD require
+declare module 'debug' {
+    export = debug;
+}
+
+declare namespace debug {
+    export interface IDebug {
+        (namespace: string): debug.IDebugger,
+        coerce: (val: any) => any,
+        disable: () => void,
+        enable: (namespaces: string) => void,
+        enabled: (namespaces: string) => boolean,
+
+        names: string[],
+        skips: string[],
+
+        formatters: IFormatters
+    }
+
+    export interface IFormatters {
+        [formatter: string]: Function
+    }
+
+    export interface IDebugger {
+        (formatter: any, ...args: any[]): void;
+
+        enabled: boolean;
+        log: Function;
+        namespace: string;
+    }
+}
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.typings.json
@@ -0,0 +1,8 @@
+{
+  "resolution": "main",
+  "tree": {
+    "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts",
+    "raw": "registry:dt/debug#0.0.0+20160317120654",
+    "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts"
+  }
+}
diff --git a/...peScriptAzureExpressApp/mine.typings.json → ...peScriptAzureExpressApp/mime.typings.json b/...peScriptAzureExpressApp/mine.typings.json → ...peScriptAzureExpressApp/mime.typings.json
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json
@@ -1,8 +1,8 @@
 {
-  "dependencies": {},
   "globalDependencies": {
-    "express": "registry:dt/express#4.0.0+20160708185218",
-    "express-serve-static-core": "registry:dt/express-serve-static-core#4.0.0+20160829034835",
+    "debug": "registry:dt/debug#0.0.0+20160317120654",
+    "express": "registry:dt/express#4.0.0+20160317120654",
+    "express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160602151406",
     "mime": "registry:dt/mime#0.0.0+20160316155526",
     "serve-static": "registry:dt/serve-static#0.0.0+20160606155157"
   }

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate
@@ -1,6 +1,6 @@
 <VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3080"/>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3081"/>
     <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3082"/>
     <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="410"/>
     <ProjectType>TypeScript</ProjectType>

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj
@@ -33,6 +33,7 @@
     <TypeScriptCompile Include="app.ts" />
     <TypeScriptCompile Include="routes\index.ts" />
     <TypeScriptCompile Include="routes\user.ts" />
+    <TypeScriptCompile Include="typings\globals\debug\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\express\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\express-serve-static-core\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\mime\index.d.ts" />

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate
@@ -43,12 +43,16 @@
           </Folder>
           <Folder Name="mime">
             <ProjectItem TargetFileName="index.d.ts">mime.d.ts</ProjectItem>
-            <ProjectItem TargetFileName="typings.json">mine.typings.json</ProjectItem>
+            <ProjectItem TargetFileName="typings.json">mime.typings.json</ProjectItem>
           </Folder>
           <Folder Name="serve-static">
             <ProjectItem TargetFileName="index.d.ts">serve-static.d.ts</ProjectItem>
             <ProjectItem TargetFileName="typings.json">serve-static.typings.json</ProjectItem>
           </Folder>
+          <Folder Name="debug">
+            <ProjectItem TargetFileName="index.d.ts">debug.d.ts</ProjectItem>
+            <ProjectItem TargetFileName="typings.json">debug.typings.json</ProjectItem>
+          </Folder>
         </Folder>
       </Folder>
       <ProjectItem OpenInEditor="true">app.ts</ProjectItem>

diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.d.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.d.ts
@@ -0,0 +1,35 @@
+// Generated by typings
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts
+declare var debug: debug.IDebug;
+
+// Support AMD require
+declare module 'debug' {
+    export = debug;
+}
+
+declare namespace debug {
+    export interface IDebug {
+        (namespace: string): debug.IDebugger,
+        coerce: (val: any) => any,
+        disable: () => void,
+        enable: (namespaces: string) => void,
+        enabled: (namespaces: string) => boolean,
+
+        names: string[],
+        skips: string[],
+
+        formatters: IFormatters
+    }
+
+    export interface IFormatters {
+        [formatter: string]: Function
+    }
+
+    export interface IDebugger {
+        (formatter: any, ...args: any[]): void;
+
+        enabled: boolean;
+        log: Function;
+        namespace: string;
+    }
+}
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.typings.json
@@ -0,0 +1,8 @@
+{
+  "resolution": "main",
+  "tree": {
+    "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts",
+    "raw": "registry:dt/debug#0.0.0+20160317120654",
+    "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts"
+  }
+}
diff --git a/...es/TypeScriptExpressApp/mine.typings.json → ...es/TypeScriptExpressApp/mime.typings.json b/...es/TypeScriptExpressApp/mine.typings.json → ...es/TypeScriptExpressApp/mime.typings.json
diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json
@@ -1,8 +1,8 @@
 {
-  "dependencies": {},
   "globalDependencies": {
-    "express": "registry:dt/express#4.0.0+20160708185218",
-    "express-serve-static-core": "registry:dt/express-serve-static-core#4.0.0+20160829034835",
+    "debug": "registry:dt/debug#0.0.0+20160317120654",
+    "express": "registry:dt/express#4.0.0+20160317120654",
+    "express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160602151406",
     "mime": "registry:dt/mime#0.0.0+20160316155526",
     "serve-static": "registry:dt/serve-static#0.0.0+20160606155157"
   }

diff --git a/Nodejs/Product/Nodejs/VSPackage.resx b/Nodejs/Product/Nodejs/VSPackage.resx
@@ -280,19 +280,19 @@
     <value>A TypeScript Tape UnitTest file</value>
   </data>
   <data name="3059" xml:space="preserve">
-    <value>Basic Azure Node.js Express 4 Application</value>
+    <value>Node.js Express 4 Application for Microsoft Azure</value>
   </data>
   <data name="3060" xml:space="preserve">
-    <value>A basic Node.js Express 4 application for Microsoft Azure.</value>
+    <value>A Node.js Express 4 application for Microsoft Azure.</value>
   </data>
   <data name="3061" xml:space="preserve">
-    <value>Blank Azure Node.js Web Application</value>
+    <value>Node.js Web Application for Microsoft Azure</value>
   </data>
   <data name="3062" xml:space="preserve">
     <value>An empty Node.js application for Microsoft Azure.</value>
   </data>
   <data name="3063" xml:space="preserve">
-    <value>Blank Azure Node.js Worker Role</value>
+    <value>Node.js Worker Role for Microsoft Azure</value>
   </data>
   <data name="3064" xml:space="preserve">
     <value>An empty Node.js worker role for Microsoft Azure.</value>
@@ -304,7 +304,7 @@
     <value>A project for creating a scalable service that runs on Microsoft Azure.</value>
   </data>
   <data name="3067" xml:space="preserve">
-    <value>Basic Node.js Express 4 Application.</value>
+    <value>Node.js Express 4 Application</value>
   </data>
   <data name="3068" xml:space="preserve">
     <value>A basic Node.js Express 4 application.</value>
@@ -316,55 +316,55 @@
     <value>Creates a new Node.js project from existing code.</value>
   </data>
   <data name="3071" xml:space="preserve">
-    <value>Blank Node.js Console Application</value>
+    <value>Node.js Console Application</value>
   </data>
   <data name="3072" xml:space="preserve">
     <value>An empty Node.js application.</value>
   </data>
   <data name="3073" xml:space="preserve">
-    <value>Blank Node.js Web Application</value>
+    <value>Node.js Web Application</value>
   </data>
   <data name="3074" xml:space="preserve">
     <value>An empty Node.js Web application.</value>
   </data>
   <data name="3075" xml:space="preserve">
-    <value>Basic Azure Node.js Express 4 Application</value>
+    <value>Node.js Express 4 Application for Microsoft Azure</value>
   </data>
   <data name="3076" xml:space="preserve">
     <value>A basic Node.js Express 4 application for Microsoft Azure.</value>
   </data>
   <data name="3077" xml:space="preserve">
-    <value>Blank Azure Node.js Worker Role</value>
+    <value>Node.js Worker Role for Microsoft Azure</value>
   </data>
   <data name="3078" xml:space="preserve">
     <value>An empty Node.js worker role for Microsoft Azure.</value>
   </data>
   <data name="3079" xml:space="preserve">
-    <value>Blank Azure Node.js Worker Role</value>
+    <value>Azure Node.js Worker Role</value>
   </data>
   <data name="3080" xml:space="preserve">
     <value>An empty Node.js worker role for Microsoft Azure.</value>
   </data>
   <data name="3081" xml:space="preserve">
-    <value>Blank Azure Node.js Web Application</value>
+    <value>Node.js Web Application for Microsoft Azure</value>
   </data>
   <data name="3082" xml:space="preserve">
     <value>An empty Node.js application for Microsoft Azure.</value>
   </data>
   <data name="3083" xml:space="preserve">
-    <value>Blank Azure Node.js Web Application</value>
+    <value>Node.js Web Application for Microsoft Azure</value>
   </data>
   <data name="3084" xml:space="preserve">
-    <value>An empty Node.js application for Microsoft Azure.</value>
+    <value>An empty Node.js web application for Microsoft Azure.</value>
   </data>
   <data name="3085" xml:space="preserve">
-    <value>Blank Node.js Console Application</value>
+    <value>Node.js Console Application</value>
   </data>
   <data name="3086" xml:space="preserve">
     <value>An empty Node.js application.</value>
   </data>
   <data name="3087" xml:space="preserve">
-    <value>Basic Node.js Express 4 Application</value>
+    <value>Node.js Express 4 Application</value>
   </data>
   <data name="3088" xml:space="preserve">
     <value>A basic Node.js Express 4 application.</value>
@@ -376,7 +376,7 @@
     <value>Creates a new Node.js project from existing code.</value>
   </data>
   <data name="3091" xml:space="preserve">
-    <value>Blank Node.js Web Application</value>
+    <value>Node.js Web Application</value>
   </data>
   <data name="3092" xml:space="preserve">
     <value>An empty Node.js application.</value>