Skip to content

Commit 9e1c005

Browse files
committed
refactor: reuse export string
1 parent 023d85c commit 9e1c005

File tree

8 files changed

+12
-12
lines changed
  • src
  • test/cases
    • custom-loader-with-functional-exports/expected
    • es-module-concatenation-modules/expected
    • es-named-export/expected
    • es-named-export-as-is/expected
    • es-named-export-as-is-output-module/expected
    • es-named-export-output-module/expected
    • export-only-locals-and-es-named-export/expected

8 files changed

+12
-12
lines changed

src/loader.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ function pitch(request) {
271271
const exportsString = `export { ${identifiers
272272
.map(([id, key]) => `${id} as ${JSON.stringify(key)}`)
273273
.join(", ")} }`;
274-
const exportDefaultString = `export default ${JSON.stringify(
275-
locals
276-
)}`;
274+
const exportDefaultString = `export default { ${identifiers
275+
.map(([id, key]) => `${JSON.stringify(key)}: ${id}`)
276+
.join(", ")} }`;
277277
return `${localsString}\n${exportsString}\n${exportDefaultString}\n`;
278278
}
279279

test/cases/custom-loader-with-functional-exports/expected/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ __webpack_require__.r(__webpack_exports__);
1515
var _1 = () => "class-name-a";
1616
var _2 = () => "class-name-b";
1717

18-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({});
18+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "cnA": _1, "cnB": _2 });
1919

2020

2121
/***/ })

test/cases/es-module-concatenation-modules/expected/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ __webpack_require__.d(index_namespaceObject, {
7373
// extracted by mini-css-extract-plugin
7474
var _1 = "foo__a";
7575

76-
/* harmony default export */ const a = ({"a":"foo__a"});
76+
/* harmony default export */ const a = ({ "a": _1 });
7777

7878
;// CONCATENATED MODULE: ./b.css
7979
// extracted by mini-css-extract-plugin
8080
var b_1 = "foo__b";
8181

82-
/* harmony default export */ const b = ({"b":"foo__b"});
82+
/* harmony default export */ const b = ({ "b": b_1 });
8383

8484
;// CONCATENATED MODULE: ./c.css
8585
// extracted by mini-css-extract-plugin
8686
var c_1 = "foo__c";
8787

88-
/* harmony default export */ const c = ({"c":"foo__c"});
88+
/* harmony default export */ const c = ({ "c": c_1 });
8989

9090
;// CONCATENATED MODULE: ./index.js
9191
/* eslint-disable import/no-namespace */

test/cases/es-named-export-as-is-output-module/expected/main.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var _1 = "Xh041yLR4iCP4RGjge50";
1515
var _2 = "NMuRsxoDwvW8BhSXhFAY";
1616
var _3 = "ayWIv09rPsAqE2JznIsI";
1717

18-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"a-class":"Xh041yLR4iCP4RGjge50","b__class":"NMuRsxoDwvW8BhSXhFAY","cClass":"ayWIv09rPsAqE2JznIsI"});
18+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "a-class": _1, "b__class": _2, "cClass": _3 });
1919

2020

2121
/***/ })

test/cases/es-named-export-as-is/expected/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var _1 = "Xh041yLR4iCP4RGjge50";
1717
var _2 = "NMuRsxoDwvW8BhSXhFAY";
1818
var _3 = "ayWIv09rPsAqE2JznIsI";
1919

20-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"a-class":"Xh041yLR4iCP4RGjge50","b__class":"NMuRsxoDwvW8BhSXhFAY","cClass":"ayWIv09rPsAqE2JznIsI"});
20+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "a-class": _1, "b__class": _2, "cClass": _3 });
2121

2222

2323
/***/ })

test/cases/es-named-export-output-module/expected/main.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var _1 = "foo__style__a-class";
1515
var _2 = "foo__style__b__class";
1616
var _3 = "foo__style__cClass";
1717

18-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"aClass":"foo__style__a-class","bClass":"foo__style__b__class","cClass":"foo__style__cClass"});
18+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "aClass": _1, "bClass": _2, "cClass": _3 });
1919

2020

2121
/***/ })

test/cases/es-named-export/expected/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var _1 = "foo__style__a-class";
1717
var _2 = "foo__style__b__class";
1818
var _3 = "foo__style__cClass";
1919

20-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"a-class":"foo__style__a-class","b__class":"foo__style__b__class","cClass":"foo__style__cClass"});
20+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "a-class": _1, "b__class": _2, "cClass": _3 });
2121

2222

2323
/***/ })

test/cases/export-only-locals-and-es-named-export/expected/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var _1 = "foo__style__a-class";
1717
var _2 = "foo__style__b__class";
1818
var _3 = "foo__style__cClass";
1919

20-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"aClass":"foo__style__a-class","bClass":"foo__style__b__class","cClass":"foo__style__cClass"});
20+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ "aClass": _1, "bClass": _2, "cClass": _3 });
2121

2222

2323
/***/ })

0 commit comments

Comments
 (0)