Skip to content

Commit 8091b2d

Browse files
bhollowaybholloway
authored
Merge pull request #223 from bholloway/cleanup-todos
Cleanup todos
2 parents 33a2d79 + 6f1143e commit 8091b2d

File tree

3 files changed

+32
-53
lines changed

3 files changed

+32
-53
lines changed

‎.github/workflows/ci.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
cache: 'yarn'
2929
- name: Install Dependencies
3030
run: yarn install
31+
- name: Lint js
32+
run: yarn lint
3133
- name: Unit test
3234
run: yarn test:unit
3335
- name: End-to-End test ${{ matrix.band }}

‎test/cases/misconfiguration.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const {buildDevNormal, buildProdNormal} = require('./common/exec');
1515
const {assertCssContent} = require('../lib/assert');
1616
const {
1717
assertWebpackOk, assertWebpackNotOk, assertNoErrors, assertStdout,
18-
assertSilence, assertMisconfigWarning, assertDeprecationWarning,
18+
assertNoMessages, assertMisconfigWarning, assertDeprecationWarning,
1919
} = require('../lib/assert');
2020

2121
const assertContentDev = compose(assertCssContent, outdent)`
@@ -72,13 +72,13 @@ module.exports = test(
7272
buildDevNormal(
7373
assertWebpackOk,
7474
assertNoErrors,
75-
assertSilence,
75+
assertNoMessages,
7676
assertContentDev
7777
),
7878
buildProdNormal(
7979
assertWebpackOk,
8080
assertNoErrors,
81-
assertSilence,
81+
assertNoMessages,
8282
assertContentProd
8383
)
8484
)
@@ -102,13 +102,13 @@ module.exports = test(
102102
buildDevNormal(
103103
assertWebpackOk,
104104
assertNoErrors,
105-
assertSilence,
105+
assertNoMessages,
106106
assertContentDev
107107
),
108108
buildProdNormal(
109109
assertWebpackOk,
110110
assertNoErrors,
111-
assertSilence,
111+
assertNoMessages,
112112
assertContentProd
113113
)
114114
)
@@ -132,13 +132,13 @@ module.exports = test(
132132
buildDevNormal(
133133
assertWebpackOk,
134134
assertNoErrors,
135-
assertSilence,
135+
assertNoMessages,
136136
assertContentDev
137137
),
138138
buildProdNormal(
139139
assertWebpackOk,
140140
assertNoErrors,
141-
assertSilence,
141+
assertNoMessages,
142142
assertContentProd
143143
)
144144
)
@@ -162,13 +162,13 @@ module.exports = test(
162162
buildDevNormal(
163163
assertWebpackOk,
164164
assertNoErrors,
165-
assertSilence,
165+
assertNoMessages,
166166
assertContentDev
167167
),
168168
buildProdNormal(
169169
assertWebpackOk,
170170
assertNoErrors,
171-
assertSilence,
171+
assertNoMessages,
172172
assertContentProd
173173
)
174174
)
@@ -192,13 +192,13 @@ module.exports = test(
192192
buildDevNormal(
193193
assertWebpackOk,
194194
assertNoErrors,
195-
assertSilence,
195+
assertNoMessages,
196196
assertContentDev
197197
),
198198
buildProdNormal(
199199
assertWebpackOk,
200200
assertNoErrors,
201-
assertSilence,
201+
assertNoMessages,
202202
assertContentProd
203203
)
204204
)
@@ -222,13 +222,13 @@ module.exports = test(
222222
buildDevNormal(
223223
assertWebpackOk,
224224
assertNoErrors,
225-
assertSilence,
225+
assertNoMessages,
226226
assertContentDev
227227
),
228228
buildProdNormal(
229229
assertWebpackOk,
230230
assertNoErrors,
231-
assertSilence,
231+
assertNoMessages,
232232
assertContentProd
233233
)
234234
)
@@ -284,13 +284,13 @@ module.exports = test(
284284
buildDevNormal(
285285
assertWebpackOk,
286286
assertNoErrors,
287-
assertSilence,
287+
assertNoMessages,
288288
assertContentDev
289289
),
290290
buildProdNormal(
291291
assertWebpackOk,
292292
assertNoErrors,
293-
assertSilence,
293+
assertNoMessages,
294294
assertContentProd
295295
)
296296
)

‎test/lib/assert/stream.js

+15-38
Original file line numberDiff line numberDiff line change
@@ -48,56 +48,33 @@ exports.assertStdout = assertStream('stdout');
4848

4949
exports.assertStderr = assertStream('stderr');
5050

51-
exports.assertSilence = sequence(
52-
exports.assertStdout('console')(0)`resolve-url-loader:`,
53-
exports.assertStderr('node deprecation warning')(0)`\[DEP_RESOLVE_URL_LOADER[A-Z_]+\]`
54-
);
55-
56-
// TODO v5 - assertNoMessages becomes the same as assertSilence when we remove rework engine
5751
exports.assertNoMessages = sequence(
5852
exports.assertStdout('console')(0)`resolve-url-loader:`,
59-
onlyMeta('meta.engine == "rework"')(
60-
exports.assertStderr('node deprecation warning')(1)`\[DEP_RESOLVE_URL_LOADER[A-Z_]+\]`
61-
),
62-
onlyMeta('meta.engine == "postcss"')(
63-
exports.assertStderr('node deprecation warning')(0)`\[DEP_RESOLVE_URL_LOADER[A-Z_]+\]`
64-
)
53+
exports.assertStderr('node deprecation warning')(0)`\[DEP_RESOLVE_URL_LOADER[A-Z_]+\]`
6554
);
6655

67-
const assertDeprecationWarning = (message= '') => exports.assertStderr('node deprecation warning')(1)`
56+
exports.assertDeprecationWarning = (message= '') => exports.assertStderr('node deprecation warning')(1)`
6857
^[^\n]*\[DEP_RESOLVE_URL_LOADER[A-Z_]+\][ ]DeprecationWarning:[ ]${message}
6958
`;
70-
// TODO v5 - this becomes the same as the internal method when we remove rework engine
71-
exports.assertDeprecationWarning = (message) => sequence(
72-
onlyMeta('meta.engine == "rework"')(
73-
assertDeprecationWarning(
74-
'the "engine" option is deprecated, "postcss" engine is the default, using "rework" engine is not advised'
75-
)
76-
),
77-
assertDeprecationWarning(message)
78-
);
79-
80-
const assertMisconfigWarningWithMessage = (message) => exports.assertStdout('webpack warning')(1)`
81-
^[ ]*WARNING[^\n]*
82-
([^\n]+\n){0,2}[^\n]*resolve-url-loader:[ ]*loader misconfiguration
83-
[ ]+${message}
84-
`;
85-
86-
const assertChildCompilationWarning = exports.assertStdout('webpack warning')(1)`
87-
1 WARNING in child compilations
88-
`;
8959

