diff --git a/jsapp/js/components/drawer.es6 b/jsapp/js/components/drawer.es6 index a729b9d3bf..4ec316675a 100644 --- a/jsapp/js/components/drawer.es6 +++ b/jsapp/js/components/drawer.es6 @@ -4,7 +4,6 @@ import reactMixin from 'react-mixin'; import autoBind from 'react-autobind'; import Reflux from 'reflux'; import { Link } from 'react-router'; -import Dropzone from 'react-dropzone'; import Select from 'react-select'; import {dataInterface} from '../dataInterface'; diff --git a/jsapp/js/components/formLanding.es6 b/jsapp/js/components/formLanding.es6 index 1bc52d040f..c26860cb9c 100644 --- a/jsapp/js/components/formLanding.es6 +++ b/jsapp/js/components/formLanding.es6 @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import reactMixin from 'react-mixin'; import autoBind from 'react-autobind'; import Reflux from 'reflux'; -import Map from 'es6-map'; import _ from 'underscore'; import { Link } from 'react-router'; import actions from '../actions'; diff --git a/jsapp/js/utils.es6 b/jsapp/js/utils.es6 index 0124021418..bb2ac78b6a 100644 --- a/jsapp/js/utils.es6 +++ b/jsapp/js/utils.es6 @@ -3,7 +3,6 @@ import moment from 'moment'; import alertify from 'alertifyjs'; import $ from 'jquery'; import cookie from 'react-cookie'; -import Promise from 'es6-promise'; export const LANGUAGE_COOKIE_NAME = 'django_language'; diff --git a/package.json b/package.json index 15b8132cab..9f0044c098 100644 --- a/package.json +++ b/package.json @@ -5,32 +5,26 @@ "devDependencies": { "@mapbox/leaflet-omnivore": "^0.3.4", "alertifyjs": "^1.9.0", - "async": "^1.4.2", - "autoprefixer": "^7.1.1", + "autoprefixer": "^9.1.5", "babel-core": "^6.26.3", - "babel-eslint": "^8.2.3", + "babel-eslint": "^10.0.1", "babel-loader": "^7.1.4", - "babel-plugin-add-module-exports": "^0.1.2", + "babel-plugin-add-module-exports": "^1.0.0", "babel-polyfill": "^6.26.0", "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", "backbone": "^1.1.2", "backbone-validation": "^0.11.5", - "bluebird": "^2.9.27", - "browser-sync": "^2.10.1", "chai": "^4.1.2", "chart.js": "^2.7.1", "classnames": "^2.2.5", "coffee-loader": "^0.9.0", "coffeescript": "^1.12.0", - "css-loader": "^0.28.11", - "diff": "^1.4.0", - "es6-map": "^0.1.4", - "es6-promise": "^3.3.1", - "eslint": "^4.19.1", + "css-loader": "^1.0.0", + "eslint": "^5.6.0", "eslint-loader": "^2.0.0", "eslint-plugin-react": "^7.10.0", - "file-loader": "^1.1.11", + "file-loader": "^2.0.0", "font-awesome": "^4.4.0", "immutable": "^3.4.7", "jquery": "^3.3.1", @@ -39,35 +33,27 @@ "leaflet": "^1.3.1", "leaflet.heat": "^0.2.0", "leaflet.markercluster": "^1.3.0", - "lodash._bindcallback": "^3.0.1", "lodash.clonedeep": "^4.5.0", - "lodash.isarguments": "^3.0.4", - "lodash.isarray": "^3.0.4", - "lodash.merge": "^3.3.2", - "lodash.restparam": "^3.6.1", - "mime-types": "^2.1.8", + "lodash.merge": "^4.6.1", "mocha": "^5.2.0", "mocha-chrome": "^1.1.0", "moment": "^2.10.3", - "ms": "^0.7.1", "node-sass": "^4.9.3", "object-assign": "^4.1.1", - "opn-cli": "^3.1.0", - "postcss": "^6.0.22", - "postcss-loader": "^2.1.5", + "postcss": "^7.0.4", + "postcss-loader": "^3.0.0", "prop-types": "^15.6.1", - "q": "^1.4.1", - "react": "^16.4.0", + "react": "^16.5.2", "react-autobind": "^1.0.6", - "react-autosize-textarea": "^0.4.3", + "react-autosize-textarea": "^4.0.0", "react-cookie": "^0.2.3", "react-copy-to-clipboard": "^5.0.0", "react-debounce-input": "^3.1.0", "react-document-title": "^2.0.2", "react-dom": "^16.4.0", - "react-dropzone": "^4.2.11", + "react-dropzone": "^5.1.1", "react-hot-loader": "3.1.0", - "react-mixin": "^3.0.5", + "react-mixin": "^5.0.0", "react-router": "^3.2.1", "react-select": "^2.0.0", "react-shortcuts": "^2.0.0", @@ -76,21 +62,17 @@ "reflux": "^6.4.1", "reflux-core": "^1.0.0", "replace-in-file": "^3.4.0", - "rimraf": "^2.4.3", - "roboto-fontface": "^0.4.5", + "roboto-fontface": "^0.10.0", "sass-loader": "^7.0.1", "select2": "3.5.2-browserify", "spark-md5": "^3.0.0", - "style-loader": "^0.21.0", + "style-loader": "^0.23.0", "underscore": "^1.8.3", - "vinyl-source-stream": "^1.1.0", "webfonts-generator": "^0.4.0", "webpack": "^4.20.2", "webpack-bundle-tracker": "0.4.0-beta", "webpack-cli": "^3.1.1", - "webpack-dev-middleware": "3.4.0", - "webpack-dev-server": "^3.1.8", - "webpack-hot-middleware": "2.24.2" + "webpack-dev-server": "^3.1.8" }, "scripts": { "build": "webpack --config webpack/prod.config.js --progress --colors", diff --git a/scripts/copy_fonts.py b/scripts/copy_fonts.py index e6dc0db303..9756456582 100644 --- a/scripts/copy_fonts.py +++ b/scripts/copy_fonts.py @@ -21,7 +21,7 @@ def copy_fonts(): for file in glob.glob("./node_modules/font-awesome/fonts/*.*"): print(file) shutil.copy(file, dest_dir) - for file in glob.glob("./node_modules/roboto-fontface/fonts/*.wof*"): + for file in glob.glob("./node_modules/roboto-fontface/fonts/roboto/*.wof*"): print(file) shutil.copy(file, dest_dir)