GeezerVison is showing github.com — Merge remote-tracking branch 'upstream/master' into feat-remove-extra… · webpack/webpack@3be112b
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: package.json +2Lines changed: 2 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
58 | 58 | "less-loader": "^4.0.3", |
59 | 59 | "lodash": "^4.17.4", |
60 | 60 | "prettier": "^1.11.1", |
| 61 | + "pug": "^2.0.3", |
| 62 | + "pug-loader": "^2.4.0", |
61 | 63 | "raw-loader": "~0.5.0", |
62 | 64 | "react": "^15.2.1", |
63 | 65 | "react-dom": "^15.2.1", |
|
Collapse file
Copy file name to clipboardExpand all lines: test/TestCases.template.js +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -139,8 +139,8 @@ const describeCases = config => { |
139 | 139 | loader: "coffee-loader" |
140 | 140 | }, |
141 | 141 | { |
142 | | - test: /\.jade$/, |
143 | | - loader: "jade-loader" |
| 142 | + test: /\.pug/, |
| 143 | + loader: "pug-loader" |
144 | 144 | } |
145 | 145 | ] |
146 | 146 | }, |
|
Collapse file
Copy file name to clipboard File renamed without changes.
Collapse file
Copy file name to clipboard File renamed without changes.
Collapse file
Copy file name to clipboard File renamed without changes.
Collapse file
Copy file name to clipboardExpand all lines: test/cases/loaders/jade-loader/index.js -4Lines changed: 0 additions & 4 deletions Collapse file
Copy file name to clipboard +4Lines changed: 4 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 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 | +}); |
Collapse file
Copy file name to clipboardExpand all lines: test/cases/resolving/context/index.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -5,7 +5,7 @@ it("should resolve loaders relative to require", function() { |
5 | 5 | query: "?query", |
6 | 6 | prev: "module.exports = \"error\";" |
7 | 7 | }); |
8 | | - expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".jade")).toEqual({ |
| 8 | + expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".pug")).toEqual({ |
9 | 9 | resourceQuery: "", |
10 | 10 | query: "?query", |
11 | 11 | prev: "xyz: abc" |
|
Collapse file
Copy file name to clipboard File renamed without changes.