From b93bfcba531bd80232a38ce48ebeb958e7105ebb Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 31 Jul 2020 08:13:24 +0200 Subject: [PATCH 01/12] prepare next development version 3.0.1-SNAPSHOT --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38c14d2..c1dac8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datavisyn-scatterplot", - "version": "3.0.0", + "version": "3.0.1-SNAPSHOT", "description": "a canvas based scatterplot implementation", "homepage": "https://datavisyn.io", "author": { From c803893f2673c761892d525c1cad0b5703073f1b Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Thu, 20 Aug 2020 15:09:30 +0200 Subject: [PATCH 02/12] Update .gitattributes --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitattributes b/.gitattributes index 544c336..711da28 100644 --- a/.gitattributes +++ b/.gitattributes @@ -125,3 +125,10 @@ AUTHORS text # with the python modules ``pickle``, ``dbm.*``, # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb`` # (among others). + + +# Mark compiled files as generated to hide them in PRs +/dist/** linguist-generated=true + +# Hide compiled files from git diff and auto-replace them when merging different branches +/dist/** -diff -merge From c4ee3a76f6971d5d69246cda1ddaa69d7f939faf Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 2 Dec 2020 15:26:17 +0100 Subject: [PATCH 03/12] refactor scss folder --- dist/scss/abstracts/_mixins.scss | 7 ++ dist/scss/abstracts/_variables.scss | 2 + dist/scss/base/_base.scss | 130 ++++++++++++++++++++++++++ dist/scss/main.scss | 139 +--------------------------- src/scss/abstracts/_mixins.scss | 7 ++ src/scss/abstracts/_variables.scss | 2 + src/scss/base/_base.scss | 130 ++++++++++++++++++++++++++ src/scss/main.scss | 139 +--------------------------- 8 files changed, 284 insertions(+), 272 deletions(-) create mode 100644 dist/scss/abstracts/_mixins.scss create mode 100644 dist/scss/abstracts/_variables.scss create mode 100644 dist/scss/base/_base.scss create mode 100644 src/scss/abstracts/_mixins.scss create mode 100644 src/scss/abstracts/_variables.scss create mode 100644 src/scss/base/_base.scss diff --git a/dist/scss/abstracts/_mixins.scss b/dist/scss/abstracts/_mixins.scss new file mode 100644 index 0000000..76510a2 --- /dev/null +++ b/dist/scss/abstracts/_mixins.scss @@ -0,0 +1,7 @@ + +@mixin abspos() { +position: absolute; +width: 100%; +height: 100%; +} + \ No newline at end of file diff --git a/dist/scss/abstracts/_variables.scss b/dist/scss/abstracts/_variables.scss new file mode 100644 index 0000000..4b7a29a --- /dev/null +++ b/dist/scss/abstracts/_variables.scss @@ -0,0 +1,2 @@ + +$ds_css: datavisyn-scatterplot; \ No newline at end of file diff --git a/dist/scss/base/_base.scss b/dist/scss/base/_base.scss new file mode 100644 index 0000000..2faed40 --- /dev/null +++ b/dist/scss/base/_base.scss @@ -0,0 +1,130 @@ +/** + * Created by sam on 28.10.2016. + */ + + +.#{$ds_css} { +position: relative; + +&.xy-zoomed { + cursor: all-scroll; +} + +&.x-zoomed { + cursor: ew-resize; +} + +&.y-zoomed { + cursor: ns-resize; +} + +canvas { + @include abspos(); + + &.#{$ds_css}-data-layer { + pointer-events: none; + z-index: 1; + } + + &.#{$ds_css}-selection-layer { + z-index: 2; + } +} + +svg { + pointer-events: none; + @include abspos(); + + &.#{$ds_css}-axis-left { + z-index: 2; + } + + &.#{$ds_css}-axis-bottom { + bottom: 0; + z-index: 3; + } + + &.#{$ds_css}-axis-right { + position: absolute; + } +} + +div { + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-bottom-label, + &.#{$ds_css}-axis-right-label { + pointer-events: none; + user-select: none; + text-align: center; + position: absolute; + } + + &.#{$ds_css}-axis-bottom-label { + bottom: 0; + } + + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-right-label { + display: flex; + justify-content: center; + align-items: center; + width: 1em; + white-space: nowrap; + + > div { + transform: rotate(270deg); + transform-origin: center center; + } + } + + &.#{$ds_css}-draw-area { + position: absolute; + user-select: none; + z-index: 3; + } +} + +/* + * similar to bootstrap tooltip + */ + +.#{$ds_css}-tooltip { + display: none; + position: absolute; + width: auto; + height: auto; + z-index: 4; + padding: 5px 0; + + > :first-child { + padding: 3px 8px; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 4px; + } + + > :last-child { + margin-left: -5px; + border-width: 5px 5px 0; + border-style: solid; + border-color: transparent; + border-top-color: #000; + position: absolute; + bottom: 0; + left: 50%; + width: 0; + height: 0; + } +} +} + +.#{$ds_css}-minimap { + position: relative; + background-color: gray; + + svg { + width: 100%; + height: 100%; + } +} diff --git a/dist/scss/main.scss b/dist/scss/main.scss index 2d35762..fe19d62 100644 --- a/dist/scss/main.scss +++ b/dist/scss/main.scss @@ -1,137 +1,4 @@ -/** - * Created by sam on 28.10.2016. - */ +@import './abstracts/variables'; +@import './abstracts/mixins'; -@mixin abspos() { - position: absolute; - width: 100%; - height: 100%; -} - -$ds_css: datavisyn-scatterplot; - -.#{$ds_css} { - position: relative; - - &.xy-zoomed { - cursor: all-scroll; - } - - &.x-zoomed { - cursor: ew-resize; - } - - &.y-zoomed { - cursor: ns-resize; - } - - canvas { - @include abspos(); - - &.#{$ds_css}-data-layer { - pointer-events: none; - z-index: 1; - } - - &.#{$ds_css}-selection-layer { - z-index: 2; - } - } - - svg { - pointer-events: none; - @include abspos(); - - &.#{$ds_css}-axis-left { - z-index: 2; - } - - &.#{$ds_css}-axis-bottom { - bottom: 0; - z-index: 3; - } - - &.#{$ds_css}-axis-right { - position: absolute; - } - } - - div { - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-bottom-label, - &.#{$ds_css}-axis-right-label { - pointer-events: none; - user-select: none; - text-align: center; - position: absolute; - } - - &.#{$ds_css}-axis-bottom-label { - bottom: 0; - } - - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-right-label { - display: flex; - justify-content: center; - align-items: center; - width: 1em; - white-space: nowrap; - - > div { - transform: rotate(270deg); - transform-origin: center center; - } - } - - &.#{$ds_css}-draw-area { - position: absolute; - user-select: none; - z-index: 3; - } - } - - /* - * similar to bootstrap tooltip - */ - - .#{$ds_css}-tooltip { - display: none; - position: absolute; - width: auto; - height: auto; - z-index: 4; - padding: 5px 0; - - > :first-child { - padding: 3px 8px; - color: #fff; - text-align: center; - background-color: #000; - border-radius: 4px; - } - - > :last-child { - margin-left: -5px; - border-width: 5px 5px 0; - border-style: solid; - border-color: transparent; - border-top-color: #000; - position: absolute; - bottom: 0; - left: 50%; - width: 0; - height: 0; - } - } -} - -.#{$ds_css}-minimap { - position: relative; - background-color: gray; - - svg { - width: 100%; - height: 100%; - } -} +@import './base/base'; diff --git a/src/scss/abstracts/_mixins.scss b/src/scss/abstracts/_mixins.scss new file mode 100644 index 0000000..76510a2 --- /dev/null +++ b/src/scss/abstracts/_mixins.scss @@ -0,0 +1,7 @@ + +@mixin abspos() { +position: absolute; +width: 100%; +height: 100%; +} + \ No newline at end of file diff --git a/src/scss/abstracts/_variables.scss b/src/scss/abstracts/_variables.scss new file mode 100644 index 0000000..4b7a29a --- /dev/null +++ b/src/scss/abstracts/_variables.scss @@ -0,0 +1,2 @@ + +$ds_css: datavisyn-scatterplot; \ No newline at end of file diff --git a/src/scss/base/_base.scss b/src/scss/base/_base.scss new file mode 100644 index 0000000..2faed40 --- /dev/null +++ b/src/scss/base/_base.scss @@ -0,0 +1,130 @@ +/** + * Created by sam on 28.10.2016. + */ + + +.#{$ds_css} { +position: relative; + +&.xy-zoomed { + cursor: all-scroll; +} + +&.x-zoomed { + cursor: ew-resize; +} + +&.y-zoomed { + cursor: ns-resize; +} + +canvas { + @include abspos(); + + &.#{$ds_css}-data-layer { + pointer-events: none; + z-index: 1; + } + + &.#{$ds_css}-selection-layer { + z-index: 2; + } +} + +svg { + pointer-events: none; + @include abspos(); + + &.#{$ds_css}-axis-left { + z-index: 2; + } + + &.#{$ds_css}-axis-bottom { + bottom: 0; + z-index: 3; + } + + &.#{$ds_css}-axis-right { + position: absolute; + } +} + +div { + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-bottom-label, + &.#{$ds_css}-axis-right-label { + pointer-events: none; + user-select: none; + text-align: center; + position: absolute; + } + + &.#{$ds_css}-axis-bottom-label { + bottom: 0; + } + + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-right-label { + display: flex; + justify-content: center; + align-items: center; + width: 1em; + white-space: nowrap; + + > div { + transform: rotate(270deg); + transform-origin: center center; + } + } + + &.#{$ds_css}-draw-area { + position: absolute; + user-select: none; + z-index: 3; + } +} + +/* + * similar to bootstrap tooltip + */ + +.#{$ds_css}-tooltip { + display: none; + position: absolute; + width: auto; + height: auto; + z-index: 4; + padding: 5px 0; + + > :first-child { + padding: 3px 8px; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 4px; + } + + > :last-child { + margin-left: -5px; + border-width: 5px 5px 0; + border-style: solid; + border-color: transparent; + border-top-color: #000; + position: absolute; + bottom: 0; + left: 50%; + width: 0; + height: 0; + } +} +} + +.#{$ds_css}-minimap { + position: relative; + background-color: gray; + + svg { + width: 100%; + height: 100%; + } +} diff --git a/src/scss/main.scss b/src/scss/main.scss index 2d35762..fe19d62 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,137 +1,4 @@ -/** - * Created by sam on 28.10.2016. - */ +@import './abstracts/variables'; +@import './abstracts/mixins'; -@mixin abspos() { - position: absolute; - width: 100%; - height: 100%; -} - -$ds_css: datavisyn-scatterplot; - -.#{$ds_css} { - position: relative; - - &.xy-zoomed { - cursor: all-scroll; - } - - &.x-zoomed { - cursor: ew-resize; - } - - &.y-zoomed { - cursor: ns-resize; - } - - canvas { - @include abspos(); - - &.#{$ds_css}-data-layer { - pointer-events: none; - z-index: 1; - } - - &.#{$ds_css}-selection-layer { - z-index: 2; - } - } - - svg { - pointer-events: none; - @include abspos(); - - &.#{$ds_css}-axis-left { - z-index: 2; - } - - &.#{$ds_css}-axis-bottom { - bottom: 0; - z-index: 3; - } - - &.#{$ds_css}-axis-right { - position: absolute; - } - } - - div { - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-bottom-label, - &.#{$ds_css}-axis-right-label { - pointer-events: none; - user-select: none; - text-align: center; - position: absolute; - } - - &.#{$ds_css}-axis-bottom-label { - bottom: 0; - } - - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-right-label { - display: flex; - justify-content: center; - align-items: center; - width: 1em; - white-space: nowrap; - - > div { - transform: rotate(270deg); - transform-origin: center center; - } - } - - &.#{$ds_css}-draw-area { - position: absolute; - user-select: none; - z-index: 3; - } - } - - /* - * similar to bootstrap tooltip - */ - - .#{$ds_css}-tooltip { - display: none; - position: absolute; - width: auto; - height: auto; - z-index: 4; - padding: 5px 0; - - > :first-child { - padding: 3px 8px; - color: #fff; - text-align: center; - background-color: #000; - border-radius: 4px; - } - - > :last-child { - margin-left: -5px; - border-width: 5px 5px 0; - border-style: solid; - border-color: transparent; - border-top-color: #000; - position: absolute; - bottom: 0; - left: 50%; - width: 0; - height: 0; - } - } -} - -.#{$ds_css}-minimap { - position: relative; - background-color: gray; - - svg { - width: 100%; - height: 100%; - } -} +@import './base/base'; From ef5085ba8ae0aaee28c2424ca824bb89fb77ba97 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 08:40:56 +0100 Subject: [PATCH 04/12] format scss --- dist/scss/base/_base.scss | 185 +++++++++++++++++++------------------- src/scss/base/_base.scss | 185 +++++++++++++++++++------------------- 2 files changed, 184 insertions(+), 186 deletions(-) diff --git a/dist/scss/base/_base.scss b/dist/scss/base/_base.scss index 2faed40..a23dbc5 100644 --- a/dist/scss/base/_base.scss +++ b/dist/scss/base/_base.scss @@ -2,121 +2,120 @@ * Created by sam on 28.10.2016. */ - .#{$ds_css} { -position: relative; - -&.xy-zoomed { - cursor: all-scroll; -} - -&.x-zoomed { - cursor: ew-resize; -} - -&.y-zoomed { - cursor: ns-resize; -} + position: relative; -canvas { - @include abspos(); + &.xy-zoomed { + cursor: all-scroll; + } - &.#{$ds_css}-data-layer { - pointer-events: none; - z-index: 1; + &.x-zoomed { + cursor: ew-resize; } - &.#{$ds_css}-selection-layer { - z-index: 2; + &.y-zoomed { + cursor: ns-resize; } -} -svg { - pointer-events: none; - @include abspos(); + canvas { + @include abspos(); - &.#{$ds_css}-axis-left { - z-index: 2; - } + &.#{$ds_css}-data-layer { + pointer-events: none; + z-index: 1; + } - &.#{$ds_css}-axis-bottom { - bottom: 0; - z-index: 3; + &.#{$ds_css}-selection-layer { + z-index: 2; + } } - &.#{$ds_css}-axis-right { - position: absolute; - } -} + svg { + pointer-events: none; + @include abspos(); -div { - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-bottom-label, - &.#{$ds_css}-axis-right-label { - pointer-events: none; - user-select: none; - text-align: center; - position: absolute; - } + &.#{$ds_css}-axis-left { + z-index: 2; + } - &.#{$ds_css}-axis-bottom-label { - bottom: 0; - } + &.#{$ds_css}-axis-bottom { + bottom: 0; + z-index: 3; + } - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-right-label { - display: flex; - justify-content: center; - align-items: center; - width: 1em; - white-space: nowrap; - - > div { - transform: rotate(270deg); - transform-origin: center center; - } + &.#{$ds_css}-axis-right { + position: absolute; + } } - &.#{$ds_css}-draw-area { - position: absolute; - user-select: none; - z-index: 3; + div { + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-bottom-label, + &.#{$ds_css}-axis-right-label { + pointer-events: none; + user-select: none; + text-align: center; + position: absolute; + } + + &.#{$ds_css}-axis-bottom-label { + bottom: 0; + } + + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-right-label { + display: flex; + justify-content: center; + align-items: center; + width: 1em; + white-space: nowrap; + + > div { + transform: rotate(270deg); + transform-origin: center center; + } + } + + &.#{$ds_css}-draw-area { + position: absolute; + user-select: none; + z-index: 3; + } } -} -/* + /* * similar to bootstrap tooltip */ -.#{$ds_css}-tooltip { - display: none; - position: absolute; - width: auto; - height: auto; - z-index: 4; - padding: 5px 0; - - > :first-child { - padding: 3px 8px; - color: #fff; - text-align: center; - background-color: #000; - border-radius: 4px; + .#{$ds_css}-tooltip { + display: none; + position: absolute; + width: auto; + height: auto; + z-index: 4; + padding: 5px 0; + + > :first-child { + padding: 3px 8px; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 4px; + } + + > :last-child { + margin-left: -5px; + border-width: 5px 5px 0; + border-style: solid; + border-color: transparent; + border-top-color: #000; + position: absolute; + bottom: 0; + left: 50%; + width: 0; + height: 0; + } } - - > :last-child { - margin-left: -5px; - border-width: 5px 5px 0; - border-style: solid; - border-color: transparent; - border-top-color: #000; - position: absolute; - bottom: 0; - left: 50%; - width: 0; - height: 0; - } -} } .#{$ds_css}-minimap { diff --git a/src/scss/base/_base.scss b/src/scss/base/_base.scss index 2faed40..a23dbc5 100644 --- a/src/scss/base/_base.scss +++ b/src/scss/base/_base.scss @@ -2,121 +2,120 @@ * Created by sam on 28.10.2016. */ - .#{$ds_css} { -position: relative; - -&.xy-zoomed { - cursor: all-scroll; -} - -&.x-zoomed { - cursor: ew-resize; -} - -&.y-zoomed { - cursor: ns-resize; -} + position: relative; -canvas { - @include abspos(); + &.xy-zoomed { + cursor: all-scroll; + } - &.#{$ds_css}-data-layer { - pointer-events: none; - z-index: 1; + &.x-zoomed { + cursor: ew-resize; } - &.#{$ds_css}-selection-layer { - z-index: 2; + &.y-zoomed { + cursor: ns-resize; } -} -svg { - pointer-events: none; - @include abspos(); + canvas { + @include abspos(); - &.#{$ds_css}-axis-left { - z-index: 2; - } + &.#{$ds_css}-data-layer { + pointer-events: none; + z-index: 1; + } - &.#{$ds_css}-axis-bottom { - bottom: 0; - z-index: 3; + &.#{$ds_css}-selection-layer { + z-index: 2; + } } - &.#{$ds_css}-axis-right { - position: absolute; - } -} + svg { + pointer-events: none; + @include abspos(); -div { - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-bottom-label, - &.#{$ds_css}-axis-right-label { - pointer-events: none; - user-select: none; - text-align: center; - position: absolute; - } + &.#{$ds_css}-axis-left { + z-index: 2; + } - &.#{$ds_css}-axis-bottom-label { - bottom: 0; - } + &.#{$ds_css}-axis-bottom { + bottom: 0; + z-index: 3; + } - &.#{$ds_css}-axis-left-label, - &.#{$ds_css}-axis-right-label { - display: flex; - justify-content: center; - align-items: center; - width: 1em; - white-space: nowrap; - - > div { - transform: rotate(270deg); - transform-origin: center center; - } + &.#{$ds_css}-axis-right { + position: absolute; + } } - &.#{$ds_css}-draw-area { - position: absolute; - user-select: none; - z-index: 3; + div { + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-bottom-label, + &.#{$ds_css}-axis-right-label { + pointer-events: none; + user-select: none; + text-align: center; + position: absolute; + } + + &.#{$ds_css}-axis-bottom-label { + bottom: 0; + } + + &.#{$ds_css}-axis-left-label, + &.#{$ds_css}-axis-right-label { + display: flex; + justify-content: center; + align-items: center; + width: 1em; + white-space: nowrap; + + > div { + transform: rotate(270deg); + transform-origin: center center; + } + } + + &.#{$ds_css}-draw-area { + position: absolute; + user-select: none; + z-index: 3; + } } -} -/* + /* * similar to bootstrap tooltip */ -.#{$ds_css}-tooltip { - display: none; - position: absolute; - width: auto; - height: auto; - z-index: 4; - padding: 5px 0; - - > :first-child { - padding: 3px 8px; - color: #fff; - text-align: center; - background-color: #000; - border-radius: 4px; + .#{$ds_css}-tooltip { + display: none; + position: absolute; + width: auto; + height: auto; + z-index: 4; + padding: 5px 0; + + > :first-child { + padding: 3px 8px; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 4px; + } + + > :last-child { + margin-left: -5px; + border-width: 5px 5px 0; + border-style: solid; + border-color: transparent; + border-top-color: #000; + position: absolute; + bottom: 0; + left: 50%; + width: 0; + height: 0; + } } - - > :last-child { - margin-left: -5px; - border-width: 5px 5px 0; - border-style: solid; - border-color: transparent; - border-top-color: #000; - position: absolute; - bottom: 0; - left: 50%; - width: 0; - height: 0; - } -} } .#{$ds_css}-minimap { From 1608976d9f282616120c912670447b828c866488 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 08:42:10 +0100 Subject: [PATCH 05/12] add !default --- dist/scss/abstracts/_mixins.scss | 8 +++----- dist/scss/abstracts/_variables.scss | 2 +- src/scss/abstracts/_mixins.scss | 8 +++----- src/scss/abstracts/_variables.scss | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dist/scss/abstracts/_mixins.scss b/dist/scss/abstracts/_mixins.scss index 76510a2..836bd08 100644 --- a/dist/scss/abstracts/_mixins.scss +++ b/dist/scss/abstracts/_mixins.scss @@ -1,7 +1,5 @@ - @mixin abspos() { -position: absolute; -width: 100%; -height: 100%; + position: absolute; + width: 100%; + height: 100%; } - \ No newline at end of file diff --git a/dist/scss/abstracts/_variables.scss b/dist/scss/abstracts/_variables.scss index 4b7a29a..9fc22f7 100644 --- a/dist/scss/abstracts/_variables.scss +++ b/dist/scss/abstracts/_variables.scss @@ -1,2 +1,2 @@ -$ds_css: datavisyn-scatterplot; \ No newline at end of file +$ds_css: datavisyn-scatterplot !default; \ No newline at end of file diff --git a/src/scss/abstracts/_mixins.scss b/src/scss/abstracts/_mixins.scss index 76510a2..836bd08 100644 --- a/src/scss/abstracts/_mixins.scss +++ b/src/scss/abstracts/_mixins.scss @@ -1,7 +1,5 @@ - @mixin abspos() { -position: absolute; -width: 100%; -height: 100%; + position: absolute; + width: 100%; + height: 100%; } - \ No newline at end of file diff --git a/src/scss/abstracts/_variables.scss b/src/scss/abstracts/_variables.scss index 4b7a29a..9fc22f7 100644 --- a/src/scss/abstracts/_variables.scss +++ b/src/scss/abstracts/_variables.scss @@ -1,2 +1,2 @@ -$ds_css: datavisyn-scatterplot; \ No newline at end of file +$ds_css: datavisyn-scatterplot !default; \ No newline at end of file From 48d3bbd17075af6f33544429821731f0245fd405 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 7 Jan 2021 13:01:54 +0100 Subject: [PATCH 06/12] update deprecated config option --- jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 93a59cc..5e98f15 100644 --- a/jest.config.js +++ b/jest.config.js @@ -37,7 +37,7 @@ module.exports = { "__VERSION__": "TEST_VERSION", "__APP_CONTEXT__": "TEST_CONTEXT", // has to be set to true, otherwise i18n import fails - "tsConfig": { + "tsconfig": { "esModuleInterop": true } }, From b568ded1f26ce6e127d0201b577937d95fe11c40 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 7 Jan 2021 13:02:05 +0100 Subject: [PATCH 07/12] update dependencies --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c1dac8d..a7bcf8f 100644 --- a/package.json +++ b/package.json @@ -67,16 +67,16 @@ "@types/d3-scale": "^2.0.1", "@types/d3-shape": "^1.2.3", "@types/d3-zoom": "^1.7.1", - "@types/jest": "~26.0.5", + "@types/jest": "~26.0.18", "identity-obj-proxy": "~3.0.0", - "jest": "~26.1.0", + "jest": "~26.6.3", "jest-raw-loader": "~1.0.1", "rimraf": "~3.0.2", - "shx": "~0.3.2", - "ts-jest": "~26.1.3", - "tslib": "~2.0.0", + "shx": "~0.3.3", + "ts-jest": "~26.4.4", + "tslib": "~2.0.3", "tslint": "~5.20.1", - "typedoc": "~0.17.8", + "typedoc": "~0.19.2", "typescript": "~3.9.7" }, "dependencies": { @@ -91,6 +91,6 @@ "d3-selection": "^1.3.0", "d3-shape": "^1.2.0", "d3-zoom": "^1.7.1", - "eventemitter3": "3.0.1" + "eventemitter3": "^4.0.7" } } From b5cde2336dbbb2a9d33826cfb8470ea5285cb319 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:32:56 +0100 Subject: [PATCH 08/12] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a6f2959..815fb66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /.tscache /.idea /lib/ +/dist/tsBuildInfoFile /build/ /tmp /.bower.json From c1239f7c0a5c870a0b3d632bd391aa3813f889ab Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:33:04 +0100 Subject: [PATCH 09/12] update tsconfig.json --- tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e7bc9b2..2e06f21 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,9 @@ "esModuleInterop": false, "resolveJsonModule": true, "allowSyntheticDefaultImports": true, - "preserveWatchOutput": true + "preserveWatchOutput": true, + "incremental": true, + "tsBuildInfoFile": "dist/tsBuildInfoFile" }, "include": [ "src/**/*.ts", From 584444e54ee3bc9203658e6a2236c0d3431b2825 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:33:11 +0100 Subject: [PATCH 10/12] use latest version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a7bcf8f..cfaecb4 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/d3-scale": "^2.0.1", "@types/d3-shape": "^1.2.3", "@types/d3-zoom": "^1.7.1", - "@types/jest": "~26.0.18", + "@types/jest": "~26.0.20", "identity-obj-proxy": "~3.0.0", "jest": "~26.6.3", "jest-raw-loader": "~1.0.1", From b29d6abf333f54dfa8cc91a1a50f01243d380165 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 26 Jan 2021 16:19:27 +0100 Subject: [PATCH 11/12] prepare release_4.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cfaecb4..26e7792 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datavisyn-scatterplot", - "version": "3.0.1-SNAPSHOT", + "version": "4.0.0", "description": "a canvas based scatterplot implementation", "homepage": "https://datavisyn.io", "author": { From d424e05963946f46642d1f4c09a18fb4dae103a1 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 12 Feb 2021 19:37:38 +0100 Subject: [PATCH 12/12] Update config.yml --- .circleci/config.yml | 56 +++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad4274d..41dbc00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,38 +1,52 @@ -version: 2 -jobs: - build: - working_directory: ~/datavisyn +version: 2.1 + +executors: + node-executor: + working_directory: ~/phovea docker: - image: circleci/node:12.13-buster-browsers + +jobs: + build: + executor: node-executor steps: - checkout + - run: + name: Show Node.js and npm version + command: | + node -v + npm -v - restore_cache: - key: deps3-{{ .Branch }}-{{ checksum "package.json" }} + key: deps1-{{ .Branch }}-{{ checksum "package.json" }} - run: - name: install-npm-wee + name: Install npm dependencies command: npm install - save_cache: - key: deps3-{{ .Branch }}-{{ checksum "package.json" }} - paths: - - ./node_modules + key: deps1-{{ .Branch }}-{{ checksum "package.json" }} + paths: ./node_modules - run: - name: dist + name: Show installed npm dependencies + command: npm list --depth=1 || true + - run: + name: Build command: npm run dist - store_artifacts: path: dist workflows: - version: 2 - build-branch: - jobs: - - build: - filters: - tags: - ignore: /^v.*/ - build-tag: + version: 2.1 +# build-nightly: +# triggers: +# - schedule: +# cron: "15 1 * * 1-5" # "At 01:15 on every day-of-week from Monday through Friday.”, see: https://crontab.guru/#15_1_*_*_1-5 +# filters: +# branches: +# only: +# - develop +# jobs: +# - build + build-branches-and-tags: jobs: - build: filters: - branches: - ignore: /.*/ tags: - only: /^v.*/ + only: /.*/