Fixes from PR feedback

Author: Walker

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 
 node_js:
   - "8"
-  - "6"
 
 script:
   - npm test

lib/util.js

@@ -9,30 +9,21 @@ const readPkgUp = require('read-pkg-up');
 const postcss = require('postcss');
 const atImport = require('postcss-import');
 
-module.exports.identifyCssModule = function identifyCssModule (filePath) {
-    return readPkgUp({
+module.exports.identifyCssModule = async function identifyCssModule(filePath) {
+    const { pkg: { name, version }, path: packagePath } = await readPkgUp({
         normalize: false,
-        cwd: path.dirname(filePath),
-    }).then(result => {
-        const { name, version } = result.pkg;
-        const ref = filePath.replace(path.dirname(result.path), name);
-
-        return {
-            id: hasher(`${name}|${version}|${ref}`),
-            name,
-            version,
-            file: ref,
-        };
+        cwd: path.dirname(filePath)
     });
+    const file = filePath.replace(path.dirname(packagePath), name);
+
+    const id = hasher(`${name}|${version}|${file}`);
+    return { id, name, version, file };
 };
 
-module.exports.bundleCssModule = function bundleCssModule (filePath) {
-    return readFile(filePath, 'utf8').then(css =>
-        postcss()
-            .use(atImport())
-            .process(css, {
-                from: filePath,
-            })
-            .then(({ css }) => css)
-    );
+module.exports.bundleCssModule = async function bundleCssModule(filePath) {
+    const fileContents = await readFile(filePath, 'utf8');
+    const { css } = await postcss()
+        .use(atImport())
+        .process(fileContents, { from: filePath });
+    return css;
 };

lib/writer.js

@@ -7,7 +7,7 @@ const { isAbsolute } = require('path');
 const assert = require('assert');
 
 module.exports = class Writer extends Readable {
-    constructor (files = []) {
+    constructor(files = []) {
         super({ objectMode: true });
 
         assert(
@@ -22,19 +22,19 @@ module.exports = class Writer extends Readable {
         }
     }
 
-    _read () {
+    async _read() {
         const file = this.files.shift();
         if (!file) {
             this.push(null);
             return;
         }
-        Promise.all([bundleCssModule(file), identifyCssModule(file)])
-            .then(([css, meta]) => {
-                meta.content = css;
-                this.push(meta);
-            })
-            .catch(err => {
-                process.nextTick(() => this.emit('error', err));
-            });
+
+        try {
+            const [css, meta] = await Promise.all([bundleCssModule(file), identifyCssModule(file)]);
+            meta.content = css;
+            this.push(meta);
+        } catch (err) {
+            this.emit('error', err);
+        }
     }
 };

test/writer.test.js

@@ -59,7 +59,6 @@ test('new Writer(filePath)', () => {
     writer.on('end', () => {
         const result1 = items[0];
         const result2 = items[1];
-
         expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}`));
         expect(result2).toBeFalsy();
     });
@@ -87,7 +86,6 @@ test('new Writer([filePath])', () => {
     writer.on('end', () => {
         const result1 = items[0];
         const result2 = items[1];
-
         expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}`));
         expect(result2).toBeFalsy();
     });