opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix splitting of windows newlines 

move fixture
update snapshots
This commit is contained in:
Tobias Koppers 2019-06-04 14:48:46 +02:00
parent 45582c51e7
commit aa78e27a44
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ModuleParseError.js
View File

@ -38,7 +38,7 @@ class ModuleParseError extends WebpackError {
// binary file
message += "\n(Source code omitted for this binary file)";
} else {
const sourceLines = source.split("\n");
const sourceLines = source.split(/\r?\n/);
const start = Math.max(0, lineNumber - 3);
const linesBefore = sourceLines.slice(start, lineNumber - 1);
const theLine = sourceLines[lineNumber - 1];

36
test/Errors.test.js
View File

@ -404,11 +404,10 @@ describe("Errors", () => {
);
it("should show loader used if it is present when module parsing fails", done => {
const folder = path.join(__dirname, "/fixtures");
getErrors(
{
mode: "development",
entry: path.resolve(folder, "./abc.html"),
entry: "./abc.html",
module: {
rules: [
{
@ -421,14 +420,14 @@ describe("Errors", () => {
(errors, warnings) => {
expect(errors).toMatchInlineSnapshot(`
Array [
"../abc.html 1:0
"./abc.html 1:0
Module parse failed: Unexpected token (1:0)
File was processed with these loaders:
* ./identity-loader.js
You may need an additional loader to handle the result of these loaders.
> <!DOCTYPE html>
| <html>
| <body>",
| <html>
| <body>",
]
`);
expect(errors[0]).toMatch("File was processed with these loaders");
@ -438,11 +437,10 @@ You may need an additional loader to handle the result of these loaders.
});
it("should show all loaders used if they are in config when module parsing fails", done => {
const folder = path.join(__dirname, "/fixtures");
getErrors(
{
mode: "development",
entry: path.resolve(folder, "./abc.html"),
entry: "./abc.html",
module: {
rules: [
{
@ -455,15 +453,15 @@ You may need an additional loader to handle the result of these loaders.
(errors, warnings) => {
expect(errors).toMatchInlineSnapshot(`
Array [
"../abc.html 1:0
"./abc.html 1:0
Module parse failed: Unexpected token (1:0)
File was processed with these loaders:
* ./identity-loader.js
* ./add-comment-loader.js
You may need an additional loader to handle the result of these loaders.
> <!DOCTYPE html>
| <html>
| <body>",
| <html>
| <body>",
]
`);
expect(errors[0]).toMatch("File was processed with these loaders");
@ -473,11 +471,10 @@ You may need an additional loader to handle the result of these loaders.
});
it("should show all loaders used if use is a string", done => {
const folder = path.join(__dirname, "/fixtures");
getErrors(
{
mode: "development",
entry: path.resolve(folder, "./abc.html"),
entry: "./abc.html",
module: {
rules: [
{ test: /\.html$/, use: identityLoader },
@ -488,15 +485,15 @@ You may need an additional loader to handle the result of these loaders.
(errors, warnings) => {
expect(errors).toMatchInlineSnapshot(`
Array [
"../abc.html 1:0
"./abc.html 1:0
Module parse failed: Unexpected token (1:0)
File was processed with these loaders:
* ./identity-loader.js
* ./add-comment-loader.js
You may need an additional loader to handle the result of these loaders.
> <!DOCTYPE html>
| <html>
| <body>",
| <html>
| <body>",
]
`);
expect(errors[0]).toMatch("File was processed with these loaders");
@ -506,22 +503,21 @@ You may need an additional loader to handle the result of these loaders.
});
it("should show 'no loaders are configured to process this file' if loaders are not included in config when module parsing fails", done => {
const folder = path.join(__dirname, "/fixtures");
getErrors(
{
mode: "development",
entry: path.resolve(folder, "./abc.html"),
entry: "./abc.html",
module: {}
},
(errors, warnings) => {
expect(errors).toMatchInlineSnapshot(`
Array [
"../abc.html 1:0
"./abc.html 1:0
Module parse failed: Unexpected token (1:0)
You may need an appropriate loader to handle this file type, currently no loaders are configured to process this file. See https://webpack.js.org/concepts#loaders
> <!DOCTYPE html>
| <html>
| <body>",
| <html>
| <body>",
]
`);
expect(errors[0]).toMatch(

6
test/fixtures/abc.html vendored
View File

@ -1,6 +0,0 @@
<!DOCTYPE html>
<html>
<body>
<h1>I love webpack :)</h1>
</body>
</html>

6
test/fixtures/errors/abc.html vendored Normal file
View File

@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<h1>I love webpack :)</h1>
</body>
</html>