Merge pull request #79 from suitcss/upgrade-easy-import

Upgrade easy import

Author: simonsmith

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### HEAD
 
 * Refactor to support Node 4 upwards
+* Update `postcss-easy-import` to `2.0.0`
 * Update `fs-extra` to `2.1.2`
 * Update `autoprefixer` to `6.7.7`
 * Update `postcss-apply` to `0.6.1`

lib/index.js

@@ -6,7 +6,10 @@ const bemLinter = require('postcss-bem-linter');
 const cssnano = require('cssnano');
 const difference = require('lodash.difference');
 const encapsulationPlugins = require('./encapsulation');
+const fs = require('fs');
 const isEmpty = require('lodash.isempty');
+const isPromise = require('is-promise');
+const pify = require('pify');
 const postcssEasyImport = require('postcss-easy-import');
 const reporter = require('postcss-reporter');
 const stylelint = require('stylelint');
@@ -37,7 +40,7 @@ const defaults = {
     ios > 6, android > 4.3, samsung > 3, chromeandroid > 50`
   },
   'postcss-easy-import': {
-    transform: identity,
+    load: getFileContent,
     onImport: noop
   },
   'postcss-reporter': {
@@ -111,16 +114,17 @@ function mergeOptions(options) {
   options = options || {};
   const mergedOpts = assign({}, defaults, options);
   const easyImportOpts = mergedOpts['postcss-easy-import'];
-  const origTransform = easyImportOpts.transform;
+  const origLoad = easyImportOpts.load;
   const origOnImport = easyImportOpts.onImport;
 
   if (mergedOpts.root) {
     easyImportOpts.root = mergedOpts.root;
   }
 
-  easyImportOpts.transform = (css, filename) => {
-    const transformedCss = origTransform(css);
-    return lintFile(transformedCss, mergedOpts, filename).then(result => result.css);
+  easyImportOpts.load = filename => {
+    const transformedCss = origLoad(filename);
+    return lintFile(transformedCss, mergedOpts, filename)
+      .then(result => result.css);
   };
 
   easyImportOpts.onImport = importedFiles => {
@@ -175,12 +179,12 @@ function lintFile(css, options, filename) {
   return processor.process(css, options.postcss);
 }
 
-function isPromise(obj) {
-  return typeof obj.then === 'function';
-}
-
 function noop() {}
 
+function getFileContent(filename) {
+  return pify(fs.readFile)(filename, 'utf8');
+}
+
 function identity(x) {
   return x;
 }

package.json

@@ -17,10 +17,12 @@
     "commander": "~2.9.0",
     "cssnano": "^3.3.2",
     "fs-extra": "^2.1.2",
+    "is-promise": "^2.1.0",
     "lodash.difference": "^4.0.2",
     "lodash.isempty": "^4.1.1",
     "object-assign-deep": "0.0.4",
     "pad-component": "0.0.1",
+    "pify": "^2.3.0",
     "postcss": "^5.2.17",
     "postcss-apply": "^0.6.1",
     "postcss-autoreset": "^1.2.0",
@@ -29,7 +31,7 @@
     "postcss-color-function": "^3.0.0",
     "postcss-custom-media": "^5.0.0",
     "postcss-custom-properties": "^5.0.0",
-    "postcss-easy-import": "^1.0.1",
+    "postcss-easy-import": "^2.0.0",
     "postcss-reporter": "^3.0.0",
     "read-file-stdin": "^0.2.1",
     "stylelint": "^7.10.1",

test/options.js

@@ -137,8 +137,8 @@ describe('using the `onImport` option in postcss-import', () => {
   });
 });
 
-describe('using the `transform` option in postcss-import', () => {
-  it('should use a default transform function that just returns the css', done => {
+describe('using the `load` option in postcss-import', () => {
+  it('should use a default load function that just returns the css', done => {
     suitcss('@import "./util.css";', {
       root: 'test/fixtures',
       lint: false
@@ -149,30 +149,30 @@ describe('using the `transform` option in postcss-import', () => {
       .catch(done);
   });
 
-  it('should call a custom transform function with the imported component', done => {
-    const transformStub = sinon.stub().returns('body { color: blue; }');
+  it('should call a custom load function with the imported component', done => {
+    const loadStub = sinon.stub().returns('body { color: blue; }');
 
     suitcss('@import "./util.css";', {
       root: 'test/fixtures',
       lint: false,
       'postcss-easy-import': {
-        transform: transformStub
+        load: loadStub
       }
     }).then(result => {
-      expect(transformStub.calledOnce).to.be.true;
-      expect(transformStub.getCall(0).args[0]).to.equal('.u-img {\n  border-radius: 50%;\n}\n');
+      expect(loadStub.calledOnce).to.be.true;
+      expect(loadStub.getCall(0).args[0]).to.contain('util.css');
       expect(result.css).to.equal('body { color: blue; }');
       done();
     })
       .catch(done);
   });
 
-  it('should also work with a promise returned from the custom transform function', done => {
+  it('should also work with a promise returned from the custom load function', done => {
     suitcss('@import "./util.css";', {
       root: 'test/fixtures',
       lint: false,
       'postcss-easy-import': {
-        transform() {
+        load() {
           return Promise.resolve('body { font: red; }');
         }
       }