From ff645417dd58d5d5b328851472ad80d2e04d93fd Mon Sep 17 00:00:00 2001
From: TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>
Date: Fri, 12 Mar 2021 23:28:22 -0500
Subject: [PATCH 1/2] Add Weather

---
 client/package.json                          |  3 +
 client/src/components/MapTiles.jsx           | 12 +++-
 client/src/components/pokestops/Pokestop.jsx |  1 -
 client/src/components/portals/Popup.jsx      |  4 +-
 client/src/components/portals/Portal.jsx     |  1 -
 client/src/components/weather/Popup.jsx      | 11 +++
 client/src/components/weather/Weather.jsx    | 32 +++++++++
 client/src/components/weather/marker.js      | 10 +++
 client/src/data/weatherTypes.json            | 34 ++++++++++
 client/src/services/Query.js                 |  5 ++
 client/src/services/data/weather.js          | 14 ++++
 client/src/services/getPolygon.js            | 20 ++++++
 client/webpack.config.js                     | 13 ++--
 server/src/models/Weather.js                 |  9 +++
 server/src/models/index.js                   |  6 +-
 server/src/schema/schema.js                  |  9 ++-
 server/src/schema/weather.js                 | 22 ++++++
 yarn.lock                                    | 70 +++++++++++++++++++-
 18 files changed, 261 insertions(+), 15 deletions(-)
 create mode 100644 client/src/components/weather/Popup.jsx
 create mode 100644 client/src/components/weather/Weather.jsx
 create mode 100644 client/src/components/weather/marker.js
 create mode 100644 client/src/data/weatherTypes.json
 create mode 100644 client/src/services/data/weather.js
 create mode 100644 client/src/services/getPolygon.js
 create mode 100644 server/src/models/Weather.js
 create mode 100644 server/src/schema/weather.js

diff --git a/client/package.json b/client/package.json
index ee2c381d6..8041cce37 100644
--- a/client/package.json
+++ b/client/package.json
@@ -16,6 +16,8 @@
     "@hot-loader/react-dom": "^17.0.1",
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
+    "ts-loader": "^8.0.18",
+    "typescript": "^4.2.3",
     "webpack": "^5.24.3",
     "webpack-dev-server": "^3.11.2"
   },
@@ -43,6 +45,7 @@
     "leaflet": "^1.7.1",
     "leaflet.markercluster": "^1.4.1",
     "mini-css-extract-plugin": "^1.3.9",
+    "nodes2ts": "^2.0.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-hot-loader": "^4.13.0",
diff --git a/client/src/components/MapTiles.jsx b/client/src/components/MapTiles.jsx
index 155508ed8..ddfd5a77d 100644
--- a/client/src/components/MapTiles.jsx
+++ b/client/src/components/MapTiles.jsx
@@ -7,11 +7,18 @@ import Pokemon from './pokemon/Pokemon.jsx'
 import Nav from './layout/Nav.jsx'
 import Spawnpoint from './spawnpoints/Spawnpoint.jsx'
 import Portal from './portals/Portal.jsx'
