Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	yarn.lock

components/common/WorldMap.js

@@ -4,17 +4,14 @@ import ReactTooltip from 'react-tooltip';
 import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
 import classNames from 'classnames';
 import tinycolor from 'tinycolor2';
+import Datamap from 'datamaps';
 import useTheme from 'hooks/useTheme';
 import { THEME_COLORS } from 'lib/constants';
 import styles from './WorldMap.module.css';
 import useCountryNames from 'hooks/useCountryNames';
 import useLocale from 'hooks/useLocale';
-import { useRouter } from 'next/router';
-
-const geoUrl = '/world-110m.json';
 
 function WorldMap({ data, className }) {
-  const { basePath } = useRouter();
   const [tooltip, setTooltip] = useState();
   const [theme] = useTheme();
   const colors = useMemo(
@@ -60,7 +57,7 @@ function WorldMap({ data, className }) {
     >
       <ComposableMap projection="geoMercator">
         <ZoomableGroup zoom={0.8} minZoom={0.7} center={[0, 40]}>
-          <Geographies geography={`${basePath}${geoUrl}`}>
+          <Geographies geography={Datamap.prototype.worldTopo}>
             {({ geographies }) => {
               return geographies.map(geo => {
                 const code = geo.properties.ISO_A2;

package.json

@@ -64,6 +64,7 @@
     "classnames": "^2.2.6",
     "cookie": "^0.4.1",
     "cors": "^2.8.5",
+    "datamaps": "^0.5.9",
     "date-fns": "^2.16.1",
     "date-fns-tz": "^1.0.12",
     "detect-browser": "^5.2.0",

public/world-110m.json

@@ -1 +0,0 @@
-{"type":"Topology","arcs":[[[16814,15074],[71,-45],[53,16],[15,54],[55,18],[39,37],[14,95],[59,24],[11,42],[32,-32],[21,-3]],[[17184,15280],[39,-1],[53,-26]],[[17276,15253],[21,-14],[51,38],[23,-23],[23,55],[41,-2],[11,17],[7,49],[30,41],[38,-27],[-8,-37],[22,-5],[-7,-101],[28,-39],[24,25],[31,12],[43,53],[48,-8],[72,-1]],[[17774,15286],[13,-34]],[[17787,15252],[-41,-13],[-35,-23],[-80,-14],[-75,-25],[-41,-52],[17,-51],[8,-60],[-35,-50],[3,-46],[-19,-43],[-67,4],[28,-80],[-45,-30],[-29,-73],[4,-72],[-28,-33],[-26,11],[-53,-16],[-7,-33],[-52,0],[-39,-68],[-3,-102],[-90,-50],[-49,10],[-14,-26],[-42,15],[-69,-17],[-117,61]],[[16791,14376],[63,109],[-6,77],[-52,20],[-6,76],[-23,96],[30,66],[-30,17],[19,88],[28,149]],[[14166,8695],[-128,-49],[-169,17],[-48,58],[-283,-6],[-11,-8],[-41,54],[-45,4],[-42,-21],[-34,-22]],[[13365,8722],[-6,75],[10,105],[24,110],[3,52],[23,108],[16,49],[41,79],[22,53],[7,89],[-3,68],[-21,43],[-19,72],[-17,72],[4,25],[21,48],[-21,116],[-14,80],[-35,76],[6,23]],[[13406,10065],[29,16],[20,-2],[25,15],[206,-2],[17,-89],[20,-72],[16,-39],[27,-63],[46,10],[23,17],[38,-17],[11,30],[17,70],[43,4],[4,21],[36,1],[-6,-44],[84,2],[1,-76],[15,-46],[-11,-73],[5,-73],[24,-45],[-4,-143],[17,11],[30,-3],[44,18],[31,-7]],[[14214,9486],[8,-37],[-8,-58],[12,-56],[-10,-45],[6,-42],[-146,2],[-3,-382],[47,-98],[46,-75]],[[13397,10103],[-19,90]],[[13378,10193],[28,52],[21,20],[26,-41]],[[13453,10224],[-25,-26],[-11,-30],[-3,-53],[-17,-12]],[[14013,15697],[-2,-31],[-22,-18],[-4,-39],[-33,-58]],[[13952,15551],[-12,8],[-1,27],[-39,40],[-6,57],[6,82],[10,37],[-12,19]],[[13898,15821],[-5,38],[30,59],[5,-22],[19,11]],[[13947,15907],[14,-33],[17,-12],[5,-43]],[[13983,15819],[-9,-41],[10,-52],[29,-29]],[[16143,13706],[12,6],[3,-33],[55,19],[57,-3],[42,-4],[48,81],[52,77],[44,74]],[[16456,13923],[13,-41]],[[16469,13882],[10,-95]],[[16479,13787],[-36,0],[-5,-78],[12,-17],[-32,-24],[0,-49],[-20,-49],[-2,-49]],[[16396,13521],[-14,-25],[-210,61],[-26,121],[-3,28]],[[7880,4211],[-42,4],[-75,0],[0,267]],[[7763,4482],[27,-55],[35,-90],[90,-72],[98,-30],[-31,-60],[-67,-6],[-35,42]],[[7767,4523],[-64,19],[-169,16],[-28,70],[1,90],[-47,-8],[-24,43],[-6,128],[53,52],[22,76],[-8,61],[37,102],[26,159],[-8,71],[31,22],[-8,46],[-32,24],[23,50],[-32,46],[-16,138],[28,24],[-12,147],[17,122],[18,107],[42,44],[-21,117],[0,110],[52,79],[-1,100],[40,117],[0,110],[-18,22],[-32,207],[43,124],[-7,116],[25,109],[46,113],[49,74],[-21,47],[14,39],[-2,200],[76,59],[24,125],[-8,30]],[[7870,8070],[58,108],[91,-29],[41,-87],[27,97],[80,-5],[11,-26]],[[8178,8128],[128,-196],[57,-18],[85,-89],[72,-47],[10,-52],[-69,-183],[71,-32],[78,-19],[55,20],[63,91],[12,106]],[[8740,7709],[34,23],[35,-69],[-1,-96],[-59,-66],[-47,-49],[-78,-116],[-93,-164]],[[8531,7172],[-18,-96],[-19,-123],[1,-120],[-15,-26],[-5,-78]],[[8475,6729],[-5,-63],[88,-102],[-9,-83],[43,-52],[-3,-59],[-67,-154],[-103,-64],[-140,-25],[-77,12],[15,-71],[-14,-90],[12,-61],[-41,-42],[-72,-17],[-67,44],[-27,-31],[10,-119],[47,-37],[38,38],[21,-62],[-64,-37],[-56,-75],[-10,-121],[-17,-64],[-66,0],[-54,-62],[-20,-90],[68,-87],[67,-25],[-24,-107],[-83,-68],[-45,-141],[-63,-47],[-29,-56],[22,-125],[47,-69],[-30,6]],[[15586,15727],[96,19]],[[15682,15746],[15,-32],[26,-21],[-14,-30],[38,-41],[-20,-38],[29,-33],[32,-19],[1,-84]],[[15789,15448],[-25,-3]],[[15764,15445],[-28,69],[0,19],[-31,0],[-20,32],[-15,-3]],[[15670,15562],[-27,35],[-52,29],[6,59],[-11,42]],[[8395,1195],[-21,-61],[-20,-54],[-146,16],[-156,-7],[-87,40],[0,5],[-38,35],[157,-5],[150,-11],[52,49],[36,42],[73,-49]],[[1449,1260],[-133,-16],[-92,42],[-41,42],[-3,7],[-45,33],[43,45],[129,-19],[70,-38],[53,-42],[19,-54]],[[9400,1434],[86,-52],[30,-73],[8,-51],[3,-61],[-108,-38],[-113,-31],[-131,-28],[-147,-23],[-165,7],[-91,40],[12,49],[149,33],[60,40],[44,52],[31,44],[42,43],[45,49],[36,0],[104,26],[105,-26]],[[4098,1979],[90,-18],[83,21],[-39,-43],[-66,-30],[-97,9],[-69,43],[15,40],[83,-22]],[[3795,1982],[106,-47],[-41,4],[-90,12],[-95,33],[50,26],[70,-28]],[[5648,2167],[76,-16],[77,14],[41,-68],[-55,9],[-85,-4],[-86,4],[-94,-7],[-71,24],[-37,49],[44,21],[89,-16],[101,-10]],[[7776,2285],[8,-54],[-12,-47],[-19,-45],[-82,-16],[-78,-24],[-92,2],[35,47],[-82,-16],[-78,-17],[-53,36],[-5,49],[77,47],[48,14],[80,-5],[21,62],[4,44],[-2,97],[40,56],[64,19],[37,-45],[17,-44],[30,-55],[23,-51],[19,-54]],[[8462,3101],[-30,-26],[-52,19],[-58,-12],[-47,-28],[-51,-31],[-34,-35],[-10,-47],[4,-45],[33,-40],[-48,-28],[-65,-9],[-38,-40],[-41,-38],[-44,-51],[-11,-45],[25,-50],[37,-37],[57,-28],[53,-38],[29,-47],[15,-45],[20,-47],[33,-40],[21,-44],[9,-111],[21,-44],[5,-47],[22,-47],[-10,-64],[-38,-49],[-41,-40],[-93,-17],[-31,-42],[-42,-40],[-106,-45],[-92,-18],[-88,-26],[-94,-26],[-56,-50],[-112,-4],[-123,4],[-110,-9],[-118,0],[22,-47],[107,-21],[77,-33],[44,-42],[-78,-38],[-120,12],[-100,-31],[-4,-49],[-2,-47],[82,-40],[15,-45],[88,-44],[148,-19],[125,-33],[100,-38],[127,-37],[173,-19],[171,-33],[119,-35],[130,-40],[68,-57],[34,-44],[85,42],[114,35],[122Line truncated

scripts/loadtest.js

@@ -109,6 +109,7 @@ function mockPageView(
     hostname: 'localhost',
     screen: '1680x1050',
     url: '/LOADTESTING',
+    referrer: 'https://www.prisma.io',
   },
 ) {
   return {