From 87ef403dc03c4f119bec47139b23ed090a53c0a6 Mon Sep 17 00:00:00 2001 From: Bucky Schwarz Date: Tue, 1 Feb 2022 14:28:30 -0800 Subject: [PATCH 1/3] revert: revert commit 493f0b, which upgraded marked from 0.7.0 => 4.0.10 and broke storybook --- package.json | 2 +- yarn.lock | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package.json b/package.json index eb104193..87d54125 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "jest": "^24.9.0", "lodash": "^4.17.21", "markdown-loader": "^5.0.0", - "marked": "^4.0.10", + "marked": "^0.7.0", "moment": "2.19.3", "prettier": "^1.19.1", "pretty-quick": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index aa301a06..426233bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8979,11 +8979,6 @@ marked@^0.7.0: resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== -marked@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.10.tgz#423e295385cc0c3a70fa495e0df68b007b879423" - integrity sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw== - marksy@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/marksy/-/marksy-8.0.0.tgz#b595f121fd47058df9dda1448f6ee156ab48810a" From cde9e29fda925e845a7edff2154d1355751a96ea Mon Sep 17 00:00:00 2001 From: Bucky Schwarz Date: Tue, 1 Feb 2022 14:34:52 -0800 Subject: [PATCH 2/3] chore: update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b04d8e4..301d22a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### 3.1.15 (TBD) +- [722](https://github.com/influxdata/clockface/pull/722): Revert update to marked dependency that broke storybooks + +### 3.1.14 (2021-02-01) +- [721](https://github.com/influxdata/clockface/pull/721): Fix color picker's validation to only allow one # + +### 3.1.13 (2021-01-19) +- [715](https://github.com/influxdata/clockface/pull/715): Fix issue with pencil icon on resource cards + ### 3.1.12 (2021-01-14) - [717](https://github.com/influxdata/clockface/pull/717): Fix scrollTo positioning issue in List From dd474060835430959d0f3343437eb559faf23f57 Mon Sep 17 00:00:00 2001 From: Bucky Schwarz Date: Tue, 1 Feb 2022 14:39:24 -0800 Subject: [PATCH 3/3] chore: version and changelog --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 301d22a3..5fb70b1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### 3.1.15 (TBD) +### 3.1.15 (2021-02-01) - [722](https://github.com/influxdata/clockface/pull/722): Revert update to marked dependency that broke storybooks ### 3.1.14 (2021-02-01) diff --git a/package.json b/package.json index 87d54125..588cdc48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@influxdata/clockface", - "version": "3.1.14", + "version": "3.1.15", "license": "MIT", "main": "dist/index.js", "style": "dist/index.css",