Skip to content

Commit 65c7655

Browse files
authored
chore(gen): replace all instances of jade with pug (#2128)
closes #1802
1 parent 3abd039 commit 65c7655

File tree

20 files changed

+19
-18
lines changed

20 files changed

+19
-18
lines changed

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ etc | etc
1111
Item | Answer
1212
----- | -----
1313
Transpiler | Babel / TypeScript
14-
Markup | HTML / Jade
14+
Markup | HTML / Pug
1515
CSS | CSS / LESS / SCSS / Stylus
1616
Router | ngRoute / ui-router
1717
Client Tests | Jasmine / Mocha

docs/getting-started/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ yo angular-fullstack
3030
```
3131

3232
You'll then be asked a series of questions regarding options for the generated app. Such things include using JavaScript or TypeScript,
33-
HTML or Jade, Bootstrap, SQL, and so on. If you don't know what to answer for a question, just hitting `ENTER` will use the default options
33+
HTML or Pug, Bootstrap, SQL, and so on. If you don't know what to answer for a question, just hitting `ENTER` will use the default options
3434
for that question, and move on to the next one.

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ yo angular-fullstack
5454

5555
* Scripts: `JavaScript (Babel)`, `TypeScript`
5656
* Module Systems: `Webpack`, `SystemJS + JSPM` (maybe)
57-
* Markup: `HTML`, `Jade`
57+
* Markup: `HTML`, `Pug`
5858
* Stylesheets: `CSS`, `Stylus`, `Sass`, `Less`
5959
* Angular Routers: `ngRoute`, `ui-router`
6060
* CSS Frameworks: `Bootstrap`

src/generators/app/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class Generator extends Base {
119119
this.filters = existingFilters;
120120

121121
this.scriptExt = this.filters.ts ? 'ts' : 'js';
122-
this.templateExt = this.filters.jade ? 'jade' : 'html';
122+
this.templateExt = this.filters.pug ? 'pug' : 'html';
123123
this.styleExt = this.filters.sass ? 'scss' :
124124
this.filters.less ? 'less' :
125125
this.filters.stylus ? 'styl' :
@@ -169,7 +169,7 @@ export class Generator extends Base {
169169
type: 'list',
170170
name: 'markup',
171171
message: 'What would you like to write markup with?',
172-
choices: ['HTML', 'Jade'],
172+
choices: ['HTML', 'Pug'],
173173
filter: val => val.toLowerCase()
174174
}, {
175175
type: 'list',
@@ -408,7 +408,7 @@ export class Generator extends Base {
408408
if(this.filters.ts) extensions.push('ts');
409409
if(this.filters.js) extensions.push('js');
410410
if(this.filters.html) extensions.push('html');
411-
if(this.filters.jade) extensions.push('jade');
411+
if(this.filters.pug) extensions.push('pug');
412412
if(this.filters.css) extensions.push('css');
413413
if(this.filters.stylus) extensions.push('styl');
414414
if(this.filters.sass) extensions.push('scss');

src/test/get-expected-files.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function app(options) {
1414
css: 'css'
1515
},
1616
markup: {
17-
jade: 'jade',
17+
pug: 'pug',
1818
html: 'html'
1919
},
2020
script: {

src/test/main.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ describe('angular-fullstack:app', function() {
183183
});
184184
});
185185

186-
describe('with TypeScript, Jade, Jasmine, LESS, & OAuth', function() {
186+
describe('with TypeScript, Pug, Jasmine, LESS, & OAuth', function() {
187187
var dir;
188188
var lintResult;
189189
var clientTestResult;
190190
var serverTestResult;
191191
var testOptions = {
192192
buildtool: 'gulp',
193193
transpiler: 'ts',
194-
markup: 'jade',
194+
markup: 'pug',
195195
stylesheet: 'less',
196196
router: 'uirouter',
197197
testing: 'jasmine',
@@ -263,7 +263,7 @@ describe('angular-fullstack:app', function() {
263263
var testOptions = {
264264
buildtool: 'gulp',
265265
transpiler: 'babel',
266-
markup: 'jade',
266+
markup: 'pug',
267267
stylesheet: 'css',
268268
router: 'uirouter',
269269
testing: 'jasmine',
@@ -335,7 +335,7 @@ describe('angular-fullstack:app', function() {
335335
var testOptions = {
336336
buildtool: 'gulp',
337337
transpiler: 'ts',
338-
markup: 'jade',
338+
markup: 'pug',
339339
stylesheet: 'stylus',
340340
router: 'uirouter',
341341
testing: 'mocha',

templates/app/_package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"lodash": "^4.6.1",
3434
"lusca": "^1.3.0",
3535
"babel-runtime": "^6.6.1",
36-
"babel-polyfill": "^6.7.2",<% if(filters.jade) { %>
37-
"jade": "^1.11.0",<% } %><% if(filters.html) { %>
36+
"babel-polyfill": "^6.7.2",<% if(filters.pug) { %>
37+
"pug": "2.0.0-beta4",<% } %><% if(filters.html) { %>
3838
"ejs": "^2.3.3",<% } %><% if(filters.mongoose) { %>
3939
"mongoose": "^4.1.2",
4040
"bluebird": "^3.3.3",
@@ -115,7 +115,7 @@
115115
"extract-text-webpack-plugin": "^1.0.1",
116116
"html-webpack-plugin": "^2.16.0",
117117
"html-webpack-harddisk-plugin": "~0.0.2",
118-
<%_ if(filters.jade) { _%>
118+
<%_ if(filters.pug) { _%>
119119
"pug-html-loader": "^1.0.8",<% } %>
120120
"awesome-typescript-loader": "0.17.0",
121121
"ng-annotate-loader": "~0.1.0",

0 commit comments

Comments
 (0)