From a63996566950f6f6b02809b7460aff57f611a92e Mon Sep 17 00:00:00 2001
From: Leo Lamprecht <mindrun@icloud.com>
Date: Mon, 17 Oct 2016 10:29:12 +0200
Subject: [PATCH] Remove duplicates from package files

---
 app/package.json |   6 +--
 package.json     | 117 +++++++++++++++++++++++------------------------
 2 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/app/package.json b/app/package.json
index 947d5cd8..2863e6a2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,7 @@
 {
   "name": "hyper",
   "productName": "Hyper",
+  "description": "HTML/JS/CSS Terminal",
   "version": "0.8.2",
   "license": "MIT",
   "author": {
@@ -8,7 +9,7 @@
     "email": "team@zeit.co"
   },
   "repository": "zeit/hyper",
-  "description": "HTML/JS/CSS Terminal",
+  "xo": false,
   "dependencies": {
     "child_pty": "3.0.1",
     "color": "0.11.3",
@@ -25,6 +26,5 @@
     "semver": "5.3.0",
     "shell-env": "0.2.0",
     "uuid": "2.0.2"
-  },
-  "xo": false
+  }
 }
diff --git a/package.json b/package.json
index 7333a061..ae68a8fb 100644
--- a/package.json
+++ b/package.json
@@ -1,55 +1,15 @@
 {
-  "name": "hyper",
-  "version": "0.8.2",
-  "description": "Web app that runs in the renderer process",
   "repository": "zeit/hyper",
-  "license": "MIT",
-  "author": {
-    "name": "Zeit, Inc.",
-    "email": "team@zeit.co"
-  },
-  "greenkeeper": {
-    "emails": false
-  },
-  "dependencies": {
-    "aphrodite-simple": "0.4.1",
-    "color": "0.11.3",
-    "hterm-umdjs": "1.1.3",
-    "json-loader": "0.5.4",
-    "mousetrap": "1.6.0",
-    "ms": "0.7.1",
-    "object-values": "1.0.0",
-    "php-escape-shell": "1.0.0",
-    "react": "15.3.2",
-    "react-addons-pure-render-mixin": "15.3.2",
-    "react-deep-force-update": "2.0.1",
-    "react-dom": "15.3.2",
-    "react-redux": "4.4.5",
-    "redux": "3.6.0",
-    "redux-thunk": "2.1.0",
-    "reselect": "2.5.4",
-    "seamless-immutable": "6.1.3",
-    "semver": "5.3.0",
-    "uuid": "2.0.2"
-  },
-  "devDependencies": {
-    "ava": "^0.16.0",
-    "babel-cli": "^6.11.4",
-    "babel-core": "^6.11.4",
-    "babel-loader": "^6.2.4",
-    "babel-preset-react": "^6.11.1",
-    "concurrently": "^3.0.0",
-    "copy-webpack-plugin": "^3.0.1",
-    "electron": "1.4.0",
-    "electron-builder": "^7.11.4",
-    "electron-devtools-installer": "^2.0.0",
-    "eslint-config-xo-react": "^0.10.0",
-    "eslint-plugin-react": "^6.3.0",
-    "husky": "^0.11.6",
-    "redux-logger": "^2.6.1",
-    "spectron": "^3.4.0",
-    "webpack": "^2.1.0-beta.15",
-    "xo": "^0.17.0"
+  "scripts": {
+    "start": "concurrently --kill-others --raw \"npm run dev\" \"npm run app\"",
+    "app": "electron app",
+    "dev": "webpack -w",
+    "build": "NODE_ENV=production webpack",
+    "test": "npm run dist && xo && ava",
+    "prepush": "npm test",
+    "postinstall": "install-app-deps",
+    "pack": "npm run build && build --dir && babel --no-comments --compact --minified --out-file app/dist/bundle.js app/dist/bundle.js",
+    "dist": "npm run build && build"
   },
   "xo": {
     "extends": "xo-react",
@@ -97,15 +57,52 @@
       "category": "public.app-category.developer-tools"
     }
   },
-  "scripts": {
-    "start": "concurrently --kill-others --raw \"npm run dev\" \"npm run app\"",
-    "app": "electron app",
-    "dev": "webpack -w",
-    "build": "NODE_ENV=production webpack",
-    "test": "npm run dist && xo && ava",
-    "prepush": "npm test",
-    "postinstall": "install-app-deps",
-    "pack": "npm run build && build --dir && babel --no-comments --compact --minified --out-file app/dist/bundle.js app/dist/bundle.js",
-    "dist": "npm run build && build"
+  "license": "MIT",
+  "author": {
+    "name": "Zeit, Inc.",
+    "email": "team@zeit.co"
+  },
+  "greenkeeper": {
+    "emails": false
+  },
+  "dependencies": {
+    "aphrodite-simple": "0.4.1",
+    "color": "0.11.3",
+    "hterm-umdjs": "1.1.3",
+    "json-loader": "0.5.4",
+    "mousetrap": "1.6.0",
+    "ms": "0.7.1",
+    "object-values": "1.0.0",
+    "php-escape-shell": "1.0.0",
+    "react": "15.3.2",
+    "react-addons-pure-render-mixin": "15.3.2",
+    "react-deep-force-update": "2.0.1",
+    "react-dom": "15.3.2",
+    "react-redux": "4.4.5",
+    "redux": "3.6.0",
+    "redux-thunk": "2.1.0",
+    "reselect": "2.5.4",
+    "seamless-immutable": "6.1.3",
+    "semver": "5.3.0",
+    "uuid": "2.0.2"
+  },
+  "devDependencies": {
+    "ava": "^0.16.0",
+    "babel-cli": "^6.11.4",
+    "babel-core": "^6.11.4",
+    "babel-loader": "^6.2.4",
+    "babel-preset-react": "^6.11.1",
+    "concurrently": "^3.0.0",
+    "copy-webpack-plugin": "^3.0.1",
+    "electron": "1.4.0",
+    "electron-builder": "^7.11.4",
+    "electron-devtools-installer": "^2.0.0",
+    "eslint-config-xo-react": "^0.10.0",
+    "eslint-plugin-react": "^6.3.0",
+    "husky": "^0.11.6",
+    "redux-logger": "^2.6.1",
+    "spectron": "^3.4.0",
+    "webpack": "^2.1.0-beta.15",
+    "xo": "^0.17.0"
   }
 }