9060
exports.assertMisconfigWarning = (message) => sequence(
91-
onlyMeta('meta.version.webpack == 4')(assertMisconfigWarningWithMessage(message)),
92-
onlyMeta('meta.version.webpack >= 5')(assertChildCompilationWarning)
61+
onlyMeta('meta.version.webpack == 4')(
62+
exports.assertStdout('webpack warning')(1)`
63+
^[ ]*WARNING[^\n]*
64+
([^\n]+\n){0,2}[^\n]*resolve-url-loader:[ ]*loader misconfiguration
65+
[ ]+${message}
66+
`
67+
),
68+
onlyMeta('meta.version.webpack >= 5')(
69+
exports.assertStdout('webpack warning')(1)`
70+
1 WARNING in child compilations
71+
`
72+
)
9373
);
9474

95-
const assertCantResolveError = exports.assertStdout('webpack "Can\'t resolve" error')(1)`
75+
exports.assertAssetError = exports.assertStdout('webpack "Can\'t resolve" error')(1)`
9676
^[ ]*ERROR[^\n]*
9777
[ ]*Module build failed[^\n]*
9878
[ ]*ModuleBuildError: Module build failed[^\n]*
9979
[ ]*Error: Can't resolve[^\n]*
10080
`;
101-
102-
// TODO inline this
103-
exports.assertAssetError = assertCantResolveError;

0 commit comments

Comments
 (0)