accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-13 00:46:28 +00:00
Code Issues Releases Activity

Update webpack config for electron

Browse Source
This commit is contained in:
Faris Ansari 2018-10-20 18:00:58 +05:30
parent 32209ed661
commit 8a2f1613b5
4 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -24,6 +24,7 @@
"css-loader": "^1.0.0",
"deepmerge": "^2.1.0",
"electron": "^3.0.2",
"electron-builder": "^20.28.4",
"electron-debug": "^2.0.0",
"electron-devtools-installer": "^2.2.4",
"express": "^4.16.2",

54
webpack/config.js
View File

@ -1,6 +1,10 @@
const path = require('path');
const webpack = require('webpack');
const { getAppConfig, resolveAppDir } = require('./utils');
const appPackageJson = require(resolveAppDir('./package.json'));
const appDependencies = appPackageJson.dependencies;
const frappeDependencies = require('../package.json').dependencies;
const allDependencies = Object.assign(frappeDependencies, appDependencies);
const plugins = {
NamedModules: webpack.NamedModulesPlugin,
@ -15,16 +19,26 @@ const plugins = {
const appConfig = getAppConfig();
const isProduction = process.env.NODE_ENV === 'production';
const isElectron = process.env.ELECTRON === 'true';
const isMonoRepo = process.env.MONO_REPO === 'true' || true;
const whiteListedModules = ['vue'];
const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))
console.log(externals);
function getConfig() {
const config = {
mode: isProduction ? 'production' : 'development',
context: resolveAppDir(),
entry: appConfig.dev.entry,
entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
externals: isElectron ? externals : null,
target: isElectron ? 'electron-renderer' : 'web',
output: {
path: path.resolve(appConfig.dev.outputDir),
path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
filename: '[name].js',
publicPath: appConfig.dev.assetsPublicPath
publicPath: appConfig.dev.assetsPublicPath,
libraryTarget: isElectron ? 'commonjs2' : null
},
devtool: 'cheap-module-eval-source-map',
module: {
@ -41,6 +55,10 @@ function getConfig() {
!/\.vue\.js/.test(file)
)
},
{
test: /\.node$/,
use: 'node-loader'
},
{
test: /\.css$/,
use: [
@ -59,13 +77,13 @@ function getConfig() {
{
test: /\.(png|svg|jpg|gif)$/,
use: [
'file-loader'
'file-loader'
]
}
]
},
resolve: {
extensions: ['.js', '.vue'],
extensions: ['.js', '.vue', '.json', '.css', '.node'],
alias: {
'vue$': 'vue/dist/vue.esm.js',
'deepmerge$': 'deepmerge/dist/umd.js',
@ -78,7 +96,10 @@ function getConfig() {
}),
new plugins.VueLoader(),
new plugins.Html({
template: resolveAppDir(appConfig.dev.entryHtml)
template: resolveAppDir(appConfig.dev.entryHtml),
nodeModules: !isProduction
? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
: false
}),
new plugins.CaseSensitivePaths(),
new plugins.NamedModules(),
@ -115,6 +136,27 @@ function getConfig() {
}
}
// if (process.env.NODE_ENV === 'production') {
// config.devtool = ''
// config.plugins.push(
// new BabiliWebpackPlugin(),
// new CopyWebpackPlugin([
// {
// from: path.join(__dirname, '../static'),
// to: path.join(__dirname, '../dist/electron/static'),
// ignore: ['.*']
// }
// ]),
// new webpack.DefinePlugin({
// 'process.env.NODE_ENV': '"production"'
// }),
// new webpack.LoaderOptionsPlugin({
// minimize: true
// })
// )
// }
return config;
}

3
webpack/serve.js
View File

@ -52,7 +52,8 @@ function startWebpackDevServer() {
function addWebpackEntryPoints(webpackConfig, forDevServer) {
const devServerEntryPoints = [
resolveAppDir('node_modules/webpack-dev-server/client/index.js') + '?http://localhost',
// resolveAppDir('node_modules/webpack-dev-server/client/index.js') + '?http://localhost',
'webpack-dev-server/client/index.js?http://localhost',
'webpack/hot/dev-server'
];
const middlewareEntryPoints = [

30
webpack/start.js
View File

@ -4,22 +4,22 @@ const { getAppConfig, resolveAppDir } = require('./utils');
const appConfig = getAppConfig();
module.exports = function start(mode) {
process.env.NODE_ENV = 'development';
process.env.NODE_ENV = 'development';
if (mode === 'electron') {
const electron = require('electron');
const electronPaths = appConfig.electron.paths;
if (mode === 'electron') {
const electron = require('electron');
const electronPaths = appConfig.electron.paths;
startWebpackDevServer()
.then((devServer) => {
const p = spawn(electron, [resolveAppDir(electronPaths.mainDev)], { stdio: 'inherit' })
p.on('close', () => {
devServer.close();
});
});
} else {
const nodePaths = appConfig.node.paths;
startWebpackDevServer()
.then((devServer) => {
const p = spawn(electron, [resolveAppDir(electronPaths.mainDev)], { stdio: 'inherit' })
p.on('close', () => {
devServer.close();
});
});
} else {
const nodePaths = appConfig.node.paths;
spawn('node', [resolveAppDir(nodePaths.main)], { stdio: 'inherit' })
}
spawn('node', [resolveAppDir(nodePaths.main)], { stdio: 'inherit' })
}
}