Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades KDS and dependencies #8459

Merged
merged 9 commits into from
Sep 24, 2021
5 changes: 2 additions & 3 deletions kolibri/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"hammerjs": "^2.0.8",
"intl": "^1.2.4",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#65ee3a69a2ab072ea92e034d95118687678b4f5f",
"kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#04d71dabf0cb4030da31b7a33a2a8f754df1c6c9",
"lockr": "0.8.4",
"lodash": "^4.17.21",
"loglevel": "^1.4.1",
Expand All @@ -27,7 +27,7 @@
"shave": "^2.1.3",
"tinycolor2": "^1.4.2",
"ua-parser-js": "^0.7.28",
"vue": "^2.6.11",
"vue": "^2.6.14",
"vue-intl": "3.0.0",
"vue-markdown": "^2.1.3",
"vue-meta": "^1.5.0",
Expand All @@ -39,7 +39,6 @@
},
"devDependencies": {
"eslint-plugin-import": "^2.20.0",
"kolibri-tools": "0.13.0-dev.10",
"responselike": "^1.0.2"
}
}
1 change: 0 additions & 1 deletion kolibri/plugins/perseus_viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"espree": "^4.1.0",
"exports-loader": "^0.7.0",
"imports-loader": "^0.8.0",
"kolibri-tools": "0.13.0-dev.10",
"mkdirp": "^0.5.1",
"pofile": "^1.0.8",
"progress": "^2.0.0",
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"private": true,
"devDependencies": {
"@types/jest": "^24.0.12",
"kolibri-tools": "0.13.0-dev.10",
"xhr-mock": "^2.5.1",
"yarn-run-all": "^3.1.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/browserslist-config-kolibri/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "browserslist-config-kolibri",
"version": "0.13.0-dev.10",
"version": "0.15.0-dev.4",
"description": "Browsers list configuration for Kolibri",
"main": "index.js",
"repository": "github.com/learningequality/kolibri",
"author": "Learning Equality",
"license": "MIT",
"private": true
"private": false
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin-kolibri/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-kolibri",
"version": "0.13.0-dev.10",
"version": "0.15.0-dev.4",
"description": "Custom rules.",
"author": "Learning Equality",
"main": "lib/index.js",
Expand Down
20 changes: 12 additions & 8 deletions packages/kolibri-core-for-export/package.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
{
"name": "kolibri",
"version": "0.13.0-dev.10",
"version": "0.15.0-dev.4",
"description": "The Kolibri core API",
"repository": "github.com/learningequality/kolibri",
"author": "Learning Equality",
"license": "MIT",
"private": false,
"dependencies": {
"@shopify/draggable": "^1.0.0-beta.8",
"@vue/composition-api": "^1.0.0-rc.11",
"@vueuse/core": "^4.11.1",
"axios": "^0.19.2",
"clipboard": "^2.0.1",
"core-js": "^3.2.1",
"core-js": "^3.13",
"csv-generator-client": "^2.1.1",
"date-fns": "^1.28.2",
"fontfaceobserver": "^2.0.13",
"frame-throttle": "^3.0.0",
"fuse.js": "^6.4.6",
"hammerjs": "^2.0.8",
"intl": "^1.2.4",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#65ee3a69a2ab072ea92e034d95118687678b4f5f",
"kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#04d71dabf0cb4030da31b7a33a2a8f754df1c6c9",
"lockr": "0.8.4",
"lodash": "^4.17.21",
"loglevel": "^1.4.1",
"markdown-it": "^8.3.1",
"screenfull": "^4.0.0",
"shave": "^2.1.3",
"vue": "^2.6.11",
"tinycolor2": "^1.4.2",
"ua-parser-js": "^0.7.28",
"vue": "^2.6.14",
"vue-intl": "3.0.0",
"vue-markdown": "^2.1.3",
"vue-meta": "^1.5.0",
"vue-popperjs": "^1.5.4",
"vue-router": "^3.3.4",
"vuex": "^3.1.0",
"vuex-router-sync": "^5.0.0"
},
"devDependencies": {
"kolibri-tools": "0.13.0-dev.10"
"vuex-router-sync": "^5.0.0",
"xstate": "^4.20.2"
}
}
11 changes: 4 additions & 7 deletions packages/kolibri-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kolibri-tools",
"version": "0.13.0-dev.10",
"version": "0.15.0-dev.4",
"description": "Tools for building Kolibri frontend plugins",
"main": "lib/cli.js",
"repository": "github.com/learningequality/kolibri",
Expand All @@ -25,7 +25,7 @@
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^27.0.2",
"babel-loader": "^8.2.2",
"browserslist-config-kolibri": "0.13.0-dev.10",
"browserslist-config-kolibri": "0.15.0-dev.4",
"check-node-version": "^3.3.0",
"chokidar": "^2.0.4",
"cli-table": "^0.3.6",
Expand All @@ -42,7 +42,7 @@
"eslint-config-vue": "^2.0.2",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-jest": "^23.3.0",
"eslint-plugin-kolibri": "0.13.0-dev.10",
"eslint-plugin-kolibri": "0.15.0-dev.4",
"eslint-plugin-vue": "^7.3.0",
"espree": "6.2.1",
"esquery": "^1.0.1",
Expand Down Expand Up @@ -86,7 +86,7 @@
"vue-jest": "2.6.0",
"vue-loader": "^15.7.0",
"vue-style-loader": "^3.0.3",
"vue-template-compiler": "^2.6.11",
"vue-template-compiler": "^2.6.14",
"webpack": "^4.6.0",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-bundle-tracker": "https://github.com/learningequality/webpack-bundle-tracker",
Expand All @@ -101,9 +101,6 @@
"node": "10.x",
"npm": ">= 3"
},
"optionalDependencies": {
"kolibri": "0.13.0-dev.10"
indirectlylit marked this conversation as resolved.
Show resolved Hide resolved
},
"devDependencies": {
"recast": "^0.20.4"
}
Expand Down
26 changes: 2 additions & 24 deletions packages/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,7 @@ versionTools.setVersion(
);

