Skip to content

Commit 609263a

Browse files
evilebottnawievilebottnawi
authored
test: refactor
1 parent 7768fce commit 609263a

23 files changed

+869
-456
lines changed

‎azure-pipelines.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
node-10-canary:
5959
node_version: ^10.13.0
6060
webpack_version: next
61-
continue_on_error: true
6261
steps:
6362
- task: NodeTool@0
6463
inputs:
@@ -115,7 +114,6 @@ jobs:
115114
node-10-canary:
116115
node_version: ^10.13.0
117116
webpack_version: next
118-
continue_on_error: true
119117
steps:
120118
- task: NodeTool@0
121119
inputs:
@@ -172,7 +170,6 @@ jobs:
172170
node-10-canary:
173171
node_version: ^10.13.0
174172
webpack_version: next
175-
continue_on_error: true
176173
steps:
177174
- script: 'git config --global core.autocrlf input'
178175
displayName: 'Config git core.autocrlf'

‎package-lock.json‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dist"
4242
],
4343
"peerDependencies": {
44-
"webpack": "^4.0.0"
44+
"webpack": "^4.0.0 || ^5.0.0"
4545
},
4646
"dependencies": {
4747
"loader-utils": "^1.2.3",
@@ -58,7 +58,7 @@
5858
"babel-jest": "^24.9.0",
5959
"commitlint-azure-pipelines-cli": "^1.0.2",
6060
"cross-env": "^6.0.3",
61-
"css-loader": "webpack-contrib/css-loader#master",
61+
"css-loader": "^3.4.0",
6262
"del": "^5.1.0",
6363
"del-cli": "^3.0.0",
6464
"es-check": "^5.1.0",

‎test/__snapshots__/loader.test.js.snap‎

Lines changed: 198 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,54 @@ exports[`loader should work when ref is negative when the "injectType" option is
314314
315315
exports[`loader should work when ref is negative when the "injectType" option is "lazyStyleTag": warnings 1`] = `Array []`;
316316
317+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and CommonJS module syntax used: DOM 1`] = `
318+
"<!DOCTYPE html><html><head>
319+
<title>style-loader test</title>
320+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
321+
<style>body {
322+
color: red;
323+
}
324+
h1 {
325+
color: blue;
326+
}
327+
</style></head>
328+
<body>
329+
<h1>Body</h1>
330+
<div class=\\"target\\"></div>
331+
<iframe class=\\"iframeTarget\\"></iframe>
332+
333+
334+
</body></html>"
335+
`;
336+
337+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and CommonJS module syntax used: errors 1`] = `Array []`;
338+
339+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and CommonJS module syntax used: warnings 1`] = `Array []`;
340+
341+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and ES module syntax used: DOM 1`] = `
342+
"<!DOCTYPE html><html><head>
343+
<title>style-loader test</title>
344+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
345+
<style>body {
346+
color: red;
347+
}
348+
h1 {
349+
color: blue;
350+
}
351+
</style></head>
352+
<body>
353+
<h1>Body</h1>
354+
<div class=\\"target\\"></div>
355+
<iframe class=\\"iframeTarget\\"></iframe>
356+
357+
358+
</body></html>"
359+
`;
360+
361+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and ES module syntax used: errors 1`] = `Array []`;
362+
363+
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag" and ES module syntax used: warnings 1`] = `Array []`;
364+
317365
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag": DOM 1`] = `
318366
"<!DOCTYPE html><html><head>
319367
<title>style-loader test</title>
@@ -338,6 +386,54 @@ exports[`loader should work when the "injectType" option is "lazySingletonStyleT
338386
339387
exports[`loader should work when the "injectType" option is "lazySingletonStyleTag": warnings 1`] = `Array []`;
340388
389+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and CommonJS module syntax used: DOM 1`] = `
390+
"<!DOCTYPE html><html><head>
391+
<title>style-loader test</title>
392+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
393+
<style>body {
394+
color: red;
395+
}
396+
</style><style>h1 {
397+
color: blue;
398+
}
399+
</style></head>
400+
<body>
401+
<h1>Body</h1>
402+
<div class=\\"target\\"></div>
403+
<iframe class=\\"iframeTarget\\"></iframe>
404+
405+
406+
</body></html>"
407+
`;
408+
409+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and CommonJS module syntax used: errors 1`] = `Array []`;
410+
411+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and CommonJS module syntax used: warnings 1`] = `Array []`;
412+
413+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and ES module syntax used: DOM 1`] = `
414+
"<!DOCTYPE html><html><head>
415+
<title>style-loader test</title>
416+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
417+
<style>body {
418+
color: red;
419+
}
420+
</style><style>h1 {
421+
color: blue;
422+
}
423+
</style></head>
424+
<body>
425+
<h1>Body</h1>
426+
<div class=\\"target\\"></div>
427+
<iframe class=\\"iframeTarget\\"></iframe>
428+
429+
430+
</body></html>"
431+
`;
432+
433+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and ES module syntax used: errors 1`] = `Array []`;
434+
435+
exports[`loader should work when the "injectType" option is "lazyStyleTag" and ES module syntax used: warnings 1`] = `Array []`;
436+
341437
exports[`loader should work when the "injectType" option is "lazyStyleTag": DOM 1`] = `
342438
"<!DOCTYPE html><html><head>
343439
<title>style-loader test</title>
@@ -362,7 +458,7 @@ exports[`loader should work when the "injectType" option is "lazyStyleTag": erro
362458
363459
exports[`loader should work when the "injectType" option is "lazyStyleTag": warnings 1`] = `Array []`;
364460
365-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses CommonJS module syntax: DOM 1`] = `
461+
exports[`loader should work when the "injectType" option is "linkTag" and CommonJS module syntax used: DOM 1`] = `
366462
"<!DOCTYPE html><html><head>
367463
<title>style-loader test</title>
368464
<style id=\\"existing-style\\">.existing { color: yellow }</style>
@@ -376,11 +472,11 @@ exports[`loader should work when the "injectType" option is "linkTag" and "file-
376472
</body></html>"
377473
`;
378474
379-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses CommonJS module syntax: errors 1`] = `Array []`;
475+
exports[`loader should work when the "injectType" option is "linkTag" and CommonJS module syntax used: errors 1`] = `Array []`;
380476
381-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses CommonJS module syntax: warnings 1`] = `Array []`;
477+
exports[`loader should work when the "injectType" option is "linkTag" and CommonJS module syntax used: warnings 1`] = `Array []`;
382478
383-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses ES module syntax: DOM 1`] = `
479+
exports[`loader should work when the "injectType" option is "linkTag" and ES module syntax used: DOM 1`] = `
384480
"<!DOCTYPE html><html><head>
385481
<title>style-loader test</title>
386482
<style id=\\"existing-style\\">.existing { color: yellow }</style>
@@ -394,9 +490,9 @@ exports[`loader should work when the "injectType" option is "linkTag" and "file-
394490
</body></html>"
395491
`;
396492
397-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses ES module syntax: errors 1`] = `Array []`;
493+
exports[`loader should work when the "injectType" option is "linkTag" and ES module syntax used: errors 1`] = `Array []`;
398494
399-
exports[`loader should work when the "injectType" option is "linkTag" and "file-loader" uses ES module syntax: warnings 1`] = `Array []`;
495+
exports[`loader should work when the "injectType" option is "linkTag" and ES module syntax used: warnings 1`] = `Array []`;
400496
401497
exports[`loader should work when the "injectType" option is "linkTag": DOM 1`] = `
402498
"<!DOCTYPE html><html><head>
@@ -416,6 +512,54 @@ exports[`loader should work when the "injectType" option is "linkTag": errors 1`
416512
417513
exports[`loader should work when the "injectType" option is "linkTag": warnings 1`] = `Array []`;
418514
515+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and CommonJS module syntax used: DOM 1`] = `
516+
"<!DOCTYPE html><html><head>
517+
<title>style-loader test</title>
518+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
519+
<style>body {
520+
color: red;
521+
}
522+
h1 {
523+
color: blue;
524+
}
525+
</style></head>
526+
<body>
527+
<h1>Body</h1>
528+
<div class=\\"target\\"></div>
529+
<iframe class=\\"iframeTarget\\"></iframe>
530+
531+
532+
</body></html>"
533+
`;
534+
535+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and CommonJS module syntax used: errors 1`] = `Array []`;
536+
537+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and CommonJS module syntax used: warnings 1`] = `Array []`;
538+
539+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and ES module syntax used: DOM 1`] = `
540+
"<!DOCTYPE html><html><head>
541+
<title>style-loader test</title>
542+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
543+
<style>body {
544+
color: red;
545+
}
546+
h1 {
547+
color: blue;
548+
}
549+
</style></head>
550+
<body>
551+
<h1>Body</h1>
552+
<div class=\\"target\\"></div>
553+
<iframe class=\\"iframeTarget\\"></iframe>
554+
555+
556+
</body></html>"
557+
`;
558+
559+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and ES module syntax used: errors 1`] = `Array []`;
560+
561+
exports[`loader should work when the "injectType" option is "singletonStyleTag" and ES module syntax used: warnings 1`] = `Array []`;
562+
419563
exports[`loader should work when the "injectType" option is "singletonStyleTag": DOM 1`] = `
420564
"<!DOCTYPE html><html><head>
421565
<title>style-loader test</title>
@@ -440,6 +584,54 @@ exports[`loader should work when the "injectType" option is "singletonStyleTag":
440584
441585
exports[`loader should work when the "injectType" option is "singletonStyleTag": warnings 1`] = `Array []`;
442586
587+
exports[`loader should work when the "injectType" option is "styleTag" and CommonJS module syntax used: DOM 1`] = `
588+
"<!DOCTYPE html><html><head>
589+
<title>style-loader test</title>
590+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
591+
<style>body {
592+
color: red;
593+
}
594+
</style><style>h1 {
595+
color: blue;
596+
}
597+
</style></head>
598+
<body>
599+
<h1>Body</h1>
600+
<div class=\\"target\\"></div>
601+
<iframe class=\\"iframeTarget\\"></iframe>
602+
603+
604+
</body></html>"
605+
`;
606+
607+
exports[`loader should work when the "injectType" option is "styleTag" and CommonJS module syntax used: errors 1`] = `Array []`;
608+
609+
exports[`loader should work when the "injectType" option is "styleTag" and CommonJS module syntax used: warnings 1`] = `Array []`;
610+
611+
exports[`loader should work when the "injectType" option is "styleTag" and ES module syntax used: DOM 1`] = `
612+
"<!DOCTYPE html><html><head>
613+
<title>style-loader test</title>
614+
<style id=\\"existing-style\\">.existing { color: yellow }</style>
615+
<style>body {
616+
color: red;
617+
}
618+
</style><style>h1 {
619+
color: blue;
620+
}
621+
</style></head>
622+
<body>
623+
<h1>Body</h1>
624+
<div class=\\"target\\"></div>
625+
<iframe class=\\"iframeTarget\\"></iframe>
626+
627+
628+
</body></html>"
629+
`;
630+
631+
exports[`loader should work when the "injectType" option is "styleTag" and ES module syntax used: errors 1`] = `Array []`;
632+
633+
exports[`loader should work when the "injectType" option is "styleTag" and ES module syntax used: warnings 1`] = `Array []`;
634+
443635
exports[`loader should work when the "injectType" option is "styleTag": DOM 1`] = `
444636
"<!DOCTYPE html><html><head>
445637
<title>style-loader test</title>

0 commit comments

Comments
 (0)