Skip to content

Commit cb9983f

Browse files
cap-Bernarditocap-Bernardito
committed
refactor: esModule enable by default
1 parent c7cb29f commit cb9983f

File tree

13 files changed

+438
-780
lines changed

13 files changed

+438
-780
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"file-loader": "^6.0.0",
7777
"husky": "^4.2.5",
7878
"jest": "^26.1.0",
79-
"jsdom": "^16.3.0",
8079
"lint-staged": "^10.2.11",
8180
"memfs": "^3.2.0",
8281
"mini-css-extract-plugin": "^0.9.0",

‎src/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ function getModuleCode(
319319

320320
beforeCode += esModule
321321
? `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${sourceMap});\n`
322-
: `___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${sourceMap});\n`;
322+
: `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${sourceMap});\n`;
323323

324324
for (const item of apiImports) {
325325
const { type, media, dedupe } = item;

‎test/__snapshots__/esModule-option.test.js.snap

Lines changed: 109 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../src/runtime/api.js\\");
190190
var ___CSS_LOADER_AT_RULE_IMPORT_0___ = require(\\"-!../../../src/index.js??[ident]!./imported.css\\");
191191
var ___CSS_LOADER_GET_URL_IMPORT___ = require(\\"../../../src/runtime/getUrl.js\\");
192192
var ___CSS_LOADER_URL_IMPORT_0___ = require(\\"./img.png\\");
193-
___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(false);
193+
var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(false);
194194
___CSS_LOADER_EXPORT___.i(___CSS_LOADER_AT_RULE_IMPORT_0___);
195195
var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);
196196
// Module
@@ -417,3 +417,111 @@ Array [
417417
`;
418418
419419
exports[`"esModule" option should work with a value equal to "true": warnings 1`] = `Array []`;
420+
421+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: errors 1`] = `Array []`;
422+
423+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: result 1`] = `undefined`;
424+
425+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: warnings 1`] = `Array []`;
426+
427+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-style-loader: errors 1`] = `Array []`;
428+
429+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-style-loader: result 1`] = `
430+
Object {
431+
"default": Object {
432+
"css": Object {
433+
"body": "uTw0Zyl5UXHez5t_lWCWm",
434+
"footer": "_2QW_-wZzF9G9_VrEnlztAG",
435+
"header-baz": "_24LP0msVwbV2gDQs7MsBEI",
436+
},
437+
"html": "
438+
<div class=\\"_24LP0msVwbV2gDQs7MsBEI\\">
439+
<div class=\\"uTw0Zyl5UXHez5t_lWCWm\\">
440+
<div class=\\"_2QW_-wZzF9G9_VrEnlztAG\\">
441+
",
442+
},
443+
}
444+
`;
445+
446+
exports[`"esModule" option should work with commonjs-css-loader + commonjs-style-loader: warnings 1`] = `Array []`;
447+
448+
exports[`"esModule" option should work with commonjs-css-loader + esModule-mini-css-extract-plugin: errors 1`] = `Array []`;
449+
450+
exports[`"esModule" option should work with commonjs-css-loader + esModule-mini-css-extract-plugin: result 1`] = `undefined`;
451+
452+
exports[`"esModule" option should work with commonjs-css-loader + esModule-mini-css-extract-plugin: warnings 1`] = `Array []`;
453+
454+
exports[`"esModule" option should work with commonjs-css-loader + esModule-style-loader: errors 1`] = `Array []`;
455+
456+
exports[`"esModule" option should work with commonjs-css-loader + esModule-style-loader: result 1`] = `
457+
Object {
458+
"default": Object {
459+
"css": Object {
460+
"body": "uTw0Zyl5UXHez5t_lWCWm",
461+
"footer": "_2QW_-wZzF9G9_VrEnlztAG",
462+
"header-baz": "_24LP0msVwbV2gDQs7MsBEI",
463+
},
464+
"html": "
465+
<div class=\\"_24LP0msVwbV2gDQs7MsBEI\\">
466+
<div class=\\"uTw0Zyl5UXHez5t_lWCWm\\">
467+
<div class=\\"_2QW_-wZzF9G9_VrEnlztAG\\">
468+
",
469+
},
470+
}
471+
`;
472+
473+
exports[`"esModule" option should work with commonjs-css-loader + esModule-style-loader: warnings 1`] = `Array []`;
474+
475+
exports[`"esModule" option should work with esModule-css-loader + commonjs-mini-css-extract-plugin: errors 1`] = `Array []`;
476+
477+
exports[`"esModule" option should work with esModule-css-loader + commonjs-mini-css-extract-plugin: result 1`] = `undefined`;
478+
479+
exports[`"esModule" option should work with esModule-css-loader + commonjs-mini-css-extract-plugin: warnings 1`] = `Array []`;
480+
481+
exports[`"esModule" option should work with esModule-css-loader + commonjs-style-loader: errors 1`] = `Array []`;
482+
483+
exports[`"esModule" option should work with esModule-css-loader + commonjs-style-loader: result 1`] = `
484+
Object {
485+
"default": Object {
486+
"css": Object {
487+
"body": "uTw0Zyl5UXHez5t_lWCWm",
488+
"footer": "_2QW_-wZzF9G9_VrEnlztAG",
489+
"header-baz": "_24LP0msVwbV2gDQs7MsBEI",
490+
},
491+
"html": "
492+
<div class=\\"_24LP0msVwbV2gDQs7MsBEI\\">
493+
<div class=\\"uTw0Zyl5UXHez5t_lWCWm\\">
494+
<div class=\\"_2QW_-wZzF9G9_VrEnlztAG\\">
495+
",
496+
},
497+
}
498+
`;
499+
500+
exports[`"esModule" option should work with esModule-css-loader + commonjs-style-loader: warnings 1`] = `Array []`;
501+
502+
exports[`"esModule" option should work with esModule-css-loader + esModule-mini-css-extract-plugin: errors 1`] = `Array []`;
503+
504+
exports[`"esModule" option should work with esModule-css-loader + esModule-mini-css-extract-plugin: result 1`] = `undefined`;
505+
506+
exports[`"esModule" option should work with esModule-css-loader + esModule-mini-css-extract-plugin: warnings 1`] = `Array []`;
507+
508+
exports[`"esModule" option should work with esModule-css-loader + esModule-style-loader: errors 1`] = `Array []`;
509+
510+
exports[`"esModule" option should work with esModule-css-loader + esModule-style-loader: result 1`] = `
511+
Object {
512+
"default": Object {
513+
"css": Object {
514+
"body": "uTw0Zyl5UXHez5t_lWCWm",
515+
"footer": "_2QW_-wZzF9G9_VrEnlztAG",
516+
"header-baz": "_24LP0msVwbV2gDQs7MsBEI",
517+
},
518+
"html": "
519+
<div class=\\"_24LP0msVwbV2gDQs7MsBEI\\">
520+
<div class=\\"uTw0Zyl5UXHez5t_lWCWm\\">
521+
<div class=\\"_2QW_-wZzF9G9_VrEnlztAG\\">
522+
",
523+
},
524+
}
525+
`;
526+
527+
exports[`"esModule" option should work with esModule-css-loader + esModule-style-loader: warnings 1`] = `Array []`;

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

