fix scripts
This commit is contained in:
parent
6ad31a3ce9
commit
ab2ee079e2
10 changed files with 16 additions and 11 deletions
|
@ -4,7 +4,7 @@ import isDev from 'electron-is-dev';
|
||||||
import windowStateKeeper from 'electron-window-state';
|
import windowStateKeeper from 'electron-window-state';
|
||||||
|
|
||||||
import setupBarMenu from './menu/setupBarMenu';
|
import setupBarMenu from './menu/setupBarMenu';
|
||||||
import * as PAGES from '../../ui/constants/pages';
|
import * as PAGES from '../ui/constants/pages';
|
||||||
|
|
||||||
export default appState => {
|
export default appState => {
|
||||||
// Get primary display dimensions from Electron.
|
// Get primary display dimensions from Electron.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* eslint-disable no-console */
|
/* eslint-disable no-console */
|
||||||
const { WEBPACK_ELECTRON_PORT } = require('../../../config');
|
const { WEBPACK_ELECTRON_PORT } = require('../config');
|
||||||
const chalk = require('chalk');
|
const chalk = require('chalk');
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
const merge = require('webpack-merge');
|
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.`)
|
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, {
|
renderConfig = merge(renderConfig, {
|
||||||
entry: { ui: ['webpack-hot-middleware/client'] },
|
entry: { ui: ['webpack-hot-middleware/client'] },
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Daemon from './Daemon';
|
||||||
import isDev from 'electron-is-dev';
|
import isDev from 'electron-is-dev';
|
||||||
import createTray from './createTray';
|
import createTray from './createTray';
|
||||||
import createWindow from './createWindow';
|
import createWindow from './createWindow';
|
||||||
import pjson from '../../../package.json';
|
import pjson from '../package.json';
|
||||||
import startSandbox from './startSandbox';
|
import startSandbox from './startSandbox';
|
||||||
import installDevtools from './installDevtools';
|
import installDevtools from './installDevtools';
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
"koa-logger": "^3.2.1",
|
"koa-logger": "^3.2.1",
|
||||||
"koa-send": "^5.0.0",
|
"koa-send": "^5.0.0",
|
||||||
"koa-static": "^5.0.0",
|
"koa-static": "^5.0.0",
|
||||||
"lbry-redux": "lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9",
|
"lbry-redux": "lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3",
|
||||||
"mysql": "^2.17.1"
|
"mysql": "^2.17.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -6,6 +6,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||||
const { DefinePlugin, ProvidePlugin } = require('webpack');
|
const { DefinePlugin, ProvidePlugin } = require('webpack');
|
||||||
|
|
||||||
const STATIC_ROOT = path.resolve(__dirname, '../static/');
|
const STATIC_ROOT = path.resolve(__dirname, '../static/');
|
||||||
|
const UI_ROOT = path.resolve(__dirname, '../ui/');
|
||||||
const DIST_ROOT = path.resolve(__dirname, 'dist/');
|
const DIST_ROOT = path.resolve(__dirname, 'dist/');
|
||||||
const WEB_PLATFORM_ROOT = __dirname;
|
const WEB_PLATFORM_ROOT = __dirname;
|
||||||
|
|
||||||
|
@ -46,6 +47,8 @@ const webConfig = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
|
modules: [UI_ROOT, __dirname],
|
||||||
|
|
||||||
alias: {
|
alias: {
|
||||||
electron: `${WEB_PLATFORM_ROOT}/stubs/electron.js`,
|
electron: `${WEB_PLATFORM_ROOT}/stubs/electron.js`,
|
||||||
fs: `${WEB_PLATFORM_ROOT}/stubs/fs.js`,
|
fs: `${WEB_PLATFORM_ROOT}/stubs/fs.js`,
|
||||||
|
|
|
@ -3333,9 +3333,9 @@ latest-version@^3.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
package-json "^4.0.0"
|
package-json "^4.0.0"
|
||||||
|
|
||||||
lbry-redux@lbryio/lbry-redux#ba429043e6fa8144a62bcf4d45ed8d183ea5aff9:
|
lbry-redux@lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3:
|
||||||
version "0.0.1"
|
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:
|
dependencies:
|
||||||
proxy-polyfill "0.1.6"
|
proxy-polyfill "0.1.6"
|
||||||
reselect "^3.0.0"
|
reselect "^3.0.0"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
"compile:web": "cd ./lbrytv && webpack --config webpack.config.js",
|
"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",
|
"compile": "cross-env NODE_ENV=production yarn compile:electron && cross-env NODE_ENV=production yarn compile:web",
|
||||||
"dev": "yarn dev:electron",
|
"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": "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: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",
|
"dev:internal-apis": "LBRY_API_URL='http://localhost:8080' yarn dev:electron",
|
||||||
|
|
|
@ -438,6 +438,7 @@ export function doAnalyticsView(uri, timeToStart) {
|
||||||
export function doSignIn() {
|
export function doSignIn() {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
// @if TARGET='web'
|
// @if TARGET='web'
|
||||||
|
debugger;
|
||||||
dispatch(doBalanceSubscribe());
|
dispatch(doBalanceSubscribe());
|
||||||
dispatch(doFetchChannelListMine());
|
dispatch(doFetchChannelListMine());
|
||||||
// @endif
|
// @endif
|
||||||
|
|
|
@ -72,8 +72,6 @@ let baseConfig = {
|
||||||
extensions: ['.js', '.jsx', '.json', '.scss'],
|
extensions: ['.js', '.jsx', '.json', '.scss'],
|
||||||
alias: {
|
alias: {
|
||||||
config: path.resolve(__dirname, './config.js'),
|
config: path.resolve(__dirname, './config.js'),
|
||||||
'lbry-redux$': 'lbry-redux/dist/bundle.es.js',
|
|
||||||
|
|
||||||
// Build optimizations for 'redux-persist-transform-filter'
|
// Build optimizations for 'redux-persist-transform-filter'
|
||||||
'redux-persist-transform-filter': 'redux-persist-transform-filter/index.js',
|
'redux-persist-transform-filter': 'redux-persist-transform-filter/index.js',
|
||||||
'lodash.get': 'lodash-es/get',
|
'lodash.get': 'lodash-es/get',
|
||||||
|
|
|
@ -82,7 +82,7 @@ if (process.env.NODE_ENV === 'production') {
|
||||||
const renderConfig = {
|
const renderConfig = {
|
||||||
target: 'electron-renderer',
|
target: 'electron-renderer',
|
||||||
entry: {
|
entry: {
|
||||||
ui: ['./src/ui/index.jsx'],
|
ui: ['./ui/index.jsx'],
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: '[name].js',
|
filename: '[name].js',
|
||||||
|
@ -106,6 +106,9 @@ const renderConfig = {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
resolve: {
|
||||||
|
modules: ['node_modules'],
|
||||||
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
// new BundleAnalyzerPlugin(),
|
// new BundleAnalyzerPlugin(),
|
||||||
new DefinePlugin({
|
new DefinePlugin({
|
||||||
|
|
Loading…
Add table
Reference in a new issue