LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues596 Pull requests6 Projects Releases238 Packages Wiki Activity

Fix keytar and bundling

Browse source
This commit is contained in:
Shawn 2019-03-15 13:58:42 -05:00
parent a1f5572cb7
commit 3c3c12fa5d
5 changed files with 22 additions and 47 deletions

38
webpack.electron.config.js
View file

@ -14,14 +14,10 @@ const mainConfig = {
},
output: {
filename: '[name].js',
path: __dirname + '/dist/electron',
path: __dirname + '/dist/electron/webpack',
},
module: {
rules: [
{
test: /\.node$/,
use: 'node-loader',
},
{
test: /\.jsx?$/,
use: [
@ -43,17 +39,16 @@ const mainConfig = {
{
from: `${STATIC_ROOT}/`,
to: `${DIST_ROOT}/electron/static/`,
ignore: ['font/**/*', 'index.html'],
},
{
from: `${STATIC_ROOT}/index.html`,
to: `${DIST_ROOT}/electron/index.html`,
ignore: ['font/**/*'],
},
]),
],
devServer: {
contentBase: path.join(__dirname, 'dist/electron'),
},
externals: {
keytar: 'require("keytar")',
},
};
const renderConfig = {
@ -63,14 +58,10 @@ const renderConfig = {
},
output: {
filename: '[name].js',
path: __dirname + '/dist/electron',
path: __dirname + '/dist/electron/webpack',
},
module: {
rules: [
{
test: /\.node$/,
use: 'node-loader',
},
{
test: /\.jsx?$/,
use: [
@ -87,23 +78,6 @@ const renderConfig = {
},
],
},
plugins: [
new CopyWebpackPlugin([
{
from: `${STATIC_ROOT}/`,
to: `${DIST_ROOT}/electron/static/`,
ignore: ['font/**/*', 'index.html', 'index.dev.html'],
},
{
from: `${STATIC_ROOT}/index.html`,
to: `${DIST_ROOT}/electron/index.html`,
},
{
from: `${STATIC_ROOT}/index.dev.html`,
to: `${DIST_ROOT}/electron/index.dev.html`,
},
]),
],
};
module.exports = [merge(baseConfig, mainConfig), merge(baseConfig, renderConfig)];