From 29f8ef6b72fa0b1663f48ab4e9d1361ee7b164bd Mon Sep 17 00:00:00 2001
From: Feross Aboukhadijeh <feross@feross.org>
Date: Thu, 4 Aug 2016 21:04:49 -0700
Subject: [PATCH] Replace deprecated `react-tools` with `babel`

- Switch to babel, since react-tools has been deprecated since June 12,
2015. See
https://facebook.github.io/react/blog/2015/06/12/deprecating-jstransform
-and-react-tools.html

- Move babel command to "npm run build"

- Move commands for package into "bin/package.js"
---
 .babelrc          | 5 +++++
 bin/check-deps.js | 2 +-
 bin/package.js    | 7 +++++++
 package.json      | 8 +++++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 00000000..2e9146fe
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "react"
+  ]
+}
diff --git a/bin/check-deps.js b/bin/check-deps.js
index f5e9e42c..fa8dd38a 100755
--- a/bin/check-deps.js
+++ b/bin/check-deps.js
@@ -45,7 +45,7 @@ var BUILT_IN_ELECTRON_MODULES = [ 'electron' ]
 
 var BUILT_IN_DEPS = [].concat(BUILT_IN_NODE_MODULES, BUILT_IN_ELECTRON_MODULES)
 
-var EXECUTABLE_DEPS = ['gh-release', 'standard', 'react-tools']
+var EXECUTABLE_DEPS = ['gh-release', 'standard', 'babel-cli', 'babel-preset-react']
 
 main()
 
diff --git a/bin/package.js b/bin/package.js
index 20f037ee..b91c39f1 100755
--- a/bin/package.js
+++ b/bin/package.js
@@ -19,6 +19,7 @@ var config = require('../src/config')
 var pkg = require('../package.json')
 
 var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
+var BUILD_PATH = path.join(config.ROOT_PATH, 'build')
 var DIST_PATH = path.join(config.ROOT_PATH, 'dist')
 
 var argv = minimist(process.argv.slice(2), {
@@ -36,6 +37,12 @@ var argv = minimist(process.argv.slice(2), {
 
 function build () {
   rimraf.sync(DIST_PATH)
+  rimraf.sync(BUILD_PATH)
+
+  console.log('Babel: Building JSX...')
+  cp.execSync('npm run build', { NODE_ENV: 'production', stdio: 'inherit' })
+  console.log('Babel: Built JSX.')
+
   var platform = argv._[0]
   if (platform === 'darwin') {
     buildDarwin(printDone)
diff --git a/package.json b/package.json
index fc34ac6d..18c74357 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,8 @@
     "zero-fill": "^2.2.3"
   },
   "devDependencies": {
+    "babel-cli": "^6.11.4",
+    "babel-preset-react": "^6.11.1",
     "cross-zip": "^2.0.1",
     "electron-osx-sign": "^0.3.0",
     "electron-packager": "^7.0.0",
@@ -55,7 +57,6 @@
     "nobin-debian-installer": "^0.0.10",
     "open": "0.0.5",
     "plist": "^1.2.0",
-    "react-tools": "^0.13.3",
     "rimraf": "^2.5.2",
     "run-series": "^1.1.4",
     "standard": "^7.0.0"
@@ -85,10 +86,11 @@
     "url": "git://github.com/feross/webtorrent-desktop.git"
   },
   "scripts": {
+    "build": "babel src -d build",
     "clean": "node ./bin/clean.js",
     "open-config": "node ./bin/open-config.js",
-    "package": "rimraf build/ && jsx --es6module src/ build/ && node ./bin/package.js",
-    "start": "jsx --es6module src/ build/ && electron .",
+    "package": "node ./bin/package.js",
+    "start": "npm run build && electron .",
     "test": "standard && node ./bin/check-deps.js",
     "update-authors": "./bin/update-authors.sh"
   }