diff --git a/contentcuration/contentcuration/frontend/shared/views/MarkdownEditor/mathquill/mathquill.js b/contentcuration/contentcuration/frontend/shared/views/MarkdownEditor/mathquill/mathquill.js index bd48723894..fbe3e250ef 100644 --- a/contentcuration/contentcuration/frontend/shared/views/MarkdownEditor/mathquill/mathquill.js +++ b/contentcuration/contentcuration/frontend/shared/views/MarkdownEditor/mathquill/mathquill.js @@ -21,7 +21,7 @@ */ (function() { - var jQuery = window.jQuery, + var jQuery = require('jquery'), undefined, mqCmdId = 'mathquill-command-id', mqBlockId = 'mathquill-block-id', diff --git a/package.json b/package.json index 0e684e7c2b..7a2d00a8dd 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "jest-each": "^24.8.0", "jest-environment-jsdom-sixteen": "^1.0.3", "jest-serializer-vue": "^2.0.2", - "kolibri-design-system": "git+https://github.com/learningequality/kolibri-design-system#v0.2.x", + "kolibri-design-system": "github:learningequality/kolibri-design-system#d502f7a877179e50964930c598e53a8f25e76203", "less": "^3.0.1", "less-loader": "^5.0.0", "mini-css-extract-plugin": "^0.4.0", diff --git a/webpack.config.js b/webpack.config.js index c7b215afc6..850b718143 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,7 +1,6 @@ /* eslint-env node */ const path = require('path'); -const webpack = require('webpack'); const BundleTracker = require('webpack-bundle-tracker'); const VueLoaderPlugin = require('vue-loader/lib/plugin'); @@ -188,11 +187,6 @@ module.exports = (env = {}) => { path: path.resolve(djangoProjectDir, 'build'), filename: 'webpack-stats.json', }), - new webpack.ProvidePlugin({ - // used in Mathquill, set in jquery - 'window.jQuery': 'jquery', - jQuery: 'jquery', - }), new MiniCssExtractPlugin({ filename: '[name]-[hash].css', chunkFilename: '[name]-[hash]-[id].css', diff --git a/yarn.lock b/yarn.lock index 66226953ab..375b7b94cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12311,23 +12311,18 @@ knuth-shuffle-seeded@^1.0.6: dependencies: seed-random "~2.2.0" -"kolibri-design-system@git+https://github.com/learningequality/kolibri-design-system#v0.2.x": - version "0.2.2-beta4" - resolved "git+https://github.com/learningequality/kolibri-design-system#3288f31a56e72f257ab6cd0b9def97f323637e53" +"kolibri-design-system@github:learningequality/kolibri-design-system#d502f7a877179e50964930c598e53a8f25e76203": + version "0.2.2-beta-2" + resolved "https://codeload.github.com/learningequality/kolibri-design-system/tar.gz/d502f7a877179e50964930c598e53a8f25e76203" dependencies: - "@babel/core" "^7.9.6" - "@babel/preset-env" "^7.9.6" - "@mdi/svg" "^5.3.45" aphrodite "https://github.com/learningequality/aphrodite/" autosize "^3.0.21" css-element-queries "^1.2.0" fuzzysearch "^1.0.3" keen-ui "^1.3.0" lodash "^4.17.15" - material-design-icons "^3.0.1" popper.js "^1.14.6" purecss "^0.6.2" - svgo "^1.3.2" tippy.js "^4.2.1" "kolibri-design-system@github:learningequality/kolibri-design-system#v0.2.1":