Skip to content

Commit

Permalink
upgrade dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zakandrewking committed Jul 10, 2019
1 parent 867a9e8 commit 240381a
Show file tree
Hide file tree
Showing 4 changed files with 2,646 additions and 1,181 deletions.
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"devDependencies": {
"@jupyter-widgets/base": "^1.1.10",
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-preset-env": "^1.6.1",
Expand All @@ -39,19 +39,21 @@
"coveralls": "^3.0.0",
"cross-env": "^5.1.0",
"css-loader": "^0.28.4",
"file-loader": "^1.1.5",
"istanbul-instrumenter-loader": "^3.0.0",
"file-loader": "^3.0.1",
"istanbul-instrumenter-loader": "^3.0.1",
"jsdom": "^11.5.1",
"mocha": "^2.3.4",
"mocha-webpack": "^1.0.1",
"mocha": "^6.1.3",
"mochapack": "^1.1.1",
"null-loader": "^0.1.1",
"nyc": "^11.2.1",
"raw-loader": "^0.5.1",
"standard": "^10.0.3",
"style-loader": "^0.18.2",
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^0.6.2",
"webpack": "^3.8.1",
"webpack-dev-server": "^2.7.1",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.0",
"webpack-dev-server": "^3.3.1",
"webpack-merge": "^4.1.0",
"webpack-node-externals": "^1.6.0"
},
Expand All @@ -76,7 +78,7 @@
"watch": "./node_modules/.bin/webpack --config webpack.prod.js --watch",
"start": "./node_modules/.bin/webpack-dev-server --config webpack.dev.js",
"clean": "rm -r dist/*; rm -r py/escher/static/*",
"test": "./node_modules/.bin/mocha-webpack --webpack-config webpack.test.js \"src/tests/*.js\"",
"test": "./node_modules/.bin/mochapack --webpack-config webpack.test.js \"src/tests/*.js\"",
"copy": "cp dist/escher.min.js dist/index.js && cp package.json py/escher/static/ && cp jupyter/notebook-extension.js py/escher/static/extension.js && cp dist/escher.min.* py/escher/static/ && mkdir -p py/escher/static/jsonschema; cp jsonschema/* py/escher/static/jsonschema/",
"coverage": "./node_modules/.bin/cross-env NODE_ENV=coverage ./node_modules/.bin/nyc --reporter=text-lcov npm run test | ./node_modules/.bin/coveralls"
},
Expand Down
4 changes: 3 additions & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ const common = require('./webpack.common.js')

module.exports = merge.smart(common, {
entry: './dev-server/index.js',
output: 'bundle.js',
output: {
filename: 'bundle.js'
},
devServer: {
contentBase: './dev-server',
open: true,
Expand Down
18 changes: 10 additions & 8 deletions webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path')
const webpack = require('webpack')
const merge = require('webpack-merge')
const common = require('./webpack.common.js')
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')

// to visualize the webpack bundle contents:
// yarn add -D webpack-bundle-analyzer
Expand All @@ -19,12 +19,14 @@ module.exports = merge.smart(common, {
library: 'escher',
libraryTarget: 'umd'
},
plugins: [
new webpack.optimize.UglifyJsPlugin({
include: /\.min\.js$/,
sourceMap: true
})
// new BundleAnalyzerPlugin()
],
optimization: {
minimizer: [
new UglifyJsPlugin({
include: /\.min\.js$/,
sourceMap: true
})
]
},
// plugins: [new BundleAnalyzerPlugin()],
externals: ['@jupyter-widgets/base']
})
Loading

0 comments on commit 240381a

Please sign in to comment.