Merge pull request #1185 from cmu-delphi/sgratzl/upgrade

sgratzl · web-flow · commit e18ba16cc8f0 · 2022-07-26T11:35:27.000-04:00
upgrade dependencies
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,89 +40,90 @@
     "prepack": "npm run build"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@fortawesome/fontawesome-free": "^5.15.4",
-    "@octokit/request": "^5.6.2",
-    "@popperjs/core": "^2.10.2",
-    "@testing-library/jest-dom": "^5.15.0",
-    "@testing-library/svelte": "^3.0.3",
-    "@tsconfig/svelte": "^2.0.1",
-    "@types/d3-color": "^3.0.2",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@fortawesome/fontawesome-free": "^5",
+    "@octokit/request": "^5.6.3",
+    "@popperjs/core": "^2.11.5",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/svelte": "^3.1.3",
+    "@tsconfig/svelte": "^3.0.0",
+    "@types/d3-color": "^3.1.0",
     "@types/d3-dsv": "^3.0.0",
     "@types/d3-format": "^3.0.1",
     "@types/d3-geo": "^3.0.2",
     "@types/d3-scale": "^4.0.2",
     "@types/d3-scale-chromatic": "^3.0.0",
     "@types/d3-time": "^3.0.0",
     "@types/d3-time-format": "^4.0.0",
-    "@types/jest": "^27.0.3",
-    "@types/lodash-es": "^4.17.5",
+    "@types/jest": "^28.1.3",
+    "@types/lodash-es": "^4.17.6",
     "@types/lz-string": "^1.3.34",
-    "@types/marked": "^4.0.1",
-    "@types/node": "^16.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "babel-jest": "^27.3.1",
-    "babel-loader": "^8.2.3",
+    "@types/marked": "^4.0.3",
+    "@types/node": "^18.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
+    "babel-jest": "^28.1.1",
+    "babel-loader": "^8.2.5",
     "clean-webpack-plugin": "^4.0.0",
-    "concurrently": "^6.4.0",
-    "copy-webpack-plugin": "^10.0.0",
-    "core-js": "^3.19.1",
+    "concurrently": "^7.2.2",
+    "copy-webpack-plugin": "^11.0.0",
+    "core-js": "^3.23.3",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.1.4",
-    "d3-color": "^3.0.1",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^4.0.0",
+    "d3-color": "^3.1.0",
     "d3-dsv": "^3.0.1",
-    "d3-format": "^3.0.1",
+    "d3-format": "^3.1.0",
     "d3-scale": "^4.0.2",
     "d3-scale-chromatic": "^3.0.0",
     "d3-time": "^3.0.0",
-    "d3-time-format": "^4.0.0",
-    "eslint": "^8.3.0",
-    "eslint-plugin-svelte3": "^3.2.1",
+    "d3-time-format": "^4.1.0",
+    "eslint": "^8.18.0",
+    "eslint-plugin-svelte3": "^4.0.0",
     "file-loader": "^6.2.0",
     "geo-albers-usa-territories": "^0.1.0",
     "html-webpack-plugin": "^5.5.0",
-    "http-server": "^14.0.0",
-    "husky": "^7.0.4",
+    "http-server": "^14.1.1",
+    "husky": "^8.0.1",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.3.1",
+    "jest": "^28.1.1",
+    "jest-environment-jsdom": "^28.1.1",
     "js-cookie": "^3.0.1",
     "js-yaml": "^4.1.0",
-    "lint-staged": "^12.1.2",
+    "lint-staged": "^13.0.3",
     "lodash-es": "^4.17.21",
-    "marked": "^4.0.10",
-    "mini-css-extract-plugin": "^2.4.5",
-    "node-fetch": "^2.6.7",
-    "prettier": "^2.4.1",
-    "prettier-plugin-svelte": "^2.5.0",
+    "marked": "^4.0.17",
+    "mini-css-extract-plugin": "^2.6.1",
+    "node-fetch": "^2",
+    "prettier": "^2.7.1",
+    "prettier-plugin-svelte": "^2.7.0",
     "raw-loader": "^4.0.2",
     "regenerator-runtime": "^0.13.9",
     "resize-observer-polyfill": "^1.5.1",
-    "sass": "^1.43.4",
-    "sass-loader": "^12.3.0",
+    "sass": "^1.53.0",
+    "sass-loader": "^13.0.2",
     "style-loader": "^3.3.1",
-    "svelte": "^3.44.2",
-    "svelte-check": "^2.2.10",
+    "svelte": "^3.48.0",
+    "svelte-check": "^2.8.0",
     "svelte-icons": "^2.1.0",
