refactor: code and tests (webpack-contrib#947)

Author: evilebottnawi

src/index.js

@@ -117,54 +117,58 @@ export default function loader(content, map, meta) {
         exportOnlyLocals
       );
 
-      const exports = getExports(
+      const exportItems = getExports(
         messages,
         exportLocalsStyle,
         importItemReplacer
       );
 
+      const exportsCode =
+        exportItems.length > 0
+          ? exportOnlyLocals
+            ? `module.exports = {\n${exportItems.join(',\n')}\n};`
+            : `// Exports\nexports.locals = {\n${exportItems.join(',\n')}\n};`
+          : '';
+
       if (exportOnlyLocals) {
-        return callback(
-          null,
-          exports.length > 0
-            ? `module.exports = {\n${exports.join(',\n')}\n};`
-            : ''
-        );
+        return callback(null, exportsCode);
       }
 
       let cssAsString = JSON.stringify(result.css).replace(
         placholderRegExps.importItemG,
         importItemReplacer
       );
 
-      const imports = getImports(messages, importPrefix, this, (message) => {
-        if (message.type !== 'url') {
-          return;
-        }
+      const importItems = getImports(
+        messages,
+        importPrefix,
+        this,
+        (message) => {
+          if (message.type !== 'url') {
+            return;
+          }
 
-        const { placeholder } = message.item;
+          const { placeholder } = message.item;
 
-        cssAsString = cssAsString.replace(
-          new RegExp(placeholder, 'g'),
-          () => `" + ${placeholder} + "`
-        );
-      });
+          cssAsString = cssAsString.replace(
+            new RegExp(placeholder, 'g'),
+            () => `" + ${placeholder} + "`
+          );
+        }
+      );
 
       const runtimeCode = `exports = module.exports = require(${stringifyRequest(
         this,
         require.resolve('./runtime/api')
       )})(${!!sourceMap});\n`;
       const importCode =
-        imports.length > 0 ? `// Imports\n${imports.join('\n')}\n\n` : '';
+        importItems.length > 0
+          ? `// Imports\n${importItems.join('\n')}\n\n`
+          : '';
       const moduleCode = `// Module\nexports.push([module.id, ${cssAsString}, ""${
         result.map ? `,${result.map}` : ''
       }]);\n\n`;
-      const exportsCode =
-        exports.length > 0
-          ? `// Exports\nexports.locals = {\n${exports.join(',\n')}\n};`
-          : '';
 
-      // Embed runtime
       return callback(
         null,
         runtimeCode + importCode + moduleCode + exportsCode

test/__snapshots__/exportOnlyLocals-option.test.js.snap

@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`modules true (mode: local): errors 1`] = `Array []`;
+
+exports[`modules true (mode: local): module 1`] = `
+"module.exports = {
+	\\"v-def\\": \\"\\" + require(\\"-!../../../src/index.js??ref--4-0!./values.css\\")[\\"v-def\\"] + \\"\\",
+	\\"v-other\\": \\"\\" + require(\\"-!../../../src/index.js??ref--4-0!./values.css\\")[\\"v-other\\"] + \\"\\",
+	\\"s-white\\": \\"\\" + require(\\"-!../../../src/index.js??ref--4-0!./values.css\\")[\\"s-white\\"] + \\"\\",
+	\\"m-small\\": \\"\\" + require(\\"-!../../../src/index.js??ref--4-0!./values.css\\")[\\"m-small\\"] + \\"\\",
+	\\"v-something\\": \\"\\" + require(\\"-!../../../src/index.js??ref--4-0!./something.css\\")[\\"v-something\\"] + \\"\\",
+	\\"v-foo\\": \\"blue\\",
+	\\"v-bar\\": \\"block\\",
+	\\"v-primary\\": \\"#BF4040\\",
+	\\"s-black\\": \\"black-selector\\",
+	\\"m-large\\": \\"(min-width: 960px)\\",
+	\\"ghi\\": \\"_ghi\\",
+	\\"class\\": \\"_class\\",
+	\\"other\\": \\"_other\\",
+	\\"other-other\\": \\"_other-other\\",
+	\\"green\\": \\"_green\\",
+	\\"foo\\": \\"_foo\\",
+	\\"simple\\": \\"_simple \\" + require(\\"-!../../../src/index.js??ref--4-0!./imported-simple.css\\")[\\"imported-simple\\"] + \\"\\",
+	\\"relative\\": \\"_relative \\" + require(\\"-!../../../src/index.js??ref--4-0!./relative.css\\")[\\"imported-relative\\"] + \\"\\",
+	\\"top-relative\\": \\"_top-relative \\" + require(\\"-!../../../src/index.js??ref--4-0!../modules/top-relative.css\\")[\\"imported-relative\\"] + \\"\\",
+	\\"module\\": \\"_module \\" + require(\\"-!../../../src/index.js??ref--4-0!package/style.css\\")[\\"imported-module\\"] + \\"\\",
+	\\"alias\\": \\"_alias \\" + require(\\"-!../../../src/index.js??ref--4-0!aliasesComposes/alias.css\\")[\\"imported-alias\\"] + \\"\\",
+	\\"primary-selector\\": \\"_primary-selector\\",
+	\\"black-selector\\": \\"_black-selector\\",
+	\\"header\\": \\"_header\\"
+};"
+`;
+
+exports[`modules true (mode: local): values module 1`] = `
+"module.exports = {
+	\\"v-def\\": \\"red\\",
+	\\"v-other\\": \\"green\\",
+	\\"s-white\\": \\"white\\",
+	\\"m-small\\": \\"(min-width: 320px)\\"
+};"
+`;
+
+exports[`modules true (mode: local): warnings 1`] = `Array []`;