package dependency cleanup (#330)

* update npm packages.  babel 7, redux 4, etc

* remove obsolete babel config file

* use correct icons
This commit is contained in:
Bruce Martin
2018-10-15 17:36:13 -07:00
committed by Colin Megill
parent 65f5244ff7
commit 6b0aafd27c
12 changed files with 3673 additions and 4352 deletions
+7 -3
View File
@@ -3,8 +3,12 @@ module.exports = {
cacheDirectory: true, cacheDirectory: true,
presets: [ presets: [
["modern-browsers", { loose: true, modules: false }], ["modern-browsers", { loose: true, modules: false }],
"stage-0", "@babel/preset-react"
"react"
], ],
plugins: ["babel-plugin-transform-decorators-legacy"] plugins: [
"@babel/plugin-proposal-function-bind",
"@babel/plugin-proposal-class-properties",
["@babel/plugin-proposal-decorators", { legacy: true }],
"@babel/plugin-proposal-export-namespace-from"
]
}; };
+7 -5
View File
@@ -2,12 +2,14 @@ module.exports = {
babelrc: false, babelrc: false,
presets: [ presets: [
["modern-browsers", { loose: true, modules: false }], ["modern-browsers", { loose: true, modules: false }],
"stage-0", "@babel/preset-react"
"react"
], ],
plugins: [ plugins: [
"babel-plugin-transform-react-constant-elements", "@babel/plugin-proposal-function-bind",
"babel-plugin-transform-decorators-legacy", "@babel/plugin-proposal-class-properties",
"babel-plugin-transform-runtime" ["@babel/plugin-proposal-decorators", { legacy: true }],
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-transform-react-constant-elements",
"@babel/plugin-transform-runtime"
] ]
}; };
-13
View File
@@ -1,13 +0,0 @@
module.exports = {
babelrc: false,
presets: [
["modern-browsers", { loose: true, modules: false }],
"stage-0",
"react"
],
plugins: [
"babel-plugin-transform-react-constant-elements",
"babel-plugin-transform-decorators-legacy",
"babel-plugin-transform-runtime"
]
};
@@ -1,6 +1,5 @@
// jshint esversion: 6 // jshint esversion: 6
const path = require("path"); const path = require("path");
const autoprefixer = require("autoprefixer");
const webpack = require("webpack"); const webpack = require("webpack");
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin");
@@ -39,12 +38,6 @@ module.exports = {
importLoaders: 1, importLoaders: 1,
localIdentName: "[name]__[local]___[hash:base64:5]" localIdentName: "[name]__[local]___[hash:base64:5]"
} }
},
{
loader: "postcss-loader",
options: {
plugins: () => []
}
} }
] ]
}, },
@@ -1,6 +1,5 @@
// jshint esversion: 6 // jshint esversion: 6
const path = require("path"); const path = require("path");
const autoprefixer = require("autoprefixer");
const webpack = require("webpack"); const webpack = require("webpack");
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin");
const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin");
@@ -45,14 +44,6 @@ module.exports = {
importLoaders: 1, importLoaders: 1,
localIdentName: "[name]__[local]___[hash:base64:5]" localIdentName: "[name]__[local]___[hash:base64:5]"
} }
},
{
loader: "postcss-loader",
options: {
plugins: function() {
return [];
}
}
} }
] ]
}, },
@@ -104,5 +95,9 @@ module.exports = {
cacheId: "cellxgene", cacheId: "cellxgene",
filename: "service-worker.js" filename: "service-worker.js"
}) })
] ],
performance: {
maxEntrypointSize: 750000,
maxAssetSize: 750000
}
}; };
+3605 -4276
View File
File diff suppressed because it is too large Load Diff
+37 -26
View File
@@ -44,56 +44,56 @@
"react-autocomplete": "^1.7.2", "react-autocomplete": "^1.7.2",
"react-dom": "^16.4.1", "react-dom": "^16.4.1",
"react-helmet": "^5.2.0", "react-helmet": "^5.2.0",
"react-icons": "^2.2.7", "react-icons": "^3.2.0",
"react-redux": "^5.0.6", "react-redux": "^5.0.6",
"redux": "^3.7.2", "redux": "^4.0.1",
"redux-thunk": "^2.2.0", "redux-thunk": "^2.2.0",
"regl": "^1.3.1", "regl": "^1.3.1",
"scroll-speed": "^1.0.0", "scroll-speed": "^1.0.0",
"urijs": "^1.19.0" "urijs": "^1.19.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.0.0-rc.1", "@babel/core": "^7.0.0",
"autoprefixer": "^9.1.1", "@babel/plugin-proposal-class-properties": "^7.0.0",
"babel-core": "^6.13.2", "@babel/plugin-proposal-decorators": "^7.0.0",
"babel-eslint": "^8.2.6", "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-proposal-function-bind": "^7.0.0",
"@babel/plugin-transform-react-constant-elements": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.0.0",
"@babel/runtime": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0", "babel-jest": "^23.6.0",
"babel-loader": "^7.1.2", "babel-loader": "^8.0.0",
"babel-plugin-istanbul": "^4.1.6", "babel-plugin-istanbul": "^5.1.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-preset-modern-browsers": "^12.0.0",
"babel-plugin-transform-react-constant-elements": "^6.9.1", "chalk": "^2.4.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.1",
"babel-preset-modern-browsers": "^11.0.1",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.11.6",
"babel-runtime": "^6.11.6",
"chalk": "^1.1.3",
"connect-history-api-fallback": "^1.3.0", "connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"css-loader": "^1.0.0", "css-loader": "^1.0.0",
"eslint": "^5.3.0", "eslint": "^5.3.0",
"eslint-config-airbnb": "^17.1.0", "eslint-config-airbnb": "^17.1.0",
"eslint-loader": "^1.5.0", "eslint-loader": "^2.1.1",
"eslint-plugin-filenames": "^1.3.2", "eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0", "eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.1", "eslint-plugin-jest": "^21.25.0",
"eslint-plugin-jsx-a11y": "^6.1.1", "eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.11.1", "eslint-plugin-react": "^7.11.1",
"express": "^4.14.0", "express": "^4.14.0",
"file-loader": "^1.1.11", "file-loader": "^2.0.0",
"html-webpack-inline-source-plugin": "0.0.10", "html-webpack-inline-source-plugin": "0.0.10",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"jest": "^23.5.0", "jest": "^23.5.0",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"mini-css-extract-plugin": "^0.4.1", "mini-css-extract-plugin": "^0.4.1",
"nyc": "^13.0.1", "nyc": "^13.0.1",
"postcss-loader": "^2.1.6",
"rimraf": "^2.5.4", "rimraf": "^2.5.4",
"serve-favicon": "^2.3.0", "serve-favicon": "^2.3.0",
"style-loader": "^0.22.1", "style-loader": "^0.23.1",
"sw-precache-webpack-plugin": "^0.7.1", "sw-precache-webpack-plugin": "^0.11.5",
"url-loader": "^1.1.0", "url-loader": "^1.1.0",
"webpack": "^4.16.0", "webpack": "^4.16.0",
"webpack-cli": "^3.1.0", "webpack-cli": "^3.1.0",
@@ -109,10 +109,21 @@
"env": { "env": {
"test": { "test": {
"presets": [ "presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-function-bind",
"@babel/plugin-proposal-class-properties",
[ [
"env" "@babel/plugin-proposal-decorators",
{
"legacy": true
}
], ],
"react" "@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-transform-react-constant-elements",
"@babel/plugin-transform-runtime"
] ]
} }
} }
@@ -8,7 +8,7 @@ import React from "react";
import _ from "lodash"; import _ from "lodash";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { kvCache } from "../../util/stateManager/"; import { kvCache } from "../../util/stateManager/";
import FaPaintBrush from "react-icons/lib/fa/paint-brush"; import { FaPaintBrush } from "react-icons/fa";
import * as d3 from "d3"; import * as d3 from "d3";
import memoize from "memoize-one"; import memoize from "memoize-one";
import * as globals from "../../globals"; import * as globals from "../../globals";
@@ -3,9 +3,9 @@ import React from "react";
import _ from "lodash"; import _ from "lodash";
import { connect } from "react-redux"; import { connect } from "react-redux";
import FaArrowRight from "react-icons/lib/fa/angle-right"; import { FaChevronRight } from "react-icons/fa";
import FaArrowDown from "react-icons/lib/fa/angle-down"; import { FaChevronDown } from "react-icons/fa";
import FaPaintBrush from "react-icons/lib/fa/paint-brush"; import { FaPaintBrush } from "react-icons/fa";
import * as globals from "../../globals"; import * as globals from "../../globals";
import Value from "./value"; import Value from "./value";
@@ -132,7 +132,7 @@ class Category extends React.Component {
this.setState({ isExpanded: !isExpanded }); this.setState({ isExpanded: !isExpanded });
}} }}
> >
{isExpanded ? <FaArrowDown /> : <FaArrowRight />} {isExpanded ? <FaChevronDown /> : <FaChevronRight />}
</span> </span>
{metadataField} {metadataField}
<input <input
@@ -5,7 +5,7 @@ import memoize from "memoize-one";
import { connect } from "react-redux"; import { connect } from "react-redux";
import ReactAutocomplete from "react-autocomplete"; /* http://emilebres.github.io/react-virtualized-checkbox/ */ import ReactAutocomplete from "react-autocomplete"; /* http://emilebres.github.io/react-virtualized-checkbox/ */
import getContrast from "font-color-contrast"; // https://www.npmjs.com/package/font-color-contrast import getContrast from "font-color-contrast"; // https://www.npmjs.com/package/font-color-contrast
import FaPaintBrush from "react-icons/lib/fa/paint-brush"; import { FaPaintBrush } from "react-icons/fa";
import * as d3 from "d3"; import * as d3 from "d3";
import { interpolateGreys } from "d3-scale-chromatic"; import { interpolateGreys } from "d3-scale-chromatic";
import * as globals from "../../globals"; import * as globals from "../../globals";
@@ -5,7 +5,7 @@ import React from "react";
import _ from "lodash"; import _ from "lodash";
import * as d3 from "d3"; import * as d3 from "d3";
import { connect } from "react-redux"; import { connect } from "react-redux";
import CirclePlus from "react-icons/lib/fa/plus-circle"; import { FaPlusCircle } from "react-icons/fa";
import HistogramBrush from "../brushableHistogram"; import HistogramBrush from "../brushableHistogram";
import * as globals from "../../globals"; import * as globals from "../../globals";
// import ReactAutocomplete from "react-autocomplete"; /* http://emilebres.github.io/react-virtualized-checkbox/ */ // import ReactAutocomplete from "react-autocomplete"; /* http://emilebres.github.io/react-virtualized-checkbox/ */
@@ -89,7 +89,7 @@ class GeneExpression extends React.Component {
}} }}
onClick={this.handleClick.bind(this)} onClick={this.handleClick.bind(this)}
> >
<CirclePlus <FaPlusCircle
style={{ style={{
display: "inline-block", display: "inline-block",
marginLeft: 7, marginLeft: 7,
+4 -4
View File
@@ -6,8 +6,8 @@ import { connect } from "react-redux";
import mat4 from "gl-mat4"; import mat4 from "gl-mat4";
import _regl from "regl"; import _regl from "regl";
import FaCrosshair from "react-icons/lib/fa/crosshairs"; import { FaCrosshairs } from "react-icons/fa";
import FaZoom from "react-icons/lib/fa/search-plus"; import { FaSearchPlus } from "react-icons/fa";
import * as globals from "../../globals"; import * as globals from "../../globals";
import setupSVGandBrushElements from "./setupSVGandBrush"; import setupSVGandBrushElements from "./setupSVGandBrush";
@@ -399,7 +399,7 @@ class Graph extends React.Component {
}} }}
> >
{" "} {" "}
<FaCrosshair />{" "} <FaCrosshairs />{" "}
</button> </button>
<button <button
type="button" type="button"
@@ -419,7 +419,7 @@ class Graph extends React.Component {
}} }}
> >
{" "} {" "}
<FaZoom />{" "} <FaSearchPlus />{" "}
</button> </button>
</span> </span>
</div> </div>