refactor: stuff

Author: alexander-akait

src/index.js

@@ -130,7 +130,9 @@ export default function loader(content, map, meta) {
 
       if (result.messages && result.messages.length > 0) {
         result.messages
-          .filter((message) => (message.type === 'module' ? message : false))
+          .filter(
+            (message) => (message.type === 'css-loader' ? message : false)
+          )
           .forEach((message) => {
             try {
               moduleObj = message.modify(moduleObj, this);

src/plugins/import.js

@@ -58,7 +58,7 @@ const parseImport = (params) => {
 
 export default postcss.plugin(
   pluginName,
-  (options) =>
+  (options = {}) =>
     function process(css, result) {
       const { importLoaders } = options;
       const imports = {};
@@ -101,7 +101,7 @@ export default postcss.plugin(
 
         result.messages.push({
           pluginName,
-          type: 'module',
+          type: 'css-loader',
           modify(moduleObj, loaderContext) {
             const { url, media } = importee;
 

src/plugins/url.js

@@ -117,7 +117,7 @@ export default postcss.plugin(
       Object.keys(urls).forEach((url) => {
         result.messages.push({
           pluginName,
-          type: 'module',
+          type: 'css-loader',
           modify(moduleObj, loaderContext) {
             if (!hasURLEscapeRuntime) {
               moduleObj.imports.push(
@@ -139,6 +139,7 @@ export default postcss.plugin(
                 urlToRequest(normalizedUrl)
               )}));`
             );
+            // eslint-disable-next-line no-param-reassign
             moduleObj.module = moduleObj.module.replace(
               new RegExp(placeholder, 'g'),
               `" + ${placeholder} + "`

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

@@ -6,8 +6,7 @@ exports[`import false: module (evaluated) 1`] = `
 Array [
   Array [
     1,
-    "
-@import url(test.css);
+    "@import url(test.css);
 @import url('test.css');
 @import url(\\"test.css\\");
 @IMPORT url(test.css);
@@ -56,9 +55,8 @@ exports[`import false: module 1`] = `
 "// CSS runtime
 module.exports = exports = require(\\"../../../src/runtime/api.js\\")(false);
 
-
 // CSS module
-exports.push([module.id, \\"\\\\n@import url(test.css);\\\\n@import url('test.css');\\\\n@import url(\\\\\\"test.css\\\\\\");\\\\n@IMPORT url(test.css);\\\\n@import URL(test.css);\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import \\\\\\"test.css\\\\\\";\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\"   \\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import url(test.css) screen and print;\\\\n@import url(test.css) SCREEN AND PRINT;\\\\n@import url(test.css)screen and print;\\\\n@import url(test-media.css) screen and print;\\\\n@import url(test-other.css) (min-width: 100px);\\\\n@import url(http://example.com/style.css);\\\\n@import url(http://example.com/style.css#hash);\\\\n@import url(http://example.com/other-style.css) screen and print;\\\\n@import url(\\\\\\"//example.com/style.css\\\\\\");\\\\n@import url(~package/test.css);\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n@import url('query.css?foo=1&bar=1');\\\\n@import url('other-query.css?foo=1&bar=1#hash');\\\\n\\\\n.class {\\\\n  a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n  @import 'path.css';\\\\n}\\\\n\\", \\"\\"]);
+exports.push([module.id, \\"@import url(test.css);\\\\n@import url('test.css');\\\\n@import url(\\\\\\"test.css\\\\\\");\\\\n@IMPORT url(test.css);\\\\n@import URL(test.css);\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import \\\\\\"test.css\\\\\\";\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\"   \\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import url(test.css) screen and print;\\\\n@import url(test.css) SCREEN AND PRINT;\\\\n@import url(test.css)screen and print;\\\\n@import url(test-media.css) screen and print;\\\\n@import url(test-other.css) (min-width: 100px);\\\\n@import url(http://example.com/style.css);\\\\n@import url(http://example.com/style.css#hash);\\\\n@import url(http://example.com/other-style.css) screen and print;\\\\n@import url(\\\\\\"//example.com/style.css\\\\\\");\\\\n@import url(~package/test.css);\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n@import url('query.css?foo=1&bar=1');\\\\n@import url('other-query.css?foo=1&bar=1#hash');\\\\n\\\\n.class {\\\\n  a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n  @import 'path.css';\\\\n}\\\\n\\", \\"\\"]);
 "
 `;
 
@@ -94,9 +92,7 @@ Array [
   ],
   Array [
     4,
-    "
-
-.test {
+    ".test {
   c: d;
 }
 ",
@@ -148,8 +144,7 @@ Array [
   ],
   Array [
     1,
-    "
-@import url();
+    "@import url();
 @import url('');
 @import url(\\"\\");
 @import '';
@@ -179,7 +174,6 @@ Array [
 exports[`import true: module 1`] = `
 "// CSS runtime
 module.exports = exports = require(\\"../../../src/runtime/api.js\\")(false);
-
 // CSS imports
 exports.i(require(\\"-!../../../src/index.js??ref--4!./test.css\\"), \\"\\");
 exports.i(require(\\"-!../../../src/index.js??ref--4!./test.css\\"), \\"screen and print\\");
@@ -192,9 +186,8 @@ exports.push([module.id, \\"@import url(//example.com/style.css);\\", \\"\\"]);
 exports.i(require(\\"-!../../../src/index.js??ref--4!package/test.css\\"), \\"\\");
 exports.i(require(\\"-!../../../src/index.js??ref--4!./query.css?foo=1&bar=1\\"), \\"\\");
 exports.i(require(\\"-!../../../src/index.js??ref--4!./other-query.css?foo=1&bar=1\\"), \\"\\");
-
 // CSS module
-exports.push([module.id, \\"\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\"   \\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n  a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n  @import 'path.css';\\\\n}\\\\n\\", \\"\\"]);
+exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\"   \\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n  a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n  @import 'path.css';\\\\n}\\\\n\\", \\"\\"]);
 "
 `;