Skip to content

Commit 0cf8cde

Browse files
cap-Bernarditocap-Bernardito
authored
fix: compatibility with named export and es5 (#1314)
1 parent 8f1a6fc commit 0cf8cde

File tree

2 files changed

+72
-72
lines changed

2 files changed

+72
-72
lines changed

‎src/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ function getExportCode(exports, replacements, options) {
776776

777777
const addExportToLocalsCode = (name, value) => {
778778
if (options.modules.namedExport) {
779-
localsCode += `export const ${name} = ${JSON.stringify(value)};\n`;
779+
localsCode += `export var ${name} = ${JSON.stringify(value)};\n`;
780780
} else {
781781
if (localsCode) {
782782
localsCode += `,\n`;

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

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,7 @@ exports[`"modules" option should throw an error on unresolved import: warnings 1
17271727

17281728
exports[`"modules" option should throw an error when class has unsupported name (JavaScript reserved words): errors 1`] = `
17291729
Array [
1730-
"ModuleParseError: Module parse failed: Unexpected keyword 'class' (7:13)
1730+
"ModuleParseError: Module parse failed: Unexpected keyword 'class' (7:11)
17311731
File was processed with these loaders:",
17321732
]
17331733
`;
@@ -3814,9 +3814,9 @@ var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1
38143814
// Module
38153815
___CSS_LOADER_EXPORT___.push([module.id, \\".header-baz {\\\\n color: red;\\\\n}\\\\n\\\\n.body {\\\\n color: coral;\\\\n}\\\\n\\\\n.footer {\\\\n color: blue;\\\\n}\\\\n\\", \\"\\"]);
38163816
// Exports
3817-
export const headerBaz = \\"header-baz\\";
3818-
export const body = \\"body\\";
3819-
export const footer = \\"footer\\";
3817+
export var headerBaz = \\"header-baz\\";
3818+
export var body = \\"body\\";
3819+
export var footer = \\"footer\\";
38203820
export default ___CSS_LOADER_EXPORT___;
38213821
"
38223822
`;
@@ -3860,7 +3860,7 @@ var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1
38603860
// Module
38613861
___CSS_LOADER_EXPORT___.push([module.id, \\".foo_barBaz {\\\\n color: red;\\\\n}\\\\n\\\\n.bar {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
38623862
// Exports
3863-
export const foo_barBaz = \\"foo_barBaz\\";
3863+
export var foo_barBaz = \\"foo_barBaz\\";
38643864
export default ___CSS_LOADER_EXPORT___;
38653865
"
38663866
`;
@@ -4135,53 +4135,53 @@ import * as ___CSS_LOADER_ICSS_IMPORT_5____NAMED___ from \\"-!../../../../src/in
41354135
import * as ___CSS_LOADER_ICSS_IMPORT_6____NAMED___ from \\"-!../../../../src/index.js??[ident]!./alias.css\\";
41364136
import * as ___CSS_LOADER_ICSS_IMPORT_7____NAMED___ from \\"-!../../../../src/index.js??[ident]!./scss-file.scss\\";
41374137
// Exports
4138-
export const vDef = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vDef\\"] + \\"\\";
4139-
export const vOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vOther\\"] + \\"\\";
4140-
export const sWhite = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"sWhite\\"] + \\"\\";
4141-
export const mSmall = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"mSmall\\"] + \\"\\";
4142-
export const vSomething = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_1____NAMED___[\\"vSomething\\"] + \\"\\";
4143-
export const vFoo = \\"blue\\";
4144-
export const vBar = \\"block\\";
4145-
export const vPrimary = \\"#BF4040\\";
4146-
export const sBlack = \\"black-selector\\";
4147-
export const mLarge = \\"(min-width: 960px)\\";
4148-
export const vIdent = \\"validIdent\\";
4149-
export const vPreDefinedIdent = \\"left\\";
4150-
export const vString = \\"'content'\\";
4151-
export const vString1 = \\"''\\";
4152-
export const vUrl = \\"url(https://www.exammple.com/images/my-background.png)\\";
4153-
export const vUrl1 = \\"url('https://www.exammple.com/images/my-background.png')\\";
4154-
export const vUrl2 = \\"url(\\\\\\"https://www.exammple.com/images/my-background.png\\\\\\")\\";
4155-
export const vInteger = \\"100\\";
4156-
export const vInteger1 = \\"-100\\";
4157-
export const vInteger2 = \\"+100\\";
4158-
export const vNumber = \\".60\\";
4159-
export const vNumber1 = \\"-456.8\\";
4160-
export const vNumber2 = \\"-3.4e-2\\";
4161-
export const vDimension = \\"12px\\";
4162-
export const vPercentage = \\"100%\\";
4163-
export const vHex = \\"#fff\\";
4164-
export const vComment = \\" /* comment */\\";
4165-
export const vFunction = \\"rgb(0,0,0)\\";
4166-
export const vUnicodeRange = \\"U+0025-00FF\\";
4167-
export const ghi = \\"_ghi\\";
4168-
export const myClass = \\"_my-class\\";
4169-
export const other = \\"_other\\";
4170-
export const otherOther = \\"_other-other\\";
4171-
export const green = \\"_green\\";
4172-
export const foo = \\"_foo\\";
4173-
export const simple = \\"_simple \\" + ___CSS_LOADER_ICSS_IMPORT_2____NAMED___[\\"importedSimple\\"] + \\"\\";
4174-
export const relative = \\"_relative \\" + ___CSS_LOADER_ICSS_IMPORT_3____NAMED___[\\"importedRelative\\"] + \\"\\";
4175-
export const topRelative = \\"_top-relative \\" + ___CSS_LOADER_ICSS_IMPORT_4____NAMED___[\\"importedRelative\\"] + \\"\\";
4176-
export const myModule = \\"_my-module \\" + ___CSS_LOADER_ICSS_IMPORT_5____NAMED___[\\"importedModule\\"] + \\"\\";
4177-
export const alias = \\"_alias \\" + ___CSS_LOADER_ICSS_IMPORT_6____NAMED___[\\"importedAlias\\"] + \\"\\";
4178-
export const aliasDuplicate = \\"_alias-duplicate \\" + ___CSS_LOADER_ICSS_IMPORT_6____NAMED___[\\"importedAlias\\"] + \\"\\";
4179-
export const primarySelector = \\"_primary-selector\\";
4180-
export const blackSelector = \\"_black-selector\\";
4181-
export const header = \\"_header\\";
4182-
export const foobarbaz = \\"_foobarbaz\\";
4183-
export const url = \\"_url\\";
4184-
export const main = \\"_main \\" + ___CSS_LOADER_ICSS_IMPORT_7____NAMED___[\\"scssClass\\"] + \\"\\";
4138+
export var vDef = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vDef\\"] + \\"\\";
4139+
export var vOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vOther\\"] + \\"\\";
4140+
export var sWhite = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"sWhite\\"] + \\"\\";
4141+
export var mSmall = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"mSmall\\"] + \\"\\";
4142+
export var vSomething = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_1____NAMED___[\\"vSomething\\"] + \\"\\";
4143+
export var vFoo = \\"blue\\";
4144+
export var vBar = \\"block\\";
4145+
export var vPrimary = \\"#BF4040\\";
4146+
export var sBlack = \\"black-selector\\";
4147+
export var mLarge = \\"(min-width: 960px)\\";
4148+
export var vIdent = \\"validIdent\\";
4149+
export var vPreDefinedIdent = \\"left\\";
4150+
export var vString = \\"'content'\\";
4151+
export var vString1 = \\"''\\";
4152+
export var vUrl = \\"url(https://www.exammple.com/images/my-background.png)\\";
4153+
export var vUrl1 = \\"url('https://www.exammple.com/images/my-background.png')\\";
4154+
export var vUrl2 = \\"url(\\\\\\"https://www.exammple.com/images/my-background.png\\\\\\")\\";
4155+
export var vInteger = \\"100\\";
4156+
export var vInteger1 = \\"-100\\";
4157+
export var vInteger2 = \\"+100\\";
4158+
export var vNumber = \\".60\\";
4159+
export var vNumber1 = \\"-456.8\\";
4160+
export var vNumber2 = \\"-3.4e-2\\";
4161+
export var vDimension = \\"12px\\";
4162+
export var vPercentage = \\"100%\\";
4163+
export var vHex = \\"#fff\\";
4164+
export var vComment = \\" /* comment */\\";
4165+
export var vFunction = \\"rgb(0,0,0)\\";
4166+
export var vUnicodeRange = \\"U+0025-00FF\\";
4167+
export var ghi = \\"_ghi\\";
4168+
export var myClass = \\"_my-class\\";
4169+
export var other = \\"_other\\";
4170+
export var otherOther = \\"_other-other\\";
4171+
export var green = \\"_green\\";
4172+
export var foo = \\"_foo\\";
4173+
export var simple = \\"_simple \\" + ___CSS_LOADER_ICSS_IMPORT_2____NAMED___[\\"importedSimple\\"] + \\"\\";
4174+
export var relative = \\"_relative \\" + ___CSS_LOADER_ICSS_IMPORT_3____NAMED___[\\"importedRelative\\"] + \\"\\";
4175+
export var topRelative = \\"_top-relative \\" + ___CSS_LOADER_ICSS_IMPORT_4____NAMED___[\\"importedRelative\\"] + \\"\\";
4176+
export var myModule = \\"_my-module \\" + ___CSS_LOADER_ICSS_IMPORT_5____NAMED___[\\"importedModule\\"] + \\"\\";
4177+
export var alias = \\"_alias \\" + ___CSS_LOADER_ICSS_IMPORT_6____NAMED___[\\"importedAlias\\"] + \\"\\";
4178+
export var aliasDuplicate = \\"_alias-duplicate \\" + ___CSS_LOADER_ICSS_IMPORT_6____NAMED___[\\"importedAlias\\"] + \\"\\";
4179+
export var primarySelector = \\"_primary-selector\\";
4180+
export var blackSelector = \\"_black-selector\\";
4181+
export var header = \\"_header\\";
4182+
export var foobarbaz = \\"_foobarbaz\\";
4183+
export var url = \\"_url\\";
4184+
export var main = \\"_main \\" + ___CSS_LOADER_ICSS_IMPORT_7____NAMED___[\\"scssClass\\"] + \\"\\";
41854185
"
41864186
`;
41874187

@@ -4257,8 +4257,8 @@ var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_
42574257
// Module
42584258
___CSS_LOADER_EXPORT___.push([module.id, \\"a {\\\\n background: url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\");\\\\n}\\\\n\\\\nbody {\\\\n background: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
42594259
// Exports
4260-
export const vUrl = \\"url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\")\\";
4261-
export const vUrlOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\"\\";
4260+
export var vUrl = \\"url(\\" + ___CSS_LOADER_URL_REPLACEMENT_0___ + \\")\\";
4261+
export var vUrlOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vUrlOther\\"] + \\"\\";
42624262
export default ___CSS_LOADER_EXPORT___;
42634263
"
42644264
`;
@@ -12362,15 +12362,15 @@ ___CSS_LOADER_EXPORT___.i(___CSS_LOADER_ICSS_IMPORT_0___, \\"\\", true);
1236212362
// Module
1236312363
___CSS_LOADER_EXPORT___.push([module.id, \\"._ghi {\\\\n color: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_def\\"] + \\";\\\\n}\\\\n\\\\n._my-class {\\\\n color: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"sWhite\\"] + \\";\\\\n}\\\\n\\\\n._other {\\\\n display: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"mSmall\\"] + \\";\\\\n}\\\\n\\\\n._other-other {\\\\n width: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_def\\"] + \\";\\\\n}\\\\n\\\\n._green {\\\\n color: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_otherOther\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
1236412364
// Exports
12365-
export const v_def = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_def\\"] + \\"\\";
12366-
export const v_otherOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_otherOther\\"] + \\"\\";
12367-
export const sWhite = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"sWhite\\"] + \\"\\";
12368-
export const mSmall = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"mSmall\\"] + \\"\\";
12369-
export const ghi = \\"_ghi\\";
12370-
export const myClass = \\"_my-class\\";
12371-
export const other = \\"_other\\";
12372-
export const otherOther = \\"_other-other\\";
12373-
export const green = \\"_green\\";
12365+
export var v_def = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_def\\"] + \\"\\";
12366+
export var v_otherOther = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"v_otherOther\\"] + \\"\\";
12367+
export var sWhite = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"sWhite\\"] + \\"\\";
12368+
export var mSmall = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"mSmall\\"] + \\"\\";
12369+
export var ghi = \\"_ghi\\";
12370+
export var myClass = \\"_my-class\\";
12371+
export var other = \\"_other\\";
12372+
export var otherOther = \\"_other-other\\";
12373+
export var green = \\"_green\\";
1237412374
export default ___CSS_LOADER_EXPORT___;
1237512375
"
1237612376
`;
@@ -12820,12 +12820,12 @@ ___CSS_LOADER_EXPORT___.i(___CSS_LOADER_ICSS_IMPORT_0___, \\"\\", true);
1282012820
// Module
1282112821
___CSS_LOADER_EXPORT___.push([module.id, \\"._10XHvKY7SkdmM8ZvRFtWzU {\\\\n color: #BF4040;\\\\n padding: 0 10px;\\\\n}\\\\n\\\\n._1kluA9lYOATstWNhEJp14n {\\\\n color: black;\\\\n}\\\\n\\\\n@media (min-width: 960px) and (max-width: 1024px) {\\\\n ._10XHvKY7SkdmM8ZvRFtWzU {\\\\n color: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vDef\\"] + \\";\\\\n padding: 0 20px;\\\\n }\\\\n}\\\\n\\", \\"\\"]);
1282212822
// Exports
12823-
export const vDef = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vDef\\"] + \\"\\";
12824-
export const vPrimary = \\"#BF4040\\";
12825-
export const sBlack = \\"black-selector\\";
12826-
export const mLarge = \\"(min-width: 960px)\\";
12827-
export const header = \\"_10XHvKY7SkdmM8ZvRFtWzU\\";
12828-
export const blackSelector = \\"_1kluA9lYOATstWNhEJp14n\\";
12823+
export var vDef = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"vDef\\"] + \\"\\";
12824+
export var vPrimary = \\"#BF4040\\";
12825+
export var sBlack = \\"black-selector\\";
12826+
export var mLarge = \\"(min-width: 960px)\\";
12827+
export var header = \\"_10XHvKY7SkdmM8ZvRFtWzU\\";
12828+
export var blackSelector = \\"_1kluA9lYOATstWNhEJp14n\\";
1282912829
export default ___CSS_LOADER_EXPORT___;
1283012830
"
1283112831
`;
@@ -12872,7 +12872,7 @@ var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1
1287212872
// Module
1287312873
___CSS_LOADER_EXPORT___.push([module.id, \\"._1DWrSJ4evr5bF-6Ojpv9nG {\\\\n color: red;\\\\n}\\\\n\\\\n.bar {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
1287412874
// Exports
12875-
export const barBaz = \\"_1DWrSJ4evr5bF-6Ojpv9nG\\";
12875+
export var barBaz = \\"_1DWrSJ4evr5bF-6Ojpv9nG\\";
1287612876
export default ___CSS_LOADER_EXPORT___;
1287712877
"
1287812878
`;
@@ -13052,7 +13052,7 @@ ___CSS_LOADER_EXPORT___.i(___CSS_LOADER_ICSS_IMPORT_0___, \\"\\", true);
1305213052
// Module
1305313053
___CSS_LOADER_EXPORT___.push([module.id, \\".className {\\\\n color: \\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"primaryColor\\"] + \\";\\\\n}\\\\n\\", \\"\\"]);
1305413054
// Exports
13055-
export const primaryColor = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"primaryColor\\"] + \\"\\";
13055+
export var primaryColor = \\"\\" + ___CSS_LOADER_ICSS_IMPORT_0____NAMED___[\\"primaryColor\\"] + \\"\\";
1305613056
export default ___CSS_LOADER_EXPORT___;
1305713057
"
1305813058
`;

0 commit comments

Comments
 (0)