Skip to content

Commit 3be112b

Browse files
xtucxtuc
committed
Merge remote-tracking branch 'upstream/master' into feat-remove-extra-wasm-decodings
2 parents 91b6480 + 0eeea0f commit 3be112b

File tree

10 files changed

+194
-52
lines changed

10 files changed

+194
-52
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.

0 commit comments

Comments
 (0)