-    "svelte-jester": "^2.1.5",
-    "svelte-loader": "^3.1.2",
-    "svelte-preprocess": "^4.9.8",
-    "ts-jest": "^27.0.7",
-    "ts-loader": "^9.2.6",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5.2",
+    "svelte-jester": "^2.3.2",
+    "svelte-loader": "^3.1.3",
+    "svelte-preprocess": "^4.10.7",
+    "ts-jest": "^28.0.5",
+    "ts-loader": "^9.3.1",
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.4",
     "url-loader": "^4.1.1",
-    "vega": "^5.21.0",
-    "vega-embed": "6.20.0",
-    "vega-lite": "^5.1.1",
-    "webpack": "^5.64.2",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.5.0"
+    "vega": "^5.22.1",
+    "vega-embed": "6.21.0",
+    "vega-lite": "^5.2.0",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.9.2"
   },
   "dependencies": {
-    "uikit": "^3.9.3"
+    "uikit": "^3.14.3"
   },
   "lint-staged": {
     "*.{ts,js,svelte}": "eslint --cache --fix",
diff --git a/src/components/vega/vegaFactory.ts b/src/components/vega/vegaFactory.ts
@@ -1,6 +1,7 @@
 import { timeFormat } from 'd3-time-format';
 import { format } from 'd3-format';
-import embed, { EmbedOptions, Result, VisualizationSpec } from 'vega-embed';
+import embed from 'vega-embed';
+import type { EmbedOptions, Result, VisualizationSpec } from 'vega-embed';
 import { Error, expressionFunction, projection, scheme } from 'vega';
 import { geoAlbersUsaTerritories } from 'geo-albers-usa-territories';
 import type { ExtendedFeature, GeoProjection } from 'd3-geo';
diff --git a/src/data/annotations.ts b/src/data/annotations.ts
@@ -1,6 +1,7 @@
 import { parseAPITime } from './utils';
 import { timeDay } from 'd3-time';
-import { callAnomaliesAPI, EpiDataAnomaliesRow } from './api';
+import { callAnomaliesAPI } from './api';
+import type { EpiDataAnomaliesRow } from './api';
 import type { RegionInfo, RegionLevel } from './regions';
 
 function parseSignals(signals: string) {
@@ -63,7 +64,7 @@ function parseRegions(regions: string): { level: RegionLevel; ids: '*' | Set<str
       }
       return null;
     })
