diff --git a/electron/createWindow.js b/electron/createWindow.js index ba8c536c7..6c7034f3a 100644 --- a/electron/createWindow.js +++ b/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. diff --git a/electron/devServer.js b/electron/devServer.js index e45c1e1a6..ebf1586ca 100644 --- a/electron/devServer.js +++ b/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'] }, diff --git a/electron/index.js b/electron/index.js index 8bfe0b656..31fce2826 100644 --- a/electron/index.js +++ b/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'; diff --git a/lbrytv/package.json b/lbrytv/package.json index bd3fa46b2..d07e57206 100644 --- a/lbrytv/package.json +++ b/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": { diff --git a/lbrytv/webpack.config.js b/lbrytv/webpack.config.js index c92c3373d..9ca886c22 100644 --- a/lbrytv/webpack.config.js +++ b/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`, diff --git a/lbrytv/yarn.lock b/lbrytv/yarn.lock index e98838009..6f07e70de 100644 --- a/lbrytv/yarn.lock +++ b/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" diff --git a/package.json b/package.json index 37024875b..9181e78cf 100644 --- a/package.json +++ b/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", diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js index 022cce473..3ae4f3d26 100644 --- a/ui/redux/actions/app.js +++ b/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 diff --git a/webpack.base.config.js b/webpack.base.config.js index 4bba00632..f0818810f 100644 --- a/webpack.base.config.js +++ b/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', diff --git a/webpack.electron.config.js b/webpack.electron.config.js index df3972889..119376677 100644 --- a/webpack.electron.config.js +++ b/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({