From 34e4f0965da1f0ed1969b959aa0e383e85faacbb Mon Sep 17 00:00:00 2001 From: MisRob Date: Thu, 19 Oct 2023 16:14:01 +0200 Subject: [PATCH 1/2] Pin KDS to version 2.0.0-beta0 on the Kolibri v16 release branch Release notes: https://github.com/learningequality/kolibri-design-system/releases/tag/2.0.0-beta0 This introduces no changes to Kolibri itself since it was already up-to-date. Even though there were few changes in KDS since the last pinned commit , all of them were internal - see diff https://github.com/learningequality/kolibri-design-system/compare/ab03c5e257a7806c67cf6250310e3e6ccb5119c9...2.0.0-beta0 --- kolibri/core/package.json | 2 +- packages/kolibri-core-for-export/package.json | 2 +- yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kolibri/core/package.json b/kolibri/core/package.json index 2f0d6fb195..e7c29735ee 100644 --- a/kolibri/core/package.json +++ b/kolibri/core/package.json @@ -21,7 +21,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9", + "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2.0.0-beta0", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json index 7ff72a0423..6c904f4a6a 100644 --- a/packages/kolibri-core-for-export/package.json +++ b/packages/kolibri-core-for-export/package.json @@ -24,7 +24,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9", + "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2.0.0-beta0", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/yarn.lock b/yarn.lock index 6a51b9ca56..9dae7166c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7650,9 +7650,9 @@ kolibri-constants@0.2.0: resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142" integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA== -"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9": +"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#2.0.0-beta0": version "1.3.0" - resolved "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9" + resolved "https://github.com/learningequality/kolibri-design-system#f990471a5fa349d7c80f11f73045e024e1585896" dependencies: aphrodite "https://github.com/learningequality/aphrodite/" autosize "^3.0.21" From a08ab52c439a41e0c07e6b25811b9cd50b3acda8 Mon Sep 17 00:00:00 2001 From: MisRob Date: Tue, 24 Oct 2023 11:02:40 +0200 Subject: [PATCH 2/2] Pin KDS to version 2.0.0-beta1 on the Kolibri v16 release branch Release notes: https://github.com/learningequality/kolibri-design-system/releases/tag/v2.0.0-beta1 --- kolibri/core/package.json | 2 +- packages/kolibri-core-for-export/package.json | 2 +- yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kolibri/core/package.json b/kolibri/core/package.json index e7c29735ee..b4428f2cd7 100644 --- a/kolibri/core/package.json +++ b/kolibri/core/package.json @@ -21,7 +21,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2.0.0-beta0", + "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#v2.0.0-beta1", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json index 6c904f4a6a..a1d20719ce 100644 --- a/packages/kolibri-core-for-export/package.json +++ b/packages/kolibri-core-for-export/package.json @@ -24,7 +24,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2.0.0-beta0", + "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#v2.0.0-beta1", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/yarn.lock b/yarn.lock index 9dae7166c8..c238112088 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7650,9 +7650,9 @@ kolibri-constants@0.2.0: resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142" integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA== -"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#2.0.0-beta0": +"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#v2.0.0-beta1": version "1.3.0" - resolved "https://github.com/learningequality/kolibri-design-system#f990471a5fa349d7c80f11f73045e024e1585896" + resolved "https://github.com/learningequality/kolibri-design-system#13e539592fd87508cd32f60e4ad22c1ec320559b" dependencies: aphrodite "https://github.com/learningequality/aphrodite/" autosize "^3.0.21"