diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJade.jade b/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyPug.pug similarity index 100% rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJade.jade rename to Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyPug.pug diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir b/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir index 20fe6ec16..7fb8c8333 100644 --- a/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir +++ b/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir @@ -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 diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj index 4d15aea05..c500ff08b 100644 --- a/Nodejs/Product/Nodejs/Nodejs.csproj +++ b/Nodejs/Product/Nodejs/Nodejs.csproj @@ -721,8 +721,8 @@ - - + + @@ -747,15 +747,15 @@ - - + + - - - - + + + + @@ -1014,12 +1014,12 @@ Designer - - + + - + true PreserveNewest @@ -1054,8 +1054,8 @@ Designer - - + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.njsproj index a8ad4439b..9884aef24 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.njsproj +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.njsproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate index 9a45f3df6..7dd66ece6 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate @@ -27,9 +27,9 @@ users.js - index.jade - layout.jade - error.jade + index.pug + layout.pug + error.pug www diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/Web.config b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/Web.config index a637ec361..6d3bd5e81 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/Web.config +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/Web.config @@ -22,10 +22,10 @@ - + - diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/app.js b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/app.js index 51427f4a1..27a2fa3a7 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/app.js +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/app.js @@ -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')); diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/error.jade b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/error.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/error.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/error.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/index.jade b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/index.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/index.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/index.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/layout.jade b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/layout.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/layout.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/package.json index 107c380d5..b36985b7a 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/package.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/package.json @@ -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" } } diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json index 9f690eea9..6e9ee37dc 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json @@ -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", diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.njsproj index 7b432d87b..3e0d8a1b8 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.njsproj +++ b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.njsproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate index 76dee2b8e..37de9f5bf 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate @@ -27,9 +27,9 @@ users.js - index.jade - layout.jade - error.jade + index.pug + layout.pug + error.pug www diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js index 51427f4a1..27a2fa3a7 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js +++ b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js @@ -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')); diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/error.jade b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/error.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/Express4App/error.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/Express4App/error.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/index.jade b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/index.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/Express4App/index.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/Express4App/index.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/layout.jade b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/layout.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/Express4App/layout.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/Express4App/layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/package.json index 107c380d5..b36985b7a 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/package.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/package.json @@ -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" } } diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json index 9f690eea9..6e9ee37dc 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json @@ -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", diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj index 0452fd1c2..438a3806b 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj @@ -38,8 +38,8 @@ - - + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate index c5fb900fe..8389477e3 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate @@ -27,8 +27,8 @@ user.ts - index.jade - layout.jade + index.pug + layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/Web.config b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/Web.config index 244ece53d..3ee7be425 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/Web.config +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/Web.config @@ -23,10 +23,10 @@ - + - diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts index 51418c59a..eb8971a05 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts @@ -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()); diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/express.d.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/express.d.ts index 160046435..b0c806c2a 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/express.d.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/express.d.ts @@ -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); * diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/index.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/index.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/index.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/index.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/layout.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/layout.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/layout.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json index b00693d24..59aed10e9 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json @@ -8,6 +8,6 @@ }, "dependencies": { "express": "3.4.4", - "jade": "*" + "pug": "~2.0.0-beta6" } } \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.njsproj index 0452fd1c2..438a3806b 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.njsproj +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.njsproj @@ -38,8 +38,8 @@ - - + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.vstemplate index 62f2259e5..e7ca96822 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/TypeScriptExpressApp.vstemplate @@ -28,8 +28,8 @@ user.ts - index.jade - layout.jade + index.pug + layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/Web.config b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/Web.config index 244ece53d..3ee7be425 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/Web.config +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/Web.config @@ -23,10 +23,10 @@ - + - diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/app.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/app.ts index 51418c59a..eb8971a05 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/app.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/app.ts @@ -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()); diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/express.d.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/express.d.ts index 160046435..b0c806c2a 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/express.d.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/express.d.ts @@ -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); * diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/index.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/index.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/index.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/index.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/layout.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/layout.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/layout.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/package.json index b00693d24..59aed10e9 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/package.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressWebRole/package.json @@ -8,6 +8,6 @@ }, "dependencies": { "express": "3.4.4", - "jade": "*" + "pug": "~2.0.0-beta6" } } \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj index 619aeb04d..cdac30f94 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj @@ -38,8 +38,8 @@ - - + + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate index edf2afb0d..9bc574e4f 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate @@ -27,8 +27,8 @@ user.ts - index.jade - layout.jade + index.pug + layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts index 51418c59a..eb8971a05 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts @@ -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()); diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/express.d.ts b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/express.d.ts index 160046435..b0c806c2a 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/express.d.ts +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/express.d.ts @@ -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); * diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/index.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/index.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/index.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/index.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/layout.jade b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/layout.pug similarity index 100% rename from Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/layout.jade rename to Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/layout.pug diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json index b00693d24..59aed10e9 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json +++ b/Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json @@ -8,6 +8,6 @@ }, "dependencies": { "express": "3.4.4", - "jade": "*" + "pug": "~2.0.0-beta6" } } \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/VSPackage.resx b/Nodejs/Product/Nodejs/VSPackage.resx index b1263018c..f8967f94f 100644 --- a/Nodejs/Product/Nodejs/VSPackage.resx +++ b/Nodejs/Product/Nodejs/VSPackage.resx @@ -178,13 +178,13 @@ TypeScript - Jade file + Pug file - An empty Jade file + An empty Pug file - Jade + Pug JSON file @@ -232,7 +232,7 @@ Stylesheet - Jade + Pug Spacing @@ -244,7 +244,7 @@ General - Jade Editor + Pug Editor A basic TypeScript UnitTest file diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj index f5d0a550d..1265e83c4 100644 --- a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj +++ b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj @@ -46,7 +46,7 @@ FileTemplates\NewItem\EmptyTs.ts; FileTemplates\NewItem\EmptyLess.less; FileTemplates\NewItem\EmptyJson.json; - FileTemplates\NewItem\EmptyJade.jade; + FileTemplates\NewItem\EmptyPug.pug; FileTemplates\NewItem\EmptyCss.css; FileTemplates\NewItem\EmptyHtml.html"> diff --git a/Nodejs/Tests/Core.UI/JadeUITests.cs b/Nodejs/Tests/Core.UI/JadeUITests.cs index 80d705fcc..4badcb980 100644 --- a/Nodejs/Tests/Core.UI/JadeUITests.cs +++ b/Nodejs/Tests/Core.UI/JadeUITests.cs @@ -24,8 +24,8 @@ public class JadeUITests : NodejsProjectTest { [HostType("VSTestHost")] public void InsertTabs() { using (new OptionHolder("TextEditor", "Jade", "InsertTabs", true)) { - using (var solution = Project("TabsSpaces", Content("quox.jade", "ul\r\n li A\r\n li B")).Generate().ToVs()) { - var jadeFile = solution.OpenItem("TabsSpaces", "quox.jade"); + using (var solution = Project("TabsSpaces", Content("quox.pug", "ul\r\n li A\r\n li B")).Generate().ToVs()) { + var jadeFile = solution.OpenItem("TabsSpaces", "quox.pug"); jadeFile.MoveCaret(1, 1); Keyboard.Type("\t"); Assert.AreEqual(jadeFile.Text, "\tul\r\n li A\r\n li B"); @@ -37,8 +37,8 @@ public void InsertTabs() { [HostType("VSTestHost")] public void InsertSpaces() { using (new OptionHolder("TextEditor", "Jade", "InsertTabs", false)) { - using (var solution = Project("TabsSpaces", Content("quox.jade", "ul\r\n li A\r\n li B")).Generate().ToVs()) { - var jadeFile = solution.OpenItem("TabsSpaces", "quox.jade"); + using (var solution = Project("TabsSpaces", Content("quox.pug", "ul\r\n li A\r\n li B")).Generate().ToVs()) { + var jadeFile = solution.OpenItem("TabsSpaces", "quox.pug"); jadeFile.MoveCaret(1, 1); Keyboard.Type("\t"); Assert.AreEqual(jadeFile.Text, " ul\r\n li A\r\n li B"); diff --git a/Nodejs/Tests/Core/JadeTests.cs b/Nodejs/Tests/Core/JadeTests.cs index 952aabbfb..a38249b53 100644 --- a/Nodejs/Tests/Core/JadeTests.cs +++ b/Nodejs/Tests/Core/JadeTests.cs @@ -37,117 +37,117 @@ public static void DoDeployment(TestContext context) { [TestMethod, Priority(0)] public void JadeTokenizerTest_File01() { - Tokenize("001.jade"); + Tokenize("001.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File02() { - Tokenize("002.jade"); + Tokenize("002.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File03() { - Tokenize("003.jade"); + Tokenize("003.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File04() { - Tokenize("004.jade"); + Tokenize("004.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File05() { - Tokenize("005.jade"); + Tokenize("005.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File06() { - Tokenize("006.jade"); + Tokenize("006.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File07() { - Tokenize("007.jade"); + Tokenize("007.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File08() { - Tokenize("008.jade"); + Tokenize("008.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File09() { - Tokenize("009.jade"); + Tokenize("009.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File10() { - Tokenize("010.jade"); + Tokenize("010.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File11() { - Tokenize("011.jade"); + Tokenize("011.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File12() { - Tokenize("012.jade"); + Tokenize("012.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File13() { - Tokenize("013.jade"); + Tokenize("013.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File14() { - Tokenize("014.jade"); + Tokenize("014.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File15() { - Tokenize("015.jade"); + Tokenize("015.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File16() { - Tokenize("016.jade"); + Tokenize("016.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File17() { - Tokenize("017.jade"); + Tokenize("017.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File18() { - Tokenize("018.jade"); + Tokenize("018.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File19() { - Tokenize("019.jade"); + Tokenize("019.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File20() { - Tokenize("020.jade"); + Tokenize("020.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File21() { - Tokenize("021.jade"); + Tokenize("021.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File22() { - Tokenize("022.jade"); + Tokenize("022.pug"); } [TestMethod, Priority(0)] public void JadeTokenizerTest_File23() { - Tokenize("023.jade"); + Tokenize("023.pug"); } private void Tokenize(string fileName) { diff --git a/Nodejs/Tests/TestData/Jade/001.jade b/Nodejs/Tests/TestData/Jade/001.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/001.jade rename to Nodejs/Tests/TestData/Jade/001.pug diff --git a/Nodejs/Tests/TestData/Jade/001.jade.tokens b/Nodejs/Tests/TestData/Jade/001.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/001.jade.tokens rename to Nodejs/Tests/TestData/Jade/001.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/002.jade b/Nodejs/Tests/TestData/Jade/002.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/002.jade rename to Nodejs/Tests/TestData/Jade/002.pug diff --git a/Nodejs/Tests/TestData/Jade/002.jade.tokens b/Nodejs/Tests/TestData/Jade/002.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/002.jade.tokens rename to Nodejs/Tests/TestData/Jade/002.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/003.jade b/Nodejs/Tests/TestData/Jade/003.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/003.jade rename to Nodejs/Tests/TestData/Jade/003.pug diff --git a/Nodejs/Tests/TestData/Jade/003.jade.tokens b/Nodejs/Tests/TestData/Jade/003.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/003.jade.tokens rename to Nodejs/Tests/TestData/Jade/003.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/004.jade b/Nodejs/Tests/TestData/Jade/004.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/004.jade rename to Nodejs/Tests/TestData/Jade/004.pug diff --git a/Nodejs/Tests/TestData/Jade/004.jade.tokens b/Nodejs/Tests/TestData/Jade/004.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/004.jade.tokens rename to Nodejs/Tests/TestData/Jade/004.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/005.jade b/Nodejs/Tests/TestData/Jade/005.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/005.jade rename to Nodejs/Tests/TestData/Jade/005.pug diff --git a/Nodejs/Tests/TestData/Jade/005.jade.tokens b/Nodejs/Tests/TestData/Jade/005.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/005.jade.tokens rename to Nodejs/Tests/TestData/Jade/005.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/006.jade b/Nodejs/Tests/TestData/Jade/006.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/006.jade rename to Nodejs/Tests/TestData/Jade/006.pug diff --git a/Nodejs/Tests/TestData/Jade/006.jade.tokens b/Nodejs/Tests/TestData/Jade/006.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/006.jade.tokens rename to Nodejs/Tests/TestData/Jade/006.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/007.jade b/Nodejs/Tests/TestData/Jade/007.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/007.jade rename to Nodejs/Tests/TestData/Jade/007.pug diff --git a/Nodejs/Tests/TestData/Jade/007.jade.tokens b/Nodejs/Tests/TestData/Jade/007.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/007.jade.tokens rename to Nodejs/Tests/TestData/Jade/007.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/008.jade b/Nodejs/Tests/TestData/Jade/008.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/008.jade rename to Nodejs/Tests/TestData/Jade/008.pug diff --git a/Nodejs/Tests/TestData/Jade/008.jade.tokens b/Nodejs/Tests/TestData/Jade/008.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/008.jade.tokens rename to Nodejs/Tests/TestData/Jade/008.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/009.jade b/Nodejs/Tests/TestData/Jade/009.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/009.jade rename to Nodejs/Tests/TestData/Jade/009.pug diff --git a/Nodejs/Tests/TestData/Jade/009.jade.tokens b/Nodejs/Tests/TestData/Jade/009.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/009.jade.tokens rename to Nodejs/Tests/TestData/Jade/009.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/010.jade b/Nodejs/Tests/TestData/Jade/010.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/010.jade rename to Nodejs/Tests/TestData/Jade/010.pug diff --git a/Nodejs/Tests/TestData/Jade/010.jade.tokens b/Nodejs/Tests/TestData/Jade/010.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/010.jade.tokens rename to Nodejs/Tests/TestData/Jade/010.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/011.jade b/Nodejs/Tests/TestData/Jade/011.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/011.jade rename to Nodejs/Tests/TestData/Jade/011.pug diff --git a/Nodejs/Tests/TestData/Jade/011.jade.tokens b/Nodejs/Tests/TestData/Jade/011.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/011.jade.tokens rename to Nodejs/Tests/TestData/Jade/011.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/012.jade b/Nodejs/Tests/TestData/Jade/012.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/012.jade rename to Nodejs/Tests/TestData/Jade/012.pug diff --git a/Nodejs/Tests/TestData/Jade/012.jade.tokens b/Nodejs/Tests/TestData/Jade/012.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/012.jade.tokens rename to Nodejs/Tests/TestData/Jade/012.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/013.jade b/Nodejs/Tests/TestData/Jade/013.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/013.jade rename to Nodejs/Tests/TestData/Jade/013.pug diff --git a/Nodejs/Tests/TestData/Jade/013.jade.tokens b/Nodejs/Tests/TestData/Jade/013.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/013.jade.tokens rename to Nodejs/Tests/TestData/Jade/013.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/014.jade b/Nodejs/Tests/TestData/Jade/014.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/014.jade rename to Nodejs/Tests/TestData/Jade/014.pug diff --git a/Nodejs/Tests/TestData/Jade/014.jade.tokens b/Nodejs/Tests/TestData/Jade/014.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/014.jade.tokens rename to Nodejs/Tests/TestData/Jade/014.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/015.jade b/Nodejs/Tests/TestData/Jade/015.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/015.jade rename to Nodejs/Tests/TestData/Jade/015.pug diff --git a/Nodejs/Tests/TestData/Jade/015.jade.tokens b/Nodejs/Tests/TestData/Jade/015.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/015.jade.tokens rename to Nodejs/Tests/TestData/Jade/015.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/016.jade b/Nodejs/Tests/TestData/Jade/016.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/016.jade rename to Nodejs/Tests/TestData/Jade/016.pug diff --git a/Nodejs/Tests/TestData/Jade/016.jade.tokens b/Nodejs/Tests/TestData/Jade/016.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/016.jade.tokens rename to Nodejs/Tests/TestData/Jade/016.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/017.jade b/Nodejs/Tests/TestData/Jade/017.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/017.jade rename to Nodejs/Tests/TestData/Jade/017.pug diff --git a/Nodejs/Tests/TestData/Jade/017.jade.tokens b/Nodejs/Tests/TestData/Jade/017.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/017.jade.tokens rename to Nodejs/Tests/TestData/Jade/017.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/018.jade b/Nodejs/Tests/TestData/Jade/018.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/018.jade rename to Nodejs/Tests/TestData/Jade/018.pug diff --git a/Nodejs/Tests/TestData/Jade/018.jade.tokens b/Nodejs/Tests/TestData/Jade/018.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/018.jade.tokens rename to Nodejs/Tests/TestData/Jade/018.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/019.jade b/Nodejs/Tests/TestData/Jade/019.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/019.jade rename to Nodejs/Tests/TestData/Jade/019.pug diff --git a/Nodejs/Tests/TestData/Jade/019.jade.tokens b/Nodejs/Tests/TestData/Jade/019.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/019.jade.tokens rename to Nodejs/Tests/TestData/Jade/019.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/020.jade b/Nodejs/Tests/TestData/Jade/020.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/020.jade rename to Nodejs/Tests/TestData/Jade/020.pug diff --git a/Nodejs/Tests/TestData/Jade/020.jade.tokens b/Nodejs/Tests/TestData/Jade/020.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/020.jade.tokens rename to Nodejs/Tests/TestData/Jade/020.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/021.jade b/Nodejs/Tests/TestData/Jade/021.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/021.jade rename to Nodejs/Tests/TestData/Jade/021.pug diff --git a/Nodejs/Tests/TestData/Jade/021.jade.tokens b/Nodejs/Tests/TestData/Jade/021.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/021.jade.tokens rename to Nodejs/Tests/TestData/Jade/021.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/022.jade b/Nodejs/Tests/TestData/Jade/022.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/022.jade rename to Nodejs/Tests/TestData/Jade/022.pug diff --git a/Nodejs/Tests/TestData/Jade/022.jade.tokens b/Nodejs/Tests/TestData/Jade/022.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/022.jade.tokens rename to Nodejs/Tests/TestData/Jade/022.pug.tokens diff --git a/Nodejs/Tests/TestData/Jade/023.jade b/Nodejs/Tests/TestData/Jade/023.pug similarity index 100% rename from Nodejs/Tests/TestData/Jade/023.jade rename to Nodejs/Tests/TestData/Jade/023.pug diff --git a/Nodejs/Tests/TestData/Jade/023.jade.tokens b/Nodejs/Tests/TestData/Jade/023.pug.tokens similarity index 100% rename from Nodejs/Tests/TestData/Jade/023.jade.tokens rename to Nodejs/Tests/TestData/Jade/023.pug.tokens