fix(shs-5963): change how theme shared js is handled

SU-HSDO · Nov 27, 2024 · 70ab7c2 · 70ab7c2
1 parent f9c4a0b
commit 70ab7c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,7 @@ docroot/themes/humsci/humsci_colorful/css/humsci_colorful-ckeditor.css
 docroot/themes/humsci/humsci_traditional/css/humsci_traditional-ckeditor.css
 docroot/themes/humsci/humsci_colorful/css/humsci_colorful-preview.css
 docroot/themes/humsci/humsci_traditional/css/humsci_traditional-preview.css
+docroot/themes/humsci/humsci_basic/dist/js
 docroot/themes/humsci/humsci_traditional/js
 docroot/themes/humsci/humsci_colorful/js
 # Ignore build artifacts

diff --git a/docroot/themes/humsci/humsci_basic/webpack.config.js b/docroot/themes/humsci/humsci_basic/webpack.config.js
@@ -21,8 +21,7 @@ module.exports = {
     // Shared files have two entries, one for each theme.
     Object.keys(shared).forEach((key) => {
       const file = shared[key];
-      entries[`humsci_traditional.${key}`] = path.resolve(srcDir, file);
-      entries[`humsci_colorful.${key}`] = path.resolve(srcDir, file);
+      entries[`shared.${key}`] = path.resolve(srcDir, file);
     });
 
     // Traditional theme specific files.
@@ -43,9 +42,10 @@ module.exports = {
   output: {
     filename(pathData) {
       const [theme, filename] = pathData.chunk.name.split('.');
-      return `${theme}/js/${filename}.js`;
+      const themePath = theme === 'shared' ? 'dist/js' : `../${theme}/js`;
+      return `${themePath}/${filename}.js`;
     },
-    path: path.resolve(__dirname, '../'),
+    path: path.resolve(__dirname, '.'),
   },
   module: {
     rules: [