Lines changed: 0 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -381,76 +381,6 @@ exports[`loader should work with ModuleConcatenationPlugin: errors 1`] = `Array
381381
382382
exports[`loader should work with ModuleConcatenationPlugin: warnings 1`] = `Array []`;
383383
384-
exports[`loader should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: css 1`] = `
385-
".some-class {
386-
color: red;
387-
}
388-
389-
"
390-
`;
391-
392-
exports[`loader should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: errors 1`] = `Array []`;
393-
394-
exports[`loader should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: result 1`] = `Object {}`;
395-
396-
exports[`loader should work with commonjs-css-loader + commonjs-mini-css-extract-plugin: warnings 1`] = `Array []`;
397-
398-
exports[`loader should work with commonjs-css-loader + commonjs-style-loader: DOM 1`] = `
399-
"<!DOCTYPE html><html><head>
400-
<title>style-loader test</title>
401-
<style id=\\"existing-style\\">.existing { color: yellow }</style>
402-
<style>.some-class {
403-
color: red;
404-
}
405-
</style></head>
406-
<body>
407-
<h1>Body</h1>
408-
<div class=\\"target\\"></div>
409-
<iframe class=\\"iframeTarget\\"></iframe>
410-
411-
412-
</body></html>"
413-
`;
414-
415-
exports[`loader should work with commonjs-css-loader + commonjs-style-loader: errors 1`] = `Array []`;
416-
417-
exports[`loader should work with commonjs-css-loader + commonjs-style-loader: warnings 1`] = `Array []`;
418-
419-
exports[`loader should work with commonjs-css-loader + esModule-mini-css-extract-plugin: css 1`] = `
420-
".some-class {
421-
color: red;
422-
}
423-
424-
"
425-
`;
426-
427-
exports[`loader should work with commonjs-css-loader + esModule-mini-css-extract-plugin: errors 1`] = `Array []`;
428-
429-
exports[`loader should work with commonjs-css-loader + esModule-mini-css-extract-plugin: result 1`] = `Object {}`;
430-
431-
exports[`loader should work with commonjs-css-loader + esModule-mini-css-extract-plugin: warnings 1`] = `Array []`;
432-
433-
exports[`loader should work with commonjs-css-loader + esModule-style-loader: DOM 1`] = `
434-
"<!DOCTYPE html><html><head>
435-
<title>style-loader test</title>
436-
<style id=\\"existing-style\\">.existing { color: yellow }</style>
437-
<style>.some-class {
438-
color: red;
439-
}
440-
</style></head>
441-
<body>
442-
<h1>Body</h1>
443-
<div class=\\"target\\"></div>
444-
<iframe class=\\"iframeTarget\\"></iframe>
445-
446-
447-
</body></html>"
448-
`;
449-
450-
exports[`loader should work with commonjs-css-loader + esModule-style-loader: errors 1`] = `Array []`;
451-
452-
exports[`loader should work with commonjs-css-loader + esModule-style-loader: warnings 1`] = `Array []`;
453-
454384
exports[`loader should work with empty css: errors 1`] = `Array []`;
455385
456386
exports[`loader should work with empty css: module 1`] = `
@@ -649,76 +579,6 @@ a[href=\\"\\" i] {
649579
650580
exports[`loader should work with empty options: warnings 1`] = `Array []`;
651581
652-
exports[`loader should work with esModule-css-loader + commonjs-mini-css-extract-plugin: css 1`] = `
653-
".some-class {
654-
color: red;
655-
}
656-
657-
"
658-
`;
659-
660-
exports[`loader should work with esModule-css-loader + commonjs-mini-css-extract-plugin: errors 1`] = `Array []`;
661-
662-
exports[`loader should work with esModule-css-loader + commonjs-mini-css-extract-plugin: result 1`] = `Object {}`;
663-
664-
exports[`loader should work with esModule-css-loader + commonjs-mini-css-extract-plugin: warnings 1`] = `Array []`;
665-
666-
exports[`loader should work with esModule-css-loader + commonjs-style-loader: DOM 1`] = `
667-
"<!DOCTYPE html><html><head>
668-
<title>style-loader test</title>
669-
<style id=\\"existing-style\\">.existing { color: yellow }</style>
670-
<style>.some-class {
671-
color: red;
672-
}
673-
</style></head>
674-
<body>
675-
<h1>Body</h1>
676-
<div class=\\"target\\"></div>
677-
<iframe class=\\"iframeTarget\\"></iframe>
678-
679-
680-
</body></html>"
681-
`;
682-
683-
exports[`loader should work with esModule-css-loader + commonjs-style-loader: errors 1`] = `Array []`;
684-
685-
exports[`loader should work with esModule-css-loader + commonjs-style-loader: warnings 1`] = `Array []`;
686-
687-
exports[`loader should work with esModule-css-loader + esModule-mini-css-extract-plugin: css 1`] = `
688-
".some-class {
689-
color: red;
690-
}
691-
692-
"
693-
`;
694-
695-
exports[`loader should work with esModule-css-loader + esModule-mini-css-extract-plugin: errors 1`] = `Array []`;
696-
697-
exports[`loader should work with esModule-css-loader + esModule-mini-css-extract-plugin: result 1`] = `Object {}`;
698-
699-
exports[`loader should work with esModule-css-loader + esModule-mini-css-extract-plugin: warnings 1`] = `Array []`;
700-
701-
exports[`loader should work with esModule-css-loader + esModule-style-loader: DOM 1`] = `
702-
"<!DOCTYPE html><html><head>
703-
<title>style-loader test</title>
704-
<style id=\\"existing-style\\">.existing { color: yellow }</style>
705-
<style>.some-class {
706-
color: red;
707-
}
708-
</style></head>
709-
<body>
710-
<h1>Body</h1>
711-
<div class=\\"target\\"></div>
712-
<iframe class=\\"iframeTarget\\"></iframe>
713-
714-
715-
</body></html>"
716-
`;
717-
718-
exports[`loader should work with esModule-css-loader + esModule-style-loader: errors 1`] = `Array []`;
719-
720-
exports[`loader should work with esModule-css-loader + esModule-style-loader: warnings 1`] = `Array []`;
721-
722582
exports[`loader should work with the "modules.auto" option and the "importLoaders" option: errors 1`] = `Array []`;
723583
724584
exports[`loader should work with the "modules.auto" option and the "importLoaders" option: result 1`] = `

0 commit comments

Comments
 (0)