fix scripts

electron/createWindow.js

@@ -4,7 +4,7 @@ import isDev from 'electron-is-dev';
 import windowStateKeeper from 'electron-window-state';
 
 import setupBarMenu from './menu/setupBarMenu';
-import * as PAGES from '../../ui/constants/pages';
+import * as PAGES from '../ui/constants/pages';
 
 export default appState => {
   // Get primary display dimensions from Electron.

electron/devServer.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-const { WEBPACK_ELECTRON_PORT } = require('../../../config');
+const { WEBPACK_ELECTRON_PORT } = require('../config');
 const chalk = require('chalk');
 const webpack = require('webpack');
 const merge = require('webpack-merge');
@@ -11,7 +11,7 @@ console.log(
   chalk.magenta(`Compiling ${chalk.underline('main')} and ${chalk.underline('render')}, this will take a while.`)
 );
 
-let [mainConfig, renderConfig] = require('../../../webpack.electron.config.js');
+let [mainConfig, renderConfig] = require('../webpack.electron.config.js');
 
 renderConfig = merge(renderConfig, {
   entry: { ui: ['webpack-hot-middleware/client'] },

electron/index.js

@@ -12,7 +12,7 @@ import Daemon from './Daemon';
 import isDev from 'electron-is-dev';
 import createTray from './createTray';
 import createWindow from './createWindow';
-import pjson from '../../../package.json';
+import pjson from '../package.json';
 import startSandbox from './startSandbox';
 import installDevtools from './installDevtools';
 

lbrytv/package.json

@@ -31,7 +31,7 @@
     "koa-logger": "^3.2.1",
     "koa-send": "^5.0.0",
     "koa-static": "^5.0.0",
-    "lbry-redux": "lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9",
+    "lbry-redux": "lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3",
     "mysql": "^2.17.1"
   },
   "devDependencies": {

lbrytv/webpack.config.js

@@ -6,6 +6,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const { DefinePlugin, ProvidePlugin } = require('webpack');
 
 const STATIC_ROOT = path.resolve(__dirname, '../static/');
+const UI_ROOT = path.resolve(__dirname, '../ui/');
 const DIST_ROOT = path.resolve(__dirname, 'dist/');
 const WEB_PLATFORM_ROOT = __dirname;
 
@@ -46,6 +47,8 @@ const webConfig = {
     ],
   },
   resolve: {
+    modules: [UI_ROOT, __dirname],
+
     alias: {
       electron: `${WEB_PLATFORM_ROOT}/stubs/electron.js`,
       fs: `${WEB_PLATFORM_ROOT}/stubs/fs.js`,

lbrytv/yarn.lock

@@ -3333,9 +3333,9 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-lbry-redux@lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9:
+lbry-redux@lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ba429043e6fa8144a62bcf4d45ed8d183ea5aff9"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4491b975cc3e23bf3733272b7c6079a28c1036b3"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"

package.json

@@ -24,7 +24,7 @@
     "compile:web": "cd ./lbrytv && webpack --config webpack.config.js",
     "compile": "cross-env NODE_ENV=production yarn compile:electron && cross-env NODE_ENV=production yarn compile:web",
     "dev": "yarn dev:electron",
-    "dev:electron": "cross-env NODE_ENV=development node ./src/platforms/electron/devServer.js",
+    "dev:electron": "cross-env NODE_ENV=development node ./electron/devServer.js",
     "dev:web": "cd ./lbrytv && yarn dev",
     "dev:web-server": "cross-env NODE_ENV=development yarn compile:web && concurrently \"cross-env NODE_ENV=development yarn compile:web --watch\" \"cd ./lbrytv && yarn dev:server\"",
     "dev:internal-apis": "LBRY_API_URL='http://localhost:8080' yarn dev:electron",

ui/redux/actions/app.js

@@ -438,6 +438,7 @@ export function doAnalyticsView(uri, timeToStart) {
 export function doSignIn() {
   return (dispatch, getState) => {
     // @if TARGET='web'
+    debugger;
     dispatch(doBalanceSubscribe());
     dispatch(doFetchChannelListMine());
     // @endif

webpack.base.config.js

@@ -72,8 +72,6 @@ let baseConfig = {
     extensions: ['.js', '.jsx', '.json', '.scss'],
     alias: {
       config: path.resolve(__dirname, './config.js'),
-      'lbry-redux$': 'lbry-redux/dist/bundle.es.js',
-
       // Build optimizations for 'redux-persist-transform-filter'
       'redux-persist-transform-filter': 'redux-persist-transform-filter/index.js',
       'lodash.get': 'lodash-es/get',

webpack.electron.config.js

@@ -82,7 +82,7 @@ if (process.env.NODE_ENV === 'production') {
 const renderConfig = {
   target: 'electron-renderer',
   entry: {
-    ui: ['./src/ui/index.jsx'],
+    ui: ['./ui/index.jsx'],
   },
   output: {
     filename: '[name].js',
@@ -106,6 +106,9 @@ const renderConfig = {
       },
     ],
   },
+  resolve: {
+    modules: ['node_modules'],
+  },
   plugins: [
     // new BundleAnalyzerPlugin(),
     new DefinePlugin({