removed default kds path and fixed cache issue

learningequality · Dec 14, 2023 · 9d5aa5a · 9d5aa5a
1 parent 58b2e17
commit 9d5aa5a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "frontend-devserver": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly {1}\" yarn:hashi-dev --",
     "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-with-kds": "concurrently --passthrough-arguments --kill-others \"yarn:watch --watchonly --kds --kds-path={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-hot": "concurrently --passthrough-arguments --kill-others \"yarn:watch-hot --watchonly {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",

diff --git a/packages/kolibri-tools/lib/cli.js b/packages/kolibri-tools/lib/cli.js
@@ -81,7 +81,6 @@ function runWebpackBuild(mode, bundleData, devServer, options, cb = null) {
     cache: options.cache,
     transpile: options.transpile,
     devServer,
-    kds: options.kds,
     kdsPath: options.kdsPath,
   };
 
@@ -227,7 +226,6 @@ program
     list,
     []
   )
-  .option('--kds', 'Flag to use local kds', false)
   .option('--kds-path <kdsPath>', 'Full path to local kds directory', String, '')
   .action(function(mode, options) {
     if (typeof mode !== 'string') {

diff --git a/packages/kolibri-tools/lib/webpack.config.plugin.js b/packages/kolibri-tools/lib/webpack.config.plugin.js
@@ -44,7 +44,6 @@ module.exports = (
     cache = false,
     transpile = false,
     devServer = false,
-    kds = false,
     kdsPath = '',
   } = {}
 ) => {
@@ -102,18 +101,10 @@ module.exports = (
   } else {
     externals = { kolibri: kolibriName };
   }
-  if (kds) {
-    if (kdsPath) {
-      coreAliases['kolibri-design-system'] = path.resolve(kdsPath);
-    } else {
-      // consider default kds directory at same level as kolibri
-      coreAliases['kolibri-design-system'] = path.resolve(
-        __dirname,
-        '../../../../kolibri-design-system/'
-      );
-    }
+  if (kdsPath) {
+    coreAliases['kolibri-design-system'] = path.resolve(kdsPath);
+    cache = false;
   }
-
   let bundle = {
     externals,
     name: data.name,