feat(plugins/import): add @import filter support (options.import) (#656)

Author: michael-ciniawsky

src/index.js

@@ -28,7 +28,11 @@ export default function loader(css, map, meta) {
   // Loader Mode (Async)
   const cb = this.async();
   const file = this.resourcePath;
+<<<<<<< HEAD
 
+=======
+  
+>>>>>>> feat(plugins/import): add `@import` filter support (`options.import`) (#656)
   // Loader Options
   const options = Object.assign({}, DEFAULTS, getOptions(this));
 
@@ -78,7 +82,7 @@ export default function loader(css, map, meta) {
       map,
       to: file,
     })
-    .then(({ css, map, messages }) => {
+    .then(({ root, css, map, messages }) => {
       if (meta && meta.messages) {
         messages = messages.concat(meta.messages);
       }
@@ -116,15 +120,30 @@ export default function loader(css, map, meta) {
 
           return exports;
         }, '');
+      
+      imports = imports ? `// CSS Imports\n${imports}\n` : false
+      exports = exports ? `// CSS Exports\n${exports}\n` : false
+      css = `// CSS\nexport default \`${css}\``
 
       imports = imports ? `// CSS Imports\n${imports}\n` : false;
       exports = exports ? `// CSS Exports\n${exports}\n` : false;
       css = `// CSS\nexport default \`${css}\``;
 
       // TODO(michael-ciniawsky)
       // triage if and add CSS runtime back
+<<<<<<< HEAD
       const result = [imports, exports, css].filter(Boolean).join('\n');
 
+=======
+      const result = [
+        imports,
+        exports,
+        css
+      ]
+        .filter(Boolean)
+        .join('\n');
+      
+>>>>>>> feat(plugins/import): add `@import` filter support (`options.import`) (#656)
       cb(null, result, map ? map.toJSON() : null);
 
       return null;

test/fixtures/import/filter/fixture.js~HEAD

@@ -0,0 +1,3 @@
+import css from './fixture.css';
+
+export default css;

test/fixtures/import/filter/fixture.js~feat(plugins_import): add `@import` filter support (`options.import`) (#656)

@@ -0,0 +1,3 @@
+import css from './fixture.css';
+
+export default css;