Skip to content

Commit

Permalink
upgrade all dev dependencies to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
zakandrewking committed Jul 10, 2019
1 parent 240381a commit 3942f3c
Show file tree
Hide file tree
Showing 11 changed files with 2,151 additions and 3,199 deletions.
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,22 @@
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-preset-env": "^1.6.1",
"bootswatch": "^3.3.6",
"chai": "^3.3.0",
"chai": "^4.2.0",
"coveralls": "^3.0.0",
"cross-env": "^5.1.0",
"css-loader": "^0.28.4",
"file-loader": "^3.0.1",
"css-loader": "^3.0.0",
"file-loader": "^4.0.0",
"istanbul-instrumenter-loader": "^3.0.1",
"jsdom": "^11.5.1",
"jsdom": "^15.1.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",
"null-loader": "^3.0.0",
"nyc": "^14.1.1",
"raw-loader": "^3.0.0",
"standard": "^12.0.1",
"style-loader": "^0.23.1",
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^0.6.2",
"url-loader": "^2.0.1",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.0",
"webpack-dev-server": "^3.3.1",
Expand Down
35 changes: 33 additions & 2 deletions py/escher/static/escher.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion py/escher/static/escher.min.js.map

Large diffs are not rendered by default.

39 changes: 20 additions & 19 deletions py/escher/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,30 @@
},
"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",
"bootswatch": "^3.3.6",
"chai": "^3.3.0",
"chai": "^4.2.0",
"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",
"jsdom": "^11.5.1",
"mocha": "^2.3.4",
"mocha-webpack": "^1.0.1",
"null-loader": "^0.1.1",
"nyc": "^11.2.1",
"raw-loader": "^0.5.1",
"standard": "^10.0.3",
"style-loader": "^0.18.2",
"url-loader": "^0.6.2",
"webpack": "^3.8.1",
"webpack-dev-server": "^2.7.1",
"css-loader": "^3.0.0",
"file-loader": "^4.0.0",
"istanbul-instrumenter-loader": "^3.0.1",
"jsdom": "^15.1.1",
"mocha": "^6.1.3",
"mochapack": "^1.1.1",
"null-loader": "^3.0.0",
"nyc": "^14.1.1",
"raw-loader": "^3.0.0",
"standard": "^12.0.1",
"style-loader": "^0.23.1",
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^2.0.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 +77,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
1 change: 0 additions & 1 deletion src/Builder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import SearchBar from './SearchBar'
import ButtonPanel from './ButtonPanel'
import TooltipContainer from './TooltipContainer'
import DefaultTooltip from './DefaultTooltip'
import scalePresets from './scalePresets'
import _ from 'underscore'
import {
select as d3Select,
Expand Down
8 changes: 4 additions & 4 deletions src/ZoomContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ export default class ZoomContainer {
* @param {Object} translate - The location, of the form {x: 2.0, y: 3.0}.
*/
goTo (scale, translate) {
utils.check_undefined(arguments, [ 'scale', 'translate' ])

// Check inputs
if (!scale) {
throw new Error('Bad scale value')
console.error('Bad scale value')
return
}
if (!translate || !('x' in translate) || !('y' in translate) ||
_.isNaN(translate.x) || _.isNaN(translate.y)) {
throw new Error('Bad translate value')
console.error('Bad translate value')
return
}

// Save to zoom behavior, which will call _goTo_callback
Expand Down
13 changes: 2 additions & 11 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,8 @@ module.exports = {
module: {
rules: [
{
test: /\.css$/,
use: [
{ loader: 'style-loader' },
{
loader: 'css-loader',
options: {
minimize: true,
sourceMap: true
}
}
]
test: /\.css$/i,
use: ['style-loader', 'css-loader']
},
{
test: /\.jsx?$/,
Expand Down
1 change: 1 addition & 0 deletions webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const merge = require('webpack-merge')
const common = require('./webpack.common.js')

module.exports = merge.smart(common, {
mode: 'development',
entry: './dev-server/index.js',
output: {
filename: 'bundle.js'
Expand Down
1 change: 1 addition & 0 deletions webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin

module.exports = merge.smart(common, {
mode: 'production',
entry: {
'escher': './src/main.js',
'escher.min': './src/main.js'
Expand Down
1 change: 1 addition & 0 deletions webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const istanbulLoader = {
const rules = isCoverage ? [istanbulLoader, cssNullLoader] : [cssNullLoader]

module.exports = merge.smart(common, {
mode: 'development',
// Webpack should emit node.js compatible code
target: 'node',
// Ignore all modules in node_modules folder from bundling
Expand Down
Loading

0 comments on commit 3942f3c

Please sign in to comment.