Skip to content

Switch Jade to Pug in Express Templates #1275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 13, 2016
Merged

Switch Jade to Pug in Express Templates #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0895fb
Switch Jade to Pug in Express Templates
mjbvz Sep 12, 2016
ad9cf3b
Rename new jade file template to pug
mjbvz Sep 12, 2016
d0fecaf
Merge branch 'master' into switch-jade-to-pug-in-templates
mjbvz Sep 12, 2016
01f8df4
Rename jade token test files to pug tokens
mjbvz Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...dejs/FileTemplates/NewItem/EmptyJade.jade → ...Nodejs/FileTemplates/NewItem/EmptyPug.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ EmptyTs.ts|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3017|200|#3018|{2ffe45c4-5c73
EmptyHtml.html|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3032|400|#3033|0|#415|0|#3034
EmptyCss.css|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3029|410|#3030|0|#414|0|#3031
EmptyJson.json|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3023|420|#3024|0|0|0|#3025
EmptyJade.jade|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3020|430|#3021|0|#417|0|#3022
EmptyPug.pug|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3020|430|#3021|0|#417|0|#3022
EmptyLess.less|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3038|450|#3039|0|0|0|#3040
EmptyXml.xml|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3035|490|#3036|0|#416|0|#3037
TextFile.txt|{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}|#13411|500|#13412|0|#6810|0|#13413
26 changes: 13 additions & 13 deletions Nodejs/Product/Nodejs/Nodejs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,8 @@
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\ChangeConfig.ps1" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\download.ps1" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\iisnode.yml" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\index.jade" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\layout.jade" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\index.pug" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\layout.pug" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\node.cmd" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\package.json" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureExpressWebRole\README.md" />
Expand All @@ -747,15 +747,15 @@
<ZipProject Include="ProjectTemplates\TypeScriptAzureWebRole\TypeScriptWebApp.njsproj" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureWebRole\Web.config" />
<ZipProject Include="ProjectTemplates\TypeScriptAzureWebRole\Web.Debug.config" />
<ZipProject Include="ProjectTemplates\Express4App\index.jade" />
<ZipProject Include="ProjectTemplates\Express4App\layout.jade" />
<ZipProject Include="ProjectTemplates\Express4App\index.pug" />
<ZipProject Include="ProjectTemplates\Express4App\layout.pug" />
<ZipProject Include="ProjectTemplates\Express4App\package.json" />
<ZipProject Include="ProjectTemplates\Express4App\README.md" />
<ZipProject Include="ProjectTemplates\Express4App\main.css" />
<ZipProject Include="ProjectTemplates\Express4App\error.jade" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\error.jade" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\index.jade" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\layout.jade" />
<ZipProject Include="ProjectTemplates\Express4App\error.pug" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\error.pug" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\index.pug" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\layout.pug" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\package.json" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\README.md" />
<ZipProject Include="ProjectTemplates\AzureExpress4App\main.css" />
Expand Down Expand Up @@ -1014,12 +1014,12 @@
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\ExpressApp.njsproj">
<SubType>Designer</SubType>
</TypeScriptProject>
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.jade" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\layout.jade" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.pug" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\layout.pug" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\package.json" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\README.md" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\main.css" />
<Content Include="FileTemplates\NewItem\EmptyJade.jade">
<Content Include="FileTemplates\NewItem\EmptyPug.pug">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -1054,8 +1054,8 @@
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\TypeScriptExpressApp.njsproj">
<SubType>Designer</SubType>
</TypeScriptProject>
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.jade" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\layout.jade" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.pug" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\layout.pug" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\package.json" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\README.md" />
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\main.css" />
Expand Down
6 changes: 3 additions & 3 deletions Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.njsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<Content Include="public\stylesheets\main.css" />
<Content Include="README.md" />
<Content Include="typings.json" />
<Content Include="views\index.jade" />
<Content Include="views\layout.jade" />
<Content Include="views\error.jade" />
<Content Include="views\index.pug" />
<Content Include="views\layout.pug" />
<Content Include="views\error.pug" />
</ItemGroup>
<ItemGroup>
<Folder Include="public\" />
Expand Down
6 changes: 3 additions & 3 deletions Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<ProjectItem>users.js</ProjectItem>
</Folder>
<Folder Name="views">
<ProjectItem>index.jade</ProjectItem>
<ProjectItem>layout.jade</ProjectItem>
<ProjectItem>error.jade</ProjectItem>
<ProjectItem>index.pug</ProjectItem>
<ProjectItem>layout.pug</ProjectItem>
<ProjectItem>error.pug</ProjectItem>
</Folder>
<Folder Name="bin">
<ProjectItem ReplaceParameters="true">www</ProjectItem>
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<modules runAllManagedModulesForAllRequests="false" />

