From ea6452fa81ad73fb8b06db65cdd18f6a339bbdb9 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 10:30:40 +0200 Subject: [PATCH 001/116] switch to lineupjs4 --- .circleci/config.yml | 12 ++++++++---- package.json | 2 +- templates/index.html | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1df5c5f..d1cce3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,15 +23,19 @@ jobs: - run: #update build doc and readme name: update api command: | - if [ "${CIRCLE_BRANCH}" == "master" ] ; then + if [ "${CIRCLE_BRANCH}" == "master" ] || [ "${CIRCLE_BRANCH}" == "develop" ] ; then git clone git@github.com:datavisyn/lineup.js.org.git cd lineup.js.org - rm -rf "app/" - mv ../build "app" + appdir=app + if [ "${CIRCLE_BRANCH}" == "develop" ] ; then + appdir=app_develop + fi + rm -rf "${appdir}/" + mv ../build "${appdir}" git config user.email "samuel_gratzl@gmx.at" git config user.name "Samuel Gratzl" git add -A - git commit -m "auto updating app" -m "trigger: ${CIRCLE_BUILD_URL}" + git commit -m "auto updating ${appdir}" -m "trigger: ${CIRCLE_BUILD_URL}" git push origin master fi diff --git a/package.json b/package.json index 113d8d6..879948a 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "dependencies": { "@types/materialize-css": "^1.0.3", "@types/papaparse": "^4.5.0", - "lineupjs": "^3.1.2", + "lineupjs": "^4.0.0-alpha.0", "materialize-css": "^0.100.2", "papaparse": "^4.5.0", "font-awesome": "^4.7.0", diff --git a/templates/index.html b/templates/index.html index 1204395..64d2089 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,14 +4,14 @@ LineUp - + - + From 8e588f3d8167254527de32233ff73fd52b40c150 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 10:46:19 +0200 Subject: [PATCH 002/116] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 879948a..6beae88 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "dependencies": { "@types/materialize-css": "^1.0.3", "@types/papaparse": "^4.5.0", - "lineupjs": "^4.0.0-alpha.0", + "lineupjs": "^4.0.0-alpha.2", "materialize-css": "^0.100.2", "papaparse": "^4.5.0", "font-awesome": "^4.7.0", From 9253ca0ac6ece0190210e2bff2f771249955cd15 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 14:50:13 +0200 Subject: [PATCH 003/116] delay resize update --- src/index.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index e2eedb5..3047495 100644 --- a/src/index.ts +++ b/src/index.ts @@ -83,9 +83,13 @@ function showFile(file: File) { } window.addEventListener('resize', () => { - if (shared.lineup) { - shared.lineup.update(); - } + setTimeout(() => { + if (shared.lineup) { + shared.lineup.update(); + } + }, 100); +}, { + passive: false }); initExport(); From 97e0873e4e926ae8fc5caca9deac9b74ee49d715 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 15:19:48 +0200 Subject: [PATCH 004/116] restructure styles --- src/index.ts | 1 - src/style.scss | 246 +------------------------- src/styles/_app.scss | 106 +++++++++++ src/styles/_icons.scss | 24 +++ src/styles/_lineup.scss | 95 ++++++++++ src/{ => styles}/_material-icons.scss | 0 src/styles/_material.scss | 22 +++ src/styles/_vars.scss | 21 +++ 8 files changed, 272 insertions(+), 243 deletions(-) create mode 100644 src/styles/_app.scss create mode 100644 src/styles/_icons.scss create mode 100644 src/styles/_lineup.scss rename src/{ => styles}/_material-icons.scss (100%) create mode 100644 src/styles/_material.scss create mode 100644 src/styles/_vars.scss diff --git a/src/index.ts b/src/index.ts index 3047495..dd51ead 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import 'materialize-css'; import 'file-loader?name=index.html!extract-loader!html-loader?interpolate!./index.html'; import './assets/favicon/favicon'; import './style.scss'; -import 'font-awesome/css/font-awesome.css'; import * as $ from 'jquery'; import 'lineupjs/build/LineUpJS.css'; import initExport from './export'; diff --git a/src/style.scss b/src/style.scss index 3c9c64a..67f8b73 100644 --- a/src/style.scss +++ b/src/style.scss @@ -1,245 +1,7 @@ -$roboto-font-path: '~materialize-css/dist/fonts/roboto/'; -@import '~materialize-css/sass/components/color'; - -$primary-color: color("grey", "lighten-3"); -$secondary-color: color("grey", "darken-3"); - -$navbar-height: 40px; -$navbar-font-color: color("grey", "darken-2"); -$navbar-brand-font-size: 1.2em; - -$footer-font-color: color("grey", "darken-4"); -$footer-copyright-font-color: $footer-font-color; - -$input-height: 2.4rem; - -$radio-fill-color: color("grey", "base") !default; -$radio-empty-color: #5a5a5a !default; -$radio-border: 2px solid $secondary-color !default; +@import './styles/app'; +@import './styles/icons'; +@import './styles/lineup'; +@import './styles/material-icons'; @import '~materialize-css/sass/materialize'; -@import './material-icons'; - -$fa-font-path: '~font-awesome/fonts'; -@import '~font-awesome/scss/font-awesome'; - -html { - font-size: 14px; -} - -body { - display: flex; - min-height: 100vh; - flex-direction: column; - - > main { - flex: 1 0 auto; - position: relative; - display: flex; - flex-direction: column; - - > div { - flex: 1 1 auto; - opacity: 1; - transition: opacity 0.5s ease; - } - - &[data-state=initial] { - #uploader { - display: none; - } - } - - &[data-state=uploading] { - #dropper { - display: none; - } - - .lu { - visibility: visible; - } - } - - &[data-state=ready] { - > *:not(.lu) { - display: none; - } - - .lu { - visibility: visible; - pointer-events: all; - opacity: 1; - } - } - } -} - -nav { - .brand-logo { - margin-left: 1em; - } - - .btn-floating.halfway-fab { - bottom: -11px; - } - - .fixed-action-btn.horizontal ul li { - float: unset; - text-align: right; - margin-top: 11px; - - > a { - margin: 0; - } - } -} - -label { - color: color("grey", "darken-3"); -} - -// modify checkbox style -[type="checkbox"] { - + label { - padding-left: 25px; - } - - + label::before, - &:not(.filled-in) + label::after { - border: 1px solid color("grey", "darken-1"); - } - - &:not(:checked):disabled + label { - cursor: not-allowed; - } - - &:not(:checked):disabled + label::before { - border: 1px solid color("grey", "lighten-1"); - background: color("grey", "lighten-2"); - } -} - -.carousel { - height: 600px; - - .card-image { - height: 250px; - } - - .carousel-item { - width: 500px; - height: 400px; - } - - .card-reveal p { - text-align: justify; - } -} - -.lu-c { - position: absolute !important; - left: 5px; - right: 5px; - top: 5px; - bottom: 5px; - visibility: hidden; - opacity: 0; - transition: opacity 0.5s ease; - pointer-events: none; - line-height: 1; -} - -.lu-rule-button-chooser.switch { - overflow: inherit; - display: flex; - justify-content: center; - margin-bottom: 0.5em; - - span { - font-size: 1rem; - } -} - -.lu-active .lu-hierarchy { - > section { - margin-bottom: 1em; - - > .lu-toolbar, - > footer { - align-items: center; - padding: 6px 0.5em 0.5em 0.5em; - } - - > footer { - &::before { - color: #cecece; - } - - .lu-search input { - margin: 0; - height: 2em; - border-color: #dedede; - font-size: small; - font-weight: normal; - } - } - } -} - -.lu-search > input[type=search] { - margin-bottom: 0; - border: 1px solid $secondary-color; - border-radius: 3px; - padding: 3px 5px; - box-sizing: border-box; -} - -.lu-summary .lu-checkbox > [type="checkbox"] + label { - margin: 0; - font-size: 12px; - line-height: 100%; -} - -article.lu-side-panel-entry { - margin-bottom: 0.8em; - - .lu-summary[data-renderer="histogram"][data-summary="stratify"] { - margin-bottom: 8em; - - select { - display: block; - position: absolute; - bottom: -7em; - } - } -} - -.lu-side-panel { - padding-top: 2em; - - &.lu-collapsed { - transform: unset; - } -} - -section.lu-header > .lu-label { - line-height: 1.5; -} - -.page-footer { - padding-top: 0; - - .footer-copyright { - min-height: 30px; - padding: 0 1em; - } -} - -.lu-side-panel .lu-collapser { - padding: 1.5em 0.2em; -} - -.lu-filter-table .lu-checkbox > [type="checkbox"] + label { - display: inline-flex; -} diff --git a/src/styles/_app.scss b/src/styles/_app.scss new file mode 100644 index 0000000..5d52c3e --- /dev/null +++ b/src/styles/_app.scss @@ -0,0 +1,106 @@ +@import './vars'; + +html { + font-size: 14px; +} + +body { + display: flex; + min-height: 100vh; + flex-direction: column; + + > main { + flex: 1 0 auto; + position: relative; + display: flex; + flex-direction: column; + + > div { + flex: 1 1 auto; + opacity: 1; + transition: opacity 0.5s ease; + } + + &[data-state=initial] { + #uploader { + display: none; + } + } + + &[data-state=uploading] { + #dropper { + display: none; + } + + .lu { + visibility: visible; + } + } + + &[data-state=ready] { + > *:not(.lu) { + display: none; + } + + .lu { + visibility: visible; + pointer-events: all; + opacity: 1; + } + } + } +} + +nav { + .brand-logo { + margin-left: 1em; + } + + .btn-floating.halfway-fab { + bottom: -11px; + } + + .fixed-action-btn.horizontal ul li { + float: unset; + text-align: right; + margin-top: 11px; + + > a { + margin: 0; + } + } +} + +label { + color: color("grey", "darken-3"); +} + +.carousel { + height: 600px; + + .card-image { + height: 250px; + } + + .carousel-item { + width: 500px; + height: 400px; + } + + .card-reveal p { + text-align: justify; + } +} + +.lu-c { + position: absolute !important; + left: 5px; + right: 5px; + top: 5px; + bottom: 5px; + visibility: hidden; + opacity: 0; + transition: opacity 0.5s ease; + pointer-events: none; + line-height: 1; +} diff --git a/src/styles/_icons.scss b/src/styles/_icons.scss new file mode 100644 index 0000000..a244ee0 --- /dev/null +++ b/src/styles/_icons.scss @@ -0,0 +1,24 @@ +@import './vars'; + +@import '~font-awesome/scss/variables'; +@import '~font-awesome/scss/path'; +@import '~font-awesome/scss/mixins'; +@import '~font-awesome/scss/variables'; + +.fa-codepen::before, +.fa-file-code-o::before, +.fa-file-excel-o::before { + @include fa-icon(); +} + +.fa-codepen::before { + content: $fa-var-codepen; +} + +.fa-file-code-o::before { + content: $fa-var-file-code-o; +} + +.fa-file-excel-o::before { + content: $fa-var-file-excel-o; +} diff --git a/src/styles/_lineup.scss b/src/styles/_lineup.scss new file mode 100644 index 0000000..30c592a --- /dev/null +++ b/src/styles/_lineup.scss @@ -0,0 +1,95 @@ +@import './vars'; + +.lu-rule-button-chooser.switch { + overflow: inherit; + display: flex; + justify-content: center; + margin-bottom: 0.5em; + + span { + font-size: 1rem; + } +} + +.lu-active .lu-hierarchy { + > section { + margin-bottom: 1em; + + > .lu-toolbar, + > footer { + align-items: center; + padding: 6px 0.5em 0.5em 0.5em; + } + + > footer { + &::before { + color: #cecece; + } + + .lu-search input { + margin: 0; + height: 2em; + border-color: #dedede; + font-size: small; + font-weight: normal; + } + } + } +} + +.lu-search > input[type=search] { + margin-bottom: 0; + border: 1px solid $secondary-color; + border-radius: 3px; + padding: 3px 5px; + box-sizing: border-box; +} + +.lu-summary .lu-checkbox > [type="checkbox"] + label { + margin: 0; + font-size: 12px; + line-height: 100%; +} + +article.lu-side-panel-entry { + margin-bottom: 0.8em; + + .lu-summary[data-renderer="histogram"][data-summary="stratify"] { + margin-bottom: 8em; + + select { + display: block; + position: absolute; + bottom: -7em; + } + } +} + +.lu-side-panel { + padding-top: 2em; + + &.lu-collapsed { + transform: unset; + } +} + +section.lu-header > .lu-label { + line-height: 1.5; +} + +.page-footer { + padding-top: 0; + + .footer-copyright { + min-height: 30px; + padding: 0 1em; + } +} + +.lu-side-panel .lu-collapser { + padding: 1.5em 0.2em; +} + +.lu-filter-table .lu-checkbox > [type="checkbox"] + label { + display: inline-flex; +} diff --git a/src/_material-icons.scss b/src/styles/_material-icons.scss similarity index 100% rename from src/_material-icons.scss rename to src/styles/_material-icons.scss diff --git a/src/styles/_material.scss b/src/styles/_material.scss new file mode 100644 index 0000000..53ac849 --- /dev/null +++ b/src/styles/_material.scss @@ -0,0 +1,22 @@ +@import './vars'; + +// modify checkbox style +[type="checkbox"] { + + label { + padding-left: 25px; + } + + + label::before, + &:not(.filled-in) + label::after { + border: 1px solid color("grey", "darken-1"); + } + + &:not(:checked):disabled + label { + cursor: not-allowed; + } + + &:not(:checked):disabled + label::before { + border: 1px solid color("grey", "lighten-1"); + background: color("grey", "lighten-2"); + } +} diff --git a/src/styles/_vars.scss b/src/styles/_vars.scss new file mode 100644 index 0000000..c3841d5 --- /dev/null +++ b/src/styles/_vars.scss @@ -0,0 +1,21 @@ +$roboto-font-path: '~materialize-css/dist/fonts/roboto/'; + +@import '~materialize-css/sass/components/color'; + +$primary-color: color("grey", "lighten-3"); +$secondary-color: color("grey", "darken-3"); + +$navbar-height: 40px; +$navbar-font-color: color("grey", "darken-2"); +$navbar-brand-font-size: 1.2em; + +$footer-font-color: color("grey", "darken-4"); +$footer-copyright-font-color: $footer-font-color; + +$input-height: 2.4rem; + +$radio-fill-color: color("grey", "base") !default; +$radio-empty-color: #5a5a5a !default; +$radio-border: 2px solid $secondary-color !default; + +$fa-font-path: '~font-awesome/fonts'; From b55c98c1ed48368496a7dd1989ad4939b7e18f01 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 15:36:25 +0200 Subject: [PATCH 005/116] optimize css --- src/style.scss | 5 ++++- src/styles/_icons.scss | 2 -- src/styles/_materialize.scss | 31 +++++++++++++++++++++++++++++++ src/styles/_vars.scss | 3 --- 4 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 src/styles/_materialize.scss diff --git a/src/style.scss b/src/style.scss index 67f8b73..f2b7f67 100644 --- a/src/style.scss +++ b/src/style.scss @@ -1,7 +1,10 @@ +$roboto-font-path: '~materialize-css/dist/fonts/roboto/'; + +@import '~materialize-css/sass/components/color'; @import './styles/app'; @import './styles/icons'; @import './styles/lineup'; @import './styles/material-icons'; -@import '~materialize-css/sass/materialize'; +@import './styles/materialize'; diff --git a/src/styles/_icons.scss b/src/styles/_icons.scss index a244ee0..0695cfb 100644 --- a/src/styles/_icons.scss +++ b/src/styles/_icons.scss @@ -1,5 +1,3 @@ -@import './vars'; - @import '~font-awesome/scss/variables'; @import '~font-awesome/scss/path'; @import '~font-awesome/scss/mixins'; diff --git a/src/styles/_materialize.scss b/src/styles/_materialize.scss new file mode 100644 index 0000000..02c3984 --- /dev/null +++ b/src/styles/_materialize.scss @@ -0,0 +1,31 @@ +@import './vars'; + +// Variables; +@import '~materialize-css/sass/components/variables'; + +// Reset +@import '~materialize-css/sass/components/normalize'; + +// components +@import '~materialize-css/sass/components/global'; +@import '~materialize-css/sass/components/badges'; +@import '~materialize-css/sass/components/icons-material-design'; +@import '~materialize-css/sass/components/grid'; +@import '~materialize-css/sass/components/navbar'; +@import '~materialize-css/sass/components/roboto'; +@import '~materialize-css/sass/components/typography'; +@import '~materialize-css/sass/components/transitions'; +@import '~materialize-css/sass/components/cards'; +@import '~materialize-css/sass/components/toast'; +@import '~materialize-css/sass/components/tooltip'; +@import '~materialize-css/sass/components/buttons'; +@import '~materialize-css/sass/components/dropdown'; +@import '~materialize-css/sass/components/waves'; +@import '~materialize-css/sass/components/materialbox'; +@import '~materialize-css/sass/components/forms/forms'; +@import '~materialize-css/sass/components/table_of_contents'; +@import '~materialize-css/sass/components/sideNav'; +@import '~materialize-css/sass/components/preloader'; +@import '~materialize-css/sass/components/slider'; +@import '~materialize-css/sass/components/carousel'; +@import '~materialize-css/sass/components/pulse'; diff --git a/src/styles/_vars.scss b/src/styles/_vars.scss index c3841d5..dba631a 100644 --- a/src/styles/_vars.scss +++ b/src/styles/_vars.scss @@ -1,6 +1,3 @@ -$roboto-font-path: '~materialize-css/dist/fonts/roboto/'; - -@import '~materialize-css/sass/components/color'; $primary-color: color("grey", "lighten-3"); $secondary-color: color("grey", "darken-3"); From 10d9445c1f0ba0f912bf0cdf998a80a18703bb0f Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 7 Sep 2018 15:53:17 +0200 Subject: [PATCH 006/116] simplify styles --- src/index.html | 6 ++-- src/style.scss | 2 +- src/styles/_app.scss | 54 ++++++++++++++++------------- src/styles/_lineup.scss | 75 +++++++++++++++++------------------------ 4 files changed, 65 insertions(+), 72 deletions(-) diff --git a/src/index.html b/src/index.html index 49bd342..343d7c2 100644 --- a/src/index.html +++ b/src/index.html @@ -46,19 +46,19 @@ file_download diff --git a/webpack.config.js b/webpack.config.js index 38c22ac..140f645 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -139,6 +139,11 @@ module.exports = (env, options) => { { test: /\.(ttf|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'file-loader' + }, + { + test: /schema\.json$/, + type: 'javascript/auto', + loader: 'file-loader' } ] }, From ec2e77279c5c0e204bf413b4aa5c067bd55432d9 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 16:47:25 +0100 Subject: [PATCH 044/116] fix export dump --- src/data/loader_dump.ts | 5 +++-- src/export.ts | 4 ++-- src/index.ts | 5 +++++ src/styles/_icons.scss | 7 ++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/data/loader_dump.ts b/src/data/loader_dump.ts index dece39b..0c62d67 100644 --- a/src/data/loader_dump.ts +++ b/src/data/loader_dump.ts @@ -1,6 +1,7 @@ import {IDataset, IDatasetMeta} from './IDataset'; import {cleanName} from './ùtils'; import '!file-loader?name=schema.1.0.0.json!./schema.json'; +import {LineUp, Taggle} from 'lineupjs'; const SCHEMA_REF = 'https://lineup.js.org/app_develop/schema.1.0.0.json'; @@ -14,10 +15,10 @@ export function fromDumpFile(parsed: any): IDatasetMeta { return parsed; } -export function exportDump(dataset: IDataset, lineup: any) { +export function exportDump(dataset: IDataset, lineup: LineUp|Taggle) { const dump = Object.assign({ $schema: SCHEMA_REF, - dump: lineup + dump: lineup.dump() }, dataset); delete dump.build; diff --git a/src/export.ts b/src/export.ts index cf43494..fbe0e1b 100644 --- a/src/export.ts +++ b/src/export.ts @@ -24,7 +24,7 @@ export default function initExport() { evt.stopPropagation(); exportJSON(shared.lineup!).then((json) => { // download link - downloadHelper.href = `data:application/json;charset=utf-8;base64,${btoa(unescape(encodeURIComponent(JSON.stringify(json))))}`; + downloadHelper.href = `data:application/json;charset=utf-8;base64,${btoa(unescape(encodeURIComponent(JSON.stringify(json, null, ' '))))}`; (downloadHelper).download = `${shared.dataset!.name}.json`; downloadHelper.click(); }); @@ -34,7 +34,7 @@ export default function initExport() { evt.stopPropagation(); Promise.resolve(exportDump(shared.dataset!, shared.lineup!)).then((json) => { // download link - downloadHelper.href = `data:application/json;charset=utf-8;base64,${btoa(unescape(encodeURIComponent(JSON.stringify(json))))}`; + downloadHelper.href = `data:application/json;charset=utf-8;base64,${btoa(unescape(encodeURIComponent(JSON.stringify(json, null, ' '))))}`; (downloadHelper).download = `${shared.dataset!.name}.json`; downloadHelper.click(); }); diff --git a/src/index.ts b/src/index.ts index e403bbb..656f6be 100644 --- a/src/index.ts +++ b/src/index.ts @@ -45,6 +45,10 @@ function build(builder: Promise, session?: ISession | null) { } else { shared.session = null; next = `#${shared.dataset!.id}`; + + if (shared.dataset!.dump) { + shared.lineup!.data.restore(shared.dataset!.dump); + } } if (location.hash !== next) { location.assign(next); @@ -63,6 +67,7 @@ function loadSession(session?: ISession) { } shared.session = session; shared.lineup.data.restore(session.dump); + location.replace(`#${shared.dataset!.id}@${session.uid}`); } function disableBubbling(node: HTMLElement, ...events: string[]) { diff --git a/src/styles/_icons.scss b/src/styles/_icons.scss index 5059184..2ce4af3 100644 --- a/src/styles/_icons.scss +++ b/src/styles/_icons.scss @@ -4,7 +4,8 @@ .fa-codepen::before, .fa-file-code-o::before, -.fa-file-excel-o::before { +.fa-file-excel-o::before, +.fa-file-archive-o::before { @include fa-icon(); } @@ -19,3 +20,7 @@ .fa-file-excel-o::before { content: $fa-var-file-excel-o; } + +.fa-file-archive-o::before { + content: $fa-var-file-archive-o; +} From 98783d572cb3b7c677f4d3e976f54e728d8ebd42 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:06:33 +0100 Subject: [PATCH 045/116] fix parsing of dumped dates --- src/data/db.ts | 3 +++ src/data/index.ts | 43 +++++++++++++++++++++++++++++++++++++++-- src/data/loader_dump.ts | 15 +++++++++++--- src/data/loaders.ts | 23 ---------------------- src/index.ts | 1 + 5 files changed, 57 insertions(+), 28 deletions(-) diff --git a/src/data/db.ts b/src/data/db.ts index 896bff1..f3caff6 100644 --- a/src/data/db.ts +++ b/src/data/db.ts @@ -59,6 +59,9 @@ export function editDataset(dataset: IDataset): Promise { } function byCreationDate(arr: T[]) { + for (const entry of arr) { + entry.creationDate = entry.creationDate instanceof Date ? entry.creationDate : new Date(entry.creationDate); + } return arr.sort((a, b) => b.creationDate.getTime() - a.creationDate.getTime()); } diff --git a/src/data/index.ts b/src/data/index.ts index cea7eb5..a4fa6a7 100644 --- a/src/data/index.ts +++ b/src/data/index.ts @@ -5,9 +5,11 @@ import happiness from './world-happiness-report'; import soccer from './soccer'; import {ieeeheat, ieeebars} from './ieee-programming'; import {listDatasets, listSessions} from './db'; -import {complete} from './loaders'; +import JSON_LOADER from './loader_json'; +import CSV_LOADER from './loader_csv'; +import {IDatasetMeta, PRELOADED_TYPE} from './IDataset'; + export {IDataset} from './IDataset'; -export {fromFile} from './loaders'; export * from './ui'; const preloaded: IDataset[] = [ @@ -21,6 +23,43 @@ const preloaded: IDataset[] = [ ]; +const loaders = [JSON_LOADER, CSV_LOADER]; + +function complete(db: IDataset | IDatasetMeta) { + if (typeof (db).build === 'function') { + return db; + } + + for (const loader of loaders) { + if (db.type === loader.type) { + return loader.complete(db); + } + } + + if (db.type.startsWith(PRELOADED_TYPE)) { + const id = db.type.slice(PRELOADED_TYPE.length + 1); // for - + const preloadedDataset = preloaded.find((d) => d.id === id); + if (preloadedDataset) { + return Object.assign(db, { + buildScript: preloadedDataset.buildScript, + build: preloadedDataset.build, + rawData: preloadedDataset.rawData + }); + } + } + return db; +} + +export function fromFile(file: File): Promise { + for (const loader of loaders) { + if (loader.supports(file)) { + return loader.loadFile(file).then(complete); + } + } + return Promise.reject(`unknown file type: ${file.name}`); +} + + export function allDatasets() { return Promise.all([listDatasets(), listSessions()]).then(([ds, sessions]) => { const full = ds.map(complete).filter((d) => d != null); diff --git a/src/data/loader_dump.ts b/src/data/loader_dump.ts index 0c62d67..97aacbd 100644 --- a/src/data/loader_dump.ts +++ b/src/data/loader_dump.ts @@ -1,4 +1,4 @@ -import {IDataset, IDatasetMeta} from './IDataset'; +import {IDataset, IDatasetMeta, PRELOADED_TYPE} from './IDataset'; import {cleanName} from './ùtils'; import '!file-loader?name=schema.1.0.0.json!./schema.json'; import {LineUp, Taggle} from 'lineupjs'; @@ -12,15 +12,23 @@ export function isDumpFile(data: any) { export function fromDumpFile(parsed: any): IDatasetMeta { delete parsed.$schema; parsed.id = cleanName(parsed.name); + parsed.creationDate = new Date(parsed.creationDate); + if (parsed.sessions) { + parsed.sessions.forEach((d: any) => d.creationDate = new Date(d.creationDate)); + } return parsed; } export function exportDump(dataset: IDataset, lineup: LineUp|Taggle) { const dump = Object.assign({ - $schema: SCHEMA_REF, - dump: lineup.dump() + $schema: SCHEMA_REF }, dataset); + if (dataset.type === PRELOADED_TYPE) { + dump.type = `${PRELOADED_TYPE}-${dataset.id}`; + delete dump.rawData; // since part of the preloaded state anyhow + } + delete dump.build; delete dump.buildScript; delete dump.id; @@ -30,5 +38,6 @@ export function exportDump(dataset: IDataset, lineup: LineUp|Taggle) { delete r.dataset; return r; }); + dump.dump = lineup.dump(); return dump; } diff --git a/src/data/loaders.ts b/src/data/loaders.ts index 69fbf55..e69de29 100644 --- a/src/data/loaders.ts +++ b/src/data/loaders.ts @@ -1,23 +0,0 @@ -import JSON_LOADER from './loader_json'; -import CSV_LOADER from './loader_csv'; -import {IDataset, IDatasetMeta} from './IDataset'; - -export const loaders = [JSON_LOADER, CSV_LOADER]; - -export function complete(db: IDataset | IDatasetMeta) { - for (const loader of loaders) { - if (db.type === loader.type && typeof (db).build !== 'function') { - return loader.complete(db); - } - } - return db; -} - -export function fromFile(file: File): Promise { - for (const loader of loaders) { - if (loader.supports(file)) { - return loader.loadFile(file).then(complete); - } - } - return Promise.reject(`unknown file type: ${file.name}`); -} diff --git a/src/index.ts b/src/index.ts index 656f6be..b0d77ee 100644 --- a/src/index.ts +++ b/src/index.ts @@ -111,6 +111,7 @@ function addToCarousel(d: IDataset) { } function showFile(file: File) { + reset(); const f = fromFile(file).then((r) => { shared.datasets.unshift(r); addToCarousel(r); From b9fd621f13b67850034e7d4b15652c741395aa79 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:20:57 +0100 Subject: [PATCH 046/116] style playing --- src/index.html | 3 ++- src/index.ts | 2 ++ src/styles/_app.scss | 27 ++++++++++++++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index fea000d..a94fe39 100644 --- a/src/index.html +++ b/src/index.html @@ -80,7 +80,8 @@
-
+
+
diff --git a/src/index.ts b/src/index.ts index b0d77ee..4bbf53a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -53,6 +53,8 @@ function build(builder: Promise, session?: ISession | null) { if (location.hash !== next) { location.assign(next); } + return new Promise((resolve) => setTimeout(resolve, 1000)); + }).then(() => { uploader.dataset.state = 'ready'; }).catch((error) => { uploader.dataset.state = 'initial'; diff --git a/src/styles/_app.scss b/src/styles/_app.scss index ebbc434..f99f976 100644 --- a/src/styles/_app.scss +++ b/src/styles/_app.scss @@ -10,6 +10,10 @@ body { flex-direction: column; } +.nav-wrapper { + z-index: 200; +} + .main-wrapper { flex: 1 0 auto; position: relative; @@ -19,7 +23,23 @@ body { > div { flex: 1 1 auto; opacity: 1; - transition: opacity 0.5s ease; + transition: opacity 0.5s ease, background 0.5s ease; + } + + .lu-blocker { + opacity: 0; + z-index: 100; + visibility: hidden; + background: rgba(255, 255, 255, 0.9); + position: absolute; + top: 3px; + left: 0; + right: 0; + bottom: 3px; + } + + .chooser { + z-index: 101; } &[data-state=initial] { @@ -36,6 +56,11 @@ body { .lu { visibility: visible; } + + .lu-blocker { + visibility: visible; + opacity: 1; + } } &[data-state=ready] { From 7fc5e305cda9bc35a4502ea51e9b00b97d636071 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:32:31 +0100 Subject: [PATCH 047/116] update dependencies --- package.json | 24 +++++++++++----------- src/data/world-happiness-report/index.ts | 26 +++++++++++++----------- "src/data/\303\271tils.ts" | 6 +++++- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index ae8af24..3cfbc95 100644 --- a/package.json +++ b/package.json @@ -37,46 +37,46 @@ "dist": "mkdirp dist && cd build && tar cvzf ../dist/lineup_app.tar.gz --exclude \"docs\" * && cd .." }, "devDependencies": { - "cache-loader": "^1.2.2", - "css-loader": "^1.0.0", + "cache-loader": "^1.2.5", + "css-loader": "^1.0.1", "extract-loader": "^3.0.0", "file-loader": "^2.0.0", - "fork-ts-checker-webpack-plugin": "^0.4.12", + "fork-ts-checker-webpack-plugin": "^0.4.15", "html-loader": "^0.5.5", "json-loader": "^0.5.7", "mini-css-extract-plugin": "^0.4.4", "mkdirp": "^0.5.1", - "node-sass": "^4.9.4", + "node-sass": "^4.10.0", "raw-loader": "^1.0.0-beta.0", "rimraf": "^2.6.2", "sass-loader": "^7.1.0", "style-loader": "^0.23.1", - "stylelint": "^9.6.0", + "stylelint": "^9.8.0", "stylelint-config-standard": "^18.2.0", - "stylelint-scss": "^3.3.2", + "stylelint-scss": "^3.4.0", "thread-loader": "^1.2.0", "ts-jest": "^23.10.4", - "ts-loader": "^5.2.2", + "ts-loader": "^5.3.0", "tslint": "^5.11.0", - "tslint-consistent-codestyle": "^1.13.3", + "tslint-consistent-codestyle": "^1.14.1", "tslint-eslint-rules": "^5.4.0", "typedoc": "^0.13.0", - "typescript": "^3.1.3", + "typescript": "^3.1.6", "url-loader": "^1.1.2", - "webpack": "^4.23.1", + "webpack": "^4.25.1", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.10", "workbox-webpack-plugin": "^3.6.3" }, "dependencies": { "@types/materialize-css": "^1.0.5", - "@types/papaparse": "^4.5.4", + "@types/papaparse": "^4.5.5", "dexie": "^2.0.4", "font-awesome": "^4.7.0", "lineupjs": "^4.0.0-alpha.7", "material-design-icons": "^3.0.1", "materialize-css": "^1.0.0", - "papaparse": "^4.6.1", + "papaparse": "^4.6.2", "typeface-roboto": "0.0.54" } } diff --git a/src/data/world-happiness-report/index.ts b/src/data/world-happiness-report/index.ts index 6f26b8f..3c98eb0 100644 --- a/src/data/world-happiness-report/index.ts +++ b/src/data/world-happiness-report/index.ts @@ -2,6 +2,7 @@ import {IDataset, PRELOADED_TYPE} from '../IDataset'; import {parse, ParseResult} from 'papaparse'; import {builder, buildRanking, buildStringColumn, buildNumberColumn} from 'lineupjs'; import image from './happiness.png'; +import {normalize} from '../ùtils'; export const data: IDataset = { id: 'happiness', @@ -46,28 +47,29 @@ export const data: IDataset = { return import('raw-loader!./2017.csv').then((content: any) => { const csv: string = content.default ? content.default : content; this.rawData = csv; - return parse(csv, { + return parse(csv, { dynamicTyping: true, header: true, - skipEmptyLines: true + skipEmptyLines: true, + transformHeader: normalize }); }).then((parsed: ParseResult) => { // "Country","Happiness.Rank","Happiness.Score","Whisker.high","Whisker.low","Economy..GDP.per.Capita.","Family","Health..Life.Expectancy.","Freedom","Generosity","Trust..Government.Corruption.","Dystopia.Residual" return builder(parsed.data) - .column(buildStringColumn('Country')) - .column(buildNumberColumn('Happiness.Score', [0, 10])) - .column(buildNumberColumn('Economy..GDP.per.Capita.', [0, 10])) - .column(buildNumberColumn('Family', [0, 10])) - .column(buildNumberColumn('Health..Life.Expectancy.', [0, 10])) - .column(buildNumberColumn('Freedom', [0, 10])) - .column(buildNumberColumn('Generosity', [0, 10])) - .column(buildNumberColumn('Trust..Government.Corruption.', [0, 10])) - .column(buildNumberColumn('Dystopia.Residual', [0, 10])) + .column(buildStringColumn('country')) + .column(buildNumberColumn('happiness_score', [0, 10])) + .column(buildNumberColumn('economy_gdp_per_capita.', [0, 10])) + .column(buildNumberColumn('family', [0, 10])) + .column(buildNumberColumn('health_life_expectancy', [0, 10])) + .column(buildNumberColumn('freedom', [0, 10])) + .column(buildNumberColumn('generosity', [0, 10])) + .column(buildNumberColumn('trust_government_corruption', [0, 10])) + .column(buildNumberColumn('dystopia_residual', [0, 10])) .deriveColors() .ranking(buildRanking() .supportTypes() .allColumns() - .sortBy('Happiness.Score', 'desc') + .sortBy('happiness_score', 'desc') ) .buildTaggle(node); }); diff --git "a/src/data/\303\271tils.ts" "b/src/data/\303\271tils.ts" index 0d86750..61f3739 100644 --- "a/src/data/\303\271tils.ts" +++ "b/src/data/\303\271tils.ts" @@ -3,6 +3,10 @@ export function randomChars(count: number) { return Math.random().toString(36).slice(-8).substr(0, count); } +export function normalize(name: string) { + return name.toLowerCase().replace(/[\s@;./\\:_+~"#'!$§%&()[\]{}?`´]+/g, '_'); +} + export function cleanName(name: string) { - return `${name.toLowerCase().replace(/[\s@;./\\:_+~"#'!$§%&()[\]{}?`´]+/g, '-')}-${randomChars(3)}`; + return `${normalize(name)}-${randomChars(3)}`; } From 930949d9b2b86f3a0085464978aa6514ab18de68 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:48:58 +0100 Subject: [PATCH 048/116] normalize headers upon csv upload --- package-lock.json | 1207 +++++++++------------- src/data/loader_csv.ts | 4 +- src/data/world-happiness-report/index.ts | 41 +- "src/data/\303\271tils.ts" | 12 + 4 files changed, 547 insertions(+), 717 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce74f18..f32b571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,21 +14,21 @@ } }, "@babel/core": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.2.tgz", - "integrity": "sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz", + "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.2", - "@babel/helpers": "^7.1.2", - "@babel/parser": "^7.1.2", + "@babel/generator": "^7.1.6", + "@babel/helpers": "^7.1.5", + "@babel/parser": "^7.1.6", "@babel/template": "^7.1.2", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.1.2", + "@babel/traverse": "^7.1.6", + "@babel/types": "^7.1.6", "convert-source-map": "^1.1.0", - "debug": "^3.1.0", - "json5": "^0.5.0", + "debug": "^4.1.0", + "json5": "^2.1.0", "lodash": "^4.17.10", "resolve": "^1.3.2", "semver": "^5.4.1", @@ -36,14 +36,29 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", + "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", "dev": true, "requires": { "ms": "^2.1.1" } }, + "json5": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", + "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -53,12 +68,12 @@ } }, "@babel/generator": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz", - "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz", + "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==", "dev": true, "requires": { - "@babel/types": "^7.1.3", + "@babel/types": "^7.1.6", "jsesc": "^2.5.1", "lodash": "^4.17.10", "source-map": "^0.5.0", @@ -66,9 +81,9 @@ }, "dependencies": { "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true } } @@ -103,14 +118,14 @@ } }, "@babel/helpers": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.2.tgz", - "integrity": "sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==", + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz", + "integrity": "sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==", "dev": true, "requires": { "@babel/template": "^7.1.2", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.1.2" + "@babel/traverse": "^7.1.5", + "@babel/types": "^7.1.5" } }, "@babel/highlight": { @@ -162,9 +177,9 @@ } }, "@babel/parser": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz", - "integrity": "sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz", + "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==", "dev": true }, "@babel/template": { @@ -179,26 +194,26 @@ } }, "@babel/traverse": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz", - "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz", + "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.3", + "@babel/generator": "^7.1.6", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.1.3", - "@babel/types": "^7.1.3", - "debug": "^3.1.0", + "@babel/parser": "^7.1.6", + "@babel/types": "^7.1.6", + "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.10" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", + "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", "dev": true, "requires": { "ms": "^2.1.1" @@ -213,9 +228,9 @@ } }, "@babel/types": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz", - "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz", + "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -224,24 +239,41 @@ } }, "@fimbul/bifrost": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@fimbul/bifrost/-/bifrost-0.11.0.tgz", - "integrity": "sha512-GspMaQafpaUoXWWOUgNLQ4vsV52tIHUt0zpKPeJUYEyMvOSp7FIcZ1eQa7SK3GTusrEiksjMrDX/fwanigC3nQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@fimbul/bifrost/-/bifrost-0.15.0.tgz", + "integrity": "sha512-sHTwnwA9YhxcVEJkBlfKH1KLmGQGnNYPxk+09w5NnkXelYiiP8a5f351weYfxG0CUPLt1Fgkha20Y/9+jhjn/Q==", "dev": true, "requires": { - "@fimbul/ymir": "^0.11.0", - "get-caller-file": "^1.0.2", + "@fimbul/ymir": "^0.15.0", + "get-caller-file": "^2.0.0", "tslib": "^1.8.1", - "tsutils": "^2.24.0" + "tsutils": "^3.1.0" + }, + "dependencies": { + "get-caller-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.0.tgz", + "integrity": "sha512-cF41L/f/7nXpSwMMHMY0FIurpTPZq/eHwJdeh2+0kKYhL9eD7RqsgMujd3qdqvWdjGIHjwvd/iEMTNECl2EhzA==", + "dev": true + }, + "tsutils": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.5.0.tgz", + "integrity": "sha512-/FZ+pEJQixWruFejFxNPRSwg+iF6aw7PYZVRqUscJ7EnzV3zieI8byfZziUR7QjCuJFulq8SEe9JcGflO4ze4Q==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } } }, "@fimbul/ymir": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@fimbul/ymir/-/ymir-0.11.0.tgz", - "integrity": "sha512-aIYQMCWbBXe7DIofgu+4DLCPDCfqbKhPjBg4ajskJdq6CAJgySz6KyhGLNnKiDYZMF93ZsaEB/y3SafyMi98Mg==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@fimbul/ymir/-/ymir-0.15.0.tgz", + "integrity": "sha512-Ow0TfxxQ65vIktHcZyXHeDsGKuzJ9Vt6y77R/aOrXQXLMdYHG+XdbiUWzQbtaGOmNzYVkQfINiFnIdvn5Bn24g==", "dev": true, "requires": { - "inversify": "^4.10.0", + "inversify": "^5.0.0", "reflect-metadata": "^0.1.12", "tslib": "^1.8.1" } @@ -257,9 +289,9 @@ } }, "@nodelib/fs.stat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz", - "integrity": "sha512-yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", + "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, "@types/cash": { @@ -351,9 +383,9 @@ "integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ==" }, "@types/papaparse": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-4.5.4.tgz", - "integrity": "sha512-Zpgl4HpeiKAs3i1gIsHJZrH6zhS7OLI8JAbkl0vjno08glm9uJ78m4KvqOBz1OsfoO+jQWj4d6g9ET9l1d7bgw==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-4.5.5.tgz", + "integrity": "sha512-ZUZ66cCRqq6WudXx9m6x6InJ022VTvAHp3ENHt/xtcRzaUkaL3/bjxrcExWNkNy5AvNmTEnvyCihWM7i/vblrA==", "requires": { "@types/node": "*" } @@ -374,174 +406,174 @@ "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==" }, "@webassemblyjs/ast": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.10.tgz", - "integrity": "sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz", + "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.7.10", - "@webassemblyjs/helper-wasm-bytecode": "1.7.10", - "@webassemblyjs/wast-parser": "1.7.10" + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz", - "integrity": "sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz", + "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz", - "integrity": "sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz", + "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz", - "integrity": "sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz", + "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==", "dev": true }, "@webassemblyjs/helper-code-frame": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz", - "integrity": "sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz", + "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.7.10" + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/helper-fsm": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz", - "integrity": "sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz", + "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz", - "integrity": "sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz", + "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==", "dev": true }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz", - "integrity": "sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz", + "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz", - "integrity": "sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz", + "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-buffer": "1.7.10", - "@webassemblyjs/helper-wasm-bytecode": "1.7.10", - "@webassemblyjs/wasm-gen": "1.7.10" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11" } }, "@webassemblyjs/ieee754": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz", - "integrity": "sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz", + "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.10.tgz", - "integrity": "sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz", + "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==", "dev": true, "requires": { "@xtuc/long": "4.2.1" } }, "@webassemblyjs/utf8": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.10.tgz", - "integrity": "sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz", + "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz", - "integrity": "sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz", + "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-buffer": "1.7.10", - "@webassemblyjs/helper-wasm-bytecode": "1.7.10", - "@webassemblyjs/helper-wasm-section": "1.7.10", - "@webassemblyjs/wasm-gen": "1.7.10", - "@webassemblyjs/wasm-opt": "1.7.10", - "@webassemblyjs/wasm-parser": "1.7.10", - "@webassemblyjs/wast-printer": "1.7.10" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/helper-wasm-section": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-opt": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/wasm-gen": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz", - "integrity": "sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz", + "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-wasm-bytecode": "1.7.10", - "@webassemblyjs/ieee754": "1.7.10", - "@webassemblyjs/leb128": "1.7.10", - "@webassemblyjs/utf8": "1.7.10" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wasm-opt": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz", - "integrity": "sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz", + "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-buffer": "1.7.10", - "@webassemblyjs/wasm-gen": "1.7.10", - "@webassemblyjs/wasm-parser": "1.7.10" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11" } }, "@webassemblyjs/wasm-parser": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz", - "integrity": "sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz", + "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-api-error": "1.7.10", - "@webassemblyjs/helper-wasm-bytecode": "1.7.10", - "@webassemblyjs/ieee754": "1.7.10", - "@webassemblyjs/leb128": "1.7.10", - "@webassemblyjs/utf8": "1.7.10" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wast-parser": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz", - "integrity": "sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz", + "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/floating-point-hex-parser": "1.7.10", - "@webassemblyjs/helper-api-error": "1.7.10", - "@webassemblyjs/helper-code-frame": "1.7.10", - "@webassemblyjs/helper-fsm": "1.7.10", + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/floating-point-hex-parser": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-code-frame": "1.7.11", + "@webassemblyjs/helper-fsm": "1.7.11", "@xtuc/long": "4.2.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz", - "integrity": "sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==", + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz", + "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/wast-parser": "1.7.10", + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11", "@xtuc/long": "4.2.1" } }, @@ -771,7 +803,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1067,9 +1099,9 @@ } }, "bluebird": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", - "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", + "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", "dev": true }, "bn.js": { @@ -1165,7 +1197,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -1202,7 +1234,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -1235,14 +1267,14 @@ } }, "browserslist": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.3.tgz", - "integrity": "sha512-6h84UD1mmHeuQ9IucX6yzBc+KBYcBBTLYt2CXtY7GYCra6iE5kOm7oM+zuGw/0tjGtbJxjm58OvxSBmogEMCRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz", + "integrity": "sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000898", - "electron-to-chromium": "^1.3.81", - "node-releases": "^1.0.0-alpha.15" + "caniuse-lite": "^1.0.30000899", + "electron-to-chromium": "^1.3.82", + "node-releases": "^1.0.1" } }, "bs-logger": { @@ -1309,7 +1341,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -1354,9 +1386,9 @@ } }, "cache-loader": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.2.tgz", - "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.5.tgz", + "integrity": "sha512-enWKEQ4kO3YreDFd7AtVRjtJBmNiqh/X9hVDReu0C4qm8gsGmySkwuWtdc+N5O+vq5FzxL1mIZc30NyXCB7o/Q==", "dev": true, "requires": { "loader-utils": "^1.1.0", @@ -1371,6 +1403,30 @@ "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=", "dev": true }, + "caller-callsite": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", + "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", + "dev": true, + "requires": { + "callsites": "^2.0.0" + } + }, + "caller-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", + "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", + "dev": true, + "requires": { + "caller-callsite": "^2.0.0" + } + }, + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "dev": true + }, "camel-case": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", @@ -1389,7 +1445,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -1398,9 +1454,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000899", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000899.tgz", - "integrity": "sha512-enC3zKfUCJxxwvUIsBkbHd54CtJw1KtIWvrK0JZxWD/fEN2knHaai45lndJ4xXAkyRAPyk60J3yagkKDWhfeMA==", + "version": "1.0.30000907", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz", + "integrity": "sha512-No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ==", "dev": true }, "caseless": { @@ -1585,12 +1641,6 @@ "is-supported-regexp-flag": "^1.0.0" } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -1796,11 +1846,12 @@ "dev": true }, "cosmiconfig": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz", - "integrity": "sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz", + "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==", "dev": true, "requires": { + "import-fresh": "^2.0.0", "is-directory": "^0.3.1", "js-yaml": "^3.9.0", "parse-json": "^4.0.0" @@ -1846,7 +1897,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -1859,7 +1910,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -1901,16 +1952,16 @@ } }, "css-loader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.0.tgz", - "integrity": "sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz", + "integrity": "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==", "dev": true, "requires": { "babel-code-frame": "^6.26.0", "css-selector-tokenizer": "^0.7.0", "icss-utils": "^2.1.0", "loader-utils": "^1.0.2", - "lodash.camelcase": "^4.3.0", + "lodash": "^4.17.11", "postcss": "^6.0.23", "postcss-modules-extract-imports": "^1.2.0", "postcss-modules-local-by-default": "^1.2.0", @@ -1921,9 +1972,9 @@ } }, "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", + "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", "dev": true, "requires": { "cssesc": "^0.1.0", @@ -2055,37 +2106,6 @@ } } }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - }, - "dependencies": { - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2139,7 +2159,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -2236,7 +2256,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", "dev": true } @@ -2250,7 +2270,7 @@ }, "domelementtype": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", "dev": true }, @@ -2311,9 +2331,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.82", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz", - "integrity": "sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==", + "version": "1.3.84", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz", + "integrity": "sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw==", "dev": true }, "elliptic": { @@ -2460,7 +2480,7 @@ }, "events": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, @@ -2557,55 +2577,13 @@ } } }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "fill-range": "^2.1.0" - }, - "dependencies": { - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } + "homedir-polyfill": "^1.0.1" } }, "express": { @@ -2782,16 +2760,16 @@ "dev": true }, "fast-glob": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz", - "integrity": "sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.4.tgz", + "integrity": "sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g==", "dev": true, "requires": { "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", + "@nodelib/fs.stat": "^1.1.2", "glob-parent": "^3.1.0", "is-glob": "^4.0.0", - "merge2": "^1.2.1", + "merge2": "^1.2.3", "micromatch": "^3.1.10" } }, @@ -2849,12 +2827,6 @@ } } }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -2915,14 +2887,14 @@ } }, "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", + "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", "dev": true, "requires": { "circular-json": "^0.3.1", - "del": "^2.0.2", "graceful-fs": "^4.1.2", + "rimraf": "~2.6.2", "write": "^0.2.1" } }, @@ -2983,18 +2955,16 @@ "dev": true }, "fork-ts-checker-webpack-plugin": { - "version": "0.4.12", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.12.tgz", - "integrity": "sha512-XoeNFO2Blc+6pkiIct74w+6gWa6VRcBmBsWKMDZ94XVLt8AnrcZcRSUTeEggIkhNa6sN3KDEwYbGXQ4Z3RBbKg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.15.tgz", + "integrity": "sha512-qNYuygh2GxXehBvQZ5rI5YlQFn+7ZV6kmkyD9Sgs33dWl73NZdUOB5aCp8v0EXJn176AhPrZP8YCMT3h01fs+g==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", "chalk": "^2.4.1", "chokidar": "^2.0.4", - "lodash.endswith": "^4.2.1", - "lodash.isfunction": "^3.0.8", - "lodash.isstring": "^4.0.1", - "lodash.startswith": "^4.2.1", + "lodash": "^4.17.11", + "micromatch": "^3.1.10", "minimatch": "^3.0.4", "resolve": "^1.5.0", "tapable": "^1.0.0" @@ -3721,42 +3691,6 @@ "path-is-absolute": "^1.0.0" } }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -3784,21 +3718,45 @@ "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", "dev": true }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, "global-modules-path": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.0.tgz", "integrity": "sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==", "dev": true }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "dev": true, + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, "globals": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", - "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==", + "version": "11.9.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz", + "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==", "dev": true }, "globby": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "resolved": "http://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "dev": true, "requires": { @@ -3822,6 +3780,12 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true } } }, @@ -3898,25 +3862,46 @@ "dev": true }, "har-validator": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", - "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "dev": true, "requires": { - "ajv": "^5.3.0", + "ajv": "^6.5.5", "har-schema": "^2.0.0" }, "dependencies": { "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz", + "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", + "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "requires": { + "punycode": "^2.1.0" } } } @@ -4023,6 +4008,15 @@ "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, + "homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dev": true, + "requires": { + "parse-passwd": "^1.0.0" + } + }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -4233,11 +4227,29 @@ "dev": true }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz", + "integrity": "sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==", "dev": true }, + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "dev": true, + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } + } + }, "import-lazy": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz", @@ -4363,6 +4375,12 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, "internal-ip": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", @@ -4380,9 +4398,9 @@ "dev": true }, "inversify": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-4.13.0.tgz", - "integrity": "sha512-O5d8y7gKtyRwrvTLZzYET3kdFjqUy58sGpBYMARF13mzqDobpfBXVOPLH7HmnD2VR6Q+1HzZtslGvsdQfeb0SA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz", + "integrity": "sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ==", "dev": true }, "invert-kv": { @@ -4474,7 +4492,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -4532,21 +4550,6 @@ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", "dev": true }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -4657,18 +4660,6 @@ "isobject": "^3.0.1" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, "is-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", @@ -4797,7 +4788,7 @@ }, "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4892,9 +4883,9 @@ "dev": true }, "known-css-properties": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.8.0.tgz", - "integrity": "sha512-pku5zscbIr9YsA6lFU1nhFGSAXsdJtEQ2WilCL40d0YCoDofBlNohMUq32wyt7tpiiaZ09GKyLZFrB1ijx6+WA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.9.0.tgz", + "integrity": "sha512-2G/A/8XPhH6MmuVgl079wYsgdqfXE3cfm62txk/ajS4wvRWo6tEHcgQCJCHOOy12Fse1Sxlbf7/IJBpR9hnVew==", "dev": true }, "lcid": { @@ -4930,7 +4921,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -4994,12 +4985,6 @@ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -5012,36 +4997,12 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "lodash.endswith": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz", - "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=", - "dev": true - }, - "lodash.isfunction": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", - "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", "dev": true }, - "lodash.startswith": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz", - "integrity": "sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=", - "dev": true - }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", @@ -5226,12 +5187,6 @@ "resolved": "https://registry.npmjs.org/materialize-css/-/materialize-css-1.0.0.tgz", "integrity": "sha512-4/oecXl8y/1i8RDZvyvwAICyqwNoKU4or5uf8uoAd74k76KzZ0Llym4zhJ5lLNUskcqjO0AuMcvNyDkpz8Z6zw==" }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, "mathml-tag-names": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz", @@ -5287,7 +5242,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -5305,7 +5260,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -5630,7 +5585,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true } @@ -5676,18 +5631,18 @@ } }, "node-releases": { - "version": "1.0.0-alpha.15", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.15.tgz", - "integrity": "sha512-hKG6hd/g6a9OV/ARt2qrxbRhe/4WEMFohTLOB9PNyTYvvI59gICZFzt9/mMgpYUTts06qXlN8H6UjfbIRdnW8A==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.3.tgz", + "integrity": "sha512-ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw==", "dev": true, "requires": { "semver": "^5.3.0" } }, "node-sass": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.4.tgz", - "integrity": "sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz", + "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -5838,27 +5793,6 @@ "isobject": "^3.0.0" } }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - } - } - }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", @@ -5934,13 +5868,13 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { @@ -5949,7 +5883,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -6018,9 +5952,9 @@ "dev": true }, "papaparse": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-4.6.1.tgz", - "integrity": "sha512-X9Ws5tnEQKRCZRfoojX3KvRZbLY1BbL0wqSHF3CKGmxD8Zr4E0WaipUuFweffkCN8RSQzHKhb/F+ATYdNcz1rg==" + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-4.6.2.tgz", + "integrity": "sha512-P/4p6S6wZyXAjcFPnJAjFn7lxMIkd+23prFELhcbfWswQfg7dG1XJfV8/lKvk5lu5BGSSJZFHSDMejjFcB1feg==" }, "parallel-transform": { "version": "1.1.0", @@ -6044,7 +5978,7 @@ }, "parse-asn1": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { @@ -6069,35 +6003,6 @@ "is-hexadecimal": "^1.0.0" } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -6107,6 +6012,12 @@ "error-ex": "^1.2.0" } }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true + }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -6202,7 +6113,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -6329,49 +6240,68 @@ } }, "postcss-jsx": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.34.0.tgz", - "integrity": "sha512-UJISlEGWH/LeMYudAwq9GeqfyPW9AeRq87GHOlbquxOIakKr0Aqu6l9Cx0Fg20f3A9bKJcX1NGX4/xzIs7PlZQ==", + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.35.0.tgz", + "integrity": "sha512-AU2/9QDmHYJRxTiniMt2bJ9fwCzVF6n00VnR4gdnFGHeXRW2mGwoptpuPgYjfivkdI8LlNIuo+w8TyS6a4JhJw==", "dev": true, "requires": { - "@babel/core": "^7.0.0", + "@babel/core": "^7.1.2", "postcss-styled": ">=0.34.0" } }, "postcss-less": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-2.0.0.tgz", - "integrity": "sha512-pPNsVnpCB13nBMOcl5GVh8JGmB0JGFjqkLUDzKdVpptFFKEe9wFdEzvh2j4lD2AD+7qcrUfw9Ta+oi5+Fw7jjQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.0.2.tgz", + "integrity": "sha512-+JBOampmDnuaf4w8OIEqkCiF+sOm/nWukDsC+1FTrYcIstptOISzGpYZk24Qh+Ewlmzmi53sRyiTbiGvMCDRwA==", "dev": true, "requires": { - "postcss": "^5.2.16" + "postcss": "^7.0.3" }, "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } }, "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz", + "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==", "dev": true, "requires": { - "chalk": "^1.1.3", - "js-base64": "^2.1.9", - "source-map": "^0.5.6", - "supports-color": "^3.2.3" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.5.0" } }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "^3.0.0" } } } @@ -6393,9 +6323,9 @@ "dev": true }, "postcss-modules-extract-imports": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz", - "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz", + "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==", "dev": true, "requires": { "postcss": "^6.0.1" @@ -6555,9 +6485,9 @@ } }, "postcss-sass": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.3.tgz", - "integrity": "sha512-uoRhfwZJHDRI8p2KQniTx4UwzYwKgQUhmFNJ7aysL3+tgFUfmv5TPX8UPnlE5gfrq6KHUUwPJ/nISFtzwxr7iQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.5.tgz", + "integrity": "sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==", "dev": true, "requires": { "gonzales-pe": "^4.2.3", @@ -6698,12 +6628,6 @@ "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", "dev": true }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, "pretty-bytes": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz", @@ -6839,25 +6763,6 @@ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", "dev": true }, - "randomatic": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", - "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", - "dev": true, - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - } - } - }, "randombytes": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", @@ -7004,15 +6909,6 @@ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", @@ -7036,7 +6932,7 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, @@ -7216,6 +7112,16 @@ } } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "dev": true, + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -7318,9 +7224,9 @@ } }, "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", "dev": true, "requires": { "ajv": "^6.1.0", @@ -7339,7 +7245,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -7474,7 +7380,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -7534,9 +7440,9 @@ "dev": true }, "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, "slice-ansi": { @@ -7771,9 +7677,9 @@ } }, "spdx-license-ids": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz", - "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz", + "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==", "dev": true }, "spdy": { @@ -7827,9 +7733,9 @@ "dev": true }, "sshpk": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz", - "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", + "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", "dev": true, "requires": { "asn1": "~0.2.3", @@ -8049,9 +7955,9 @@ "dev": true }, "stylelint": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.6.0.tgz", - "integrity": "sha512-Q0UcbFPRiC+3FejNyIBAWbMuKwZNAC0kvZtGQbjwA9LMKDod6xMlBsiIigQxmE3ywpmTeFj3mkG5Jj36EfC7XA==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.8.0.tgz", + "integrity": "sha512-qYYgP9UnZ6S4uaXrfEGPIMeNv21gP4t3E7BtnYfJIiHKvz7AbrCP0vj1wPgD6OFyxLT5txQxtoznfSkm2vsUkQ==", "dev": true, "requires": { "autoprefixer": "^9.0.0", @@ -8062,31 +7968,32 @@ "execall": "^1.0.0", "file-entry-cache": "^2.0.0", "get-stdin": "^6.0.0", + "global-modules": "^1.0.0", "globby": "^8.0.0", "globjoin": "^0.1.4", "html-tags": "^2.0.0", - "ignore": "^4.0.0", + "ignore": "^5.0.4", "import-lazy": "^3.1.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.8.0", + "known-css-properties": "^0.9.0", "leven": "^2.1.0", "lodash": "^4.17.4", "log-symbols": "^2.0.0", "mathml-tag-names": "^2.0.1", "meow": "^5.0.0", - "micromatch": "^2.3.11", + "micromatch": "^3.1.10", "normalize-selector": "^0.2.0", "pify": "^4.0.0", "postcss": "^7.0.0", "postcss-html": "^0.34.0", - "postcss-jsx": "^0.34.0", - "postcss-less": "^2.0.0", + "postcss-jsx": "^0.35.0", + "postcss-less": "^3.0.1", "postcss-markdown": "^0.34.0", "postcss-media-query-parser": "^0.2.3", "postcss-reporter": "^6.0.0", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^4.0.0", - "postcss-sass": "^0.3.0", + "postcss-sass": "^0.3.5", "postcss-scss": "^2.0.0", "postcss-selector-parser": "^3.1.0", "postcss-styled": "^0.34.0", @@ -8094,6 +8001,7 @@ "postcss-value-parser": "^3.3.0", "resolve-from": "^4.0.0", "signal-exit": "^3.0.2", + "slash": "^2.0.0", "specificity": "^0.4.1", "string-width": "^2.1.0", "style-search": "^0.1.0", @@ -8117,32 +8025,6 @@ "color-convert": "^1.9.0" } }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, "camelcase": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", @@ -8180,24 +8062,6 @@ "ms": "^2.1.1" } }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -8219,36 +8083,12 @@ "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", "dev": true }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, "load-json-file": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", @@ -8292,27 +8132,6 @@ "yargs-parser": "^10.0.0" } }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -8473,16 +8292,16 @@ } }, "stylelint-scss": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.3.2.tgz", - "integrity": "sha512-0x+nD1heoMJYOfi3FfGcz3Hrwhcm+Qyq+BuvoBv5v9xrZZ1aziRXQauuhjwb87gWAa9MBzxhfUqBnvTUrHlLjA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.4.0.tgz", + "integrity": "sha512-sM1bsOrbmR35N1ZAg+7uLVI+n2QHqOVMZPRiAIyiOa1ITBrg0hajBH/i1F/ZxbsBUWLAeSq/NREwPw1+xF9exQ==", "dev": true, "requires": { - "lodash": "^4.17.10", + "lodash": "^4.17.11", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-selector-parser": "^4.0.0", - "postcss-value-parser": "^3.3.0" + "postcss-value-parser": "^3.3.1" }, "dependencies": { "cssesc": { @@ -8586,9 +8405,9 @@ }, "dependencies": { "ajv": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz", - "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz", + "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -8659,7 +8478,7 @@ }, "tar": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { @@ -8686,12 +8505,12 @@ "dev": true }, "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "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.1.5", + "readable-stream": "~2.3.6", "xtend": "~4.0.1" } }, @@ -8879,9 +8698,9 @@ } }, "ts-loader": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.2.2.tgz", - "integrity": "sha512-vM/TrEKXBqRYq5yLatsXyKFnYSpv53klmGtrILGlNqcMsxPVi8+e4yr1Agbu9oMZepx/4szDVn5QpFo83IQdQg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.0.tgz", + "integrity": "sha512-lGSNs7szRFj/rK9T1EQuayE3QNLg6izDUxt5jpmq0RG1rU2bapAt7E7uLckLCUPeO1jwxCiet2oRaWovc53UAg==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -8986,14 +8805,14 @@ } }, "tslint-consistent-codestyle": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.13.3.tgz", - "integrity": "sha512-+ocXSNGHqUCUyTJsPhS7xqcC3qf6FyP4vd1jEaXaWaJ5NNN36gKZhqNt3nAWH/YgSV0tYaapjSWMbJQJmn/5MQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.14.1.tgz", + "integrity": "sha512-UxGRX2fF5LpZtqYpuPFaIva+2D7ASX3pTVw41yis6Hmw7PPA3cBnFEX1jqRsnyxGrca6mHxz7xDnwCHtOjWJMQ==", "dev": true, "requires": { - "@fimbul/bifrost": "^0.11.0", + "@fimbul/bifrost": "^0.15.0", "tslib": "^1.7.1", - "tsutils": "^2.27.0" + "tsutils": "^2.29.0" } }, "tslint-eslint-rules": { @@ -9107,9 +8926,9 @@ "integrity": "sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ==" }, "typescript": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz", - "integrity": "sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", + "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==", "dev": true }, "uglify-js": { @@ -9564,15 +9383,15 @@ } }, "webpack": { - "version": "4.23.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.23.1.tgz", - "integrity": "sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==", + "version": "4.25.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.25.1.tgz", + "integrity": "sha512-T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.7.10", - "@webassemblyjs/helper-module-context": "1.7.10", - "@webassemblyjs/wasm-edit": "1.7.10", - "@webassemblyjs/wasm-parser": "1.7.10", + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/wasm-edit": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", "acorn": "^5.6.2", "acorn-dynamic-import": "^3.0.0", "ajv": "^6.1.0", diff --git a/src/data/loader_csv.ts b/src/data/loader_csv.ts index 4d1f758..01c6040 100644 --- a/src/data/loader_csv.ts +++ b/src/data/loader_csv.ts @@ -1,7 +1,7 @@ import {parse, ParseResult} from 'papaparse'; import {IDataLoader, IDatasetMeta, IDataset} from './IDataset'; import {builder, Taggle, LineUp} from 'lineupjs'; -import {cleanName} from './ùtils'; +import {cleanName, fixHeaders} from './ùtils'; import {niceDate} from '../ui'; function buildScript(rawVariable: string, domVariable: string) { @@ -28,7 +28,7 @@ export const CSV_LOADER: IDataLoader = { return new Promise<{raw: string, parsed: ParseResult}>((resolve) => { const reader = new FileReader(); reader.onload = () => { - const raw = String(reader.result); + const raw = fixHeaders(String(reader.result)); const parsed = parse(raw, { dynamicTyping: true, header: true, diff --git a/src/data/world-happiness-report/index.ts b/src/data/world-happiness-report/index.ts index 3c98eb0..39f48c1 100644 --- a/src/data/world-happiness-report/index.ts +++ b/src/data/world-happiness-report/index.ts @@ -2,7 +2,7 @@ import {IDataset, PRELOADED_TYPE} from '../IDataset'; import {parse, ParseResult} from 'papaparse'; import {builder, buildRanking, buildStringColumn, buildNumberColumn} from 'lineupjs'; import image from './happiness.png'; -import {normalize} from '../ùtils'; +import {normalize, fixHeaders} from '../ùtils'; export const data: IDataset = { id: 'happiness', @@ -26,19 +26,19 @@ export const data: IDataset = { const lineup = LineUpJS.builder(parsed.data) .column(LineUpJS.buildStringColumn('Country')) - .column(LineUpJS.buildNumberColumn('Happiness.Score', [0, 10])) - .column(LineUpJS.buildNumberColumn('Economy..GDP.per.Capita.', [0, 10])) + .column(LineUpJS.buildNumberColumn('Happiness_Score', [0, 10])) + .column(LineUpJS.buildNumberColumn('Economy_GDP_per_Capita_', [0, 10])) .column(LineUpJS.buildNumberColumn('Family', [0, 10])) - .column(LineUpJS.buildNumberColumn('Health..Life.Expectancy.', [0, 10])) + .column(LineUpJS.buildNumberColumn('Health_Life_Expectancy_', [0, 10])) .column(LineUpJS.buildNumberColumn('Freedom', [0, 10])) .column(LineUpJS.buildNumberColumn('Generosity', [0, 10])) - .column(LineUpJS.buildNumberColumn('Trust..Government.Corruption.', [0, 10])) - .column(LineUpJS.buildNumberColumn('Dystopia.Residual', [0, 10])) + .column(LineUpJS.buildNumberColumn('Trust_Government_Corruption_', [0, 10])) + .column(LineUpJS.buildNumberColumn('Dystopia_Residual', [0, 10])) .deriveColors() .ranking(LineUpJS.buildRanking() .supportTypes() .allColumns() - .sortBy('Happiness.Score', 'desc') + .sortBy('Happiness_Score', 'desc') ) .buildTaggle(${domVariable}); `; @@ -46,30 +46,29 @@ export const data: IDataset = { build(node: HTMLElement) { return import('raw-loader!./2017.csv').then((content: any) => { const csv: string = content.default ? content.default : content; - this.rawData = csv; - return parse(csv, { + this.rawData = fixHeaders(csv); + return parse(this.rawData, { dynamicTyping: true, header: true, - skipEmptyLines: true, - transformHeader: normalize + skipEmptyLines: true }); }).then((parsed: ParseResult) => { // "Country","Happiness.Rank","Happiness.Score","Whisker.high","Whisker.low","Economy..GDP.per.Capita.","Family","Health..Life.Expectancy.","Freedom","Generosity","Trust..Government.Corruption.","Dystopia.Residual" return builder(parsed.data) - .column(buildStringColumn('country')) - .column(buildNumberColumn('happiness_score', [0, 10])) - .column(buildNumberColumn('economy_gdp_per_capita.', [0, 10])) - .column(buildNumberColumn('family', [0, 10])) - .column(buildNumberColumn('health_life_expectancy', [0, 10])) - .column(buildNumberColumn('freedom', [0, 10])) - .column(buildNumberColumn('generosity', [0, 10])) - .column(buildNumberColumn('trust_government_corruption', [0, 10])) - .column(buildNumberColumn('dystopia_residual', [0, 10])) + .column(buildStringColumn('Country')) + .column(buildNumberColumn('Happiness_Score', [0, 10])) + .column(buildNumberColumn('Economy_GDP_per_Capita_', [0, 10])) + .column(buildNumberColumn('Family', [0, 10])) + .column(buildNumberColumn('Health_Life_Expectancy_', [0, 10])) + .column(buildNumberColumn('Freedom', [0, 10])) + .column(buildNumberColumn('Generosity', [0, 10])) + .column(buildNumberColumn('Trust_Government_Corruption_', [0, 10])) + .column(buildNumberColumn('Dystopia_Residual', [0, 10])) .deriveColors() .ranking(buildRanking() .supportTypes() .allColumns() - .sortBy('happiness_score', 'desc') + .sortBy('Happiness_Score', 'desc') ) .buildTaggle(node); }); diff --git "a/src/data/\303\271tils.ts" "b/src/data/\303\271tils.ts" index 61f3739..e774dca 100644 --- "a/src/data/\303\271tils.ts" +++ "b/src/data/\303\271tils.ts" @@ -10,3 +10,15 @@ export function normalize(name: string) { export function cleanName(name: string) { return `${normalize(name)}-${randomChars(3)}`; } + + +export function fixHeaders(csv: string) { + const line = csv.search(/[\n\r]/); + if (line < 0) { + return csv; + } + // don't include ; as common separator and no quote chars + const headers = csv.slice(0, line).replace(/[\s@./\\:_+~#!$§%&()[\]{}?`´]+/g, '_'); + + return `${headers}${csv.slice(line)}`; +} From 6744cf3d10ec6437d37e20932071fd09648e50a7 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:49:39 +0100 Subject: [PATCH 049/116] fix lintng --- src/data/world-happiness-report/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/world-happiness-report/index.ts b/src/data/world-happiness-report/index.ts index 39f48c1..5cab155 100644 --- a/src/data/world-happiness-report/index.ts +++ b/src/data/world-happiness-report/index.ts @@ -2,7 +2,7 @@ import {IDataset, PRELOADED_TYPE} from '../IDataset'; import {parse, ParseResult} from 'papaparse'; import {builder, buildRanking, buildStringColumn, buildNumberColumn} from 'lineupjs'; import image from './happiness.png'; -import {normalize, fixHeaders} from '../ùtils'; +import {fixHeaders} from '../ùtils'; export const data: IDataset = { id: 'happiness', From 2a86fb287e2a8f2089e282ed97e16bbcfe4c1670 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 17:52:09 +0100 Subject: [PATCH 050/116] update lineup version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cfbc95..ad33fb1 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@types/papaparse": "^4.5.5", "dexie": "^2.0.4", "font-awesome": "^4.7.0", - "lineupjs": "^4.0.0-alpha.7", + "lineupjs": "^4.0.0-alpha.8", "material-design-icons": "^3.0.1", "materialize-css": "^1.0.0", "papaparse": "^4.6.2", From 114fe73d8b3b48d02b5d7069b7fc5e27a018e569 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 18:15:09 +0100 Subject: [PATCH 051/116] include dump generated codepen --- src/data/IDataset.ts | 2 +- src/data/forbes-top-2000-companies/index.ts | 43 ++++++------- src/data/ieee-programming/index.ts | 70 +++++++-------------- src/data/loader_csv.ts | 22 ++++--- src/data/loader_json.ts | 14 +++-- src/data/soccer/index.ts | 62 +++++++++--------- src/data/world-happiness-report/index.ts | 45 +++++++------ src/data/wur/index.ts | 48 +++++++------- src/export.ts | 6 +- 9 files changed, 145 insertions(+), 167 deletions(-) diff --git a/src/data/IDataset.ts b/src/data/IDataset.ts index 1e8e743..6118f48 100644 --- a/src/data/IDataset.ts +++ b/src/data/IDataset.ts @@ -25,7 +25,7 @@ export interface ISession { export interface IDataset extends IDatasetMeta { - buildScript(rawVariable: string, domVariable: string): string; + buildScript(rawVariable: string, domVariable: string, dumpVariable: string): string; build(node: HTMLElement): Promise | LineUp | Taggle; diff --git a/src/data/forbes-top-2000-companies/index.ts b/src/data/forbes-top-2000-companies/index.ts index dbb5738..eeddc74 100644 --- a/src/data/forbes-top-2000-companies/index.ts +++ b/src/data/forbes-top-2000-companies/index.ts @@ -15,31 +15,28 @@ export const data: IDataset = { the company size, its market value, sales, profit,etc.

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` - const parsed = Papa.parse(${rawVariable}, { - dynamicTyping: true, - header: true, - skipEmptyLines: true - }); +const parsed = Papa.parse(${rawVariable}, { + dynamicTyping: true, + header: true, + skipEmptyLines: true +}); +const dump = ${dumpVariable}; - const lineup = LineUpJS.builder(parsed.data) - .column(buildStringColumn('Company')) - .column(buildStringColumn('Country')) - .column(buildNumberColumn('Rank')) - .column(buildNumberColumn('Sales')) - .column(buildNumberColumn('Market Value')) - .column(buildNumberColumn('Profits')) - .column(buildNumberColumn('Assets')) - .column(buildCategoricalColumn('Sector')) - .column(buildStringColumn('Industry')) - .deriveColors() - .ranking(buildRanking() - .supportTypes() - .allColumns() - .sortBy('Rank', 'asc') - ) - .buildTaggle(${domVariable}); +const lineup = LineUpJS.builder(parsed.data) + .column(LineUpJS.buildStringColumn('Company')) + .column(LineUpJS.buildStringColumn('Country')) + .column(LineUpJS.buildNumberColumn('Rank')) + .column(LineUpJS.buildNumberColumn('Sales')) + .column(LineUpJS.buildNumberColumn('Market Value')) + .column(LineUpJS.buildNumberColumn('Profits')) + .column(LineUpJS.buildNumberColumn('Assets')) + .column(LineUpJS.buildCategoricalColumn('Sector')) + .column(LineUpJS.buildStringColumn('Industry')) + .deriveColors() + .restore(dump) + .buildTaggle(${domVariable}); `; }, build(node: HTMLElement) { diff --git a/src/data/ieee-programming/index.ts b/src/data/ieee-programming/index.ts index 05b0c8a..78ef372 100644 --- a/src/data/ieee-programming/index.ts +++ b/src/data/ieee-programming/index.ts @@ -17,13 +17,14 @@ export const ieeebars: IDataset = {

Source: IEEE Spectrum

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` const parsed = Papa.parse(${rawVariable}, { dynamicTyping: true, header: true, skipEmptyLines: true }); + const dump = ${dumpVariable}; const years = [2014, 2015, 2016, 2017, 2018]; // 5 years const sources = ['Career Builder', 'Dice', 'Github (active)', 'Github (created)', 'Google Search', 'Google Trends', 'Hacker News', 'IEEE Xplore', 'Reddit (posts)', 'Stack Overflow (?s)', 'Stack Overflow (views)', 'Twitter']; // 12 sources @@ -36,17 +37,17 @@ export const ieeebars: IDataset = { }); // basic data - let dataBuilder = builder(parsed.data) - .column(buildStringColumn('name')) - .column(buildCategoricalColumn('web')) - .column(buildCategoricalColumn('mobile')) - .column(buildCategoricalColumn('enterprise')) - .column(buildCategoricalColumn('embedded')) - .column(buildNumberColumn('NA 2018')); // NA column of 2018 + let dataBuilder = LineUpJS.builder(parsed.data) + .column(LineUpJS.buildStringColumn('name')) + .column(LineUpJS.buildCategoricalColumn('web')) + .column(LineUpJS.buildCategoricalColumn('mobile')) + .column(LineUpJS.buildCategoricalColumn('enterprise')) + .column(LineUpJS.buildCategoricalColumn('embedded')) + .column(LineUpJS.buildNumberColumn('NA 2018')); // NA column of 2018 // source matrices sources.forEach((source) => { - dataBuilder = dataBuilder.column(buildNumberColumn(source).asArray(years.map(String))); + dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(source).asArray(years.map(String))); }); // rankings per year, begin with 2018 @@ -60,21 +61,13 @@ export const ieeebars: IDataset = { // not available in dataset colSpectrumWeights.splice(i, 1); //remove weight } else { - dataBuilder = dataBuilder.column(buildNumberColumn(colName)); //Create a column to use it for the ranking + dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(colName)); //Create a column to use it for the ranking columnNames.push(colName); } }); - - dataBuilder = dataBuilder.ranking( - buildRanking() - .column({ type: 'weightedSum', columns: columnNames, weights: colSpectrumWeights, label: year.toString()}) - .supportTypes() - .column('name') - .sortBy(year.toString(), 'desc') - ); }); - const lineup= dataBuilder.deriveColors().buildTaggle(${domVariable}); + const lineup = dataBuilder.deriveColors().restore(dump).buildTaggle(${domVariable}); `; }, build(node: HTMLElement) { @@ -153,13 +146,14 @@ export const ieeeheat: IDataset = {

Source: IEEE Spectrum

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` const parsed = Papa.parse(${rawVariable}, { dynamicTyping: true, header: true, skipEmptyLines: true }); + const dump = ${dumpVariable}; const years = [2014, 2015, 2016, 2017, 2018]; // 5 years const sources = ['Career Builder', 'Dice', 'Github (active)', 'Github (created)', 'Google Search', 'Google Trends', 'Hacker News', 'IEEE Xplore', 'Reddit (posts)', 'Stack Overflow (?s)', 'Stack Overflow (views)', 'Twitter']; // 12 sources @@ -178,41 +172,25 @@ export const ieeeheat: IDataset = { // basic data - let dataBuilder = builder(parsed.data) - .column(buildStringColumn('name')) - .column(buildCategoricalColumn('web')) - .column(buildCategoricalColumn('mobile')) - .column(buildCategoricalColumn('enterprise')) - .column(buildCategoricalColumn('embedded')) - .column(buildNumberColumn('NA 2018')); // NA column of 2018 + let dataBuilder = LineUpJS.builder(parsed.data) + .column(LineUpJS.buildStringColumn('name')) + .column(LineUpJS.buildCategoricalColumn('web')) + .column(LineUpJS.buildCategoricalColumn('mobile')) + .column(LineUpJS.buildCategoricalColumn('enterprise')) + .column(LineUpJS.buildCategoricalColumn('embedded')) + .column(LineUpJS.buildNumberColumn('NA 2018')); // NA column of 2018 // source matrices sources.forEach((source) => { - dataBuilder = dataBuilder.column(buildNumberColumn(source, [0, NaN]).asArray(years.map(String)); + dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(source, [0, NaN]).asArray(years.map(String)); }); // year matrices years.forEach((year) => { - dataBuilder = dataBuilder.column(buildNumberColumn(year.toString(), [0, NaN]).asArray(sources)); + dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(year.toString(), [0, NaN]).asArray(sources)); }); - dataBuilder = dataBuilder.ranking( - buildRanking() - .supportTypes() - .column('name') - .column('2018') - .sortBy('2018', 'desc') - ); - - dataBuilder = dataBuilder.ranking( - buildRanking() - .supportTypes() - .column('name') - .column('2017').column('2016').column('2015').column('2014') - .sortBy('2017', 'desc') - ); - - const lineup= dataBuilder.deriveColors().buildTaggle(${domVariable}); + const lineup = dataBuilder.deriveColors().restore(dump).buildTaggle(${domVariable}); `; }, build(node: HTMLElement) { diff --git a/src/data/loader_csv.ts b/src/data/loader_csv.ts index 01c6040..af300f6 100644 --- a/src/data/loader_csv.ts +++ b/src/data/loader_csv.ts @@ -4,16 +4,22 @@ import {builder, Taggle, LineUp} from 'lineupjs'; import {cleanName, fixHeaders} from './ùtils'; import {niceDate} from '../ui'; -function buildScript(rawVariable: string, domVariable: string) { +function buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` - const parsed = Papa.parse(${rawVariable}, { - dynamicTyping: true, - header: true, - skipEmptyLines: true - }); +const parsed = Papa.parse(${rawVariable}, { + dynamicTyping: true, + header: true, + skipEmptyLines: true +}); +const dump = ${dumpVariable}; - const lineup = LineUpJS.asLineUp(${domVariable}, parsed.data, ...parsed.meta.fields); - `; +const lineup = LineUpJS + .builder(parsed.data) + .deriveColumns(...parsed.meta.fields) + .deriveColors() + .restore(dump) + .build(${domVariable}); +`; } diff --git a/src/data/loader_json.ts b/src/data/loader_json.ts index 0b1a94e..e4b3f98 100644 --- a/src/data/loader_json.ts +++ b/src/data/loader_json.ts @@ -4,12 +4,18 @@ import {cleanName} from './ùtils'; import {niceDate} from '../ui'; import {isDumpFile, fromDumpFile} from './loader_dump'; -function buildScript(rawVariable: string, domVariable: string) { +function buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` - const parsed = JSON.parse(${rawVariable}); +const parsed = JSON.parse(${rawVariable}); +const dump = ${dumpVariable}; - const lineup = LineUpJS.asLineUp(${domVariable}, parsed); - `; +const lineup = LineUpJS + .builder(parsed) + .deriveColumns() + .deriveColors() + .restore(dump) + .build(${domVariable}); +`; } export function exportJSON(lineup: LineUp | Taggle) { diff --git a/src/data/soccer/index.ts b/src/data/soccer/index.ts index 7f71c79..3582dfd 100644 --- a/src/data/soccer/index.ts +++ b/src/data/soccer/index.ts @@ -14,42 +14,40 @@ export const data: IDataset = { The aim of this dataset is to offer in a relatively small number of columns (~30) data to compare the performance of some football players, or to compare the efficiency of strikers in-between different European leagues.

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` - const parsed = Papa.parse(${rawVariable}, { - dynamicTyping: true, - header: true, - skipEmptyLines: true - }); +const parsed = Papa.parse(${rawVariable}, { + dynamicTyping: true, + header: true, + skipEmptyLines: true +}); +const dump = ${dumpVariable}; - parsed.data.forEach((row) => { - const suffix = [12, 13, 14, 15, 16, 17]; - const cols = ['games', 'goals', 'minutes', 'assists']; - cols.forEach((col) => { - row[col] = suffix.map((d) => !row[col + d] && row[col + d] !== 0 ? null : row[col + d]); - }); +parsed.data.forEach((row) => { + const suffix = [12, 13, 14, 15, 16, 17]; + const cols = ['games', 'goals', 'minutes', 'assists']; + cols.forEach((col) => { + row[col] = suffix.map((d) => !row[col + d] && row[col + d] !== 0 ? null : row[col + d]); }); +}); - const lineup = LineUpJS.builder(parsed.data) - .column(buildStringColumn('player')) - .column(buildNumberColumn('age', [0, NaN])) - .column(buildStringColumn('current_club')) - .column(buildCategoricalColumn('current_league')) - .column(buildCategoricalColumn('foot')) - .column(buildNumberColumn('height', [160, NaN])) - .column(buildStringColumn('nationality')) - .column(buildCategoricalColumn('position')) - .column(buildNumberColumn('games', [0, NaN]).asArray(4)) - .column(buildNumberColumn('goals', [0, NaN]).asArray(4)) - .column(buildNumberColumn('minutes', [0, NaN]).asArray(4)) - .column(buildNumberColumn('assists', [0, NaN]).asArray(4)) - .deriveColors() - .ranking(buildRanking() - .supportTypes() - .allColumns() - ) - .buildTaggle(${domVariable}); - `; +const lineup = LineUpJS.builder(parsed.data) + .column(LineUpJS.buildStringColumn('player')) + .column(LineUpJS.buildNumberColumn('age', [0, NaN])) + .column(LineUpJS.buildStringColumn('current_club')) + .column(LineUpJS.buildCategoricalColumn('current_league')) + .column(LineUpJS.buildCategoricalColumn('foot')) + .column(LineUpJS.buildNumberColumn('height', [160, NaN])) + .column(LineUpJS.buildStringColumn('nationality')) + .column(LineUpJS.buildCategoricalColumn('position')) + .column(LineUpJS.buildNumberColumn('games', [0, NaN]).asArray(4)) + .column(LineUpJS.buildNumberColumn('goals', [0, NaN]).asArray(4)) + .column(LineUpJS.buildNumberColumn('minutes', [0, NaN]).asArray(4)) + .column(LineUpJS.buildNumberColumn('assists', [0, NaN]).asArray(4)) + .deriveColors() + .restore(dump) + .buildTaggle(${domVariable}); +`; }, build(node: HTMLElement) { return import('raw-loader!./soccer.csv').then((content: any) => { diff --git a/src/data/world-happiness-report/index.ts b/src/data/world-happiness-report/index.ts index 5cab155..7bf7335 100644 --- a/src/data/world-happiness-report/index.ts +++ b/src/data/world-happiness-report/index.ts @@ -16,32 +16,29 @@ export const data: IDataset = { ranks 155 countries by their happiness levels, was released at the United Nations at an event celebrating International Day of Happiness on March 20th.

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { return ` - const parsed = Papa.parse(${rawVariable}, { - dynamicTyping: true, - header: true, - skipEmptyLines: true - }); +const parsed = Papa.parse(${rawVariable}, { + dynamicTyping: true, + header: true, + skipEmptyLines: true +}); +const dump = ${dumpVariable}; - const lineup = LineUpJS.builder(parsed.data) - .column(LineUpJS.buildStringColumn('Country')) - .column(LineUpJS.buildNumberColumn('Happiness_Score', [0, 10])) - .column(LineUpJS.buildNumberColumn('Economy_GDP_per_Capita_', [0, 10])) - .column(LineUpJS.buildNumberColumn('Family', [0, 10])) - .column(LineUpJS.buildNumberColumn('Health_Life_Expectancy_', [0, 10])) - .column(LineUpJS.buildNumberColumn('Freedom', [0, 10])) - .column(LineUpJS.buildNumberColumn('Generosity', [0, 10])) - .column(LineUpJS.buildNumberColumn('Trust_Government_Corruption_', [0, 10])) - .column(LineUpJS.buildNumberColumn('Dystopia_Residual', [0, 10])) - .deriveColors() - .ranking(LineUpJS.buildRanking() - .supportTypes() - .allColumns() - .sortBy('Happiness_Score', 'desc') - ) - .buildTaggle(${domVariable}); - `; +const lineup = LineUpJS.builder(parsed.data) + .column(LineUpJS.buildStringColumn('Country')) + .column(LineUpJS.buildNumberColumn('Happiness_Score', [0, 10])) + .column(LineUpJS.buildNumberColumn('Economy_GDP_per_Capita_', [0, 10])) + .column(LineUpJS.buildNumberColumn('Family', [0, 10])) + .column(LineUpJS.buildNumberColumn('Health_Life_Expectancy_', [0, 10])) + .column(LineUpJS.buildNumberColumn('Freedom', [0, 10])) + .column(LineUpJS.buildNumberColumn('Generosity', [0, 10])) + .column(LineUpJS.buildNumberColumn('Trust_Government_Corruption_', [0, 10])) + .column(LineUpJS.buildNumberColumn('Dystopia_Residual', [0, 10])) + .deriveColors() + .restore(dump) + .buildTaggle(${domVariable}); +`; }, build(node: HTMLElement) { return import('raw-loader!./2017.csv').then((content: any) => { diff --git a/src/data/wur/index.ts b/src/data/wur/index.ts index 1be3379..a3547df 100644 --- a/src/data/wur/index.ts +++ b/src/data/wur/index.ts @@ -26,35 +26,31 @@ university measures. Founded in the United Kingdom in 2010, it has been criticiz and for undermining non-English-instructing institutions.

`, rawData: '', - buildScript(rawVariable: string, domVariable: string) { + buildScript(rawVariable: string, domVariable: string, dumpVariable: string) { const yearArray = (this).yearArray; - return `// per year: - const yearArray = ${JSON.stringify(yearArray)}; - const rows = JSON.parse(${rawVariable}); - - const perYear = 'score,national_rank,quality_of_education,alumni_employment,quality_of_faculty,publications,influence,citations,broad_impact,patents'.split(','); - const b = builder(rows) - .column(buildStringColumn('institution')) - .column(buildStringColumn('country')); - - yearArray.slice(0, 2).forEach((year) => { - const bb = buildRanking() - .supportTypes() - .column('institution') - .column('country') - .sortBy(year + '_score', 'desc'); - perYear.forEach((k) => { - b.column(buildNumberColumn(year + '_' + k).label(k + '(' + year + ')')); - bb.column(year + '_' + k); - }); - b.ranking(bb); - }); + return ` +// per year: +const yearArray = ${JSON.stringify(yearArray)}; +const rows = JSON.parse(${rawVariable}); +const dump = ${dumpVariable}; + +const perYear = 'score,national_rank,quality_of_education,alumni_employment,quality_of_faculty,publications,influence,citations,broad_impact,patents'.split(','); +const b = LineUpJS.builder(rows) + .column(LineUpJS.buildStringColumn('institution')) + .column(LineUpJS.buildStringColumn('country')); + +yearArray.slice(0, 2).forEach((year) => { + perYear.forEach((k) => { + b.column(LineUpJS.buildNumberColumn(year + '_' + k).label(k + '(' + year + ')')); + }); +}); - yearArray.slice(2).forEach((year) => { - b.column(buildNumberColumn(year + '_score').label('score (' + year + ')')); - }); +yearArray.slice(2).forEach((year) => { + b.column(LineUpJS.buildNumberColumn(year + '_score').label('score (' + year + ')')); +}); - return b.deriveColors().buildTaggle(${domVariable});`; +const lineup = b.deriveColors().restore(dump).buildTaggle(${domVariable}); + `; }, build(node: HTMLElement) { return import('raw-loader!./cwurData.csv').then((content: any) => { diff --git a/src/export.ts b/src/export.ts index fbe0e1b..50dc2ba 100644 --- a/src/export.ts +++ b/src/export.ts @@ -50,15 +50,15 @@ export default function initExport() { const data = { title: document.title, description: shared.dataset!.description, - html: ``, + html: `\n\n`, css: CODEPEN_CSS, css_pre_processor: 'scss', css_starter: 'normalize', - js: shared.dataset!.buildScript(`document.querySelector('#data').textContent`, 'document.body'), + js: shared.dataset!.buildScript(`document.querySelector('#data').textContent`, 'document.body', `JSON.parse(document.querySelector('#dump').textContent)`), js_pre_processor: 'babel', js_modernizr: false, css_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.min.css`, - js_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.min.js;https://cdn.rawgit.com/mholt/PapaParse/master/papaparse.min.js` + js_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.min.js;https://unpkg.com/papaparse` }; const json = JSON.stringify(data) From ec28d31f6ffa812b7002c532586c3ba218c0e65b Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 18:18:17 +0100 Subject: [PATCH 052/116] fix script links --- package-lock.json | 60 +++++++++++++++++++++++------------------------ src/export.ts | 4 ++-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index f32b571..e8de146 100644 --- a/package-lock.json +++ b/package-lock.json @@ -803,7 +803,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1197,7 +1197,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -1234,7 +1234,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -1341,7 +1341,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -1445,7 +1445,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -1897,7 +1897,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -1910,7 +1910,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -2159,7 +2159,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -2256,7 +2256,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", "dev": true } @@ -2270,7 +2270,7 @@ }, "domelementtype": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", "dev": true }, @@ -2480,7 +2480,7 @@ }, "events": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, @@ -3756,7 +3756,7 @@ }, "globby": { "version": "8.0.1", - "resolved": "http://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "dev": true, "requires": { @@ -4492,7 +4492,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -4788,7 +4788,7 @@ }, "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, @@ -4909,9 +4909,9 @@ "integrity": "sha512-kICcqTF7pDPfizKGHtxFbDAvlI6kX2FemAhtE7f4tMZVKv1qR62DRidgE+1c+mFe5JVPx+8nu0S6W9Gla50r8g==" }, "lineupjs": { - "version": "4.0.0-alpha.7", - "resolved": "https://registry.npmjs.org/lineupjs/-/lineupjs-4.0.0-alpha.7.tgz", - "integrity": "sha512-giIIOz9NEnGax70lshXW8YHVh7Nn1I+XZtBw3fVeQRLdZLhmpJ0ZZkLi7NFVxWf8kamWU+PEe66crUuRnE1xCg==", + "version": "4.0.0-alpha.8", + "resolved": "https://registry.npmjs.org/lineupjs/-/lineupjs-4.0.0-alpha.8.tgz", + "integrity": "sha512-sHb7ob5eOm3uR8TrOi70+bVLuEz/s+X3uPdbL54wRaOiFC44FOxO8tUJYB6N6B3ouvevAENj7kzSKhhGxvZLVg==", "requires": { "@types/d3-format": "^1.3.0", "lineupengine": "^2.0.0-alpha.4", @@ -4921,7 +4921,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -5242,7 +5242,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -5260,7 +5260,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -5585,7 +5585,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true } @@ -5868,13 +5868,13 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { @@ -5883,7 +5883,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -5978,7 +5978,7 @@ }, "parse-asn1": { "version": "5.1.1", - "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { @@ -6113,7 +6113,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -6932,7 +6932,7 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, @@ -7245,7 +7245,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -7380,7 +7380,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -8478,7 +8478,7 @@ }, "tar": { "version": "2.2.1", - "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { diff --git a/src/export.ts b/src/export.ts index 50dc2ba..10564aa 100644 --- a/src/export.ts +++ b/src/export.ts @@ -57,8 +57,8 @@ export default function initExport() { js: shared.dataset!.buildScript(`document.querySelector('#data').textContent`, 'document.body', `JSON.parse(document.querySelector('#dump').textContent)`), js_pre_processor: 'babel', js_modernizr: false, - css_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.min.css`, - js_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.min.js;https://unpkg.com/papaparse` + css_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.css`, + js_external: `https://unpkg.com/lineupjs@${version}/build/LineUpJS.js;https://unpkg.com/papaparse` }; const json = JSON.stringify(data) From a5edd738cbfb457aa806a70051412e900ae81a5e Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Fri, 16 Nov 2018 18:27:21 +0100 Subject: [PATCH 053/116] fix codepen export --- src/data/ieee-programming/index.ts | 4 ++-- src/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/ieee-programming/index.ts b/src/data/ieee-programming/index.ts index 78ef372..e427e95 100644 --- a/src/data/ieee-programming/index.ts +++ b/src/data/ieee-programming/index.ts @@ -56,7 +56,7 @@ export const ieeebars: IDataset = { const colSpectrumWeights = spectrumWeights.slice(); //duplicate array sources.forEach((source, i) => { - const colName = source + ' ' + y; + const colName = source + ' ' + year; if(colName === 'Google Trends 2018') { // not available in dataset colSpectrumWeights.splice(i, 1); //remove weight @@ -182,7 +182,7 @@ export const ieeeheat: IDataset = { // source matrices sources.forEach((source) => { - dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(source, [0, NaN]).asArray(years.map(String)); + dataBuilder = dataBuilder.column(LineUpJS.buildNumberColumn(source, [0, NaN]).asArray(years.map(String))); }); // year matrices diff --git a/src/index.html b/src/index.html index a94fe39..354fabe 100644 --- a/src/index.html +++ b/src/index.html @@ -39,7 +39,7 @@
From bc6a9cf91a69a3e57de785274b31cc5ae59dfd66 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Sun, 23 Dec 2018 19:46:17 +0100 Subject: [PATCH 091/116] style tuning download menu --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index fdb22bf..a6ccce8 100644 --- a/src/index.html +++ b/src/index.html @@ -59,7 +59,7 @@ file_download -