From b14e7d3201259261dc83eb3bd3c3ec58884b4b40 Mon Sep 17 00:00:00 2001 From: MisRob Date: Thu, 22 Feb 2024 12:31:22 +0100 Subject: [PATCH 01/50] Install KDS v4.0.1 Release notes - https://github.com/learningequality/kolibri-design-system/releases/tag/v3.1.0 - https://github.com/learningequality/kolibri-design-system/releases/tag/v4.0.0 - https://github.com/learningequality/kolibri-design-system/releases/tag/v4.0.1 --- kolibri/core/package.json | 2 +- packages/kolibri-core-for-export/package.json | 2 +- yarn.lock | 101 ++++++++---------- 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/kolibri/core/package.json b/kolibri/core/package.json index 563e8b4bca7..ab32f995a43 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": "3.0.1", + "kolibri-design-system": "4.0.1", "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 7748f923752..fc3fa78e1e7 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": "3.0.1", + "kolibri-design-system": "4.0.1", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/yarn.lock b/yarn.lock index 6e04f4c1691..dc3ebd889f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1861,7 +1861,7 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" -"@vue/composition-api@^1.7.2": +"@vue/composition-api@1.7.2", "@vue/composition-api@^1.7.2": version "1.7.2" resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.7.2.tgz#0b656f3ec39fefc2cf40aaa8c12426bcfeae1b44" integrity sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw== @@ -2481,10 +2481,10 @@ autoprefixer@10.4.16: picocolors "^1.0.0" postcss-value-parser "^4.2.0" -autosize@^3.0.20, autosize@^3.0.21: +autosize@3.0.21: version "3.0.21" resolved "https://registry.yarnpkg.com/autosize/-/autosize-3.0.21.tgz#f182f40d17757d978a139a4c9ca40c4c0e448603" - integrity sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM= + integrity sha512-xGFj5jTV4up6+fxRwtnAWiCIx/5N0tEnFn5rdhAkK1Lq2mliLMuGJgP5Bf4phck3sHGYrVKpYwugfJ61MSz9nA== available-typed-arrays@^1.0.5: version "1.0.5" @@ -4074,10 +4074,10 @@ css-declaration-sorter@^7.1.1: resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80" integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ== -css-element-queries@^1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.3.tgz#e14940b1fcd4bf0da60ea4145d05742d7172e516" - integrity sha512-QK9uovYmKTsV2GXWQiMOByVNrLn2qz6m3P7vWpOR4IdD6I3iXoDw5qtgJEN3Xq7gIbdHVKvzHjdAtcl+4Arc4Q== +css-element-queries@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.0.tgz#081373d7f30302adad46b7c29b83b85f8ef8f62c" + integrity sha512-4gaxpioSFueMcp9yj1TJFCLjfooGv38y6ZdwFUS3GuS+9NIVijdeiExXKwSIHoQDADfpgnaYSTzmJs+bV+Hehg== css-functions-list@^3.1.0: version "3.1.0" @@ -4293,7 +4293,7 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -date-fns@^1.28.2, date-fns@^1.30.1: +date-fns@1.30.1, date-fns@^1.28.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== @@ -4387,11 +4387,6 @@ deep-object-diff@^1.1.9: resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.9.tgz#6df7ef035ad6a0caa44479c536ed7b02570f4595" integrity sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA== -deepmerge@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" - integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== - deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" @@ -5673,7 +5668,7 @@ fractional@^1.0.0: resolved "https://registry.yarnpkg.com/fractional/-/fractional-1.0.0.tgz#dab167a2f9f804cf9038bddf47aa9ba7f207eabc" integrity sha1-2rFnovn4BM+QOL3fR6qbp/IH6rw= -frame-throttle@^3.0.0: +frame-throttle@3.0.0, frame-throttle@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/frame-throttle/-/frame-throttle-3.0.0.tgz#a666e007c10af6239909cf73871be09a7ea1c6d1" integrity sha1-pmbgB8EK9iOZCc9zhxvgmn6hxtE= @@ -5740,10 +5735,10 @@ fuse.js@^7.0.0: resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-7.0.0.tgz#6573c9fcd4c8268e403b4fc7d7131ffcf99a9eb2" integrity sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q== -fuzzysearch@^1.0.3: +fuzzysearch@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz#dffc80f6d6b04223f2226aa79dd194231096d008" - integrity sha1-3/yA9tawQiPyImqnndGUIxCW0Ag= + integrity sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg== gauge@^4.0.0: version "4.0.0" @@ -7521,17 +7516,6 @@ jszip@*, jszip@^3.1.5, jszip@^3.10.1: readable-stream "~2.3.6" setimmediate "^1.0.5" -keen-ui@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/keen-ui/-/keen-ui-1.3.1.tgz#981411a0afa0b3b716eb56304a8b7d563a2aa25f" - integrity sha512-2EAZy2YFdthCRtZvDHXvMZUTwvHda70WcjbEUaJKM1oH5q9rgecL80VBsTmmcIvfuratIEisBBiteojw3XEa5g== - dependencies: - autosize "^3.0.20" - deepmerge "^2.0.1" - fuzzysearch "^1.0.3" - lodash.debounce "^4.0.8" - tippy.js "^4.2.1" - keycode@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" @@ -7583,25 +7567,24 @@ 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@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-3.0.1.tgz#ba6368c78ffab1d6195b828b1aacc4f11b9a67c3" - integrity sha512-/O+KuYTGiv5z9VTlm8bIWZwanMdearGmIP162EqaVn2tIbo/hY42lsuAbGSTZPi5CITm+LJ9r99ogImDRH8z2w== +kolibri-design-system@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.0.1.tgz#24cb0b81c53b1c9731c941df297397a58ec5e667" + integrity sha512-wMbRMX6lTSdG77G9OVVeJek0GKg/d5RoGifZhjIq0x0lpgWLDecJpMtBGZfn+/nLGWXguvOsf/EAxY6wIqjPMg== dependencies: - "@vue/composition-api" "^1.7.2" + "@vue/composition-api" "1.7.2" aphrodite "https://github.com/learningequality/aphrodite/" - autosize "^3.0.21" - css-element-queries "^1.2.0" - date-fns "^1.30.1" - frame-throttle "^3.0.0" - fuzzysearch "^1.0.3" - keen-ui "^1.3.0" - lodash "^4.17.15" - popper.js "^1.14.6" - purecss "^0.6.2" - tippy.js "^4.2.1" - vue-intl "^3.1.0" - xstate "^4.38.3" + autosize "3.0.21" + css-element-queries "1.2.0" + date-fns "1.30.1" + frame-throttle "3.0.0" + fuzzysearch "1.0.3" + lodash "4.17.15" + popper.js "1.14.6" + purecss "0.6.2" + tippy.js "4.2.1" + vue-intl "3.1.0" + xstate "4.38.3" launch-editor-middleware@^2.6.1: version "2.6.1" @@ -7756,6 +7739,11 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= +lodash@4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.12: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -8865,7 +8853,12 @@ pofile@^1.0.8: resolved "https://registry.yarnpkg.com/pofile/-/pofile-1.1.1.tgz#a581df04a6fae4941eebd7c1211dbd43700c5541" integrity sha512-RVAzFGo1Mx9+YukVKSgTLut6r4ZVBW8IVrqGHAPfEsVJN93WSp5HRD6+qNa7av1q/joPKDNJd55m5AJl9GBQGA== -popper.js@^1.14.6, popper.js@^1.14.7: +popper.js@1.14.6: + version "1.14.6" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.6.tgz#ab20dd4edf9288b8b3b6531c47c361107b60b4b0" + integrity sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA== + +popper.js@^1.14.7: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== @@ -9325,10 +9318,10 @@ pure-rand@^6.0.0: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.1.tgz#31207dddd15d43f299fdcdb2f572df65030c19af" integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg== -purecss@^0.6.2: +purecss@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/purecss/-/purecss-0.6.2.tgz#f0827d227e909543c5138f36d56c8c613f476b8c" - integrity sha1-8IJ9In6QlUPFE4821WyMYT9Ha4w= + integrity sha512-6BZF+rr9UAy8xwWDW6mi//2TnImxqMAjfLTYCO80OzPcavSI3DMjnD4fY92383KB5FA+gEHO/ug46q/yeitu9w== purgecss@^5.0.0: version "5.0.0" @@ -10935,10 +10928,10 @@ tinycolor2@^1.6.0: resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e" integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw== -tippy.js@^4.2.1: - version "4.3.5" - resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54" - integrity sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA== +tippy.js@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.2.1.tgz#9e4939d976465f77229b05a3cb233b5dc28cf850" + integrity sha512-xEE7zYNgQxCDdPcuT6T04f0frPh0wO7CcIqJKMFazU/NqusyjCgYSkLRosIHoiRkZMRzSPOudC8wRN5GjvAyOQ== dependencies: popper.js "^1.14.7" @@ -11457,7 +11450,7 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-intl@3.1.0, vue-intl@^3.1.0: +vue-intl@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/vue-intl/-/vue-intl-3.1.0.tgz#707f1f7406595c9b4afc6049254b333093be37be" integrity sha512-0v3S5gspuYnt6j1G+KLfPUsNnjRdbMOcYrWYoSd1gYk6rX8VuOyh7NLztPrSIJt+NLs/qzLOZXxI1LORukEiqA== @@ -11552,7 +11545,7 @@ vue2-teleport@^1.0.1: resolved "https://registry.yarnpkg.com/vue2-teleport/-/vue2-teleport-1.0.1.tgz#1b7f9f69c1223f522cf6cd81c39b8d6019e1cf66" integrity sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw== -vue@2.6.14, vue@^2.6.14: +vue@2.6.14: version "2.6.14" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== @@ -11925,7 +11918,7 @@ xmldom@^0.1.27: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== -xstate@^4.38.3: +xstate@4.38.3, xstate@^4.38.3: version "4.38.3" resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.38.3.tgz#4e15e7ad3aa0ca1eea2010548a5379966d8f1075" integrity sha512-SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw== From aed77234370a463d1d233093e5284b9e55105875 Mon Sep 17 00:00:00 2001 From: MisRob Date: Tue, 5 Mar 2024 20:24:44 +0100 Subject: [PATCH 02/50] Update composable paths This is a part of upgrade to KDS v4.0.0 that changes location of the composable. --- kolibri/core/assets/src/core-app/apiSpec.js | 2 +- .../core/assets/test/horizontal-nav-bar-with-overflow.spec.js | 4 ++-- kolibri/core/assets/test/views/app-bar-core-page.spec.js | 4 ++-- kolibri/core/assets/test/views/app-bar.spec.js | 4 ++-- .../assets/src/views/UserPage/__test__/UserPage.spec.js | 4 ++-- .../facility/assets/test/views/facility-app-bar-page.spec.js | 4 ++-- .../assets/src/views/HomePage/__tests__/HomePage.spec.js | 4 ++-- kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue | 2 +- kolibri/plugins/learn/assets/test/views/library-page.spec.js | 4 ++-- .../assets/src/views/SlideshowRendererComponent.vue | 2 +- .../user_profile/assets/test/views/profile-page.spec.js | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js index d17dad1d196..fbaa30937e6 100644 --- a/kolibri/core/assets/src/core-app/apiSpec.js +++ b/kolibri/core/assets/src/core-app/apiSpec.js @@ -17,7 +17,7 @@ import vuex from 'vuex'; import UiAlert from 'kolibri-design-system/lib/keen/UiAlert'; import responsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin'; import responsiveElementMixin from 'kolibri-design-system/lib/KResponsiveElementMixin'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import useKShow from 'kolibri-design-system/lib/composables/useKShow'; import UiIconButton from 'kolibri-design-system/lib/keen/UiIconButton'; // temp hack import * as vueCompositionApi from '@vue/composition-api'; diff --git a/kolibri/core/assets/test/horizontal-nav-bar-with-overflow.spec.js b/kolibri/core/assets/test/horizontal-nav-bar-with-overflow.spec.js index c6572da40cb..0552fd66863 100644 --- a/kolibri/core/assets/test/horizontal-nav-bar-with-overflow.spec.js +++ b/kolibri/core/assets/test/horizontal-nav-bar-with-overflow.spec.js @@ -1,8 +1,8 @@ import HorizontalNavBarWithOverflowMenu from 'kolibri.coreVue.components.HorizontalNavBarWithOverflowMenu'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import { shallowMount } from '@vue/test-utils'; -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); function makeWrapper({ propsData } = {}) { return shallowMount(HorizontalNavBarWithOverflowMenu, { propsData }); diff --git a/kolibri/core/assets/test/views/app-bar-core-page.spec.js b/kolibri/core/assets/test/views/app-bar-core-page.spec.js index d785abe0824..41f21bea637 100644 --- a/kolibri/core/assets/test/views/app-bar-core-page.spec.js +++ b/kolibri/core/assets/test/views/app-bar-core-page.spec.js @@ -1,9 +1,9 @@ import { createLocalVue, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import AppBarPage from '../../src/views/CorePage/AppBarPage'; -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/kolibri/core/assets/test/views/app-bar.spec.js b/kolibri/core/assets/test/views/app-bar.spec.js index 4058a284795..7af57004db8 100644 --- a/kolibri/core/assets/test/views/app-bar.spec.js +++ b/kolibri/core/assets/test/views/app-bar.spec.js @@ -1,10 +1,10 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import Vuex from 'vuex'; import AppBar from '../../src/views/AppBar'; jest.mock('kolibri.urls'); -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/kolibri/plugins/facility/assets/src/views/UserPage/__test__/UserPage.spec.js b/kolibri/plugins/facility/assets/src/views/UserPage/__test__/UserPage.spec.js index 03c6b2bcb3e..25b67cc9f18 100644 --- a/kolibri/plugins/facility/assets/src/views/UserPage/__test__/UserPage.spec.js +++ b/kolibri/plugins/facility/assets/src/views/UserPage/__test__/UserPage.spec.js @@ -1,14 +1,14 @@ import mock from 'xhr-mock'; import { mount } from '@vue/test-utils'; import VueRouter from 'vue-router'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import makeStore from '../../../../test/makeStore'; import UserPage from '../index'; jest.mock('kolibri.lib.logging'); jest.mock('kolibri.urls'); jest.mock('lockr'); -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); const router = new VueRouter({ routes: [ diff --git a/kolibri/plugins/facility/assets/test/views/facility-app-bar-page.spec.js b/kolibri/plugins/facility/assets/test/views/facility-app-bar-page.spec.js index 87e9acd1835..62753c46bac 100644 --- a/kolibri/plugins/facility/assets/test/views/facility-app-bar-page.spec.js +++ b/kolibri/plugins/facility/assets/test/views/facility-app-bar-page.spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import FacilityAppBarPage from '../../src/views/FacilityAppBarPage'; function makeWrapper({ propsData = {}, getters = {} }) { @@ -16,7 +16,7 @@ function makeWrapper({ propsData = {}, getters = {} }) { }); } jest.mock('kolibri.urls'); -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); describe('FacilityAppBarPage', function() { beforeAll(() => { diff --git a/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js b/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js index f09fdfea9a3..0ec2c26a250 100644 --- a/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js +++ b/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js @@ -4,7 +4,7 @@ import Vuex from 'vuex'; import { useDevicesWithFilter } from 'kolibri.coreVue.componentSets.sync'; import useUser, { useUserMock } from 'kolibri.coreVue.composables.useUser'; -import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; +import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow'; import { ClassesPageNames, PageNames } from '../../../constants'; import HomePage from '../index'; /* eslint-disable import/named */ @@ -24,7 +24,7 @@ jest.mock('../../../composables/useLearnerResources'); jest.mock('../../../composables/useContentLink'); // Needed to test anything using mount() where children use this composable jest.mock('../../../composables/useLearningActivities'); -jest.mock('kolibri-design-system/lib/useKResponsiveWindow'); +jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow'); const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue b/kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue index 74cf05e79cd..61c9ce84231 100644 --- a/kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue +++ b/kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue @@ -9,7 +9,7 @@ diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue index fa5544908c5..53a722c633a 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue @@ -1,6 +1,6 @@