@oroinc/oro-webpack-config-builder 6.1.0-lts07 → 6.1.0-lts08

package/modules-config/layout-modules-config-loader.js

@@ -2,25 +2,7 @@ const path = require('path');
 const merge = require('deepmerge');
 const ModulesConfigLoader = require('./modules-config-loader');
 
-const arrayMerge = (target, source) => target.concat(source.filter(item => !target.includes(item)));
-
 class LayoutModulesConfigLoader extends ModulesConfigLoader {
-    /**
-     * @inheritdoc
-     */
-    _collectThemes(themesLocation, themeInfoFileName) {
-        const themes = super._collectThemes(themesLocation, themeInfoFileName);
-
-        for (const [name] of Object.entries(themes)) {
-            const {parent: parentTheme} = themes[name];
-            if (typeof parentTheme === 'string') {
-                themes[name] = merge(themes[parentTheme], themes[name], {arrayMerge});
-            }
-        }
-
-        return themes;
-    }
-
     /**
      * @inheritdoc
      */

package/modules-config/modules-config-loader.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const merge = require('deepmerge');
 const yaml = require('js-yaml');
 const validation = require('../validation');
+
 // merge only unique items
 const arrayMerge = (target, source) => target.concat(source.filter(item => !target.includes(item)));
 
@@ -51,25 +52,25 @@ class ModulesConfigLoader {
             themesLocation = [themesLocation];
         }
 
-        let allThemes = {};
+        const themes = {};
+        const self = this;
         themesLocation.forEach(themesLocation => {
-            allThemes = merge(allThemes, this._collectThemes(themesLocation, themeInfoFileName), {arrayMerge});
+            self._collectThemes(themes, themesLocation, themeInfoFileName);
         });
 
-        this._themes = allThemes;
+        this._themes = themes;
         this._processedFiles = [];
     }
 
     /**
      * Collects list of themes with their parents into given storage(themes param)
      *
+     * @param {Object} themes
      * @param {string} themesLocation
      * @param {string} themeInfoFileName
      * @private
-     * @returns {Object.<string|null>}
      */
-    _collectThemes(themesLocation, themeInfoFileName) {
-        const themes = {};
+    _collectThemes(themes, themesLocation, themeInfoFileName) {
         this._processedFiles = [];
 
         this._bundles.forEach(bundle => {
@@ -82,7 +83,9 @@ class ModulesConfigLoader {
                 if (!fs.lstatSync(themePath).isDirectory()) {
                     return;
                 }
+
                 const themeFile = path.resolve(themePath, themeInfoFileName);
+
                 if (!fs.existsSync(themeFile)) {
                     return;
                 }
@@ -96,8 +99,6 @@ class ModulesConfigLoader {
                 themes[name] = merge(themes[name] || {}, doc, {arrayMerge});
             });
         });
-
-        return themes;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "6.1.0-lts07",
+  "version": "6.1.0-lts08",
   "author": "Oro, Inc. (https://oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",