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.

Sign up for GitHub

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

kolibri #1

Merged
merged 9 commits into from
Dec 25, 2023
Merged

kolibri #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74f3799
Add error message when kds path not specified
KshitijThareja Dec 16, 2023
51a24ab
Change descriptions for errors and flags
KshitijThareja Dec 19, 2023
07a2036
Fix card widths on ultra wide screen
Dec 21, 2023
a84a63a
Merge pull request #11665 from iskipu/fix-11653
nucleogenesis Dec 21, 2023
e612388
Merge pull request #11657 from KshitijThareja/N11632
nucleogenesis Dec 21, 2023
e043d4a
Bump the babel group with 1 update
dependabot[bot] Dec 22, 2023
d272a80
Bump eslint-plugin-import from 2.29.0 to 2.29.1
dependabot[bot] Dec 22, 2023
e69f784
Merge pull request #11668 from learningequality/dependabot/npm_and_ya…
rtibbles Dec 22, 2023
af2ab3d
Merge pull request #11670 from learningequality/dependabot/npm_and_ya…
rtibbles Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<div>
<div :style="{ maxWidth: '1700px' }">
<transition name="delay-entry">
<PostSetupModalGroup
v-if="!(rootNodesLoading || searchLoading)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"app-devserver": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly {1}\" yarn:app-python-devserver yarn:hashi-dev --",
"devserver": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly {1}\" yarn:python-devserver yarn:hashi-dev --",
"devserver-hot": "concurrently --passthrough-arguments --kill-others \"yarn:watch-hot --watchonly {1}\" yarn:python-devserver yarn:hashi-dev --",
"devserver-with-kds": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly --kds-path={1}\" yarn:python-devserver yarn:hashi-dev --",
"devserver-with-kds": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly={2} --require-kds-path --kds-path={1}\" yarn:python-devserver yarn:hashi-dev --",
"bundle-stats": "kolibri-tools build stats --file ./build_tools/build_plugins.txt --transpile",
"clean": "kolibri-tools build clean --file ./build_tools/build_plugins.txt",
"preinstall": "node ./packages/kolibri-tools/lib/npm_deprecation_warning.js",
Expand Down
14 changes: 14 additions & 0 deletions packages/kolibri-tools/lib/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ function runWebpackBuild(mode, bundleData, devServer, options, cb = null) {
cache: options.cache,
transpile: options.transpile,
devServer,
requireKdsPath: options.requireKdsPath,
kdsPath: options.kdsPath,
};

Expand Down Expand Up @@ -226,8 +227,21 @@ program
list,
[]
)
.option(
'--require-kds-path',
'Flag to check if yarn command is run using devserver-with-kds',
false
)
.option('--kds-path <kdsPath>', 'Full path to local kds directory', String, '')
.action(function(mode, options) {
if (options.requireKdsPath) {
if (!options.kdsPath) {
cliLogging.error(
'The --require-kds-path flag was specified, but no --kds-path value was provided. Please include the path to the local KDS directory.'
);
process.exit(1);
}
}
if (typeof mode !== 'string') {
cliLogging.error('Build mode must be specified');
process.exit(1);
Expand Down
4 changes: 2 additions & 2 deletions packages/kolibri-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@babel/core": "^7.23.6",
"@babel/plugin-syntax-import-assertions": "^7.22.5",
"@babel/plugin-transform-runtime": "^7.23.4",
"@babel/plugin-transform-runtime": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@testing-library/jest-dom": "^6.1.5",
"@vue/test-utils": "^1.3.6",
Expand All @@ -41,7 +41,7 @@
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.15.0",
"eslint-config-vue": "^2.0.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^23.3.0",
"eslint-plugin-kolibri": "0.16.0-dev.6",
"eslint-plugin-vue": "^7.3.0",
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,10 +835,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"

"@babel/plugin-transform-runtime@^7.23.4":
version "7.23.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.4.tgz#5132b388580002fc5cb7c84eccfb968acdc231cb"
integrity sha512-ITwqpb6V4btwUG0YJR82o2QvmWrLgDnx/p2A3CTPYGaRgULkDiC0DRA2C4jlRB9uXGUEfaSS/IGHfVW+ohzYDw==
"@babel/plugin-transform-runtime@^7.23.6":
version "7.23.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.6.tgz#bf853cd0a675c16ee33e6ba2a63b536e75e5d754"
integrity sha512-kF1Zg62aPseQ11orDhFRw+aPG/eynNQtI+TyY+m33qJa2cJ5EEvza2P2BNTIA9E5MyqFABHEyY6CPHwgdy9aNg==
dependencies:
"@babel/helper-module-imports" "^7.22.15"
"@babel/helper-plugin-utils" "^7.22.5"
Expand Down Expand Up @@ -5010,10 +5010,10 @@ eslint-plugin-compat@^4.2.0:
lodash.memoize "^4.1.2"
semver "^7.5.4"

eslint-plugin-import@^2.29.0:
version "2.29.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
eslint-plugin-import@^2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
dependencies:
array-includes "^3.1.7"
array.prototype.findlastindex "^1.2.3"
Expand All @@ -5031,7 +5031,7 @@ eslint-plugin-import@^2.29.0:
object.groupby "^1.0.1"
object.values "^1.1.7"
semver "^6.3.1"
tsconfig-paths "^3.14.2"
tsconfig-paths "^3.15.0"

eslint-plugin-jest@^23.3.0:
version "23.13.2"
Expand Down Expand Up @@ -11128,10 +11128,10 @@ truncate-utf8-bytes@^1.0.2:
dependencies:
utf8-byte-length "^1.0.1"

tsconfig-paths@^3.14.2:
version "3.14.2"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
tsconfig-paths@^3.15.0:
version "3.15.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
dependencies:
"@types/json5" "^0.0.29"
json5 "^1.0.2"
Expand Down