<!-- Web.Debug.config adds attributes to this to enable remote debugging when publishing in Debug configuration. -->
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"/>
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"/>

<!-- Remote debugging (Azure Website with git deploy): Comment out iisnode above, and uncomment iisnode below. -->
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"
loggingEnabled="true"
devErrorsEnabled="true"
nodeProcessCommandLine="node.exe &#45;&#45;debug"/>-->
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');

// uncomment after placing your favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
Expand Down
0 ...jectTemplates/AzureExpress4App/error.jade → ...ojectTemplates/AzureExpress4App/error.pug
View file
Open in desktop
File renamed without changes.
0 ...jectTemplates/AzureExpress4App/index.jade → ...ojectTemplates/AzureExpress4App/index.pug
View file
Open in desktop
File renamed without changes.
0 ...ectTemplates/AzureExpress4App/layout.jade → ...jectTemplates/AzureExpress4App/layout.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"morgan": "~1.3.0",
"serve-favicon": "~2.1.3",
"debug": "~2.0.0",
"jade": "~1.6.0"
"pug": "~2.0.0-beta6"
}
}
1 change: 0 additions & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"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",
"jade": "registry:dt/jade#0.0.0+20160316155526",
"mime": "registry:dt/mime#0.0.0+20160316155526",
Copy link
Contributor Author

@mjbvz mjbvz Sep 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed because the pug type definitions only exist in the npm registry, not in dt. Multiple registries (and ones that are not --global) are not something our super simplified typings acquisition system can handle. VS15 should handle typings better.

For the majority of use cases, users are not invoking pug directly but just using it through express.

"morgan": "registry:dt/morgan#1.7.0+20160524142355",
"serve-favicon": "registry:dt/serve-favicon#0.0.0+20160316155526",
Expand Down
6 changes: 3 additions & 3 deletions Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.njsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<Content Include="public\stylesheets\main.css" />
<Content Include="README.md" />
<Content Include="typings.json" />
<Content Include="views\index.jade" />
<Content Include="views\layout.jade" />
<Content Include="views\error.jade" />
<Content Include="views\index.pug" />
<Content Include="views\layout.pug" />
<Content Include="views\error.pug" />
</ItemGroup>
<ItemGroup>
<Folder Include="public\" />
Expand Down
6 changes: 3 additions & 3 deletions Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<ProjectItem>users.js</ProjectItem>
</Folder>
<Folder Name="views">
<ProjectItem>index.jade</ProjectItem>
<ProjectItem>layout.jade</ProjectItem>
<ProjectItem>error.jade</ProjectItem>
<ProjectItem>index.pug</ProjectItem>
<ProjectItem>layout.pug</ProjectItem>
<ProjectItem>error.pug</ProjectItem>
</Folder>
<Folder Name="bin">
<ProjectItem ReplaceParameters="true">www</ProjectItem>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');

