Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to React #729

Merged
merged 12 commits into from
Jul 23, 2016
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
dist
build
dist
2 changes: 1 addition & 1 deletion bin/check-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
var EXECUTABLE_DEPS = ['gh-release', 'standard', 'react-tools']

main()

Expand Down
6 changes: 6 additions & 0 deletions bin/clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ var rimraf = require('rimraf')
var config = require('../config')
var handlers = require('../main/handlers')

// First, remove generated files
rimraf.sync('build/')
rimraf.sync('dist/')

// Remove any saved configuration
rimraf.sync(config.CONFIG_PATH)

// Remove any temporary files
var tmpPath
try {
tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
Expand Down
2 changes: 1 addition & 1 deletion bin/list-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This is a truly heinous hack, but it works pretty nicely.
# Find all modules we're requiring---even conditional requires.

grep "require('" *.js bin/ main/ renderer/ -R |
grep "require('" src/ bin/ -R |
grep '.js:' |
sed "s/.*require('\([^'\/]*\).*/\1/" |
grep -v '^\.' |
Expand Down
2 changes: 1 addition & 1 deletion bin/open-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node

var config = require('../config')
var config = require('../src/config')
var open = require('open')

open(config.CONFIG_PATH)
2 changes: 1 addition & 1 deletion bin/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var rimraf = require('rimraf')
var series = require('run-series')
var zip = require('cross-zip')

var config = require('../config')
var config = require('../src/config')
var pkg = require('../package.json')

var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require('./main')
require('./build/main')
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@
"drag-drop": "^2.11.0",
"electron-prebuilt": "1.2.1",
"fs-extra": "^0.27.0",
"hyperx": "^2.0.2",
"iso-639-1": "^1.2.1",
"languagedetect": "^1.1.1",
"main-loop": "^3.2.0",
"musicmetadata": "^2.0.2",
"network-address": "^1.1.0",
"parse-torrent": "^5.7.3",
"prettier-bytes": "^1.0.1",
"react": "^15.2.1",
"react-dom": "^15.2.1",
"run-parallel": "^1.1.6",
"semver": "^5.1.0",
"simple-concat": "^1.0.0",
"simple-get": "^2.0.0",
"srt-to-vtt": "^1.1.1",
"virtual-dom": "^2.1.1",
"vlc-command": "^1.0.1",
"webtorrent": "0.x",
"winreg": "^1.2.0",
Expand All @@ -54,6 +53,7 @@
"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"
Expand Down Expand Up @@ -82,8 +82,8 @@
"scripts": {
"clean": "node ./bin/clean.js",
"open-config": "node ./bin/open-config.js",
"package": "node ./bin/package.js",
"start": "electron .",
"package": "rm -rf build/ && jsx --es6module src/ build/ && node ./bin/package.js",
"start": "jsx --es6module src/ build/ && electron .",
"test": "standard && node ./bin/check-deps.js",
"update-authors": "./bin/update-authors.sh"
}
Expand Down
5 changes: 0 additions & 5 deletions renderer/lib/hx.js

This file was deleted.

11 changes: 0 additions & 11 deletions renderer/main.html

This file was deleted.

83 changes: 0 additions & 83 deletions renderer/views/app.js

This file was deleted.

149 changes: 0 additions & 149 deletions renderer/views/create-torrent.js

This file was deleted.

Loading