diff --git a/assets/css/app.css b/assets/css/app.css index 0ecc15b44..7b4c20ece 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -81,7 +81,7 @@ blockquote { @screen xl { .main-graph { - height: 480px; + height: 460px; } } @@ -97,29 +97,6 @@ a { transition: all .1s ease-in; } -.truncated-label { - @apply no-underline text-grey-darkest; - white-space: nowrap; - width: calc(100% - 40px); - overflow: hidden; - text-overflow: ellipsis; - text-align: left; -} - -.bar { - height: 4px; - width: 100%; - background-color: #f5f6f7; - border-radius: 4px; - margin-top: 8px; - margin-bottom: 24px; -} - -.bar__fill { - height: 100%; - border-radius: 4px; -} - .pulsating-circle { position: absolute; left: 50%; @@ -248,3 +225,33 @@ a { .tweet-text a:hover { text-decoration: underline; } + +.stats-item { + @apply mt-6; + width: 100%; +} + +@screen md { + .stats-item { + margin-left: 6px; + margin-right: 6px; + width: calc(50% - 6px); + position: relative; + } +} + +.stats-item:first-child { + margin-left: 0; +} + +.stats-item:last-child { + margin-right: 0; +} + +.fade-enter { + opacity: 0; +} +.fade-enter-active { + opacity: 1; + transition: opacity 200ms ease-in; +} diff --git a/assets/js/dashboard/index.js b/assets/js/dashboard/index.js index 9be7f8670..64b30113d 100644 --- a/assets/js/dashboard/index.js +++ b/assets/js/dashboard/index.js @@ -8,9 +8,7 @@ import VisitorGraph from './stats/visitor-graph' import Referrers from './stats/referrers' import Pages from './stats/pages' import Countries from './stats/countries' -import Browsers from './stats/browsers' -import OperatingSystems from './stats/operating-systems' -import ScreenSizes from './stats/screen-sizes' +import Devices from './stats/devices' import Conversions from './stats/conversions' import {parseQuery} from './query' @@ -36,6 +34,14 @@ class Stats extends React.Component { } } + forgotten() { + return ( +
+ +
+ ) + } + render() { return (
@@ -48,17 +54,14 @@ class Stats extends React.Component {
-
+
-
-
- - - +
+ +
- { this.renderConversions() }
) diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.js index b4688c2d5..56cb32e8a 100644 --- a/assets/js/dashboard/router.js +++ b/assets/js/dashboard/router.js @@ -6,8 +6,6 @@ import ReferrersDrilldownModal from './stats/modals/referrer-drilldown' import GoogleKeywordsModal from './stats/modals/google-keywords' import PagesModal from './stats/modals/pages' import CountriesModal from './stats/modals/countries' -import BrowsersModal from './stats/modals/browsers' -import OperatingSystemsModal from './stats/modals/operating-systems' import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom"; @@ -45,12 +43,6 @@ export default function Router({site}) { - - - - - - diff --git a/assets/js/dashboard/stats/bar.js b/assets/js/dashboard/stats/bar.js index 2f5238e35..fd69897ed 100644 --- a/assets/js/dashboard/stats/bar.js +++ b/assets/js/dashboard/stats/bar.js @@ -15,8 +15,7 @@ export default function Bar({count, all, color}) { const width = barWidth(count, all) return ( -
-
+
) } diff --git a/assets/js/dashboard/stats/browsers.js b/assets/js/dashboard/stats/browsers.js deleted file mode 100644 index 0288e9007..000000000 --- a/assets/js/dashboard/stats/browsers.js +++ /dev/null @@ -1,64 +0,0 @@ -import React from 'react'; - -import Bar from './bar' -import MoreLink from './more-link' -import * as api from '../api' - -export default class Browsers extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - } - - componentDidMount() { - this.fetchBrowsers() - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, browsers: null}) - this.fetchBrowsers() - } - } - - fetchBrowsers() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/browsers`, this.props.query) - .then((res) => this.setState({loading: false, browsers: res})) - } - - renderBrowser(browser) { - return ( - -
- {browser.name} - {browser.percentage}% -
- -
- ) - } - - render() { - if (this.state.loading) { - return ( -
-
-
- ) - } else if (this.state.browsers) { - return ( -
-
-

Browsers

-
by visitors
-
- -
- { this.state.browsers.map(this.renderBrowser.bind(this)) } -
- -
- ) - } - } -} diff --git a/assets/js/dashboard/stats/conversions.js b/assets/js/dashboard/stats/conversions.js index e8d759ece..81f68ef13 100644 --- a/assets/js/dashboard/stats/conversions.js +++ b/assets/js/dashboard/stats/conversions.js @@ -33,34 +33,33 @@ export default class Conversions extends React.Component { query.set('goal', goal.name) return ( - -
- { goal.name } - {numberFormatter(goal.count)} +
+
+ + { goal.name }
- - + {numberFormatter(goal.count)} +
) } render() { if (this.state.loading) { return ( -
+
) } else if (this.state.goals) { return ( -
-
-

Goal Conversions

-
by visitors
+
+

Goal Conversions

+
+ Goal + Conversions
-
- { this.state.goals.map(this.renderGoal.bind(this)) } -
+ { this.state.goals.map(this.renderGoal.bind(this)) }
) } diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/countries.js index b81734b8b..932c0ce79 100644 --- a/assets/js/dashboard/stats/countries.js +++ b/assets/js/dashboard/stats/countries.js @@ -1,4 +1,5 @@ import React from 'react'; +import Datamap from 'datamaps' import Bar from './bar' import MoreLink from './more-link' @@ -7,6 +8,7 @@ import * as api from '../api' export default class Countries extends React.Component { constructor(props) { super(props) + this.resizeMap = this.resizeMap.bind(this) this.state = { loading: true } @@ -14,6 +16,11 @@ export default class Countries extends React.Component { componentDidMount() { this.fetchCountries() + window.addEventListener('resize', this.resizeMap); + } + + componentWillUnmount() { + window.removeEventListener('resize', this.resizeMap); } componentDidUpdate(prevProps) { @@ -26,39 +33,65 @@ export default class Countries extends React.Component { fetchCountries() { api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/countries`, this.props.query) .then((res) => this.setState({loading: false, countries: res})) + .then(() => this.drawMap()) } - renderCountry(country) { - return ( - -
- {country.name} - {country.percentage}% -
- -
- ) + resizeMap() { + this.map && this.map.resize() + } + + drawMap() { + var dataset = {}; + + var onlyValues = this.state.countries.map(function(obj){ return obj.count }); + var minValue = Math.min.apply(null, onlyValues), + maxValue = Math.max.apply(null, onlyValues); + + var paletteScale = d3.scale.linear() + .domain([minValue,maxValue]) + .range(["#f3ebff","#a779e9"]); + + this.state.countries.forEach(function(item){ + dataset[item.name] = {numberOfThings: item.count, fillColor: paletteScale(item.count)}; + }); + + this.map = new Datamap({ + element: document.getElementById('map-container'), + responsive: true, + projection: 'mercator', + fills: { defaultFill: '#f8fafc' }, + data: dataset, + geographyConfig: { + borderColor: '#dae1e7', + highlightBorderWidth: 2, + highlightFillColor: function(geo) { + return geo['fillColor'] || '#F5F5F5'; + }, + highlightBorderColor: '#a779e9', + popupTemplate: function(geo, data) { + if (!data) { return ; } + return ['
', + '', geo.properties.name, '', + '
', data.numberOfThings, ' Visitors', + '
'].join(''); + } + } + }); } render() { if (this.state.loading) { return ( -
+
) } else if (this.state.countries) { return ( -
-
-

Top Countries

-
by visitors
-
- -
- { this.state.countries.map(this.renderCountry.bind(this)) } -
- +
+

Countries

+
+
) } diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index c944549fe..ebda9e17b 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -27,11 +27,11 @@ export default class CurrentVisitors extends React.Component { render() { if (this.state.currentVisitors !== null) { return ( -
+
- {this.state.currentVisitors} current visitors + {this.state.currentVisitors} current visitors
) } else { diff --git a/assets/js/dashboard/stats/devices.js b/assets/js/dashboard/stats/devices.js new file mode 100644 index 000000000..be92bedd7 --- /dev/null +++ b/assets/js/dashboard/stats/devices.js @@ -0,0 +1,239 @@ +import React from 'react'; + +import Bar from './bar' +import MoreLink from './more-link' +import * as api from '../api' + + +function FadeIn({show, children}) { + const className = show ? "fade-enter-active" : "fade-enter" + + return
{children}
+} + +const EXPLANATION = { + 'Mobile': 'up to 576px', + 'Tablet': '576px to 992px', + 'Laptop': '992px to 1440px', + 'Desktop': 'above 1440px', +} + +function iconFor(screenSize) { + if (screenSize === 'Mobile') { + return ( + + ) + } else if (screenSize === 'Tablet') { + return ( + + ) + } else if (screenSize === 'Laptop') { + return ( + + ) + } else if (screenSize === 'Desktop') { + return ( + + ) + } +} + +class ScreenSizes extends React.Component { + constructor(props) { + super(props) + this.state = {loading: true} + } + + componentDidMount() { + this.fetchScreenSizes() + } + + componentDidUpdate(prevProps) { + if (this.props.query !== prevProps.query) { + this.setState({loading: true, sizes: null}) + this.fetchScreenSizes() + } + } + + fetchScreenSizes() { + api.get(`/api/stats/${this.props.site.domain}/screen-sizes`, this.props.query) + .then((res) => this.setState({loading: false, sizes: res})) + } + + renderScreenSize(size) { + return ( +
+
+ + {iconFor(size.name)} {size.name} +
+ {size.percentage}% +
+ ) + } + + render() { + return ( + + +
+ Screen size + Visitors +
+ { this.state.sizes && this.state.sizes.map(this.renderScreenSize.bind(this)) } +
+
+ ) + } +} + +class Browsers extends React.Component { + constructor(props) { + super(props) + this.state = {loading: true} + } + + componentDidMount() { + this.fetchBrowsers() + } + + componentDidUpdate(prevProps) { + if (this.props.query !== prevProps.query) { + this.setState({loading: true, browsers: null}) + this.fetchBrowsers() + } + } + + fetchBrowsers() { + api.get(`/api/stats/${this.props.site.domain}/browsers`, this.props.query) + .then((res) => this.setState({loading: false, browsers: res})) + } + + renderBrowser(browser) { + return ( +
+
+ + {browser.name} +
+ {browser.percentage}% +
+ ) + } + + render() { + return ( + +
+
+ Browser + Visitors +
+ { this.state.browsers && this.state.browsers.map(this.renderBrowser.bind(this)) } +
+
+ ) + } +} + +class OperatingSystems extends React.Component { + constructor(props) { + super(props) + this.state = {loading: true} + } + + componentDidMount() { + this.fetchOperatingSystems() + } + + componentDidUpdate(prevProps) { + if (this.props.query !== prevProps.query) { + this.setState({loading: true, operatingSystems: null}) + this.fetchOperatingSystems() + } + } + + fetchOperatingSystems() { + api.get(`/api/stats/${this.props.site.domain}/operating-systems`, this.props.query) + .then((res) => this.setState({loading: false, operatingSystems: res})) + } + + renderOperatingSystem(os) { + return ( +
+
+ + {os.name} +
+ {os.percentage}% +
+ ) + } + + render() { + return ( + + +
+ Operating system + Visitors +
+ { this.state.operatingSystems && this.state.operatingSystems.map(this.renderOperatingSystem.bind(this)) } +
+
+ ) + } +} + +export default class Devices extends React.Component { + constructor(props) { + super(props) + this.state = {mode: 'size'} + } + + renderContent() { + if (this.state.mode === 'size') { + return + } else if (this.state.mode === 'browser') { + return + } else if (this.state.mode === 'os') { + return + } + } + + setMode(mode) { + return () => { + this.setState({mode}) + } + } + + renderPill(name, mode) { + const isActive = this.state.mode === mode + const extraClass = name === 'OS' ? '' : ' border-r border-grey-light' + + if (isActive) { + return {name} + } else { + return {name} + } + } + + render() { + return ( +
+
+

Devices

+ +
+ { this.renderPill('Size', 'size') } + { this.renderPill('Browser', 'browser') } + { this.renderPill('OS', 'os') } +
+ + { this.renderContent() } + +
+
+ ) + } +} diff --git a/assets/js/dashboard/stats/modals/browsers.js b/assets/js/dashboard/stats/modals/browsers.js deleted file mode 100644 index d9ae04f47..000000000 --- a/assets/js/dashboard/stats/modals/browsers.js +++ /dev/null @@ -1,68 +0,0 @@ -import React from "react"; -import { withRouter } from 'react-router-dom' - -import Modal from './modal' -import * as api from '../../api' -import numberFormatter from '../../number-formatter' -import Bar from '../bar' -import {parseQuery} from '../../query' - -class BrowsersModal extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - } - - componentDidMount() { - const query = parseQuery(this.props.location.search, this.props.site) - - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/browsers`, query, {limit: 100}) - .then((res) => this.setState({loading: false, browsers: res})) - } - - renderBrowser(browser) { - return ( - -
- {browser.name} - {browser.percentage}% -
- -
- ) - } - - renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.browsers) { - return ( - -
-

Top browsers

-
-
by visitors
- -
-
-
- { this.state.browsers.map(this.renderBrowser.bind(this)) } -
-
-
- ) - } - } - - render() { - return ( - - { this.renderBody() } - - ) - } -} - -export default withRouter(BrowsersModal) diff --git a/assets/js/dashboard/stats/modals/countries.js b/assets/js/dashboard/stats/modals/countries.js index 030e28f17..e1def2039 100644 --- a/assets/js/dashboard/stats/modals/countries.js +++ b/assets/js/dashboard/stats/modals/countries.js @@ -22,13 +22,10 @@ class CountriesModal extends React.Component { renderCountry(country) { return ( - -
- {country.name} - {country.percentage}% -
- -
+ + {country.full_country_name} + {numberFormatter(country.percentage)}% + ) } @@ -47,9 +44,17 @@ class CountriesModal extends React.Component {
-
- { this.state.countries.map(this.renderCountry.bind(this)) } -
+ + + + + + + + + { this.state.countries.map(this.renderCountry.bind(this)) } + +
CountryVisitors
) diff --git a/assets/js/dashboard/stats/modals/operating-systems.js b/assets/js/dashboard/stats/modals/operating-systems.js deleted file mode 100644 index e3a123fdd..000000000 --- a/assets/js/dashboard/stats/modals/operating-systems.js +++ /dev/null @@ -1,68 +0,0 @@ -import React from "react"; -import { withRouter } from 'react-router-dom' - -import Modal from './modal' -import * as api from '../../api' -import numberFormatter from '../../number-formatter' -import Bar from '../bar' -import {parseQuery} from '../../query' - -class OperatingSystemsModal extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - } - - componentDidMount() { - const query = parseQuery(this.props.location.search, this.props.site) - - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/operating-systems`, query, {limit: 100}) - .then((res) => this.setState({loading: false, systems: res})) - } - - renderSystem(system) { - return ( - -
- {system.name} - {system.percentage}% -
- -
- ) - } - - renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.systems) { - return ( - -
-

Operating Systems

-
-
by visitors
- -
-
-
- { this.state.systems.map(this.renderSystem.bind(this)) } -
-
-
- ) - } - } - - render() { - return ( - - { this.renderBody() } - - ) - } -} - -export default withRouter(OperatingSystemsModal) diff --git a/assets/js/dashboard/stats/operating-systems.js b/assets/js/dashboard/stats/operating-systems.js deleted file mode 100644 index 37e9f0240..000000000 --- a/assets/js/dashboard/stats/operating-systems.js +++ /dev/null @@ -1,64 +0,0 @@ -import React from 'react'; - -import Bar from './bar' -import MoreLink from './more-link' -import * as api from '../api' - -export default class OperatingSystems extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - } - - componentDidMount() { - this.fetchOperatingSystems() - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, systems: null}) - this.fetchOperatingSystems() - } - } - - fetchOperatingSystems() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/operating-systems`, this.props.query) - .then((res) => this.setState({loading: false, systems: res})) - } - - renderSystem(system) { - return ( - -
- {system.name} - {system.percentage}% -
- -
- ) - } - - render() { - if (this.state.loading) { - return ( -
-
-
- ) - } else if (this.state.systems) { - return ( -
-
-

Operating Systems

-
by visitors
-
- -
- { this.state.systems.map(this.renderSystem.bind(this)) } -
- -
- ) - } - } -} diff --git a/assets/js/dashboard/stats/pages.js b/assets/js/dashboard/stats/pages.js index d918dc655..10e73290e 100644 --- a/assets/js/dashboard/stats/pages.js +++ b/assets/js/dashboard/stats/pages.js @@ -32,35 +32,35 @@ export default class Pages extends React.Component { renderPage(page) { return ( - -
- {page.name} - {numberFormatter(page.count)} +
+
+ + {page.name}
- - + {numberFormatter(page.count)} +
) } render() { if (this.state.loading) { return ( -
+
) } else if (this.state.pages) { return ( -
-
-

Top Pages

-
by {eventName(this.props.query)}
-
+
+

Top Pages

-
- { this.state.pages.map(this.renderPage.bind(this)) } +
+ Page url + Pageviews
- + + { this.state.pages.map(this.renderPage.bind(this)) } +
) } diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index 0ddbe5846..820c88536 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -35,37 +35,41 @@ export default class Referrers extends React.Component { renderReferrer(referrer) { return ( - -
- { referrer.name } - {numberFormatter(referrer.count)} +
+
+ + { referrer.name }
- - + {numberFormatter(referrer.count)} +
) } - render() { + renderContent() { if (this.state.loading) { + return
+ } else { return ( -
-
-
- ) - } else if (this.state.referrers) { - return ( -
-
-

Top Referrers

-
by visitors
-
+ -
- { this.state.referrers.map(this.renderReferrer.bind(this)) } +
+ Referrer + Visitors
- -
+ + { this.state.referrers.map(this.renderReferrer.bind(this)) } + +
) } } + + render() { + return ( +
+

Top Referrers

+ { this.renderContent() } +
+ ) + } } diff --git a/assets/js/dashboard/stats/screen-sizes.js b/assets/js/dashboard/stats/screen-sizes.js deleted file mode 100644 index 03f9acd56..000000000 --- a/assets/js/dashboard/stats/screen-sizes.js +++ /dev/null @@ -1,92 +0,0 @@ -import React from 'react'; - -import Bar from './bar' -import * as api from '../api' - -const EXPLANATION = { - 'Mobile': 'up to 576px', - 'Tablet': '576px to 992px', - 'Laptop': '992px to 1440px', - 'Desktop': 'above 1440px', -} - -function iconFor(screenSize) { - if (screenSize === 'Mobile') { - return ( - - ) - } else if (screenSize === 'Tablet') { - return ( - - ) - } else if (screenSize === 'Laptop') { - return ( - - ) - } else if (screenSize === 'Desktop') { - return ( - - ) - } -} - -export default class ScreenSizes extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - } - - componentDidMount() { - this.fetchScreenSizes() - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, sizes: null}) - this.fetchScreenSizes() - } - } - - fetchScreenSizes() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/screen-sizes`, this.props.query) - .then((res) => this.setState({loading: false, sizes: res})) - } - - renderScreenSize(size) { - return ( - -
- - { iconFor(size.name) } - {size.name} - - {size.percentage}% -
- -
- ) - } - - render() { - if (this.state.loading) { - return ( -
-
-
- ) - } else if (this.state.sizes) { - return ( -
-
-

Screen Sizes

-
by visitors
-
- -
- { this.state.sizes.map(this.renderScreenSize.bind(this)) } -
-
- ) - } - } -} diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 43500eca9..94872fa56 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -123,16 +123,6 @@ function dateFormatter(graphData) { } } -function formatStat(stat) { - if (typeof(stat.count) === 'number') { - return numberFormatter(stat.count) - } else if (typeof(stat.duration) === 'number') { - return new Date(stat.duration * 1000).toISOString().substr(14, 5) - } else if (typeof(stat.percentage) === 'number') { - return stat.percentage + '%' - } -} - class LineGraph extends React.Component { componentDidMount() { const {graphData} = this.props @@ -260,13 +250,13 @@ class LineGraph extends React.Component { const formattedComparison = numberFormatter(Math.abs(comparison)) if (comparison > 0) { - const color = name === 'Bounce rate' ? 'text-red-light' : 'text-green-dark' - return ↑ {formattedComparison}% from {this.comparisonTimeframe()} + const color = name === 'Bounce rate' ? 'text-red-light' : 'text-green' + return ↑ {formattedComparison}% } else if (comparison < 0) { - const color = name === 'Bounce rate' ? 'text-green-dark' : 'text-red-light' - return ↓ {formattedComparison}% from {this.comparisonTimeframe()} + const color = name === 'Bounce rate' ? 'text-green' : 'text-red-light' + return ↓ {formattedComparison}% } else if (comparison === 0) { - return 〰 same as {this.comparisonTimeframe()} + return 〰 N/A } } @@ -277,12 +267,12 @@ class LineGraph extends React.Component { border = index % 2 === 0 ? border + ' border-r lg:border-r-0' : border return ( -
+
{stat.name}
-
- {formatStat(stat)} +
+ { typeof(stat.count) == 'number' ? numberFormatter(stat.count) : stat.percentage + '%' } + {this.renderComparison(stat.name, stat.change)}
- {this.renderComparison(stat.name, stat.change)}
) }) @@ -356,7 +346,7 @@ export default class VisitorGraph extends React.Component { render() { return ( -
+
{ this.renderInner() }
) diff --git a/assets/package-lock.json b/assets/package-lock.json index 5369964f2..c67e2866d 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -1059,6 +1059,11 @@ "to-fast-properties": "^2.0.0" } }, + "@types/d3": { + "version": "3.5.38", + "resolved": "https://registry.npmjs.org/@types/d3/-/d3-3.5.38.tgz", + "integrity": "sha1-dvjy6RWa5WKWWy+g5vvuGqZDobw=" + }, "@types/q": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", @@ -1805,6 +1810,17 @@ } } }, + "brfs": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", + "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==", + "requires": { + "quote-stream": "^1.0.1", + "resolve": "^1.1.5", + "static-module": "^2.2.0", + "through2": "^2.0.0" + } + }, "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", @@ -1912,11 +1928,15 @@ "isarray": "^1.0.0" } }, + "buffer-equal": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz", + "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=" + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "buffer-xor": { "version": "1.0.3", @@ -2267,7 +2287,6 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -2294,7 +2313,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, "requires": { "safe-buffer": "~5.1.1" } @@ -2443,8 +2461,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { "version": "4.0.0", @@ -3071,6 +3088,34 @@ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, + "d3": { + "version": "3.5.17", + "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", + "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" + }, + "d3-geo-projection": { + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz", + "integrity": "sha1-SZTs0QM92xUztsTFUoocgdzClCc=", + "requires": { + "brfs": "^1.3.0" + } + }, + "d3-queue": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz", + "integrity": "sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=" + }, + "datamaps": { + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/datamaps/-/datamaps-0.5.9.tgz", + "integrity": "sha512-GUXpO713URNzaExVUgBtqA5fr2UuxUG/fVitI04zEFHVL2FHSjd672alHq8E16oQqRNzF0m1bmx8WlTnDrGSqQ==", + "requires": { + "@types/d3": "3.5.38", + "d3": "^3.5.6", + "topojson": "^1.6.19" + } + }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -3098,6 +3143,11 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3239,6 +3289,14 @@ "is-obj": "^1.0.0" } }, + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "^2.0.2" + } + }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -3357,6 +3415,31 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, + "escodegen": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + } + } + }, "eslint-scope": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", @@ -3370,8 +3453,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esrecurse": { "version": "4.2.1", @@ -3385,14 +3467,12 @@ "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "events": { "version": "3.0.0", @@ -3570,6 +3650,29 @@ } } }, + "falafel": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz", + "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=", + "requires": { + "acorn": "^5.0.0", + "foreach": "^2.0.5", + "isarray": "0.0.1", + "object-keys": "^1.0.6" + }, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + } + } + }, "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", @@ -3582,6 +3685,11 @@ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, "figgy-pudding": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", @@ -3659,6 +3767,11 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -3720,25 +3833,29 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -3748,13 +3865,15 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": false, + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, "requires": { @@ -3764,37 +3883,43 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, "requires": { @@ -3803,25 +3928,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -3830,13 +3959,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": false, + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -3852,7 +3983,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -3866,13 +3998,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": false, + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -3881,7 +4015,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -3890,7 +4025,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": false, + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -3900,19 +4036,22 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, "requires": { @@ -3921,13 +4060,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, "requires": { @@ -3936,13 +4077,15 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": false, + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true, "optional": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "optional": true, "requires": { @@ -3952,7 +4095,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -3961,7 +4105,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "optional": true, "requires": { @@ -3970,13 +4115,15 @@ }, "ms": { "version": "2.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, "requires": { @@ -3987,7 +4134,8 @@ }, "node-pre-gyp": { "version": "0.12.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, "requires": { @@ -4005,7 +4153,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -4015,13 +4164,15 @@ }, "npm-bundled": { "version": "1.0.6", - "bundled": true, + "resolved": false, + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, "requires": { @@ -4031,7 +4182,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -4043,19 +4195,22 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, "requires": { @@ -4064,19 +4219,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -4086,19 +4244,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -4110,7 +4271,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -4118,7 +4280,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": false, + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -4133,7 +4296,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -4142,43 +4306,50 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, "requires": { @@ -4189,7 +4360,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -4198,7 +4370,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, "requires": { @@ -4207,13 +4380,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -4228,13 +4403,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -4243,13 +4420,15 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true, "optional": true } @@ -4258,8 +4437,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gather-stream": { "version": "1.0.0", @@ -4407,7 +4585,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -4555,6 +4732,11 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "iconv-lite": { + "version": "0.2.11", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", + "integrity": "sha1-HOYKOleGSiktEyH/RgnKS7llrcg=" + }, "icss-utils": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz", @@ -4701,8 +4883,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.5", @@ -4971,8 +5152,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -5083,6 +5263,15 @@ "leven": "^3.1.0" } }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, "loader-runner": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", @@ -5159,6 +5348,14 @@ "yallist": "^3.0.2" } }, + "magic-string": { + "version": "0.22.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", + "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", + "requires": { + "vlq": "^0.2.2" + } + }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -5237,6 +5434,14 @@ "readable-stream": "^2.0.1" } }, + "merge-source-map": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", + "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", + "requires": { + "source-map": "^0.5.6" + } + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -5320,8 +5525,7 @@ "minimist": { "version": "1.2.0", "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mississippi": { "version": "3.0.0", @@ -5581,11 +5785,15 @@ } } }, + "object-inspect": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", + "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object-visit": { "version": "1.0.1", @@ -5648,6 +5856,14 @@ "wrappy": "1" } }, + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "requires": { + "wordwrap": "~0.0.2" + } + }, "optimize-css-assets-webpack-plugin": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz", @@ -5658,6 +5874,19 @@ "last-call-webpack-plugin": "^3.0.0" } }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -5803,8 +6032,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { "version": "1.8.0", @@ -8131,6 +8359,11 @@ "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", "dev": true }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, "prepend-http": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", @@ -8158,8 +8391,7 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "promise-inflight": { "version": "1.0.1", @@ -8264,6 +8496,16 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, + "quote-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz", + "integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=", + "requires": { + "buffer-equal": "0.0.1", + "minimist": "^1.1.3", + "through2": "^2.0.0" + } + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -8353,7 +8595,6 @@ "version": "2.3.6", "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -8492,7 +8733,6 @@ "version": "1.14.2", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", - "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -8592,11 +8832,15 @@ "aproba": "^1.1.1" } }, + "rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -8690,6 +8934,28 @@ "safe-buffer": "^5.0.1" } }, + "shallow-copy": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz", + "integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=" + }, + "shapefile": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/shapefile/-/shapefile-0.3.1.tgz", + "integrity": "sha1-m7mkKb1ghqDPsDli0Uz99CD/uhI=", + "requires": { + "d3-queue": "1", + "iconv-lite": "0.2", + "optimist": "0.3" + }, + "dependencies": { + "d3-queue": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-1.2.3.tgz", + "integrity": "sha1-FDpwHPpl/gISkvMhwQ0U6Yq9SRs=" + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -8874,8 +9140,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { "version": "0.5.2", @@ -8944,6 +9209,34 @@ "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", "dev": true }, + "static-eval": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.3.tgz", + "integrity": "sha512-zsxDGucfAh8T339sSKgpFbvg15Fms2IVaJGC+jqp0bVsxhcpM+iMeAI8weNo8dmf4OblgifTBUoyk1vGVtYw2w==", + "requires": { + "escodegen": "^1.11.1" + }, + "dependencies": { + "escodegen": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.13.0.tgz", + "integrity": "sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + } + } + }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -8965,6 +9258,27 @@ } } }, + "static-module": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz", + "integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==", + "requires": { + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "falafel": "^2.1.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", + "merge-source-map": "1.0.4", + "object-inspect": "~1.4.0", + "quote-stream": "~1.0.2", + "readable-stream": "~2.3.3", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.0", + "through2": "~2.0.3" + } + }, "stream-browserify": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", @@ -9048,7 +9362,6 @@ "version": "1.1.1", "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -9396,7 +9709,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, "requires": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -9481,6 +9793,19 @@ "repeat-string": "^1.6.1" } }, + "topojson": { + "version": "1.6.27", + "resolved": "https://registry.npmjs.org/topojson/-/topojson-1.6.27.tgz", + "integrity": "sha1-rb4zpn4vFnPTON8SZErSD8ILQu0=", + "requires": { + "d3": "3", + "d3-geo-projection": "0.2", + "d3-queue": "2", + "optimist": "0.3", + "rw": "1", + "shapefile": "0.3" + } + }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -9493,11 +9818,18 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "uglify-js": { "version": "3.6.0", @@ -9763,8 +10095,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { "version": "1.0.0", @@ -9799,6 +10130,11 @@ "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==", "dev": true }, + "vlq": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", + "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==" + }, "vm-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", @@ -10014,6 +10350,16 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, "worker-farm": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", @@ -10066,8 +10412,7 @@ "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { "version": "4.0.0", diff --git a/assets/package.json b/assets/package.json index fcc440a2f..9d0051f9a 100644 --- a/assets/package.json +++ b/assets/package.json @@ -8,6 +8,7 @@ "dependencies": { "autoprefixer": "^9.7.4", "chart.js": "^2.9.3", + "datamaps": "^0.5.9", "phoenix": "file:../deps/phoenix", "phoenix_html": "file:../deps/phoenix_html", "react": "^16.12.0", diff --git a/assets/tailwind.js b/assets/tailwind.js index 0e12dc19e..3d7f8c0e5 100644 --- a/assets/tailwind.js +++ b/assets/tailwind.js @@ -756,6 +756,7 @@ module.exports = { default: '0 2px 4px 0 rgba(0,0,0,0.10)', 'md': '0 4px 8px 0 rgba(0,0,0,0.12), 0 2px 4px 0 rgba(0,0,0,0.08)', 'lg': '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)', + 'xl': '8px 14px 38px rgba(39,44,49,.06),1px 3px 8px rgba(39,44,49,.03);', 'inner': 'inset 0 2px 4px 0 rgba(0,0,0,0.06)', 'outline': '0 0 0 3px rgba(52,144,220,0.5)', 'none': 'none', diff --git a/lib/plausible/stats/countries.ex b/lib/plausible/stats/countries.ex index 5d58044a2..af0a33eae 100644 --- a/lib/plausible/stats/countries.ex +++ b/lib/plausible/stats/countries.ex @@ -154,7 +154,6 @@ defmodule Plausible.Stats.CountryName do "NR" => "Nauru", "NP" => "Nepal", "NL" => "Netherlands", - "AN" => "Netherlands Antilles", "NC" => "New Caledonia", "NZ" => "New Zealand", "NI" => "Nicaragua", @@ -247,6 +246,257 @@ defmodule Plausible.Stats.CountryName do "ZW" => "Zimbabwe" } + @alpha3_codes %{ + "SL" => "SLE", + "VA" => "VAT", + "SM" => "SMR", + "TV" => "TUV", + "KZ" => "KAZ", + "PE" => "PER", + "CD" => "COD", + "SN" => "SEN", + "BA" => "BIH", + "VC" => "VCT", + "TW" => "TWN", + "NP" => "NPL", + "UZ" => "UZB", + "MY" => "MYS", + "GM" => "GMB", + "GA" => "GAB", + "PW" => "PLW", + "TH" => "THA", + "NR" => "NRU", + "KW" => "KWT", + "MU" => "MUS", + "GI" => "GIB", + "BJ" => "BEN", + "AR" => "ARG", + "SA" => "SAU", + "GW" => "GNB", + "AT" => "AUT", + "AW" => "ABW", + "MZ" => "MOZ", + "IT" => "ITA", + "BI" => "BDI", + "GR" => "GRC", + "FO" => "FRO", + "SD" => "SDN", + "PS" => "PSE", + "SB" => "SLB", + "KR" => "KOR", + "TR" => "TUR", + "ST" => "STP", + "JP" => "JPN", + "TG" => "TGO", + "GQ" => "GNQ", + "PH" => "PHL", + "LS" => "LSO", + "LT" => "LTU", + "JM" => "JAM", + "GF" => "GUF", + "AZ" => "AZE", + "LA" => "LAO", + "TM" => "TKM", + "MH" => "MHL", + "TJ" => "TJK", + "FR" => "FRA", + "GG" => "GGY", + "WF" => "WLF", + "BZ" => "BLZ", + "VN" => "VNM", + "SC" => "SYC", + "PN" => "PCN", + "GL" => "GRL", + "RS" => "SRB", + "CV" => "CPV", + "BM" => "BMU", + "DJ" => "DJI", + "BV" => "BVT", + "CK" => "COK", + "NA" => "NAM", + "BS" => "BHS", + "PL" => "POL", + "HN" => "HND", + "BF" => "BFA", + "PF" => "PYF", + "BR" => "BRA", + "ER" => "ERI", + "UG" => "UGA", + "NE" => "NER", + "NL" => "NLD", + "NG" => "NGA", + "IQ" => "IRQ", + "BB" => "BRB", + "PY" => "PRY", + "IR" => "IRN", + "CH" => "CHE", + "UM" => "UMI", + "TK" => "TKL", + "TL" => "TLS", + "YT" => "MYT", + "CI" => "CIV", + "SK" => "SVK", + "WS" => "WSM", + "AQ" => "ATA", + "MG" => "MDG", + "TT" => "TTO", + "PM" => "SPM", + "ZW" => "ZWE", + "DM" => "DMA", + "RE" => "REU", + "CM" => "CMR", + "CC" => "CCK", + "SZ" => "SWZ", + "MR" => "MRT", + "HM" => "HMD", + "RW" => "RWA", + "FM" => "FSM", + "MP" => "MNP", + "PK" => "PAK", + "MW" => "MWI", + "VE" => "VEN", + "KY" => "CYM", + "CN" => "CHN", + "DZ" => "DZA", + "KM" => "COM", + "NU" => "NIU", + "PT" => "PRT", + "US" => "USA", + "MS" => "MSR", + "SO" => "SOM", + "ES" => "ESP", + "AM" => "ARM", + "ML" => "MLI", + "TC" => "TCA", + "MM" => "MMR", + "JE" => "JEY", + "AO" => "AGO", + "LV" => "LVA", + "FJ" => "FJI", + "UA" => "UKR", + "BH" => "BHR", + "EG" => "EGY", + "ME" => "MNE", + "AX" => "ALA", + "MQ" => "MTQ", + "MX" => "MEX", + "CX" => "CXR", + "KH" => "KHM", + "SV" => "SLV", + "AS" => "ASM", + "IN" => "IND", + "GB" => "GBR", + "LU" => "LUX", + "HT" => "HTI", + "DE" => "DEU", + "VI" => "VIR", + "NI" => "NIC", + "CG" => "COG", + "ET" => "ETH", + "CZ" => "CZE", + "HR" => "HRV", + "CY" => "CYP", + "KG" => "KGZ", + "BO" => "BOL", + "PG" => "PNG", + "ZA" => "ZAF", + "MO" => "MAC", + "FI" => "FIN", + "PR" => "PRI", + "SR" => "SUR", + "GN" => "GIN", + "TD" => "TCD", + "MF" => "MAF", + "VG" => "VGB", + "NF" => "NFK", + "IL" => "ISR", + "GH" => "GHA", + "TZ" => "TZA", + "SH" => "SHN", + "JO" => "JOR", + "MV" => "MDV", + "BE" => "BEL", + "NC" => "NCL", + "DK" => "DNK", + "GS" => "SGS", + "LB" => "LBN", + "AI" => "AIA", + "LI" => "LIE", + "OM" => "OMN", + "UY" => "URY", + "KN" => "KNA", + "HU" => "HUN", + "BT" => "BTN", + "EC" => "ECU", + "TO" => "TON", + "NO" => "NOR", + "RU" => "RUS", + "MD" => "MDA", + "SY" => "SYR", + "DO" => "DOM", + "MA" => "MAR", + "HK" => "HKG", + "SJ" => "SJM", + "BW" => "BWA", + "IO" => "IOT", + "LY" => "LBY", + "CA" => "CAN", + "LK" => "LKA", + "LC" => "LCA", + "AG" => "ATG", + "SI" => "SVN", + "GP" => "GLP", + "BN" => "BRN", + "IM" => "IMN", + "SE" => "SWE", + "BD" => "BGD", + "VU" => "VUT", + "KI" => "KIR", + "AL" => "ALB", + "MT" => "MLT", + "KE" => "KEN", + "BG" => "BGR", + "GE" => "GEO", + "IE" => "IRL", + "PA" => "PAN", + "ID" => "IDN", + "AE" => "ARE", + "RO" => "ROU", + "NZ" => "NZL", + "MN" => "MNG", + "GY" => "GUY", + "BL" => "BLM", + "EE" => "EST", + "LR" => "LBR", + "CO" => "COL", + "CF" => "CAF", + "MC" => "MCO", + "CR" => "CRI", + "AU" => "AUS", + "ZM" => "ZMB", + "GT" => "GTM", + "AF" => "AFG", + "MK" => "MKD", + "GD" => "GRD", + "FK" => "FLK", + "AD" => "AND", + "SG" => "SGP", + "QA" => "QAT", + "CL" => "CHL", + "GU" => "GUM", + "TN" => "TUN", + "YE" => "YEM", + "BY" => "BLR", + "IS" => "ISL", + "CU" => "CUB", + "TF" => "ATF", + "EH" => "ESH" + } + + def to_alpha3(code) do + Map.get(@alpha3_codes, code, code) + end + def from_iso3166(code) do Map.get(@country_codes_to_names, code, code) end diff --git a/lib/plausible/stats/stats.ex b/lib/plausible/stats/stats.ex index 7e7570d61..881e20847 100644 --- a/lib/plausible/stats/stats.ex +++ b/lib/plausible/stats/stats.ex @@ -386,15 +386,22 @@ defmodule Plausible.Stats do end) end + defp add_percentages(stat_list) do + total = Enum.reduce(stat_list, 0, fn %{count: count}, total -> total + count end) + Enum.map(stat_list, fn stat -> + Map.put(stat, :percentage, round(stat[:count] / total * 100)) + end) + end + @available_screen_sizes ["Desktop", "Laptop", "Tablet", "Mobile"] def top_screen_sizes(site, query) do Repo.all(from e in base_query(site, query), - select: {e.screen_size, count(e.user_id, :distinct)}, + select: %{name: e.screen_size, count: count(e.user_id, :distinct)}, group_by: e.screen_size, where: not is_nil(e.screen_size) ) - |> Enum.sort(fn {screen_size1, _}, {screen_size2, _} -> + |> Enum.sort(fn %{name: screen_size1}, %{name: screen_size2} -> index1 = Enum.find_index(@available_screen_sizes, fn s -> s == screen_size1 end) index2 = Enum.find_index(@available_screen_sizes, fn s -> s == screen_size2 end) index2 > index1 @@ -402,34 +409,25 @@ defmodule Plausible.Stats do |> add_percentages end - defp add_percentages(stat_list) do - total = Enum.reduce(stat_list, 0, fn {_, count}, total -> total + count end) - Enum.map(stat_list, fn {stat, count} -> - %{ - name: stat, - count: count, - percentage: round(count / total * 100) - } - end) - end - - def countries(site, query, limit \\ 5) do + def countries(site, query) do Repo.all(from e in base_query(site, query), - select: {e.country_code, count(e.user_id, :distinct)}, + select: %{name: e.country_code, count: count(e.user_id, :distinct)}, group_by: e.country_code, where: not is_nil(e.country_code), order_by: [desc: 2] ) - |> Enum.map(fn {country_code, count} -> - {Plausible.Stats.CountryName.from_iso3166(country_code), count} + |> Enum.map(fn stat -> + two_letter_code = stat[:name] + stat + |> Map.put(:name, Plausible.Stats.CountryName.to_alpha3(two_letter_code)) + |> Map.put(:full_country_name, Plausible.Stats.CountryName.from_iso3166(two_letter_code)) end) |> add_percentages - |> Enum.take(limit) end def browsers(site, query, limit \\ 5) do Repo.all(from e in base_query(site, query), - select: {e.browser, count(e.user_id, :distinct)}, + select: %{name: e.browser, count: count(e.user_id, :distinct)}, group_by: e.browser, where: not is_nil(e.browser), order_by: [desc: 2] @@ -440,7 +438,7 @@ defmodule Plausible.Stats do def operating_systems(site, query, limit \\ 5) do Repo.all(from e in base_query(site, query), - select: {e.operating_system, count(e.user_id, :distinct)}, + select: %{name: e.operating_system, count: count(e.user_id, :distinct)}, group_by: e.operating_system, where: not is_nil(e.operating_system), order_by: [desc: 2] diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 7051d3b07..005318d6b 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -70,7 +70,7 @@ defmodule PlausibleWeb.Api.StatsController do query = Stats.Query.from(site.timezone, params) include = if params["include"], do: String.split(params["include"], ","), else: [] - json(conn, Stats.top_referrers(site, query, params["limit"] || 5, include)) + json(conn, Stats.top_referrers(site, query, params["limit"] || 9, include)) end def referrers_for_goal(conn, params) do @@ -129,28 +129,28 @@ defmodule PlausibleWeb.Api.StatsController do query = Stats.Query.from(site.timezone, params) include = if params["include"], do: String.split(params["include"], ","), else: [] - json(conn, Stats.top_pages(site, query, params["limit"] || 5, include)) + json(conn, Stats.top_pages(site, query, params["limit"] || 9, include)) end def countries(conn, params) do site = conn.assigns[:site] query = Stats.Query.from(site.timezone, params) - json(conn, Stats.countries(site, query, parse_integer(params["limit"]) || 5)) + json(conn, Stats.countries(site, query)) end def browsers(conn, params) do site = conn.assigns[:site] query = Stats.Query.from(site.timezone, params) - json(conn, Stats.browsers(site, query, parse_integer(params["limit"]) || 5)) + json(conn, Stats.browsers(site, query, parse_integer(params["limit"]) || 9)) end def operating_systems(conn, params) do site = conn.assigns[:site] query = Stats.Query.from(site.timezone, params) - json(conn, Stats.operating_systems(site, query, parse_integer(params["limit"]) || 5)) + json(conn, Stats.operating_systems(site, query, parse_integer(params["limit"]) || 9)) end def screen_sizes(conn, params) do diff --git a/lib/plausible_web/controllers/page_controller.ex b/lib/plausible_web/controllers/page_controller.ex index ea89ff8d1..b6558e02a 100644 --- a/lib/plausible_web/controllers/page_controller.ex +++ b/lib/plausible_web/controllers/page_controller.ex @@ -3,19 +3,23 @@ defmodule PlausibleWeb.PageController do use Plausible.Repo @demo_referrers [ - {"indiehackers.com", 30}, + {"indiehackers.com", 56}, + {"Github", 23}, {"Twitter", 17}, + {"Reddit", 8}, {"Google", 6}, {"DuckDuckGo", 4}, {"Bing", 2}, ] - @demo_countries [ - {"United Kingdom", 41}, - {"United States", 38}, - {"France", 13}, - {"India", 7}, - {"Netherlands", 6}, + @demo_pages [ + {"/", 140}, + {"/plausible.io", 63}, + {"/blog", 41}, + {"/register", 13}, + {"/login", 7}, + {"/blog/google-analytics-and-privacy", 4}, + {"/blog/launching-plausible", 2} ] def index(conn, _params) do @@ -23,7 +27,7 @@ defmodule PlausibleWeb.PageController do user = conn.assigns[:current_user] |> Repo.preload(:sites) render(conn, "sites.html", sites: user.sites) else - render(conn, "index.html", demo_referrers: @demo_referrers, demo_countries: @demo_countries, landing_nav: true) + render(conn, "index.html", demo_referrers: @demo_referrers, demo_pages: @demo_pages, landing_nav: true) end end diff --git a/lib/plausible_web/templates/page/index.html.eex b/lib/plausible_web/templates/page/index.html.eex index 78f70044c..1179f1802 100644 --- a/lib/plausible_web/templates/page/index.html.eex +++ b/lib/plausible_web/templates/page/index.html.eex @@ -9,33 +9,39 @@ -
-

Top Referrers

-
by visitors
- -
- <%= for {referrer, count} <- @demo_referrers do %> -
- <%= referrer %> - <%= count %> -
- <%= PlausibleWeb.StatsView.bar(count, @demo_referrers) %> - <% end %> +
+

Top Referrers

+
+ Referrer + Visitors
-
-
-

Top Countries

-
by visitors
-
- <%= for {country, count} <- @demo_countries do %> -
- <%= Plausible.Stats.CountryName.from_iso3166(country) %> - <%= count %> + <%= for {referrer, count} <- @demo_referrers do %> +
+
+ <%= PlausibleWeb.StatsView.bar(count, @demo_referrers, :blue) %> + <%= referrer %>
- <%= PlausibleWeb.StatsView.bar(count, @demo_countries, :orange) %> - <% end %> + <%= count %> +
+ <% end %> +
+ +
+

Top Pages

+
+ Page + Visitors
+ <%= for {country, count} <- @demo_pages do %> +
+
+ <%= PlausibleWeb.StatsView.bar(count, @demo_pages, :orange) %> + <%= Plausible.Stats.CountryName.from_iso3166(country) %> +
+ <%= count %> +
+ <% end %>
diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index fb05abf9a..1ff0f1c80 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -4,8 +4,10 @@ <%= link("Click here to enable weekly email reports →", to: "/#{URI.encode_www_form(@site.domain)}/settings#email-reports", class: "py-2 block") %>
<% end %> -
+
+ +
diff --git a/lib/plausible_web/views/stats_view.ex b/lib/plausible_web/views/stats_view.ex index c40e2ef70..ac6735444 100644 --- a/lib/plausible_web/views/stats_view.ex +++ b/lib/plausible_web/views/stats_view.ex @@ -24,9 +24,7 @@ defmodule PlausibleWeb.StatsView do def bar(count, all, color \\ :blue) do ~E""" -
-
-
+
""" end diff --git a/test/plausible_web/controllers/api/stats_controller/countries_test.exs b/test/plausible_web/controllers/api/stats_controller/countries_test.exs index 19c288914..3b55a4b48 100644 --- a/test/plausible_web/controllers/api/stats_controller/countries_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/countries_test.exs @@ -13,8 +13,8 @@ defmodule PlausibleWeb.Api.StatsController.CountriesTest do conn = get(conn, "/api/stats/#{site.domain}/countries?period=day&date=2019-01-01") assert json_response(conn, 200) == [ - %{"name" => "Estonia", "count" => 2, "percentage" => 67}, - %{"name" => "United Kingdom", "count" => 1, "percentage" => 33}, + %{"name" => "EST", "full_country_name" => "Estonia", "count" => 2, "percentage" => 67}, + %{"name" => "GBR", "full_country_name" => "United Kingdom", "count" => 1, "percentage" => 33}, ] end end