// uncomment after placing your favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
Expand Down
0 ...s/ProjectTemplates/Express4App/error.jade → ...js/ProjectTemplates/Express4App/error.pug
View file
Open in desktop
File renamed without changes.
0 ...s/ProjectTemplates/Express4App/index.jade → ...js/ProjectTemplates/Express4App/index.pug
View file
Open in desktop
File renamed without changes.
0 .../ProjectTemplates/Express4App/layout.jade → ...s/ProjectTemplates/Express4App/layout.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/Express4App/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"morgan": "~1.3.0",
"serve-favicon": "~2.1.3",
"debug": "~2.0.0",
"jade": "~1.6.0"
"pug": "~2.0.0-beta6"
}
}
1 change: 0 additions & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"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",
"jade": "registry:dt/jade#0.0.0+20160316155526",
"mime": "registry:dt/mime#0.0.0+20160316155526",
"morgan": "registry:dt/morgan#1.7.0+20160524142355",
"serve-favicon": "registry:dt/serve-favicon#0.0.0+20160316155526",
Expand Down
4 changes: 2 additions & 2 deletions ...js/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<Content Include="package.json" />
<Content Include="public\stylesheets\main.css" />
<Content Include="README.md" />
<Content Include="views\index.jade" />
<Content Include="views\layout.jade" />
<Content Include="views\index.pug" />
<Content Include="views\layout.pug" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config" />
<Content Include="bin\ChangeConfig.ps1" />
Expand Down
4 changes: 2 additions & 2 deletions ...Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<ProjectItem>user.ts</ProjectItem>
</Folder>
<Folder Name="views">
<ProjectItem>index.jade</ProjectItem>
<ProjectItem>layout.jade</ProjectItem>
<ProjectItem>index.pug</ProjectItem>
<ProjectItem>layout.pug</ProjectItem>
</Folder>
<Folder Name="Scripts">
<Folder Name="typings">
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<modules runAllManagedModulesForAllRequests="false" />

<!-- Web.Debug.config adds attributes to this to enable remote debugging when publishing in Debug configuration. -->
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"/>
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"/>

<!-- Remote debugging (Azure Website with git deploy): Comment out iisnode above, and uncomment iisnode below. -->
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"
loggingEnabled="true"
devErrorsEnabled="true"
nodeProcessCommandLine="node.exe &#45;&#45;debug"/>-->
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var app = express();
// all environments
app.set('port', process.env.PORT || 3000);
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');
app.use(express.favicon());
app.use(express.logger('dev'));
app.use(express.json());
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/express.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ declare module "express" {
*
* By default will `require()` the engine based on the
* file extension. For example if you try to render
* a "foo.jade" file Express will invoke the following internally:
* a "foo.pug" file Express will invoke the following internally:
*
* app.engine('jade', require('jade').__express);
*
Expand Down
0 ...ates/TypeScriptAzureExpressApp/index.jade → ...lates/TypeScriptAzureExpressApp/index.pug
View file
Open in desktop
File renamed without changes.
0 ...tes/TypeScriptAzureExpressApp/layout.jade → ...ates/TypeScriptAzureExpressApp/layout.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"dependencies": {
"express": "3.4.4",
"jade": "*"
"pug": "~2.0.0-beta6"
}
}
4 changes: 2 additions & 2 deletions ...roduct/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.njsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<Content Include="package.json" />
<Content Include="public\stylesheets\main.css" />
<Content Include="README.md" />
<Content Include="views\index.jade" />
<Content Include="views\layout.jade" />
<Content Include="views\index.pug" />
<Content Include="views\layout.pug" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config" />
<Content Include="bin\ChangeConfig.ps1" />
Expand Down
4 changes: 2 additions & 2 deletions ...uct/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<ProjectItem>user.ts</ProjectItem>
</Folder>
<Folder Name="views">
<ProjectItem>index.jade</ProjectItem>
<ProjectItem>layout.jade</ProjectItem>
<ProjectItem>index.pug</ProjectItem>
<ProjectItem>layout.pug</ProjectItem>
</Folder>
<Folder Name="Scripts">
<Folder Name="typings">
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<modules runAllManagedModulesForAllRequests="false" />

<!-- Web.Debug.config adds attributes to this to enable remote debugging when publishing in Debug configuration. -->
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"/>
<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"/>