-    .filter((d): d is { level: RegionLevel; ids: '*' | Set<string> } => d != null);
+    .filter((d): d is { level: RegionLevel; ids: Set<string> } => d != null);
 }
 
 export class Annotation {
diff --git a/src/data/apimodel.ts b/src/data/apimodel.ts
@@ -1,5 +1,6 @@
 import type { Region } from '../stores/params';
-import { hhsInfo, hrrInfo, RegionLevel, stateInfo } from './regions';
+import { hhsInfo, hrrInfo, stateInfo } from './regions';
+import type { RegionLevel } from './regions';
 import type { TimeFrame } from './TimeFrame';
 import { formatAPITime, formatAPIWeekTime, parseAPITime } from './utils';
 
diff --git a/src/data/fetchData.ts b/src/data/fetchData.ts
@@ -1,4 +1,5 @@
-import { callAPI, EpiDataJSONRow } from './api';
+import { callAPI } from './api';
+import type { EpiDataJSONRow } from './api';
 import { timeDay, timeWeek } from 'd3-time';
 import { parseAPIDateAndWeek, toTimeValue } from './utils';
 import { getInfoByName } from './regions';
diff --git a/src/data/fetchTriple.ts b/src/data/fetchTriple.ts
@@ -1,6 +1,8 @@
-import { EpiDataRow, parseData } from '.';
+import { parseData } from '.';
+import type { EpiDataRow } from '.';
 import type { Sensor } from '../stores/constants';
-import { callAPI, EpiDataJSONRow } from './api';
+import { callAPI } from './api';
+import type { EpiDataJSONRow } from './api';
 import { GeoPair, isArray, SourceSignalPair, TimePair, groupByLevel, groupBySource } from './apimodel';
 import { EpiWeek } from './EpiWeek';
 import type { RegionInfo as Region, RegionLevel } from './regions';
diff --git a/src/data/meta.ts b/src/data/meta.ts
@@ -1,9 +1,11 @@
-import { EpiDataMetaInfo, EpiDataMetaSourceInfo, EpiDataMetaStatsInfo, KNOWN_LICENSES, SignalCategory } from './api';
+import { KNOWN_LICENSES } from './api';
+import type { EpiDataMetaInfo, EpiDataMetaSourceInfo, EpiDataMetaStatsInfo, SignalCategory } from './api';
 import { parseAPIDateAndWeek } from './utils';
 import type { RegionLevel } from './regions';
 import { isCountSignal } from './signals';
 import { ALL_TIME_FRAME, TimeFrame } from './TimeFrame';
-import { Sensor, units, colorScales, vegaColorScales, yAxis, EpiDataMetaParsedInfo, SensorLike } from './sensor';
+import type { Sensor, EpiDataMetaParsedInfo, SensorLike } from './sensor';
+import { units, colorScales, vegaColorScales, yAxis } from './sensor';
 import { formatSpecifiers, formatter } from '../formats';
 import { marked } from 'marked';
 import { isCasesSignal } from './signals';
diff --git a/src/data/relatedRegions.ts b/src/data/relatedRegions.ts
@@ -1,6 +1,7 @@
 import { dsvFormat } from 'd3-dsv';
 import relatedCountiesRaw from './processed/related_counties.csv.js';
-import { getInfoByName, RegionInfo } from './regions';
+import type { RegionInfo } from './regions';
+import { getInfoByName } from './regions';
 
 const lookup = (() => {
   const lookup = new Map<string, string[]>();
diff --git a/src/data/sensor.ts b/src/data/sensor.ts
@@ -1,6 +1,7 @@
 import { formatter, formatSpecifiers } from '../formats';
 import { getDataSource } from './dataSourceLookup';
-import { defaultCountyRegion, defaultStateRegion, nationInfo, Region, RegionLevel } from './regions';
+import { defaultCountyRegion, defaultStateRegion, nationInfo } from './regions';
+import type { Region, RegionLevel } from './regions';
 import type { EpiDataMetaInfo, SignalCategory, SignalFormat, SignalHighValuesAre } from './api';
 import { isArray } from './apimodel';
 import type { EpiWeek } from './EpiWeek';
diff --git a/src/data/trend.ts b/src/data/trend.ts
@@ -1,6 +1,7 @@
 import type { EpiDataRow } from './fetchData';
 import type { Sensor } from '../stores/constants';
-import { callTrendAPI, EpiDataTrendRow, FieldSpec } from './api';
+import { callTrendAPI } from './api';
+import type { EpiDataTrendRow, FieldSpec } from './api';
 import { GeoPair, SourceSignalPair } from './apimodel';
 import type { Region, RegionLevel } from './regions';
 import { splitDailyWeekly } from './sensor';
diff --git a/src/modes/dashboard/configResolver.ts b/src/modes/dashboard/configResolver.ts
@@ -1,6 +1,7 @@
 import { parseAPITime } from '../../data';
 import { getInfoByName } from '../../data/regions';
-import { DateParam, RegionLevel, RegionParam, Sensor, SensorParam, TimeFrame } from '../../stores/params';
+import { DateParam, RegionParam, SensorParam, TimeFrame } from '../../stores/params';
+import type { RegionLevel, Sensor } from '../../stores/params';
 
 export function resolveSensor(defaultSensor: SensorParam, key?: string): SensorParam {
   if (!key) {
diff --git a/src/modes/dashboard/highlight.ts b/src/modes/dashboard/highlight.ts
@@ -1,15 +1,8 @@
 import { formatDateISO } from '../../formats';
-import {
-  CountyInfo,
-  getHHSRegionOfState,
-  getInfoByName,
-  getStateOfCounty,
-  getStatesOfHHS,
-  HHSInfo,
-  nationInfo,
-  StateInfo,
-} from '../../data/regions';
-import { DateParam, Region, RegionLevel, RegionParam, Sensor, SensorParam, TimeFrame } from '../../stores/params';
+import { getHHSRegionOfState, getInfoByName, getStateOfCounty, getStatesOfHHS, nationInfo } from '../../data/regions';
+import type { CountyInfo, HHSInfo, StateInfo } from '../../data/regions';
+import { DateParam, RegionParam, SensorParam, TimeFrame } from '../../stores/params';
+import type { Region, RegionLevel, Sensor } from '../../stores/params';
 import { EpiWeek } from '../../data/EpiWeek';
 import { metaDataManager } from '../../stores';
 import { get } from 'svelte/store';
diff --git a/src/modes/exportdata/ExportData.svelte b/src/modes/exportdata/ExportData.svelte
@@ -390,9 +390,12 @@
           </form>
           <p>Manually fetch data:</p>
           <div class="code-block-wrapper">
-            <pre
-              class="code-block"><code>
-            {`wget --content-disposition "${CSV_SERVER_ENDPOINT}?signal=${sensor ? `${sensor.id}:${sensor.signal}` : ''}&start_day=${formatDate(startDate)}&end_day=${formatDate(endDate)}&geo_type=${geoType}${isAllRegions ? '' : `&geo_values=${geoIDs.join(',')}`}${usesAsOf ? `&as_of=${formatDate(asOfDate)}` : ''}"`}
+            <pre class="code-block"><code>
+            {`wget --content-disposition "${CSV_SERVER_ENDPOINT}?signal=${
+                  sensor ? `${sensor.id}:${sensor.signal}` : ''
+                }&start_day=${formatDate(startDate)}&end_day=${formatDate(endDate)}&geo_type=${geoType}${
+                  isAllRegions ? '' : `&geo_values=${geoIDs.join(',')}`
+                }${usesAsOf ? `&as_of=${formatDate(asOfDate)}` : ''}"`}
             </code></pre>
           </div>
           <p class="description">
@@ -407,14 +410,15 @@
           <p>Install <code>covidcast</code> via pip:</p>
           <pre class="code-block"><code>pip install covidcast</code></pre>
           <p>Fetch data:</p>
-          <pre
-            class="code-block"><code>
+          <pre class="code-block"><code>
         {`${isWeekly ? 'from epiweeks import Week' : 'from datetime import date'}
 import covidcast
 
 data = covidcast.signal("${sensor ? sensor.id : ''}", "${sensor ? sensor.signal : ''}",
                         ${formatPythonDate(startDate)}, ${formatPythonDate(endDate)},
-                        "${geoType}"${isAllRegions ? '' : `, ["${geoIDs.join('", "')}"]`}${usesAsOf ? `, as_of = ${formatPythonDate(asOfDate)}` : ''})`}
+                        "${geoType}"${isAllRegions ? '' : `, ["${geoIDs.join('", "')}"]`}${
+                usesAsOf ? `, as_of = ${formatPythonDate(asOfDate)}` : ''
+              })`}
       </code></pre>
           <p class="description">
             For more details and examples, see the
@@ -430,14 +434,15 @@ data = covidcast.signal("${sensor ? sensor.id : ''}", "${sensor ? sensor.signal
           <p>Install <code>covidcast</code> via CRAN:</p>
           <pre class="code-block"><code>install.packages('covidcast')</code></pre>
           <p>Fetch data:</p>
-          <pre
-            class="code-block"><code>
+          <pre class="code-block"><code>
         {`library(covidcast)
 
 cc_data <- covidcast_signal(
   data_source = "${sensor ? sensor.id : ''}", signal = "${sensor ? sensor.signal : ''}",
   start_day = "${formatDate(startDate)}", end_day = "${formatDate(endDate)}",
-  geo_type = "${geoType}"${isAllRegions ? '' : `, geo_values = c("${geoIDs.join('", "')}")`}${usesAsOf ? `, as_of = "${formatDate(asOfDate)}"` : ''}
+  geo_type = "${geoType}"${isAllRegions ? '' : `, geo_values = c("${geoIDs.join('", "')}")`}${
+                usesAsOf ? `, as_of = "${formatDate(asOfDate)}"` : ''
+              }
 )`}
       </code></pre>
           <p class="description">
diff --git a/src/modes/indicator-status/data.ts b/src/modes/indicator-status/data.ts
@@ -1,14 +1,19 @@
 import { timeDay } from 'd3-time';
-import { callBackfillAPI, callCoverageAPI, CoverageRow, EpiDataBackfillRow, ParsedCoverageRow } from '../../data/api';
+import { callBackfillAPI, callCoverageAPI } from '../../data/api';
+import type { CoverageRow, EpiDataBackfillRow, ParsedCoverageRow } from '../../data/api';
 import { GeoPair, SourceSignalPair, TimePair } from '../../data/apimodel';
 import type { MetaDataManager, SensorSource } from '../../data/meta';
-import { countyInfo, RegionLevel, stateCoreInfo } from '../../data/regions';
+import { countyInfo, stateCoreInfo } from '../../data/regions';
+import type { RegionLevel } from '../../data/regions';
 import { parseAPIDateAndWeek, parseAPITime, toTimeValue } from '../../data/utils';
-import { Sensor, TimeFrame } from '../../stores/params';
-import { addNameInfos, EpiDataRow } from '../../data';
+import { TimeFrame } from '../../stores/params';
+import type { Sensor } from '../../stores/params';
+import { addNameInfos } from '../../data';
+import type { EpiDataRow } from '../../data';
 import fetchTriple from '../../data/fetchTriple';
 import type { RegionInfo } from '../../data/regions';
-import { EpiDataMetaParsedInfo, SensorLike, splitDailyWeekly } from '../../data/sensor';
+import { splitDailyWeekly } from '../../data/sensor';
+import type { EpiDataMetaParsedInfo, SensorLike } from '../../data/sensor';
 import { EpiWeek, weekRange } from '../../data/EpiWeek';
 
 export interface SourceData extends SensorSource {
diff --git a/src/stores/DataFetcher.ts b/src/stores/DataFetcher.ts
@@ -1,15 +1,19 @@
 import { timeDay } from 'd3-time';
-import { addMissing, addNameInfos, EpiDataRow, parseAPITime } from '../data';
+import { addMissing, addNameInfos, parseAPITime } from '../data';
+import type { EpiDataRow } from '../data';
 import { callTrendSeriesAPI } from '../data/api';
 import { fixLevel, GeoPair, SourceSignalPair } from '../data/apimodel';
 import type { EpiWeek } from '../data/EpiWeek';
 import fetchTriple from '../data/fetchTriple';
 import type { MetaDataManager } from '../data/meta';
-import { getInfoByName, nationInfo, RegionInfo, RegionLevel } from '../data/regions';
+import { getInfoByName, nationInfo } from '../data/regions';
+import type { RegionInfo, RegionLevel } from '../data/regions';
 import type { Sensor } from '../data/sensor';
 import { TimeFrame } from '../data/TimeFrame';
-import { asSensorTrend, fetchTrendR, fetchTrendS, fetchTrendSR, SensorTrend } from '../data/trend';
-import { DateParam, groupByRegion, Region, RegionParam, SensorParam } from './params';
+import { asSensorTrend, fetchTrendR, fetchTrendS, fetchTrendSR } from '../data/trend';
+import type { SensorTrend } from '../data/trend';
+import { DateParam, groupByRegion, RegionParam, SensorParam } from './params';
+import type { Region } from './params';
 
 export interface RegionEpiDataRow extends EpiDataRow, Region {}
 
diff --git a/src/stores/descriptions.raw.txt b/src/stores/descriptions.raw.txt
@@ -83,7 +83,7 @@ Unit: per 100 tests
 SignalTooltip: Positivity rate of COVID-19 antigen tests, based on data provided by Quidel, Inc.
 
 
-Description: Delphi receives data from COVID-19 antigen tests conducted by Quidel, a national provider of networked lab testing devices (covering doctors' offices, clinics, and hospitals). Antigen tests can detect parts of the virus that are present during an active infection. We report the percentage of COVID antigen tests that are positive. Note that this signal only includes Quidel’s antigen tests, not those run by other test providers.
+Description: Delphi receives data from COVID-19 antigen tests conducted by Quidel, a national provider of networked lab testing devices (covering doctors' offices, clinics, and hospitals). Antigen tests can detect parts of the virus that are present during an active infection.We report the percentage of COVID antigen tests that are positive. Note that this signal only includes Quidel’s antigen tests, not those run by other test providers.
 
 
 AgeStratifications:
diff --git a/src/stores/index.ts b/src/stores/index.ts
@@ -7,15 +7,17 @@ import {
   resolveSensorWithAliases,
   sensorConfig,
 } from './constants';
-import modes, { Mode, modeByID, ModeID } from '../modes';
+import modes, { modeByID } from '../modes';
+import type { Mode, ModeID } from '../modes';
 import { parseAPITime } from '../data/utils';
 import { getInfoByName } from '../data/regions';
 export { defaultRegionOnStartup, getLevelInfo, levels, levelList } from './constants';
 import { AnnotationManager, fetchAnnotations } from '../data';
 import type { RegionInfo, RegionLevel } from '../data/regions';
 import { MetaDataManager } from '../data/meta';
 import { callMetaAPI } from '../data/api';
-import { Sensor, sensorTypes } from '../data/sensor';
+import { sensorTypes } from '../data/sensor';
+import type { Sensor } from '../data/sensor';
 import { SURVEY_EMD } from './questions';
 
 export const appReady = writable(false);
diff --git a/src/stores/params.ts b/src/stores/params.ts
diff --git a/src/stores/urlHandler.ts b/src/stores/urlHandler.ts
