From fbb941c841a4f7fe283bc344ef53395315ec7da1 Mon Sep 17 00:00:00 2001
From: Adam Miller <ammiller@linkedin.com>
Date: Tue, 11 Sep 2018 13:05:03 -0500
Subject: [PATCH] fix: Peg Travis' Node.js 10 version to 10.4.1 for mock-fs
 support.

---
 .travis.yml                                   |  2 +-
 package.json                                  |  2 +-
 .../@css-blocks/jsx/src/Analyzer/index.ts     | 19 +++++++++----------
 yarn.lock                                     |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72216ebbd..18b5ec596 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: node_js
 
 node_js:
   - "8"
-  - "10"
+  - "10.4.1"
 
 env:
   - CXX=g++-4.8
diff --git a/package.json b/package.json
index 3aa86010e..23a4403f4 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "markdown-toc": "^1.2.0",
     "mocha": "^3.4.2",
     "mocha-typescript": "^1.0.23",
-    "mock-fs": "^4.3.0",
+    "mock-fs": "4.6.0",
     "mock-require": "^2.0.2",
     "outdent": "^0.4.1",
     "perfectionist": "^2.4.0",
diff --git a/packages/@css-blocks/jsx/src/Analyzer/index.ts b/packages/@css-blocks/jsx/src/Analyzer/index.ts
index 37d745d97..b84461c65 100644
--- a/packages/@css-blocks/jsx/src/Analyzer/index.ts
+++ b/packages/@css-blocks/jsx/src/Analyzer/index.ts
@@ -8,7 +8,7 @@ import { some, unwrap } from "@opticss/util";
 import traverse from "babel-traverse";
 import * as babylon from "babylon";
 import * as debugGenerator from "debug";
-import * as fs from "fs";
+import * as fs from "fs-extra";
 import * as path from "path";
 
 import { CssBlocksJSXOptions } from "../options";
@@ -143,15 +143,14 @@ export class CSSBlocksJSXAnalyzer extends Analyzer<TEMPLATE_TYPE> {
    * @param file The file path to read in and parse.
    * @param opts Optional analytics parser options.
    */
-  public parseFile(file: string): Promise<JSXAnalysis> {
+  public async parseFile(file: string): Promise<JSXAnalysis> {
+    let data;
     file = path.resolve(this.options.baseDir, file);
-    return new Promise((resolve, reject) => {
-      fs.readFile(file, "utf8", (err, data) => {
-        if (err) {
-          reject(new JSXParseError(`Cannot read JSX entry point file ${file}: ${err.message}`, { filename: file }));
-        }
-        resolve(this.parse(file, data));
-      });
-    });
+    try {
+      data = await fs.readFile(file, "utf8");
+    } catch (err) {
+      throw new JSXParseError(`Cannot read JSX entry point file ${file}: ${err.message}`, { filename: file });
+    }
+    return this.parse(file, data);
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 0b05cb054..f2098169b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9372,7 +9372,7 @@ mocha@^3.4.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-mock-fs@^4.3.0:
+mock-fs@4.6.0:
   version "4.6.0"
   resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-4.6.0.tgz#d944ef4c3e03ceb4e8332b4b31b8ac254051c8ae"