/*
* Step 5 - Set version of the kolibri-tools dev dependency
*/

versionTools.setDependencyVersion(
'kolibri-tools',
path.resolve(__dirname, 'kolibri-core-for-export/package.json'),
version
);

versionTools.setDependencyVersion(
'kolibri-tools',
path.resolve(__dirname, '../package.json'),
version
);

versionTools.setDependencyVersion(
'kolibri-tools',
path.resolve(__dirname, '../kolibri/core/package.json'),
version
);

/*
* Step 6 - Set version of kolibri-tools' kolibri dependency, eslint-plugin-kolibri dependency,
* Step 5 - Set version of kolibri-tools' kolibri dependency, eslint-plugin-kolibri dependency,
* and browserslist-config-kolibri dependency
*/

Expand All @@ -76,7 +54,7 @@ versionTools.setDependencyVersion(
);

/*
* Step 7 - Set the version of hashi's browserslist-config-kolibri dependency
* Step 6 - Set the version of hashi's browserslist-config-kolibri dependency
*/
versionTools.setDependencyVersion(
'browserslist-config-kolibri',
Expand Down
25 changes: 10 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4609,11 +4609,6 @@ core-js@^3.13:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c"
integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==

core-js@^3.2.1:
version "3.15.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==

core-js@^3.6.5:
version "3.15.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.1.tgz#6c08ab88abdf56545045ccf5fd81f47f407e7f1a"
Expand Down Expand Up @@ -8848,9 +8843,9 @@ knuth-shuffle-seeded@^1.0.6:
dependencies:
seed-random "~2.2.0"

"kolibri-design-system@git://github.com/learningequality/kolibri-design-system#65ee3a69a2ab072ea92e034d95118687678b4f5f":
"kolibri-design-system@git://github.com/learningequality/kolibri-design-system#04d71dabf0cb4030da31b7a33a2a8f754df1c6c9":
version "0.2.2-beta-2"
resolved "git://github.com/learningequality/kolibri-design-system#65ee3a69a2ab072ea92e034d95118687678b4f5f"
resolved "git://github.com/learningequality/kolibri-design-system#04d71dabf0cb4030da31b7a33a2a8f754df1c6c9"
dependencies:
aphrodite "https://github.com/learningequality/aphrodite/"
autosize "^3.0.21"
Expand Down Expand Up @@ -14337,10 +14332,10 @@ vue-style-loader@^4.1.0:
hash-sum "^1.0.2"
loader-utils "^1.0.2"

vue-template-compiler@^2.6.11:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080"
integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==
vue-template-compiler@^2.6.14:
version "2.6.14"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
Expand All @@ -14359,10 +14354,10 @@ vue-virtual-scroller@0.12.0:
vue-observe-visibility "^0.4.1"
vue-resize "^0.4.4"

vue@^2.6.11:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
vue@^2.6.14:
version "2.6.14"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==

vuex-router-sync@^5.0.0:
version "5.0.0"
Expand Down