<!-- Remote debugging (Azure Website with git deploy): Comment out iisnode above, and uncomment iisnode below. -->
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.jade"
<!--<iisnode watchedFiles="web.config;*.js;routes\*.js;views\*.pug"
loggingEnabled="true"
devErrorsEnabled="true"
nodeProcessCommandLine="node.exe &#45;&#45;debug"/>-->
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var app = express();
// all environments
app.set('port', process.env.PORT || 3000);
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');
app.use(express.favicon());
app.use(express.logger('dev'));
app.use(express.json());
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/express.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ declare module "express" {
*
* By default will `require()` the engine based on the
* file extension. For example if you try to render
* a "foo.jade" file Express will invoke the following internally:
* a "foo.pug" file Express will invoke the following internally:
*
* app.engine('jade', require('jade').__express);
*
Expand Down
0 .../TypeScriptAzureExpressWebRole/index.jade → ...s/TypeScriptAzureExpressWebRole/index.pug
View file
Open in desktop
File renamed without changes.
0 ...TypeScriptAzureExpressWebRole/layout.jade → .../TypeScriptAzureExpressWebRole/layout.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"dependencies": {
"express": "3.4.4",
"jade": "*"
"pug": "~2.0.0-beta6"
}
}
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<Content Include="package.json" />
<Content Include="public\stylesheets\main.css" />
<Content Include="README.md" />
<Content Include="views\index.jade" />
<Content Include="views\layout.jade" />
<Content Include="views\index.pug" />
<Content Include="views\layout.pug" />
</ItemGroup>
<ItemGroup>
<Folder Include="public\" />
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<ProjectItem>user.ts</ProjectItem>
</Folder>
<Folder Name="views">
<ProjectItem>index.jade</ProjectItem>
<ProjectItem>layout.jade</ProjectItem>
<ProjectItem>index.pug</ProjectItem>
<ProjectItem>layout.pug</ProjectItem>
</Folder>
<Folder Name="Scripts">
<Folder Name="typings">
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var app = express();
// all environments
app.set('port', process.env.PORT || 3000);
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');
app.use(express.favicon());
app.use(express.logger('dev'));
app.use(express.json());
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/express.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ declare module "express" {
*
* By default will `require()` the engine based on the
* file extension. For example if you try to render
* a "foo.jade" file Express will invoke the following internally:
* a "foo.pug" file Express will invoke the following internally:
*
* app.engine('jade', require('jade').__express);
*
Expand Down
0 ...Templates/TypeScriptExpressApp/index.jade → ...tTemplates/TypeScriptExpressApp/index.pug
View file
Open in desktop
File renamed without changes.
0 ...emplates/TypeScriptExpressApp/layout.jade → ...Templates/TypeScriptExpressApp/layout.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"dependencies": {
"express": "3.4.4",
"jade": "*"
"pug": "~2.0.0-beta6"
}
}
10 changes: 5 additions & 5 deletions Nodejs/Product/Nodejs/VSPackage.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@
<value>TypeScript</value>
</data>
<data name="3020" xml:space="preserve">
<value>Jade file</value>
<value>Pug file</value>
</data>
<data name="3021" xml:space="preserve">
<value>An empty Jade file</value>
<value>An empty Pug file</value>
</data>
<data name="3022" xml:space="preserve">
<value>Jade</value>
<value>Pug</value>
</data>
<data name="3023" xml:space="preserve">
<value>JSON file</value>
Expand Down Expand Up @@ -232,7 +232,7 @@
<value>Stylesheet</value>
</data>
<data name="3041" xml:space="preserve">
<value>Jade</value>
<value>Pug</value>
</data>
<data name="3042" xml:space="preserve">
<value>Spacing</value>
Expand All @@ -244,7 +244,7 @@
<value>General</value>
</data>
<data name="3045" xml:space="preserve">
<value>Jade Editor</value>
<value>Pug Editor</value>
</data>
<data name="3046" xml:space="preserve">
<value>A basic TypeScript UnitTest file</value>
Expand Down
Loading