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

Basic integration of updated kolibri-tools #4045

Merged
merged 2 commits into from
May 4, 2023

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented May 3, 2023

Summary

Description of the change(s) you made

  • Updates kolibri-tools and adds fixes to webpack build process to handle the updated dependencies
  • Updates language info to limit it to Studio supported languages
  • Updates makefile commands for i18n to be Studio specific, remove copypasta from kolibri

Manual verification steps performed

Ran make i18n-extract
Ran yarn run devserver-hot
Ran yarn run build

All seemed to do what I expected.

@rtibbles rtibbles added this to the Studio: next major release milestone May 3, 2023
@rtibbles rtibbles requested review from bjester and nucleogenesis May 3, 2023 00:34
@rtibbles
Copy link
Member Author

rtibbles commented May 3, 2023

Looks like I have some linting updates to make here.

Mostly setting lets to const when appropriate.
Ignore variables from vuetify.
@bjester bjester changed the title Basic integration of updated kolibri-tools. Basic integration of updated kolibri-tools May 4, 2023
Copy link
Member

@nucleogenesis nucleogenesis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM

@@ -26,15 +26,15 @@ module.exports = (env = {}) => {
const hot = env.hot;
const base = baseConfig({ mode: dev ? 'development' : 'production', hot, cache: dev });

if (String(base.module.rules[2].test) !== String(/\.css$/)) {
if (String(base.module.rules[1].test) !== String(/\.css$/)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious what changed that made this value need to change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit in Kolibri changed the order of the rules in the basic webpack config: learningequality/kolibri@5ba4074

@rtibbles rtibbles merged commit fd9f45d into learningequality:unstable May 4, 2023
@rtibbles rtibbles deleted the crowdinv2_integration branch May 4, 2023 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants