Skip to content

Commit 0eeea0f

Browse files
TheLarkInnTheLarkInn
authored
Merge pull request webpack#7266 from webpack/tests/remove_jade
Replace Jade by Pug
2 parents ea26eac + 9b37c6b commit 0eeea0f

File tree

10 files changed

+191
-14
lines changed

10 files changed

+191
-14
lines changed

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
"less-loader": "^4.0.3",
5959
"lodash": "^4.17.4",
6060
"prettier": "^1.11.1",
61+
"pug": "^2.0.3",
62+
"pug-loader": "^2.4.0",
6163
"raw-loader": "~0.5.0",
6264
"react": "^15.2.1",
6365
"react-dom": "^15.2.1",

‎test/TestCases.template.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ const describeCases = config => {
139139
loader: "coffee-loader"
140140
},
141141
{
142-
test: /\.jade$/,
143-
loader: "jade-loader"
142+
test: /\.pug/,
143+
loader: "pug-loader"
144144
}
145145
]
146146
},

test/cases/loaders/_resources/included.jade renamed to test/cases/loaders/_resources/included.pug

File renamed without changes.

test/cases/loaders/_resources/parent.jade renamed to test/cases/loaders/_resources/parent.pug

File renamed without changes.

test/cases/loaders/_resources/template.jade renamed to test/cases/loaders/_resources/template.pug

File renamed without changes.

‎test/cases/loaders/jade-loader/index.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎test/cases/loaders/pug-loader/index.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
it("should handle the pug loader correctly", function() {
2+
expect(require("!pug-loader?self!../_resources/template.pug")({ abc: "abc" })).toBe("<p>selfabc</p><h1>included</h1>");
3+
expect(require("../_resources/template.pug")({ abc: "abc" })).toBe("<p>abc</p><h1>included</h1>");
4+
});

‎test/cases/resolving/context/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ it("should resolve loaders relative to require", function() {
55
query: "?query",
66
prev: "module.exports = \"error\";"
77
});
8-
expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".jade")).toEqual({
8+
expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".pug")).toEqual({
99
resourceQuery: "",
1010
query: "?query",
1111
prev: "xyz: abc"

test/cases/resolving/context/node_modules/subcontent/test.jade renamed to test/cases/resolving/context/node_modules/subcontent/test.pug

File renamed without changes.

‎yarn.lock‎

Lines changed: 182 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
esutils "^2.0.2"
1111
js-tokens "^3.0.0"
1212

13+
"@types/babel-types@*", "@types/babel-types@^7.0.0":
14+
version "7.0.2"
15+
resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.2.tgz#63dc3e5e7f6367e1819d2bba5213783cd926c5d5"
16+
17+
"@types/babylon@^6.16.2":
18+
version "6.16.2"
19+
resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
20+
dependencies:
21+
"@types/babel-types" "*"
22+
1323
"@types/node@^9.6.4":
1424
version "9.6.6"
1525
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2"
@@ -160,6 +170,12 @@ acorn-globals@^1.0.3:
160170
dependencies:
161171
acorn "^2.1.0"
162172

173+
acorn-globals@^3.0.0:
174+
version "3.1.0"
175+
resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
176+
dependencies:
177+
acorn "^4.0.4"
178+
163179
acorn-globals@^4.1.0:
164180
version "4.1.0"
165181
resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
@@ -180,10 +196,14 @@ acorn@^2.1.0:
180196
version "2.7.0"
181197
resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
182198

183-
acorn@^3.0.4:
199+
acorn@^3.0.4, acorn@^3.1.0:
184200
version "3.3.0"
185201
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
186202

203+
acorn@^4.0.4, acorn@~4.0.2:
204+
version "4.0.13"
205+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
206+
187207
acorn@^5.0.0, acorn@^5.5.0:
188208
version "5.5.3"
189209
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
@@ -934,6 +954,12 @@ character-parser@1.2.1:
934954
version "1.2.1"
935955
resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
936956

957+
character-parser@^2.1.1:
958+
version "2.2.0"
959+
resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
960+
dependencies:
961+
is-regex "^1.0.3"
962+
937963
chardet@^0.4.0:
938964
version "0.4.2"
939965
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1001,6 +1027,12 @@ clean-css@^3.1.9:
10011027
commander "2.8.x"
10021028
source-map "0.4.x"
10031029

1030+
clean-css@^4.1.11:
1031+
version "4.1.11"
1032+
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
1033+
dependencies:
1034+
source-map "0.5.x"
1035+
10041036
cli-cursor@^2.1.0:
10051037
version "2.1.0"
10061038
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1174,6 +1206,15 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
11741206
version "1.1.0"
11751207
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
11761208

1209+
constantinople@^3.0.1:
1210+
version "3.1.2"
1211+
resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
1212+
dependencies:
1213+
"@types/babel-types" "^7.0.0"
1214+
"@types/babylon" "^6.16.2"
1215+
babel-types "^6.26.0"
1216+
babylon "^6.18.0"
1217+
11771218
constantinople@~3.0.1:
11781219
version "3.0.2"
11791220
resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.0.2.tgz#4b945d9937907bcd98ee575122c3817516544141"
@@ -1576,6 +1617,10 @@ doctrine@^2.1.0:
15761617
dependencies:
15771618
esutils "^2.0.2"
15781619

1620+
doctypes@^1.1.0:
1621+
version "1.1.0"
1622+
resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
1623+
15791624
domain-browser@^1.1.1:
15801625
version "1.2.0"
15811626
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -2751,6 +2796,13 @@ is-equal-shallow@^0.1.3:
27512796
dependencies:
27522797
is-primitive "^2.0.0"
27532798

2799+
is-expression@^3.0.0:
2800+
version "3.0.0"
2801+
resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
2802+
dependencies:
2803+
acorn "~4.0.2"
2804+
object-assign "^4.0.1"
2805+
27542806
is-extendable@^0.1.0, is-extendable@^0.1.1:
27552807
version "0.1.1"
27562808
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -2889,7 +2941,7 @@ is-property@^1.0.0:
28892941
version "1.0.2"
28902942
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
28912943

2892-
is-regex@^1.0.4:
2944+
is-regex@^1.0.3, is-regex@^1.0.4:
28932945
version "1.0.4"
28942946
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
28952947
dependencies:
@@ -3398,6 +3450,10 @@ js-base64@^2.1.9:
33983450
version "2.4.3"
33993451
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
34003452

3453+
js-stringify@^1.0.1:
3454+
version "1.0.2"
3455+
resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
3456+
34013457
js-tokens@^3.0.0, js-tokens@^3.0.2:
34023458
version "3.0.2"
34033459
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -3527,6 +3583,13 @@ jstransformer@0.0.2:
35273583
is-promise "^2.0.0"
35283584
promise "^6.0.1"
35293585

3586+
jstransformer@1.0.0:
3587+
version "1.0.0"
3588+
resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
3589+
dependencies:
3590+
is-promise "^2.0.0"
3591+
promise "^7.0.1"
3592+
35303593
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
35313594
version "3.2.2"
35323595
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4705,7 +4768,7 @@ promise@^6.0.1:
47054768
dependencies:
47064769
asap "~1.0.0"
47074770

4708-
promise@^7.1.1:
4771+
promise@^7.0.1, promise@^7.1.1:
47094772
version "7.3.1"
47104773
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
47114774
dependencies:
@@ -4750,6 +4813,107 @@ public-encrypt@^4.0.0:
47504813
parse-asn1 "^5.0.0"
47514814
randombytes "^2.0.1"
47524815

4816+
pug-attrs@^2.0.3:
4817+
version "2.0.3"
4818+
resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
4819+
dependencies:
4820+
constantinople "^3.0.1"
4821+
js-stringify "^1.0.1"
4822+
pug-runtime "^2.0.4"
4823+
4824+
pug-code-gen@^2.0.1:
4825+
version "2.0.1"
4826+
resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.1.tgz#0951ec83225d74d8cfc476a7f99a259b5f7d050c"
4827+
dependencies:
4828+
constantinople "^3.0.1"
4829+
doctypes "^1.1.0"
4830+
js-stringify "^1.0.1"
4831+
pug-attrs "^2.0.3"
4832+
pug-error "^1.3.2"
4833+
pug-runtime "^2.0.4"
4834+
void-elements "^2.0.1"
4835+
with "^5.0.0"
4836+
4837+
pug-error@^1.3.2:
4838+
version "1.3.2"
4839+
resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
4840+
4841+
pug-filters@^3.1.0:
4842+
version "3.1.0"
4843+
resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.0.tgz#27165555bc04c236e4aa2b0366246dfa021b626e"
4844+
dependencies:
4845+
clean-css "^4.1.11"
4846+
constantinople "^3.0.1"
4847+
jstransformer "1.0.0"
4848+
pug-error "^1.3.2"
4849+
pug-walk "^1.1.7"
4850+
resolve "^1.1.6"
4851+
uglify-js "^2.6.1"
4852+
4853+
pug-lexer@^4.0.0:
4854+
version "4.0.0"
4855+
resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278"
4856+
dependencies:
4857+
character-parser "^2.1.1"
4858+
is-expression "^3.0.0"
4859+
pug-error "^1.3.2"
4860+
4861+
pug-linker@^3.0.5:
4862+
version "3.0.5"
4863+
resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f"
4864+
dependencies:
4865+
pug-error "^1.3.2"
4866+
pug-walk "^1.1.7"
4867+
4868+
pug-load@^2.0.11:
4869+
version "2.0.11"
4870+
resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527"
4871+
dependencies:
4872+
object-assign "^4.1.0"
4873+
pug-walk "^1.1.7"
4874+
4875+
pug-loader@^2.4.0:
4876+
version "2.4.0"
4877+
resolved "https://registry.yarnpkg.com/pug-loader/-/pug-loader-2.4.0.tgz#18eebdda045d9c31c2856f1cc3ceb8d3df7ca49a"
4878+
dependencies:
4879+
loader-utils "^1.1.0"
4880+
pug-walk "^1.0.0"
4881+
resolve "^1.1.7"
4882+
4883+
pug-parser@^5.0.0:
4884+
version "5.0.0"
4885+
resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4"
4886+
dependencies:
4887+
pug-error "^1.3.2"
4888+
token-stream "0.0.1"
4889+
4890+
pug-runtime@^2.0.4:
4891+
version "2.0.4"
4892+
resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"
4893+
4894+
pug-strip-comments@^1.0.3:
4895+
version "1.0.3"
4896+
resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz#f1559592206edc6f85310dacf4afb48a025af59f"
4897+
dependencies:
4898+
pug-error "^1.3.2"
4899+
4900+
pug-walk@^1.0.0, pug-walk@^1.1.7:
4901+
version "1.1.7"
4902+
resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.7.tgz#c00d5c5128bac5806bec15d2b7e7cdabe42531f3"
4903+
4904+
pug@^2.0.3:
4905+
version "2.0.3"
4906+
resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.3.tgz#71cba82537c95a5eab7ed04696e4221f53aa878e"
4907+
dependencies:
4908+
pug-code-gen "^2.0.1"
4909+
pug-filters "^3.1.0"
4910+
pug-lexer "^4.0.0"
4911+
pug-linker "^3.0.5"
4912+
pug-load "^2.0.11"
4913+
pug-parser "^5.0.0"
4914+
pug-runtime "^2.0.4"
4915+
pug-strip-comments "^1.0.3"
4916+
47534917
pump@^2.0.0, pump@^2.0.1:
47544918
version "2.0.1"
47554919
resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@@ -5128,7 +5292,7 @@ resolve@1.1.7, resolve@1.1.x:
51285292
version "1.1.7"
51295293
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
51305294

5131-
resolve@^1.3.3:
5295+
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
51325296
version "1.7.1"
51335297
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
51345298
dependencies:
@@ -5439,7 +5603,7 @@ source-map@0.4.x, source-map@^0.4.4:
54395603
dependencies:
54405604
amdefine ">=0.0.4"
54415605

5442-
source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
5606+
source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
54435607
version "0.5.7"
54445608
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
54455609

@@ -5802,6 +5966,10 @@ to-regex@^3.0.1, to-regex@^3.0.2:
58025966
regex-not "^1.0.2"
58035967
safe-regex "^1.1.0"
58045968

5969+
token-stream@0.0.1:
5970+
version "0.0.1"
5971+
resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
5972+
58055973
topo@2.x.x:
58065974
version "2.0.2"
58075975
resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
@@ -5888,7 +6056,7 @@ uglify-es@^3.3.4:
58886056
commander "~2.13.0"
58896057
source-map "~0.6.1"
58906058

5891-
uglify-js@^2.4.19, uglify-js@^2.6:
6059+
uglify-js@^2.4.19, uglify-js@^2.6, uglify-js@^2.6.1:
58926060
version "2.8.29"
58936061
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
58946062
dependencies:
@@ -6070,7 +6238,7 @@ vm-browserify@0.0.4, vm-browserify@~0.0.0:
60706238
dependencies:
60716239
indexof "0.0.1"
60726240

6073-
void-elements@~2.0.1:
6241+
void-elements@^2.0.1, void-elements@~2.0.1:
60746242
version "2.0.1"
60756243
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
60766244

@@ -6174,6 +6342,13 @@ window-size@0.1.0:
61746342
version "0.1.0"
61756343
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
61766344

6345+
with@^5.0.0:
6346+
version "5.1.1"
6347+
resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
6348+
dependencies:
6349+
acorn "^3.1.0"
6350+
acorn-globals "^3.0.0"
6351+
61776352
with@~4.0.0:
61786353
version "4.0.3"
61796354
resolved "https://registry.yarnpkg.com/with/-/with-4.0.3.tgz#eefd154e9e79d2c8d3417b647a8f14d9fecce14e"

0 commit comments

Comments
 (0)