Skip to content

Commit b3e6378

Browse files
refactor: error/warning messages (#125)
1 parent 119a66a commit b3e6378

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed

src/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class CssMinimizerPlugin {
106106
}
107107

108108
const builtWarning = new Error(
109-
`${file} from Css Minimizer Plugin\n${warningMessage}${
109+
`${file} from Css Minimizer plugin\n${warningMessage}${
110110
locationMessage ? ` ${locationMessage}` : ""
111111
}`
112112
);
@@ -122,7 +122,7 @@ class CssMinimizerPlugin {
122122
let builtError;
123123

124124
if (typeof error === "string") {
125-
builtError = new Error(`${file} from Css Minimizer Plugin\n${error}`);
125+
builtError = new Error(`${file} from Css Minimizer plugin\n${error}`);
126126
builtError.file = file;
127127

128128
return builtError;
@@ -138,7 +138,7 @@ class CssMinimizerPlugin {
138138

139139
if (original && original.source && requestShortener) {
140140
builtError = new Error(
141-
`${file} from Css Minimizer Plugin\n${
141+
`${file} from Css Minimizer plugin\n${
142142
error.message
143143
} [${requestShortener.shorten(original.source)}:${original.line},${
144144
original.column
@@ -154,7 +154,7 @@ class CssMinimizerPlugin {
154154
}
155155

156156
builtError = new Error(
157-
`${file} from Css Minimizer Plugin\n${error.message} [${file}:${
157+
`${file} from Css Minimizer plugin\n${error.message} [${file}:${
158158
error.line
159159
},${error.column}]${
160160
error.stack ? `\n${error.stack.split("\n").slice(1).join("\n")}` : ""
@@ -167,15 +167,15 @@ class CssMinimizerPlugin {
167167

168168
if (error.stack) {
169169
builtError = new Error(
170-
`${file} from Css Minimizer Plugin\n${error.stack}`
170+
`${file} from Css Minimizer plugin\n${error.stack}`
171171
);
172172
builtError.file = file;
173173

174174
return builtError;
175175
}
176176

177177
builtError = new Error(
178-
`${file} from Css Minimizer Plugin\n${error.message}`
178+
`${file} from Css Minimizer plugin\n${error.message}`
179179
);
180180
builtError.file = file;
181181

test/__snapshots__/CssMinimizerPlugin.test.js.snap

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`CssMinimizerPlugin buildError method 1`] = `
4-
[Error: test.css from Css Minimizer Plugin
4+
[Error: test.css from Css Minimizer plugin
55
Message]
66
`;
77

88
exports[`CssMinimizerPlugin buildError method 2`] = `
9-
[Error: test.css from Css Minimizer Plugin
9+
[Error: test.css from Css Minimizer plugin
1010
Message [test.css:1,1]]
1111
`;
1212

1313
exports[`CssMinimizerPlugin buildError method 3`] = `
14-
[Error: test.css from Css Minimizer Plugin
14+
[Error: test.css from Css Minimizer plugin
1515
Message [http://example.com/www/js/one.css:1,1][test.css:1,1]]
1616
`;
1717

1818
exports[`CssMinimizerPlugin buildError method 4`] = `
19-
[Error: test.css from Css Minimizer Plugin
19+
[Error: test.css from Css Minimizer plugin
2020
Stack]
2121
`;
2222

2323
exports[`CssMinimizerPlugin buildWarning method 1`] = `
24-
[Warning: undefined from Css Minimizer Plugin
24+
[Warning: undefined from Css Minimizer plugin
2525
Warning test.css:1:1]
2626
`;
2727

2828
exports[`CssMinimizerPlugin buildWarning method 2`] = `
29-
[Warning: test.css from Css Minimizer Plugin
29+
[Warning: test.css from Css Minimizer plugin
3030
Warning test.css:1:1]
3131
`;
3232

3333
exports[`CssMinimizerPlugin buildWarning method 3`] = `
34-
[Warning: test.css from Css Minimizer Plugin
34+
[Warning: test.css from Css Minimizer plugin
3535
Warning test.css:1:1]
3636
`;
3737

3838
exports[`CssMinimizerPlugin buildWarning method 4`] = `
39-
[Warning: test.css from Css Minimizer Plugin
39+
[Warning: test.css from Css Minimizer plugin
4040
Warning http://example.com/www/js/one.css:1:1]
4141
`;
4242

4343
exports[`CssMinimizerPlugin buildWarning method 5`] = `
44-
[Warning: test.css from Css Minimizer Plugin
44+
[Warning: test.css from Css Minimizer plugin
4545
Warning http://example.com/www/js/one.css:1:1]
4646
`;
4747

4848
exports[`CssMinimizerPlugin buildWarning method 6`] = `null`;
4949

5050
exports[`CssMinimizerPlugin should build error: error 1`] = `
5151
Array [
52-
"Error: error.css from Css Minimizer Plugin
52+
"Error: error.css from Css Minimizer plugin
5353
/error.css:1:1: Unknown word [error.css:1,1]",
5454
]
5555
`;
@@ -60,7 +60,7 @@ exports[`CssMinimizerPlugin should build warning: error 1`] = `Array []`;
6060

6161
exports[`CssMinimizerPlugin should build warning: warning 1`] = `
6262
Array [
63-
"Warning: foo.css from Css Minimizer Plugin
63+
"Warning: foo.css from Css Minimizer plugin
6464
[warning-plugin] Warning",
6565
]
6666
`;
@@ -87,7 +87,7 @@ exports[`CssMinimizerPlugin should run plugin against assets added later by plug
8787

8888
exports[`CssMinimizerPlugin should throw error from postcss: error 1`] = `
8989
Array [
90-
"Error: foo.css from Css Minimizer Plugin
90+
"Error: foo.css from Css Minimizer plugin
9191
error-plugin: /foo.css:2:3: Postcss error [webpack://./test/foo.css:2,2][foo.css:2,3]",
9292
]
9393
`;
@@ -313,11 +313,11 @@ a {
313313

314314
exports[`CssMinimizerPlugin should work with warnings and use memory cache when the "cache" option is "true" and the asset has been changed: errors 1`] = `
315315
Array [
316-
"Warning: foo.css from Css Minimizer Plugin
316+
"Warning: foo.css from Css Minimizer plugin
317317
[warning-plugin] Warning from foo.css",
318-
"Warning: style-2.css from Css Minimizer Plugin
318+
"Warning: style-2.css from Css Minimizer plugin
319319
[warning-plugin] Warning from style-2.css",
320-
"Warning: style.css from Css Minimizer Plugin
320+
"Warning: style.css from Css Minimizer plugin
321321
[warning-plugin] Warning from style.css",
322322
]
323323
`;
@@ -328,11 +328,11 @@ exports[`CssMinimizerPlugin should work with warnings and use memory cache when
328328

329329
exports[`CssMinimizerPlugin should work with warnings and use memory cache when the "cache" option is "true" and the asset has been changed: warnings 2`] = `
330330
Array [
331-
"Warning: foo.css from Css Minimizer Plugin
331+
"Warning: foo.css from Css Minimizer plugin
332332
[warning-plugin] Warning from foo.css",
333-
"Warning: style-2.css from Css Minimizer Plugin
333+
"Warning: style-2.css from Css Minimizer plugin
334334
[warning-plugin] Warning from style-2.css",
335-
"Warning: style.css from Css Minimizer Plugin
335+
"Warning: style.css from Css Minimizer plugin
336336
[warning-plugin] Warning from style.css",
337337
]
338338
`;
@@ -367,11 +367,11 @@ a {
367367

368368
exports[`CssMinimizerPlugin should work with warnings and use memory cache when the "cache" option is "true": errors 1`] = `
369369
Array [
370-
"Warning: foo.css from Css Minimizer Plugin
370+
"Warning: foo.css from Css Minimizer plugin
371371
[warning-plugin] Warning from foo.css",
372-
"Warning: style-2.css from Css Minimizer Plugin
372+
"Warning: style-2.css from Css Minimizer plugin
373373
[warning-plugin] Warning from style-2.css",
374-
"Warning: style.css from Css Minimizer Plugin
374+
"Warning: style.css from Css Minimizer plugin
375375
[warning-plugin] Warning from style.css",
376376
]
377377
`;
@@ -382,11 +382,11 @@ exports[`CssMinimizerPlugin should work with warnings and use memory cache when
382382

383383
exports[`CssMinimizerPlugin should work with warnings and use memory cache when the "cache" option is "true": warnings 2`] = `
384384
Array [
385-
"Warning: foo.css from Css Minimizer Plugin
385+
"Warning: foo.css from Css Minimizer plugin
386386
[warning-plugin] Warning from foo.css",
387-
"Warning: style-2.css from Css Minimizer Plugin
387+
"Warning: style-2.css from Css Minimizer plugin
388388
[warning-plugin] Warning from style-2.css",
389-
"Warning: style.css from Css Minimizer Plugin
389+
"Warning: style.css from Css Minimizer plugin
390390
[warning-plugin] Warning from style.css",
391391
]
392392
`;

test/__snapshots__/cache-option.test.js.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,30 +132,30 @@ exports[`"cache" option should work with the "filesystem" value for the "cache.t
132132

133133
exports[`"cache" option should work with the "filesystem" value for the "cache.type" option and output warnings: warnings 1`] = `
134134
Array [
135-
"Warning: five.css from Css Minimizer Plugin
135+
"Warning: five.css from Css Minimizer plugin
136136
[warning-plugin] Warning from five.css",
137-
"Warning: four.css from Css Minimizer Plugin
137+
"Warning: four.css from Css Minimizer plugin
138138
[warning-plugin] Warning from four.css",
139-
"Warning: one.css from Css Minimizer Plugin
139+
"Warning: one.css from Css Minimizer plugin
140140
[warning-plugin] Warning from one.css",
141-
"Warning: three.css from Css Minimizer Plugin
141+
"Warning: three.css from Css Minimizer plugin
142142
[warning-plugin] Warning from three.css",
143-
"Warning: two.css from Css Minimizer Plugin
143+
"Warning: two.css from Css Minimizer plugin
144144
[warning-plugin] Warning from two.css",
145145
]
146146
`;
147147

148148
exports[`"cache" option should work with the "filesystem" value for the "cache.type" option and output warnings: warnings 2`] = `
149149
Array [
150-
"Warning: five.css from Css Minimizer Plugin
150+
"Warning: five.css from Css Minimizer plugin
151151
[warning-plugin] Warning from five.css",
152-
"Warning: four.css from Css Minimizer Plugin
152+
"Warning: four.css from Css Minimizer plugin
153153
[warning-plugin] Warning from four.css",
154-
"Warning: one.css from Css Minimizer Plugin
154+
"Warning: one.css from Css Minimizer plugin
155155
[warning-plugin] Warning from one.css",
156-
"Warning: three.css from Css Minimizer Plugin
156+
"Warning: three.css from Css Minimizer plugin
157157
[warning-plugin] Warning from three.css",
158-
"Warning: two.css from Css Minimizer Plugin
158+
"Warning: two.css from Css Minimizer plugin
159159
[warning-plugin] Warning from two.css",
160160
]
161161
`;

test/__snapshots__/minify-option.test.js.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ exports[`"minify" option should work and allow to return errors and warnings fro
1010

1111
exports[`"minify" option should work and allow to return errors and warnings from custom function: warning 1`] = `
1212
Array [
13-
"Error: foo.css from Css Minimizer Plugin
13+
"Error: foo.css from Css Minimizer plugin
1414
Error 1",
15-
"Error: foo.css from Css Minimizer Plugin
15+
"Error: foo.css from Css Minimizer plugin
1616
Error: Error 2",
17-
"Warning: foo.css from Css Minimizer Plugin
17+
"Warning: foo.css from Css Minimizer plugin
1818
Warning 1",
19-
"Warning: foo.css from Css Minimizer Plugin
19+
"Warning: foo.css from Css Minimizer plugin
2020
Warning 2",
2121
]
2222
`;
@@ -100,7 +100,7 @@ body a {
100100

101101
exports[`"minify" option should work throw an error if minimizer function doesn't return: error 1`] = `
102102
Array [
103-
"Error: foo.css from Css Minimizer Plugin
103+
"Error: foo.css from Css Minimizer plugin
104104
Error: Minimizer function doesn't return result",
105105
]
106106
`;

test/__snapshots__/sourceMap-option.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
exports[`when applied with "sourceMap" option should work and emit warning on valid sourcemap and minimizer error: errors 1`] = `
44
Array [
5-
"Error: broken-source-map.css from Css Minimizer Plugin
5+
"Error: broken-source-map.css from Css Minimizer plugin
66
error-plugin: /broken-source-map.css:1:7: Postcss error [test:1,5][broken-source-map.css:1,7]",
77
"ModuleBuildError: Module build failed (from ../../node_modules/mini-css-extract-plugin/dist/loader.js):
8-
Error: broken-source-map.css from Css Minimizer Plugin",
8+
Error: broken-source-map.css from Css Minimizer plugin",
99
]
1010
`;
1111

test/__snapshots__/warningsFilter-option.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ exports[`warningsFilter option should match snapshot for a "function" value: err
3636

3737
exports[`warningsFilter option should match snapshot for a "function" value: warnings 1`] = `
3838
Array [
39-
"Warning: bar1.css from Css Minimizer Plugin
39+
"Warning: bar1.css from Css Minimizer plugin
4040
[warning-plugin] Warning from bar1.css",
41-
"Warning: bar2.css from Css Minimizer Plugin
41+
"Warning: bar2.css from Css Minimizer plugin
4242
[warning-plugin] Warning from bar2.css",
4343
]
4444
`;

0 commit comments

Comments
 (0)