Fix Desktop Pathing

Author: casesandberg

apps/desktop/package.json

@@ -8,11 +8,11 @@
     "node": "^6.7.0"
   },
   "scripts": {
-    "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill package.js",
+    "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill scripts/package.js",
     "package-all": "npm run package -- --all",
-    "start": "node startup-message.js && concurrently --kill-others \"npm run start-electron\" \"npm run start-webpack\" -n \"electron,webpack\" -p name",
+    "start": "node scripts/startup-message.js && concurrently --kill-others \"npm run start-electron\" \"npm run start-webpack\" -n \"electron,webpack\" -p name",
     "start-electron": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./main.dev",
-    "start-webpack": "cross-env NODE_ENV=development node -r babel-register dev-server.js",
+    "start-webpack": "cross-env NODE_ENV=development node -r babel-register scripts/dev-server.js",
     "install-grpc": "cd node_modules/grpc && git submodule update --init && npm run electron-build -- --target=1.4.6"
   },
   "bin": {

apps/desktop/scripts/dev-server.js

@@ -5,7 +5,7 @@ import path from 'path'
 import webpackDevMiddleware from 'webpack-dev-middleware'
 import webpackHotMiddleware from 'webpack-hot-middleware'
 
-import config from './webpack.config.development'
+import config from '../webpack.config.development'
 
 const app = express()
 const compiler = webpack(config)
@@ -21,7 +21,7 @@ app.use(webpackHotMiddleware(compiler))
 
 app.use(express.static('static'))
 app.get('*', (request, response) => {
-  response.sendFile(path.resolve(__dirname, 'app.dev.html'))
+  response.sendFile(path.resolve(__dirname, '..', 'app.dev.html'))
 })
 
 app.listen(PORT, 'localhost', (err) => {

apps/desktop/scripts/package.js

@@ -8,10 +8,10 @@ import webpack from 'webpack'
 import packager from 'electron-packager'
 import del from 'del'
 import minimist from 'minimist'
-import cfg from './webpack.config.production'
-import pkg from './package.json'
+import prodCfg from '../webpack.config.production'
+import electronCfg from '../webpack.config.electron'
+import pkg from '../package.json'
 
-import electronCfg from './webpack.config.electron'
 
 const argv = minimist(process.argv.slice(2))
 const toNodePath = name => `/node_modules/${ name }($|/)`
@@ -95,7 +95,7 @@ function startPack() {
     [
       del('../../release', { force: true }),
       build(electronCfg),
-      build(cfg),
+      build(prodCfg),
     ]
   ).then(() => {
     if (shouldBuildAll) {

apps/desktop/webpack.config.development.js

@@ -14,7 +14,7 @@ export default validate(merge(baseConfig, {
     app: [
       `webpack-hot-middleware/client?path=http://localhost:${ port }/__webpack_hmr`,
       'babel-polyfill',
-      './../lightning-desktop/index',
+      './index',
     ],
     vendor: ['react', 'redux', 'lodash'],
   },

apps/desktop/webpack.config.production.js

@@ -12,7 +12,7 @@ const config = validate(merge(baseConfig, {
   entry: {
     app: [
       'babel-polyfill',
-      './../lightning-desktop/index',
+      './index',
     ],
     vendor: ['react', 'redux', 'lodash'],
   },

lerna.json

@@ -1,6 +1,7 @@
 {
   "lerna": "2.0.0-beta.31",
   "packages": [
+    "apps/*",
     "packages/*"
   ],
   "version": "independent"

package.json

@@ -8,12 +8,12 @@
     "publish": "lerna publish",
     "clean": "lerna clean",
     "reinstall": "npm run clean && npm install",
-    "start": "cd packages/lightning-desktop && npm start -s",
+    "start": "cd apps/desktop && npm start -s",
     "setup": "npm install && npm run install-grpc",
-    "package-electron": "cd packages/lightning-desktop && npm run package",
-    "package-all-electron": "cd packages/lightning-desktop && npm run package-all",
+    "package-electron": "cd apps/desktop && npm run package",
+    "package-all-electron": "cd apps/desktop && npm run package-all",
     "eslint": "node_modules/.bin/eslint packages/**/*.js --quiet",
-    "install-grpc": "cd packages/lightning-desktop && npm run install-grpc"
+    "install-grpc": "cd apps/desktop && npm run install-grpc"
   },
   "repository": {
     "type": "git",