Skip to content
This repository has been archived by the owner on Jan 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #23 from joshuef/WebpackDevServerUpdate
Browse files Browse the repository at this point in the history
Webpack dev server update
  • Loading branch information
S-Coyle authored Jan 8, 2019
2 parents f8c80c0 + 4fef8d2 commit 3f49e35
Show file tree
Hide file tree
Showing 6 changed files with 4,078 additions and 4,520 deletions.
2 changes: 1 addition & 1 deletion app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ chainsaw@~0.1.0:
dependencies:
traverse ">=0.3.0 <0.4"

"cids@github:bochaco/js-cid#temp-use-bochaco-multicodec":
cids@bochaco/js-cid#temp-use-bochaco-multicodec:
version "0.5.3"
resolved "https://codeload.github.com/bochaco/js-cid/tar.gz/fdd908ad57edd5359008adffde1ce32e3e970b15"
dependencies:
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"prestart": "npm run build",
"start": "cross-env NODE_ENV=production electron ./app/",
"start-main-dev": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./app/main.dev",
"start-renderer-dev": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.config.renderer.dev.js",
"start-renderer-dev": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/.bin/webpack-dev-server --config webpack.config.renderer.dev.js",
"test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js",
"test-all": "npm run lint && npm run flow && npm run build && npm run test && npm run test-e2e",
"test-e2e": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js e2e",
Expand Down Expand Up @@ -129,7 +129,6 @@
"babel-preset-react-optimize": "^1.0.1",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.24.1",
"babili-webpack-plugin": "^0.1.2",
"chalk": "^2.0.1",
"concurrently": "^3.5.0",
"copy-webpack-plugin": "^4.2.0",
Expand All @@ -154,9 +153,9 @@
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^7.1.0",
"express": "^4.15.3",
"extract-text-webpack-plugin": "^2.1.0",
"extract-text-webpack-plugin": "4.0.0-beta.0",
"fbjs-scripts": "^0.8.0",
"file-loader": "^0.11.1",
"file-loader": "3.0.1",
"flow-bin": "^0.48.0",
"flow-runtime": "^0.13.0",
"flow-typed": "^2.1.2",
Expand All @@ -180,18 +179,19 @@
"stylelint": "^7.12.0",
"stylelint-config-standard": "^16.0.0",
"url-loader": "^0.5.8",
"webpack": "^3.0.0",
"webpack": "^4.28.3",
"webpack-bundle-analyzer": "^2.8.2",
"webpack-dev-server": "^2.5.0",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "<3.1.11",
"webpack-merge": "^4.1.0"
},
"dependencies": {
"archiver": "^2.0.3",
"command-line-args": "^4.0.7",
"devtron": "^1.4.0",
"electron-debug": "^1.2.0",
"fs-extra": "^4.0.2",
"font-awesome": "^4.7.0",
"fs-extra": "^4.0.2",
"history": "^4.6.3",
"prop-types": "^15.6.0",
"react": "^15.6.1",
Expand Down
6 changes: 0 additions & 6 deletions webpack.config.main.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import webpack from 'webpack';
import merge from 'webpack-merge';
import BabiliPlugin from 'babili-webpack-plugin';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import baseConfig from './webpack.config.base';
import CheckNodeEnv from './internals/scripts/CheckNodeEnv';
Expand All @@ -25,11 +24,6 @@ export default merge.smart(baseConfig, {
},

plugins: [
/**
* Babli is an ES6+ aware minifier based on the Babel toolchain (beta)
*/
new BabiliPlugin(),

new BundleAnalyzerPlugin({
analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
openAnalyzer: process.env.OPEN_ANALYZER === 'true'
Expand Down
5 changes: 1 addition & 4 deletions webpack.config.renderer.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ if (!(fs.existsSync(dll) && fs.existsSync(manifest))) {
}

export default merge.smart(baseConfig, {
mode: 'development',
devtool: 'inline-source-map',

target: 'electron-renderer',
Expand Down Expand Up @@ -181,10 +182,6 @@ export default merge.smart(baseConfig, {
new webpack.LoaderOptionsPlugin({
debug: true
}),

new ExtractTextPlugin({
filename: '[name].css'
}),
],

node: {
Expand Down
8 changes: 1 addition & 7 deletions webpack.config.renderer.prod.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/**
* Build config for electron renderer process
*/

process.traceDeprecation = true
import path from 'path';
import webpack from 'webpack';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import merge from 'webpack-merge';
import BabiliPlugin from 'babili-webpack-plugin';
import CopyWebpackPlugin from 'copy-webpack-plugin';
import baseConfig from './webpack.config.base';
import CheckNodeEnv from './internals/scripts/CheckNodeEnv';
Expand Down Expand Up @@ -129,11 +128,6 @@ export default merge.smart(baseConfig, {
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
}),

/**
* Babli is an ES6+ aware minifier based on the Babel toolchain (beta)
*/
new BabiliPlugin(),

new CopyWebpackPlugin([
{
from: 'app/template',
Expand Down
Loading

0 comments on commit 3f49e35

Please sign in to comment.