Merge remote-tracking branch 'upstream/master' into feat-remove-extra…

…-wasm-decodings
webpack · May 10, 2018 · 3be112b · 3be112b
2 parents 91b6480 + 0eeea0f
commit 3be112b
Show file tree

Hide file tree

Showing 10 changed files with 194 additions and 52 deletions.
diff --git a/package.json b/package.json
@@ -58,6 +58,8 @@
     "less-loader": "^4.0.3",
     "lodash": "^4.17.4",
     "prettier": "^1.11.1",
+    "pug": "^2.0.3",
+    "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",

diff --git a/test/TestCases.template.js b/test/TestCases.template.js
@@ -139,8 +139,8 @@ const describeCases = config => {
 											loader: "coffee-loader"
 										},
 										{
-											test: /\.jade$/,
-											loader: "jade-loader"
+											test: /\.pug/,
+											loader: "pug-loader"
 										}
 									]
 								},

diff --git a/test/cases/loaders/_resources/included.jade → test/cases/loaders/_resources/included.pug b/test/cases/loaders/_resources/included.jade → test/cases/loaders/_resources/included.pug
diff --git a/test/cases/loaders/_resources/parent.jade → test/cases/loaders/_resources/parent.pug b/test/cases/loaders/_resources/parent.jade → test/cases/loaders/_resources/parent.pug
diff --git a/test/cases/loaders/_resources/template.jade → test/cases/loaders/_resources/template.pug b/test/cases/loaders/_resources/template.jade → test/cases/loaders/_resources/template.pug
diff --git a/test/cases/loaders/jade-loader/index.js b/test/cases/loaders/jade-loader/index.js
diff --git a/test/cases/loaders/pug-loader/index.js b/test/cases/loaders/pug-loader/index.js
@@ -0,0 +1,4 @@
+it("should handle the pug loader correctly", function() {
+	expect(require("!pug-loader?self!../_resources/template.pug")({ abc: "abc" })).toBe("<p>selfabc</p><h1>included</h1>");
+	expect(require("../_resources/template.pug")({ abc: "abc" })).toBe("<p>abc</p><h1>included</h1>");
+});
diff --git a/test/cases/resolving/context/index.js b/test/cases/resolving/context/index.js
@@ -5,7 +5,7 @@ it("should resolve loaders relative to require", function() {
 		query: "?query",
 		prev: "module.exports = \"error\";"
 	});
-	expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".jade")).toEqual({
+	expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".pug")).toEqual({
 		resourceQuery: "",
 		query: "?query",
 		prev: "xyz: abc"

diff --git a/...context/node_modules/subcontent/test.jade → .../context/node_modules/subcontent/test.pug b/...context/node_modules/subcontent/test.jade → .../context/node_modules/subcontent/test.pug