From ac384ddbff009cc6db41188d4fa85acb0adfe6f6 Mon Sep 17 00:00:00 2001
From: Joshua Wiens <joshuaw@easymetrics.com>
Date: Fri, 24 Feb 2017 12:01:34 -0600
Subject: [PATCH 1/2] fix(getOptions): deprecation warn in loaderUtils

---
 index.js     | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index f6ec7f7d..d575e030 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,7 @@ function randomIdent() {
 }
 
 function getLoaderConfig(context) {
-	var query = loaderUtils.parseQuery(context.query);
+	var query = loaderUtils.getOptions(context) || {};
 	var configKey = query.config || 'htmlLoader';
 	var config = context.options && context.options.hasOwnProperty(configKey) ? context.options[configKey] : {};
 
diff --git a/package.json b/package.json
index 9cc3e0e3..3938cf7a 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "es6-templates": "^0.2.2",
     "fastparse": "^1.1.1",
     "html-minifier": "^3.0.1",
-    "loader-utils": "^0.2.15",
+    "loader-utils": "^1.0.2",
     "object-assign": "^4.1.0"
   },
   "license": "MIT",

From efb47d8436a302ba93b607634105f3e5a5444e12 Mon Sep 17 00:00:00 2001
From: Joshua Wiens <joshuaw@easymetrics.com>
Date: Fri, 24 Feb 2017 12:13:49 -0600
Subject: [PATCH 2/2] ci(Travis): removes osx build and node 5

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cedf0b89..69489378 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,9 @@ sudo: false
 language: node_js
 os:
   - linux
-  - osx
 node_js:
   - node
   - "6"
-  - "5"
   - "4"
 
 script: npm run travis