+import Weather from './weather/Weather.jsx'
 
 const MapTiles = ({ map, settings }) => {
   const [bounds, setBounds] = useState({
-    _southWest: { lat: 0, lng: 0 },
-    _northEast: { lat: 0, lng: 0 }
+    _southWest: { 
+      lat: settings.map.startLat-0.025, 
+      lng: settings.map.startLon-0.025 
+    },
+    _northEast: { 
+      lat: settings.map.startLat+0.025, 
+      lng: settings.map.startLon+0.025
+    }
   })
   const [selected, setSelected] = useState({
     gyms: settings.map.filters.gyms,
@@ -53,6 +60,7 @@ const MapTiles = ({ map, settings }) => {
       {selected.pokemon && <Pokemon bounds={bounds} />}
       {selected.portals && <Portal bounds={bounds} />}
       {selected.spawnpoints && <Spawnpoint bounds={bounds} />}
+      {selected.weather && <Weather />}
       <Nav
         selected={selected}
         setSelected={setSelected}
diff --git a/client/src/components/pokestops/Pokestop.jsx b/client/src/components/pokestops/Pokestop.jsx
index e13e5919b..42ad5ccf7 100644
--- a/client/src/components/pokestops/Pokestop.jsx
+++ b/client/src/components/pokestops/Pokestop.jsx
@@ -17,7 +17,6 @@ const Pokestop = ({ bounds }) => {
       maxLon: bounds._northEast.lng
     }
   })
-  console.log(data)
 
   return (
     <MarkerClusterGroup
diff --git a/client/src/components/portals/Popup.jsx b/client/src/components/portals/Popup.jsx
index f40f42a81..cba070faf 100644
--- a/client/src/components/portals/Popup.jsx
+++ b/client/src/components/portals/Popup.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-const SpawnpointPopup = ({ portal }) => {
+const PortalPopup = ({ portal }) => {
   return (
     <>
     {portal.name}
@@ -8,4 +8,4 @@ const SpawnpointPopup = ({ portal }) => {
   )
 }
 
-export default SpawnpointPopup
\ No newline at end of file
+export default PortalPopup
\ No newline at end of file
diff --git a/client/src/components/portals/Portal.jsx b/client/src/components/portals/Portal.jsx
index cd67f3b16..6ce75c478 100644
--- a/client/src/components/portals/Portal.jsx
+++ b/client/src/components/portals/Portal.jsx
@@ -17,7 +17,6 @@ const Portal = ({ bounds }) => {
       maxLon: bounds._northEast.lng
     }
   })
-  console.log(data)
   return (
     <MarkerClusterGroup
       disableClusteringAtZoom={16}
diff --git a/client/src/components/weather/Popup.jsx b/client/src/components/weather/Popup.jsx
new file mode 100644
index 000000000..5bb30942c
--- /dev/null
+++ b/client/src/components/weather/Popup.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+const WeatherPopup = ({ weather }) => {
+  return (
+    <>
+    {weather.id}
+    </>
+  )
+}
+
+export default WeatherPopup
\ No newline at end of file
diff --git a/client/src/components/weather/Weather.jsx b/client/src/components/weather/Weather.jsx
new file mode 100644
index 000000000..6f48b7305
--- /dev/null
+++ b/client/src/components/weather/Weather.jsx
@@ -0,0 +1,32 @@
+import React from 'react'
+import { Popup, Polygon } from 'react-leaflet'
+
+import { useQuery } from '@apollo/client'
+import Query from '../../services/Query.js'
+
+import marker from './marker.js'
+import PopupContent from './Popup.jsx'
+import getPolygon from '../../services/getPolygon.js' 
+
+const Weather = props => {
+  const { loading, error, data } = useQuery(Query.getAllWeather())
+
+  return (
+    <>
+      {data && data.weather.map(cell => {
+        return (
+          <Polygon
+            key={cell.id}
+            positions={getPolygon(cell.id)}
+            pathOptions={marker(cell.id)}>
+            <Popup position={[cell.lat, cell.lon]}>
+              <PopupContent weather={cell} />
+            </Popup>
+          </Polygon>
+        )
+      })}
+    </>
+  )
+}
+
+export default Weather
diff --git a/client/src/components/weather/marker.js b/client/src/components/weather/marker.js
new file mode 100644
index 000000000..c3fcb0a79
--- /dev/null
+++ b/client/src/components/weather/marker.js
@@ -0,0 +1,10 @@
+export default function (weather) {
+  const lastUpdatedHour = (new Date(weather.updated * 1000)).getHours()
+  const currentHour = (new Date).getHours()
+
+  return {
+    color: currentHour === lastUpdatedHour ? 'green' : 'red',
+    fillColor: currentHour === lastUpdatedHour ? 'blue' : 'red',
+    fillOpacity: 0.25,  
+  }
+}
\ No newline at end of file
diff --git a/client/src/data/weatherTypes.json b/client/src/data/weatherTypes.json
new file mode 100644
index 000000000..150b91bcb
--- /dev/null
+++ b/client/src/data/weatherTypes.json
@@ -0,0 +1,34 @@
+{
+    "0": {
+        "types": [],
+        "name": "None"
+    },
+    "1": {
+        "types": ["Fire","Grass","Ground"],
+        "name": "Clear"
+    },
+    "2": {
+        "types": ["Water","Electric","Bug"],
+        "name": "Rain"
+    },
+    "3": {
+        "types": ["Normal","Rock"],
+        "name": "Partly Cloudy"
+    },
+    "4": {
+        "types": ["Fairy","Fighting","Poison"],
+        "name": "Cloudy"
+    },
+    "5": {
+        "types": ["Dragon","Flying","Psychic"],
+        "name": "Windy"
+    },
+    "6": {
+        "types": ["Ice","Steel"],
+        "name": "Snow"
+    },
+    "7" : {
+        "types": ["Dark","Ghost"],
+        "name": "Fog"
+    }
+}
\ No newline at end of file
diff --git a/client/src/services/Query.js b/client/src/services/Query.js
index 66480ffe3..52bae217b 100644
--- a/client/src/services/Query.js
+++ b/client/src/services/Query.js
@@ -4,6 +4,7 @@ import { getAllPokestops } from './data/pokestop.js'
 import { getAllPokemon } from './data/pokemon.js'
 import { getAllSpawnpoints } from './data/spawnpoint.js'
 import { getAllPortals } from './data/portal.js' 
+import { getAllWeather } from './data/weather.js'
 
 class Query {
 
@@ -31,6 +32,10 @@ class Query {
     return getAllSpawnpoints
   }
 
+  static getAllWeather() {
+    return getAllWeather
+  }
+
 }
 
 export default Query
\ No newline at end of file
diff --git a/client/src/services/data/weather.js b/client/src/services/data/weather.js
new file mode 100644
index 000000000..e9ffa0f03
--- /dev/null
+++ b/client/src/services/data/weather.js
@@ -0,0 +1,14 @@
+import { gql } from '@apollo/client'
+
+const getAllWeather = gql`
+{
+  weather {
+    id
+    latitude
+    longitude
+    updated
+  }
+}
+`
+
+export { getAllWeather }
\ No newline at end of file
diff --git a/client/src/services/getPolygon.js b/client/src/services/getPolygon.js
new file mode 100644
index 000000000..ccc1c4f2b
--- /dev/null
+++ b/client/src/services/getPolygon.js
@@ -0,0 +1,20 @@
+import { S2LatLng, S2Cell, S2CellId, S2Point } from 'nodes2ts';
+
+export default function (s2cellId) {
+  let s2cell = new S2Cell(new S2CellId(BigInt(s2cellId).toString()))
+  let polygon = []
+  for (let i = 0; i <= 3; i++) {
+    let coordinate = s2cell.getVertex(i)
+    let point = new S2Point(coordinate.x, coordinate.y, coordinate.z)
+    let latLng = S2LatLng.fromPoint(point)
+    let latitude = latLng.latDegrees
+    let longitude = latLng.lngDegrees
+
+    polygon.push([
+      latitude,
+      longitude
+    ])
+  }
+
+  return polygon
+}
diff --git a/client/webpack.config.js b/client/webpack.config.js
index bf5d720db..69c25a6b3 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -1,6 +1,7 @@
 import path, { dirname } from 'path'
 import { fileURLToPath } from 'url'
 import HtmlWebpackPlugin from "html-webpack-plugin"
+import config from '../server/src/services/config.js'
 
 import webpack from 'webpack'
 
@@ -55,24 +56,28 @@ export default {
       {
         test: /\.(png|jpe?g|gif)$/i,
         loader: 'file-loader',
+      },
+      {
+        test: /\.tsx?$/,
+        use: [{ loader: 'ts-loader', options: { transpileOnly: true } }]
       }
     ]
   },
   resolve: {
-    mainFields: ['browser','main','module'],
+    mainFields: ['browser', 'main', 'module'],
     alias: {
       ...reactDomAlias,
       "@Components": path.resolve(__dirname, "src/components/"),
       "@Providers": path.resolve(__dirname, "src/providers/"),
     },
-    extensions: ["*", ".js", ".jsx", ".scss"],
+    extensions: ["*", ".js", ".jsx", ".ts", ".tsx", ".scss"],
   },
   devServer: {
     contentBase: path.join(__dirname, "public/"),
     historyApiFallback: true,
-    port: 3000,
+    port: config.port,
     hotOnly: true,
-    publicPath: "http://localhost:3000/",
+    publicPath: `http://${config.interface}:${config.port}/`,
     proxy: [
       {
         context: ["/auth", "/api"],
diff --git a/server/src/models/Weather.js b/server/src/models/Weather.js
new file mode 100644
index 000000000..f0c838f35
--- /dev/null
+++ b/server/src/models/Weather.js
@@ -0,0 +1,9 @@
+import { Model } from 'objection'
+
+class Weather extends Model {
+  static get tableName() {
+    return 'weather'
+  }
+}
+
+export default Weather
\ No newline at end of file
diff --git a/server/src/models/index.js b/server/src/models/index.js
index ee3046584..913d3b449 100644
--- a/server/src/models/index.js
+++ b/server/src/models/index.js
@@ -2,8 +2,9 @@ import Device from './Device.js'
 import Gym from './Gym.js'
 import Pokestop from './Pokestop.js'
 import Pokemon from './Pokemon.js'
-import Spawnpoint from './Spawnpoint.js'
 import Portal from './Portal.js' 
+import Spawnpoint from './Spawnpoint.js'
+import Weather from './Weather.js' 
 
 export {
   Device,
@@ -11,5 +12,6 @@ export {
   Pokestop,
   Pokemon,
   Portal,
-  Spawnpoint
+  Spawnpoint,
+  Weather
 }
\ No newline at end of file
diff --git a/server/src/schema/schema.js b/server/src/schema/schema.js
index 581d1a3d3..1686e5084 100644
--- a/server/src/schema/schema.js
+++ b/server/src/schema/schema.js
@@ -6,7 +6,8 @@ import PokestopType from './pokestop.js'
 import PokemonType from './pokemon.js'
 import PortalType from './portals.js'
 import SpawnpointType from './spawnpoint.js'
-import { Device, Gym, Pokemon, Pokestop, Portal, Spawnpoint } from '../models/index.js'
+import WeatherType from './weather.js'
+import { Device, Gym, Pokemon, Pokestop, Portal, Spawnpoint, Weather } from '../models/index.js'
 
 const minMaxArgs = {
   minLat: { type: GraphQLFloat },
@@ -86,6 +87,12 @@ const RootQuery = new GraphQLObjectType({
           .whereBetween('lat', [args.minLat, args.maxLat])
           .andWhereBetween('lon', [args.minLon, args.maxLon])
       }
+    },
+    weather: {
+      type: new GraphQLList(WeatherType),
+      async resolve(parent, args) {
+        return await Weather.query()
+      }
     }
   }
 })
diff --git a/server/src/schema/weather.js b/server/src/schema/weather.js
new file mode 100644
index 000000000..0020b204c
--- /dev/null
+++ b/server/src/schema/weather.js
@@ -0,0 +1,22 @@
+import { GraphQLObjectType, GraphQLID, GraphQLInt, GraphQLFloat, GraphQLBoolean } from 'graphql'
+
+export default new GraphQLObjectType({
+  name: 'Weather',
+  fields: () => ({
+    id: { type: GraphQLID },
+    level: { type: GraphQLInt },
+    latitude: { type: GraphQLFloat },
+    longitude: { type: GraphQLFloat },
+    gameplay_condition: { type: GraphQLInt },
+    wind_direction: { type: GraphQLInt },
+    cloud_level: { type: GraphQLInt },
+    rain_level: { type: GraphQLInt },
+    wind_level: { type: GraphQLInt },
+    snow_level: { type: GraphQLInt },
+    fog_level: { type: GraphQLInt },
+    special_effect_level: { type: GraphQLInt },
+    severity: { type: GraphQLBoolean },
+    warn_weather: { type: GraphQLBoolean },
+    updated: { type: GraphQLInt }
+  })
+})
diff --git a/yarn.lock b/yarn.lock
index c11cb0f14..53e130837 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1777,7 +1777,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1891,6 +1891,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 "chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
@@ -2525,6 +2533,15 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+enhanced-resolve@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 enhanced-resolve@^5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c"
@@ -3981,6 +3998,11 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -4066,6 +4088,14 @@ memory-fs@^0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -4100,6 +4130,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 mime-db@1.46.0, "mime-db@>= 1.43.0 < 2":
   version "1.46.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
@@ -4323,6 +4361,13 @@ nodemon@^2.0.7:
     undefsafe "^2.0.3"
     update-notifier "^4.1.0"
 
+nodes2ts@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nodes2ts/-/nodes2ts-2.0.0.tgz#7ff815313257d9eba696eecb63482ed3754d1954"
+  integrity sha512-847uDvD2P19xsN7BNPbeUqaZCxA3OBmlHCIqpAsy/JCnGI90XZeZTFtHueK6GZjn/CNaBG2sA42aI0qQvLAJig==
+  dependencies:
+    long "^4.0.0"
+
 nopt@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -4633,7 +4678,7 @@ pg-connection-string@2.4.0:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10"
   integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -5730,6 +5775,11 @@ symbol-observable@^2.0.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
+tapable@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
@@ -5858,6 +5908,17 @@ ts-invariant@^0.6.0:
     "@ungap/global-this" "^0.4.2"
     tslib "^1.9.3"
 
+ts-loader@^8.0.18:
+  version "8.0.18"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.18.tgz#b2385cbe81c34ad9f997915129cdde3ad92a61ea"
+  integrity sha512-hRZzkydPX30XkLaQwJTDcWDoxZHK6IrEMDQpNd7tgcakFruFkeUp/aY+9hBb7BUGb+ZWKI0jiOGMo0MckwzdDQ==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^2.0.0"
+    micromatch "^4.0.0"
+    semver "^7.3.4"
+
 tslib@^1.10.0, tslib@^1.14.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -5888,6 +5949,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typescript@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
+  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
+
 uglify-js@^3.1.4:
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.0.tgz#66ed69f7241f33f13531d3d51d5bcebf00df7f69"

From 0131bd35965823c7f536c33d96d367be5c8d9e62 Mon Sep 17 00:00:00 2001
From: TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 13 Mar 2021 23:36:33 -0500
Subject: [PATCH 2/2] Use Polylines for Weather

- Fix weather implementation
- Polylines instead of polygons
- Fix up webpack
- Fix getting correct cell IDs
---
 client/package.json                       |  3 -
 client/src/components/MapTiles.jsx        |  2 +-
 client/src/components/weather/Weather.jsx | 32 ++++++---
 client/src/components/weather/marker.js   | 24 +++++--
 client/src/services/data/weather.js       |  5 +-
 client/src/services/getPolygon.js         | 17 ++---
 client/src/services/getPolyline.js        | 18 +++++
 client/webpack.config.js                  | 11 +--
 server/src/schema/schema.js               |  7 ++
 server/src/schema/weather.js              |  4 +-
 yarn.lock                                 | 86 +----------------------
 11 files changed, 80 insertions(+), 129 deletions(-)
 create mode 100644 client/src/services/getPolyline.js

diff --git a/client/package.json b/client/package.json
index 8041cce37..1e5432e1e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -16,8 +16,6 @@
     "@hot-loader/react-dom": "^17.0.1",
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
-    "ts-loader": "^8.0.18",
-    "typescript": "^4.2.3",
     "webpack": "^5.24.3",
     "webpack-dev-server": "^3.11.2"
   },
@@ -53,7 +51,6 @@
     "react-leaflet-markercluster": "^3.0.0-rc1",
     "react-router-dom": "^5.2.0",
     "sass-loader": "^11.0.1",
-    "source-map-loader": "^2.0.1",
     "style-loader": "^2.0.0",
     "webpack": "^5.24.3",
     "webpack-cli": "^4.5.0",
diff --git a/client/src/components/MapTiles.jsx b/client/src/components/MapTiles.jsx
index ddfd5a77d..c79dc5d1b 100644
--- a/client/src/components/MapTiles.jsx
+++ b/client/src/components/MapTiles.jsx
@@ -60,7 +60,7 @@ const MapTiles = ({ map, settings }) => {
       {selected.pokemon && <Pokemon bounds={bounds} />}
       {selected.portals && <Portal bounds={bounds} />}
       {selected.spawnpoints && <Spawnpoint bounds={bounds} />}
-      {selected.weather && <Weather />}
+      {selected.weather && <Weather bounds={bounds} />}
       <Nav
         selected={selected}
         setSelected={setSelected}
diff --git a/client/src/components/weather/Weather.jsx b/client/src/components/weather/Weather.jsx
index 6f48b7305..f3c45fa1c 100644
--- a/client/src/components/weather/Weather.jsx
+++ b/client/src/components/weather/Weather.jsx
@@ -1,28 +1,38 @@
 import React from 'react'
-import { Popup, Polygon } from 'react-leaflet'
+import { Popup, Polygon, Polyline, Marker } from 'react-leaflet'
 
 import { useQuery } from '@apollo/client'
 import Query from '../../services/Query.js'
 
 import marker from './marker.js'
 import PopupContent from './Popup.jsx'
-import getPolygon from '../../services/getPolygon.js' 
+import getPolygon from '../../services/getPolygon.js'
+import getPolyline from '../../services/getPolyline.js' 
 
-const Weather = props => {
-  const { loading, error, data } = useQuery(Query.getAllWeather())
+const Weather = ({ bounds }) => {
+  const { loading, error, data } = useQuery(Query.getAllWeather(), {
+    variables: {
+      minLat: bounds._southWest.lat,
+      minLon: bounds._southWest.lng,
+      maxLat: bounds._northEast.lat,
+      maxLon: bounds._northEast.lng
+    }
+  })
 
   return (
     <>
       {data && data.weather.map(cell => {
         return (
-          <Polygon
+          <Polyline
             key={cell.id}
-            positions={getPolygon(cell.id)}
-            pathOptions={marker(cell.id)}>
-            <Popup position={[cell.lat, cell.lon]}>
-              <PopupContent weather={cell} />
-            </Popup>
-          </Polygon>
+            positions={getPolyline(cell.id)}
+            pathOptions={{ color: 'green', opacity: 0.5 }}>
+            <Marker icon={marker(cell)} position={[cell.latitude, cell.longitude]}>
+              <Popup position={[cell.latitude, cell.longitude]}>
+                <PopupContent weather={cell} />
+              </Popup>
+            </Marker>
+          </Polyline>
         )
       })}
     </>
diff --git a/client/src/components/weather/marker.js b/client/src/components/weather/marker.js
index c3fcb0a79..d023edf84 100644
--- a/client/src/components/weather/marker.js
+++ b/client/src/components/weather/marker.js
@@ -1,10 +1,20 @@
+import { Icon } from 'leaflet'
+
 export default function (weather) {
-  const lastUpdatedHour = (new Date(weather.updated * 1000)).getHours()
-  const currentHour = (new Date).getHours()
+  const lastUpdate = new Date(weather.updated * 1000)
+  const now = new Date
+
+  const correctWeather = (
+    lastUpdate.getFullYear() === now.getFullYear() &&
+    lastUpdate.getMonth() === now.getMonth() &&
+    lastUpdate.getDate() === now.getDate() &&
+    lastUpdate.getHours() === now.getHours()
+  )
 
-  return {
-    color: currentHour === lastUpdatedHour ? 'green' : 'red',
-    fillColor: currentHour === lastUpdatedHour ? 'blue' : 'red',
-    fillOpacity: 0.25,  
-  }
+  return new Icon({
+    iconUrl: `/img/weather/${weather.gameplay_condition}.png`,
+    iconSize: [30, 30],
+    iconAnchor: [20, 33.96],
+    popupAnchor: [0, -41.96]
+  })
 }
\ No newline at end of file
diff --git a/client/src/services/data/weather.js b/client/src/services/data/weather.js
index e9ffa0f03..ec188920c 100644
--- a/client/src/services/data/weather.js
+++ b/client/src/services/data/weather.js
@@ -1,11 +1,12 @@
 import { gql } from '@apollo/client'
 
 const getAllWeather = gql`
-{
-  weather {
+query Data($minLat: Float!, $minLon: Float!, $maxLat: Float!, $maxLon: Float!) {
+  weather(minLat: $minLat, minLon: $minLon, maxLat: $maxLat, maxLon: $maxLon) {
     id
     latitude
     longitude
+    gameplay_condition
     updated
   }
 }
diff --git a/client/src/services/getPolygon.js b/client/src/services/getPolygon.js
index ccc1c4f2b..38b0a856f 100644
--- a/client/src/services/getPolygon.js
+++ b/client/src/services/getPolygon.js
@@ -1,18 +1,15 @@
 import { S2LatLng, S2Cell, S2CellId, S2Point } from 'nodes2ts';
 
 export default function (s2cellId) {
-  let s2cell = new S2Cell(new S2CellId(BigInt(s2cellId).toString()))
-  let polygon = []
+  const s2cell = new S2Cell(new S2CellId(BigInt(s2cellId).toString()))
+  const polygon = []
   for (let i = 0; i <= 3; i++) {
-    let coordinate = s2cell.getVertex(i)
-    let point = new S2Point(coordinate.x, coordinate.y, coordinate.z)
-    let latLng = S2LatLng.fromPoint(point)
-    let latitude = latLng.latDegrees
-    let longitude = latLng.lngDegrees
-
+    const coordinate = s2cell.getVertex(i)
+    const point = new S2Point(coordinate.x, coordinate.y, coordinate.z)
+    const latLng = S2LatLng.fromPoint(point)
     polygon.push([
-      latitude,
-      longitude
+      latLng.latDegrees,
+      latLng.lngDegrees
     ])
   }
 
diff --git a/client/src/services/getPolyline.js b/client/src/services/getPolyline.js
new file mode 100644
index 000000000..ee9f19005
--- /dev/null
+++ b/client/src/services/getPolyline.js
@@ -0,0 +1,18 @@
+import { S2LatLng, S2Cell, S2CellId, S2Point } from 'nodes2ts';
+
+export default function (s2cellId) {
+  const s2cell = new S2Cell(new S2CellId(BigInt(s2cellId).toString()))
+  const polygon = []
+  for (let i = 0; i <= 3; i++) {
+    const coordinate = s2cell.getVertex(i)
+    const point = new S2Point(coordinate.x, coordinate.y, coordinate.z)
+    const latLng = S2LatLng.fromPoint(point)
+    polygon.push([
+      latLng.latDegrees,
+      latLng.lngDegrees
+    ])
+  }
+  polygon.push(polygon[0])
+
+  return polygon
+}
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 69c25a6b3..6ba6bf196 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -2,7 +2,6 @@ import path, { dirname } from 'path'
 import { fileURLToPath } from 'url'
 import HtmlWebpackPlugin from "html-webpack-plugin"
 import config from '../server/src/services/config.js'
-
 import webpack from 'webpack'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -20,6 +19,7 @@ export default {
     publicPath: '/dist/'
   },
   mode: 'development',
+  devtool: "source-map",
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
     new HtmlWebpackPlugin({
@@ -48,18 +48,9 @@ export default {
           "sass-loader",
         ]
       },
-      {
-        test: /\.jsx?$/,
-        enforce: 'pre',
-        use: ['source-map-loader'],
-      },
       {
         test: /\.(png|jpe?g|gif)$/i,
         loader: 'file-loader',
-      },
-      {
-        test: /\.tsx?$/,
-        use: [{ loader: 'ts-loader', options: { transpileOnly: true } }]
       }
     ]
   },
diff --git a/server/src/schema/schema.js b/server/src/schema/schema.js
index 1686e5084..a8cd6b93f 100644
--- a/server/src/schema/schema.js
+++ b/server/src/schema/schema.js
@@ -1,4 +1,5 @@
 import { GraphQLObjectType, GraphQLID, GraphQLFloat, GraphQLList, GraphQLSchema } from 'graphql'
+import { ref } from 'objection'
 
 import DeviceType from './device.js'
 import GymType from './gym.js'
@@ -90,8 +91,14 @@ const RootQuery = new GraphQLObjectType({
     },
     weather: {
       type: new GraphQLList(WeatherType),
+      args: minMaxArgs,
       async resolve(parent, args) {
         return await Weather.query()
+          .select(['*', ref('id')
+            .castTo('CHAR')
+            .as('id')])
+          .whereBetween('latitude', [args.minLat, args.maxLat])
+          .andWhereBetween('longitude', [args.minLon, args.maxLon])
       }
     }
   }
diff --git a/server/src/schema/weather.js b/server/src/schema/weather.js
index 0020b204c..5ab7b053c 100644
--- a/server/src/schema/weather.js
+++ b/server/src/schema/weather.js
@@ -1,9 +1,9 @@
-import { GraphQLObjectType, GraphQLID, GraphQLInt, GraphQLFloat, GraphQLBoolean } from 'graphql'
+import { GraphQLObjectType, GraphQLInt, GraphQLFloat, GraphQLBoolean, GraphQLString } from 'graphql'
 
 export default new GraphQLObjectType({
   name: 'Weather',
   fields: () => ({
-    id: { type: GraphQLID },
+    id: { type: GraphQLString },
     level: { type: GraphQLInt },
     latitude: { type: GraphQLFloat },
     longitude: { type: GraphQLFloat },
diff --git a/yarn.lock b/yarn.lock
index 53e130837..172984bfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1429,11 +1429,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
-
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1777,7 +1772,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1891,14 +1886,6 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 "chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
@@ -2533,15 +2520,6 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
-  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
 enhanced-resolve@^5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c"
@@ -3335,13 +3313,6 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
@@ -4088,14 +4059,6 @@ memory-fs@^0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -4130,14 +4093,6 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
 mime-db@1.46.0, "mime-db@>= 1.43.0 < 2":
   version "1.46.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
@@ -4678,7 +4633,7 @@ pg-connection-string@2.4.0:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10"
   integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -5288,7 +5243,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+"safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -5567,20 +5522,6 @@ source-list-map@^2.0.0, source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-js@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
-  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
-
-source-map-loader@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-2.0.1.tgz#b4fd0ae7fa7e7d3954300f383f2d6fcc230a4261"
-  integrity sha512-UzOTTQhoNPeTNzOxwFw220RSRzdGSyH4lpNyWjR7Qm34P4/N0W669YSUFdH07+YNeN75h765XLHmNsF/bm97RQ==
-  dependencies:
-    abab "^2.0.5"
-    iconv-lite "^0.6.2"
-    source-map-js "^0.6.2"
-
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -5775,11 +5716,6 @@ symbol-observable@^2.0.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
-tapable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
@@ -5908,17 +5844,6 @@ ts-invariant@^0.6.0:
     "@ungap/global-this" "^0.4.2"
     tslib "^1.9.3"
 
-ts-loader@^8.0.18:
-  version "8.0.18"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.18.tgz#b2385cbe81c34ad9f997915129cdde3ad92a61ea"
-  integrity sha512-hRZzkydPX30XkLaQwJTDcWDoxZHK6IrEMDQpNd7tgcakFruFkeUp/aY+9hBb7BUGb+ZWKI0jiOGMo0MckwzdDQ==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^2.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
 tslib@^1.10.0, tslib@^1.14.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -5949,11 +5874,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
-  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
-
 uglify-js@^3.1.4:
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.0.tgz#66ed69f7241f33f13531d3d51d5bcebf00df7f69"