Skip to content

Commit 4410ba8

Browse files
sgratzlsgratzl
authored
Merge pull request #953 from cmu-delphi/sgratzl/deps
update dependencies
2 parents 29079cd + 8ba1154 commit 4410ba8

File tree

8 files changed

+3621
-2384
lines changed

8 files changed

+3621
-2384
lines changed

‎jest.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
testEnvironment: 'jsdom',
23
// preprocess *.ts test files with ts-jest
34
preset: 'ts-jest',
45

‎package-lock.json‎

Lines changed: 3508 additions & 2282 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
"prepack": "npm run build"
4242
},
4343
"devDependencies": {
44-
"@babel/core": "^7.14.2",
45-
"@babel/preset-env": "^7.14.2",
44+
"@babel/core": "^7.14.5",
45+
"@babel/preset-env": "^7.14.5",
4646
"@fortawesome/fontawesome-free": "^5.15.3",
47-
"@octokit/request": "^5.4.15",
47+
"@octokit/request": "^5.6.0",
4848
"@popperjs/core": "^2.9.2",
4949
"@testing-library/cypress": "^7.0.6",
50-
"@testing-library/jest-dom": "^5.12.0",
50+
"@testing-library/jest-dom": "^5.14.1",
5151
"@testing-library/svelte": "^3.0.3",
52-
"@tsconfig/svelte": "^1.0.10",
52+
"@tsconfig/svelte": "^2.0.1",
5353
"@turf/bbox": "^6.3.0",
5454
"@turf/boolean-disjoint": "^6.3.0",
5555
"@turf/center-of-mass": "^6.3.0",
@@ -61,26 +61,26 @@
6161
"@types/d3-dsv": "^2.0.1",
6262
"@types/d3-format": "^2.0.0",
6363
"@types/d3-geo": "^2.0.0",
64-
"@types/d3-scale": "^3.2.2",
64+
"@types/d3-scale": "^3.3.0",
6565
"@types/d3-scale-chromatic": "^2.0.0",
66-
"@types/d3-time": "^2.0.0",
66+
"@types/d3-time": "^2.1.0",
6767
"@types/d3-time-format": "^3.0.0",
6868
"@types/jest": "^26.0.23",
6969
"@types/lodash-es": "^4.17.4",
70-
"@types/node": "^15.3.0",
70+
"@types/node": "^15.12.2",
7171
"@types/regression": "^2.0.0",
72-
"@typescript-eslint/eslint-plugin": "^4.23.0",
73-
"@typescript-eslint/parser": "^4.23.0",
74-
"babel-jest": "^26.6.3",
72+
"@typescript-eslint/eslint-plugin": "^4.26.1",
73+
"@typescript-eslint/parser": "^4.26.1",
74+
"babel-jest": "^27.0.2",
7575
"babel-loader": "^8.2.2",
7676
"clean-webpack-plugin": "^3.0.0",
7777
"compute-logspace": "^1.0.0",
78-
"concurrently": "^6.1.0",
79-
"copy-webpack-plugin": "^8.1.1",
80-
"core-js": "^3.12.1",
78+
"concurrently": "^6.2.0",
79+
"copy-webpack-plugin": "^9.0.0",
80+
"core-js": "^3.14.0",
8181
"cross-env": "^7.0.3",
82-
"css-loader": "^5.2.4",
83-
"css-minimizer-webpack-plugin": "^3.0.0",
82+
"css-loader": "^5.2.6",
83+
"css-minimizer-webpack-plugin": "^3.0.1",
8484
"cypress": "^7.3.0",
8585
"cypress-image-snapshot": "^4.0.1",
8686
"d3-color": "^2.0.0",
@@ -92,7 +92,7 @@
9292
"d3-time": "^2.1.1",
9393
"d3-time-format": "^3.0.0",
9494
"dirty-reprojectors": "0.0.2",
95-
"eslint": "^7.26.0",
95+
"eslint": "^7.28.0",
9696
"eslint-plugin-cypress": "^2.11.3",
9797
"eslint-plugin-svelte3": "^3.2.0",
9898
"file-loader": "^6.2.0",
@@ -102,49 +102,49 @@
102102
"http-server": "^0.12.3",
103103
"husky": "^6.0.0",
104104
"identity-obj-proxy": "^3.0.0",
105-
"jest": "^26.6.3",
105+
"jest": "^27.0.4",
106106
"js-cookie": "^2.2.1",
107107
"js-yaml": "^4.1.0",
108108
"lint-staged": "^11.0.0",
109109
"lodash-es": "^4.17.21",
110110
"mapbox-gl": "^1.13.0",
111-
"marked": "^2.0.3",
111+
"marked": "^2.0.7",
112112
"mini-css-extract-plugin": "^1.6.0",
113113
"node-fetch": "^2.6.1",
114-
"prettier": "^2.3.0",
114+
"prettier": "^2.3.1",
115115
"prettier-plugin-svelte": "^2.3.0",
116116
"raw-loader": "^4.0.2",
117117
"regenerator-runtime": "^0.13.7",
118118
"regression": "^2.0.1",
119119
"resize-observer-polyfill": "^1.5.1",
120-
"sass": "^1.32.13",
121-
"sass-loader": "^11.1.1",
120+
"sass": "^1.34.1",
121+
"sass-loader": "^12.1.0",
122122
"seedrandom": "^3.0.5",
123123
"style-loader": "^2.0.0",
124124
"svelte": "^3.38.2",
125-
"svelte-check": "^1.5.4",
125+
"svelte-check": "^2.1.0",
126126
"svelte-icons": "^2.1.0",
127-
"svelte-jester": "^1.5.0",
127+
"svelte-jester": "^1.7.0",
128128
"svelte-loader": "^3.1.1",
129129
"svelte-preprocess": "^4.7.3",
130130
"topojson-client": "^3.1.0",
131131
"topojson-server": "^3.0.1",
132-
"ts-jest": "^26.5.6",
133-
"ts-loader": "^9.1.2",
134-
"tslib": "^2.2.0",
135-
"typescript": "^4.2.4",
132+
"ts-jest": "^27.0.3",
133+
"ts-loader": "^9.2.3",
134+
"tslib": "^2.3.0",
135+
"typescript": "^4.3.2",
136136
"url-loader": "^4.1.1",
137137
"vega": "^5.20.2",
138138
"vega-embed": "^6.18.2",
139139
"vega-lite": "^5.1.0",
140-
"webpack": "^5.37.0",
141-
"webpack-cli": "^4.7.0",
140+
"webpack": "^5.38.1",
141+
"webpack-cli": "^4.7.2",
142142
"webpack-dev-server": "^3.11.2",
143143
"@types/lz-string": "^1.3.34",
144144
"lz-string": "^1.4.4"
145145
},
146146
"dependencies": {
147-
"uikit": "^3.6.21"
147+
"uikit": "^3.6.22"
148148
},
149149
"lint-staged": {
150150
"*.{ts,js,svelte}": "eslint --cache --fix",

‎src/modes/index.ts‎

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import { modes } from './modes';
2+
export { modes } from './modes';
3+
14
export interface Mode {
25
id: string;
36
label: string;
@@ -6,72 +9,6 @@ export interface Mode {
69
anchor?: string;
710
}
811

9-
const modes: Mode[] = [
10-
{
11-
id: 'landing',
12-
label: 'COVIDcast Overview',
13-
component: () => import(/* webpackChunkName: 'm-landing' */ './landing/Landing.svelte').then((r) => r.default),
14-
},
15-
{
16-
id: 'summary',
17-
label: 'Location Summary',
18-
component: () => import(/* webpackChunkName: 'm-overview' */ './summary/Summary.svelte').then((r) => r.default),
19-
},
20-
{
21-
id: 'indicator',
22-
label: 'Indicator Details',
23-
component: () =>
24-
import(/* webpackChunkName: 'm-indicator' */ './indicator/Indicator.svelte').then((r) => r.default),
25-
},
26-
{
27-
id: 'correlation',
28-
label: 'Indicator Correlation',
29-
component: () =>
30-
import(/* webpackChunkName: 'm-correlation' */ './correlation/Correlation.svelte').then((r) => r.default),
31-
},
32-
{
33-
id: 'classic',
34-
label: 'Classic COVIDcast',
35-
component: () => import(/* webpackChunkName: 'm-old' */ './classic/Overview.svelte').then((r) => r.default),
36-
},
37-
{
38-
id: 'survey-results',
39-
label: 'Survey Results',
40-
component: () =>
41-
import(/* webpackChunkName: 'm-survey' */ './survey-results/SurveyResults.svelte').then((r) => r.default),
42-
},
43-
{
44-
id: 'export',
45-
label: 'Export Data',
46-
component: () => import(/* webpackChunkName: 'm-export' */ './exportdata/ExportData.svelte').then((r) => r.default),
47-
},
48-
{
49-
id: 'lab',
50-
label: 'Lab',
51-
component: () => import(/* webpackChunkName: 'mode-lab' */ './lab/Lab.svelte').then((r) => r.default),
52-
},
53-
{
54-
id: 'indicator-status',
55-
label: 'Indicator Status Overview',
56-
component: () =>
57-
import(/* webpackChunkName: 'm-indicator-status' */ './indicator-status/IndicatorStatusOverview.svelte').then(
58-
(r) => r.default,
59-
),
60-
},
61-
{
62-
id: 'data-anomalies',
63-
label: 'Data Anomalies',
64-
component: () =>
65-
import(/* webpackChunkName: 'm-data-anomalies' */ './data-anomalies/DataAnomalies.svelte').then((r) => r.default),
66-
},
67-
{
68-
id: 'dashboard',
69-
label: 'Dashboard',
70-
component: () =>
71-
import(/* webpackChunkName: 'm-databoard' */ './dashboard/Dashboard.svelte').then((r) => r.default),
72-
},
73-
];
74-
7512
export default modes;
7613

7714
export type ModeID =

‎src/modes/indicator-status/store.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ export const dateLabel = derived([dateField], ([value]) => dateOptions.find((d)
1313

1414
export const anchorLag = writable(60);
1515

16-
export const valueField =
17-
writable<'value_completeness' | 'value_rel_change' | 'sample_size_completeness' | 'sample_size_rel_change'>(
18-
'value_completeness',
19-
);
16+
export const valueField = writable<
17+
'value_completeness' | 'value_rel_change' | 'sample_size_completeness' | 'sample_size_rel_change'
18+
>('value_completeness');
2019

2120
export const valueOptions = derived([anchorLag], ([lag]) => [
2221
{ label: `As fraction of value at lag ${lag}`, value: 'value_completeness' },

‎src/modes/modes.d.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import type { Mode } from './index';
2+
3+
export const modes: Mode[];

‎src/modes/modes.js‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/**
2+
* @type {import('./index').Mode[]}
3+
*/
4+
export const modes = [
5+
{
6+
id: 'landing',
7+
label: 'COVIDcast Overview',
8+
component: () => import(/* webpackChunkName: 'm-landing' */ './landing/Landing.svelte').then((r) => r.default),
9+
},
10+
{
11+
id: 'summary',
12+
label: 'Location Summary',
13+
component: () => import(/* webpackChunkName: 'm-overview' */ './summary/Summary.svelte').then((r) => r.default),
14+
},
15+
{
16+
id: 'indicator',
17+
label: 'Indicator Details',
18+
component: () =>
19+
import(/* webpackChunkName: 'm-indicator' */ './indicator/Indicator.svelte').then((r) => r.default),
20+
},
21+
{
22+
id: 'correlation',
23+
label: 'Indicator Correlation',
24+
component: () =>
25+
import(/* webpackChunkName: 'm-correlation' */ './correlation/Correlation.svelte').then((r) => r.default),
26+
},
27+
{
28+
id: 'classic',
29+
label: 'Classic COVIDcast',
30+
component: () => import(/* webpackChunkName: 'm-old' */ './classic/Overview.svelte').then((r) => r.default),
31+
},
32+
{
33+
id: 'survey-results',
34+
label: 'Survey Results',
35+
component: () =>
36+
import(/* webpackChunkName: 'm-survey' */ './survey-results/SurveyResults.svelte').then((r) => r.default),
37+
},
38+
{
39+
id: 'export',
40+
label: 'Export Data',
41+
component: () => import(/* webpackChunkName: 'm-export' */ './exportdata/ExportData.svelte').then((r) => r.default),
42+
},
43+
{
44+
id: 'lab',
45+
label: 'Lab',
46+
component: () => import(/* webpackChunkName: 'mode-lab' */ './lab/Lab.svelte').then((r) => r.default),
47+
},
48+
{
49+
id: 'indicator-status',
50+
label: 'Indicator Status Overview',
51+
component: () =>
52+
import(/* webpackChunkName: 'm-indicator-status' */ './indicator-status/IndicatorStatusOverview.svelte').then(
53+
(r) => r.default,
54+
),
55+
},
56+
{
57+
id: 'data-anomalies',
58+
label: 'Data Anomalies',
59+
component: () =>
60+
import(/* webpackChunkName: 'm-data-anomalies' */ './data-anomalies/DataAnomalies.svelte').then((r) => r.default),
61+
},
62+
{
63+
id: 'dashboard',
64+
label: 'Dashboard',
65+
component: () =>
66+
import(/* webpackChunkName: 'm-databoard' */ './dashboard/Dashboard.svelte').then((r) => r.default),
67+
waitForReady: true,
68+
},
69+
];

‎src/wrapper/_customize.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
// Font
24
$global-font-family: 'Open Sans', Roboto, Arial, sans-serif;
35

@@ -27,4 +29,4 @@ $breadcrumb-divider-margin-horizontal: 3px;
2729
$tab-item-active-border: $menu-active-color;
2830
$tab-item-border-width: $menu-active-border-width;
2931

30-
$grid-gap: (32/1440) * 100%;
32+
$grid-gap: math.div(32, 1440) * 100%;

0 commit comments

Comments
 (0)