Update cssnext, fixes #3 (#4)

* Update cssnext

Probably a breaking change. The `cssnext` package is deprecated.

* add imported files to `result.files`

* Node 4+

* Update standard

Author: goto-bus-stop

.travis.yml

@@ -1,7 +1,7 @@
 node_js:
-- "0.12"
+- "stable"
 - "4"
 sudo: false
 language: node_js
 script: "npm run test:cov"
-after_script: "npm i -g codecov.io && cat ./coverage/lcov.info | codecov"
+after_script: "npm i -g codecov.io && cat ./coverage/lcov.info | codecov"

index.js

@@ -1,21 +1,43 @@
-const cssnext = require('cssnext')
+const postcss = require('postcss')
+const cssnext = require('postcss-cssnext')
+const imports = require('postcss-import')
 const xtend = require('xtend')
 
 module.exports = transform
 
 function transform (filename, source, options, done) {
-  try {
-    source = cssnext(source, xtend({
-      sourcemap: true,
-      from: filename,
-      messages: {
-        browser: true,
-        console: false
+  options = xtend(options || {})
+  const sourcemap = options.sourcemap
+  delete options.sourcemap
+
+  const processor = postcss([
+    imports(),
+    cssnext(options)
+  ])
+
+  const poptions = xtend({
+    map: sourcemap === false ? false : { inline: true },
+    from: filename,
+    messages: {
+      browser: true,
+      console: false
+    }
+  }, options || {})
+
+  processor.process(source, poptions).then(function (result) {
+    // Collect imported files for watchify
+    const files = [filename]
+    result.messages.forEach(function (msg) {
+      if (msg.type === 'dependency') {
+        files.push(msg.file)
       }
-    }, options || {}))
-  } catch (e) {
-    return done(e)
-  }
+    })
 
-  done(null, source)
+    done(null, {
+      css: result.css,
+      files: files
+    })
+  }, function (err) {
+    done(err)
+  })
 }

package.json

@@ -22,13 +22,18 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "cssnext": "^1.8.4",
+    "postcss": "^6.0.17",
+    "postcss-cssnext": "^3.1.0",
+    "postcss-import": "^11.0.0",
     "xtend": "^4.0.0"
   },
   "devDependencies": {
     "dependency-check": "^2.5.1",
     "istanbul": "^0.4.1",
-    "standard": "^5.4.1",
+    "standard": "^10.0.3",
     "tape": "^4.2.1"
+  },
+  "engines": {
+    "node": ">= 4"
   }
 }

test.js

@@ -3,25 +3,37 @@ const test = require('tape')
 const path = require('path')
 const fs = require('fs')
 
-test('basic', compare('basic.css', 'basic-out.css'))
-test('import', compare('import.css', 'basic-out.css'))
+test('basic', function (t) {
+  t.plan(1)
 
-function compare (inputFile, outputFile) {
-  return function compareTest (t) {
-    const file = path.join(__dirname, 'fixtures', inputFile)
-    const src = fs.readFileSync(file, 'utf8')
-    const expected = fs.readFileSync(
-      path.join(__dirname, 'fixtures', outputFile)
-    , 'utf8')
+  const file = path.join(__dirname, 'fixtures/basic.css')
+  const src = fs.readFileSync(file, 'utf8')
+  const expected = fs.readFileSync(path.join(__dirname, 'fixtures/basic-out.css'), 'utf8')
 
-    t.plan(1)
+  transform(file, src, {
+    sourcemap: false
+  }, function (err, actual) {
+    if (err) return t.error(err)
 
-    transform(file, src, {
-      sourcemap: false
-    }, function (err, actual) {
-      if (err) return t.error(err)
+    t.equal(actual.css, expected, 'output is as expected')
+  })
+})
+test('import', function (t) {
+  t.plan(2)
 
-      t.equal(actual, expected, 'output is as expected')
-    })
-  }
-}
+  const file = path.join(__dirname, 'fixtures/import.css')
+  const src = fs.readFileSync(file, 'utf8')
+  const expected = fs.readFileSync(path.join(__dirname, 'fixtures/basic-out.css'), 'utf8')
+
+  transform(file, src, {
+    sourcemap: false
+  }, function (err, actual) {
+    if (err) return t.error(err)
+
+    t.equal(actual.css, expected, 'output is as expected')
+    t.deepEqual(actual.files, [
+      file,
+      path.join(__dirname, 'fixtures/basic.css')
+    ], 'lists imported files')
+  })
+})