feat: esModule export named

webpack-contrib · Jul 15, 2020 · 71f812f · 71f812f
1 parent 2054896
commit 71f812f
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -1036,7 +1036,7 @@ module.exports = {
 };
 ```
 
-### `exportNamed`
+### `namedExport`
 
 Type: `Boolean`
 Default: `false`
@@ -1076,8 +1076,9 @@ module.exports = {
         loader: 'css-loader',
         options: {
           esModule: true,
-          modules: true,
-          exportNamed: true,
+          modules: {
+            namedExport: true,
+          },
         },
       },
     ],

diff --git a/src/index.js b/src/index.js
@@ -171,22 +171,23 @@ export default function loader(content, map, meta) {
         );
       });
 
-      const exportNamed =
-        typeof options.exportNamed !== 'undefined'
-          ? options.exportNamed
+      const namedExport =
+        typeof options.modules === 'object' &&
+        typeof options.modules.namedExport !== 'undefined'
+          ? options.modules.namedExport
           : false;
 
-      const { localsConvention } = exportNamed
+      const { localsConvention } = namedExport
         ? { localsConvention: 'camelCaseOnly' }
         : options;
 
       const esModule =
         typeof options.esModule !== 'undefined' ? options.esModule : false;
 
-      if (Boolean(exportNamed) && Boolean(exportNamed) !== Boolean(esModule)) {
+      if (Boolean(namedExport) && Boolean(namedExport) !== Boolean(esModule)) {
         this.emitError(
           new Error(
-            '`Options.exportNamed` can not use without `options.esModule`'
+            '`Options.module.namedExport` cannot be used without `options.esModule`'
           )
         );
       }
@@ -196,7 +197,7 @@ export default function loader(content, map, meta) {
         exportType,
         imports,
         esModule,
-        exportNamed
+        namedExport
       );
       const moduleCode = getModuleCode(
         result,
@@ -206,15 +207,15 @@ export default function loader(content, map, meta) {
         urlReplacements,
         icssReplacements,
         esModule,
-        exportNamed
+        namedExport
       );
       const exportCode = getExportCode(
         exports,
         exportType,
         localsConvention,
         icssReplacements,
         esModule,
-        exportNamed
+        namedExport
       );
 
       return callback(null, `${importCode}${moduleCode}${exportCode}`);

diff --git a/src/options.json b/src/options.json
@@ -90,6 +90,10 @@
                   "instanceof": "Function"
                 }
               ]
+            },
+            "namedExport": {
+              "description": "Use the named export ES modules.",
+              "type": "boolean"
             }
           }
         }
@@ -121,10 +125,6 @@
     "esModule": {
       "description": "Use the ES modules syntax (https://github.com/webpack-contrib/css-loader#esmodule).",
       "type": "boolean"
-    },
-    "exportNamed": {
-      "description": "Use the named export ES modules.",
-      "type": "boolean"
     }
   },
   "type": "object"

diff --git a/src/utils.js b/src/utils.js
@@ -263,7 +263,7 @@ function getImportCode(
   exportType,
   imports,
   esModule,
-  exportNamed
+  namedExport
 ) {
   let code = '';
 
@@ -282,7 +282,7 @@ function getImportCode(
     const { importName, url, icss } = item;
 
     code += esModule
-      ? icss && exportNamed
+      ? icss && namedExport
         ? `import ${importName}, * as ${importName}_NAMED___ from ${url};\n`
         : `import ${importName} from ${url};\n`
       : `var ${importName} = require(${url});\n`;
@@ -299,7 +299,7 @@ function getModuleCode(
   urlReplacements,
   icssReplacements,
   esModule,
-  exportNamed
+  namedExport
 ) {
   if (exportType !== 'full') {
     return 'var ___CSS_LOADER_EXPORT___ = {};\n';
@@ -349,7 +349,7 @@ function getModuleCode(
     const { replacementName, importName, localName } = replacement;
 
     code = code.replace(new RegExp(replacementName, 'g'), () =>
-      exportNamed
+      namedExport
         ? `" + ${importName}_NAMED___[${JSON.stringify(
             camelCase(localName)
           )}] + "`
@@ -372,7 +372,7 @@ function getExportCode(
   localsConvention,
   icssReplacements,
   esModule,
-  exportNamed
+  namedExport
 ) {
   let code = '';
   let localsCode = '';
@@ -385,7 +385,7 @@ function getExportCode(
 
     localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
 
-    if (exportNamed) {
+    if (namedExport) {
       namedCode += `export const ${name} = ${JSON.stringify(value)};\n`;
     }
   };
@@ -435,7 +435,7 @@ function getExportCode(
       () => `" + ${importName}.locals[${JSON.stringify(localName)}] + "`
     );
 
-    if (exportNamed) {
+    if (namedExport) {
       namedCode = namedCode.replace(
         new RegExp(replacementName, 'g'),
         () =>

diff --git a/test/__snapshots__/esModule-option.test.js.snap b/test/__snapshots__/esModule-option.test.js.snap
@@ -12,7 +12,7 @@ exports[`"esModule" option should emit error when class has unsupported name: wa
 exports[`"esModule" option should emit error when exportNamed true && esModule false: errors 1`] = `
 Array [
   "ModuleError: Module Error (from \`replaced original path\`):
-\`Options.exportNamed\` can not use without \`options.esModule\`",
+\`Options.module.namedExport\` cannot be used without \`options.esModule\`",
 ]
 `;