update deps (SimulatedGREG#63)

SimulatedGREG · SimulatedGREG · commit 3b0769148e06 · 2017-01-12T20:03:53.000-06:00
diff --git a/template/.gitignore b/template/.gitignore
@@ -10,4 +10,5 @@ node_modules
 npm-debug.log
 npm-debug.log.*
 thumbs.db
+yarn.lock
 !.gitkeep
diff --git a/template/package.json b/template/package.json
@@ -41,8 +41,8 @@
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-stage-0": "^6.5.0",
     "babel-runtime": "^6.6.1",
-    "cross-env": "^1.0.7",
-    "css-loader": "^0.23.1",
+    "cross-env": "^3.1.4",
+    "css-loader": "^0.26.1",
     "del": "^2.2.1",
     "devtron": "^1.1.0",
     "electron": "^1.3.1",
@@ -51,22 +51,22 @@
     "electron-rebuild": "^1.1.3",
     {{#eslint}}
     "babel-eslint": "^7.0.0",
-    "eslint": "^2.10.2",
+    "eslint": "^3.13.1",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-html": "^1.3.0",
     {{#if_eq eslintConfig 'standard'}}
-    "eslint-config-standard": "^5.1.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
+    "eslint-config-standard": "^6.2.1",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq eslintConfig 'airbnb'}}
     "eslint-config-airbnb-base": "^3.0.1",
     "eslint-plugin-import": "^1.8.1",
     {{/if_eq}}
     {{/eslint}}
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.5",
+    "file-loader": "^0.9.0",
     "html-webpack-plugin": "^2.16.1",
     "json-loader": "^0.5.4",
     {{#if unit}}
@@ -80,7 +80,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
     "karma-webpack": "^1.8.0",
-    "webpack-merge": "^0.14.1",
+    "webpack-merge": "^2.4.0",
     {{/if}}
     {{#if e2e}}
     "babel-register": "^6.14.0",
