@oroinc/oro-webpack-config-builder 4.2.1-dev3 → 4.2.1-dev4

package/README.md

@@ -2,4 +2,4 @@
 
 An integration of OroPlatform based applications with the Webpack.
 
-For more details see [the documentation](https://doc.oroinc.com/backend/bundles/platform/AssetBundle/).
+For more details see [the documentation](https://doc.oroinc.com/bundles/platform/AssetBundle/).

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

@@ -4,7 +4,7 @@ const ModulesConfigLoader = require('./modules-config-loader');
 
 class LayoutModulesConfigLoader extends ModulesConfigLoader {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     loadConfig(theme, filePath) {
         let themeConfig = super.loadConfig(theme, path.join('/Resources/views/layouts/', theme, filePath));

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

@@ -3,6 +3,9 @@ const fs = require('fs');
 const merge = require('deepmerge');
 const yaml = require('js-yaml');
 
+// merge only unique items
+const arrayMerge = (target, source) => target.concat(source.filter(item => !target.includes(item)));
+
 class ModulesConfigLoader {
     /**
      * @returns {Array}
@@ -43,17 +46,15 @@ class ModulesConfigLoader {
             if (!fs.existsSync(source)) return;
 
             fs.readdirSync(source).forEach(name => {
-                const theme = path.resolve(source, name);
-                if (!fs.lstatSync(theme).isDirectory()) {
+                const themePath = path.resolve(source, name);
+                if (!fs.lstatSync(themePath).isDirectory()) {
                     return;
                 }
-                const themeFile = path.resolve(theme, themeInfoFileName);
+                const themeFile = path.resolve(themePath, themeInfoFileName);
                 if (!fs.existsSync(themeFile)) return;
 
-                if (!(name in themes)) {
-                    themes[name] = null;
-                }
-                themes[name] = yaml.safeLoad(fs.readFileSync(themeFile, 'utf8'));
+                const theme = yaml.load(fs.readFileSync(themeFile, 'utf8'));
+                themes[name] = merge(themes[name] || {}, theme, {arrayMerge});
             });
         });
 
@@ -71,7 +72,7 @@ class ModulesConfigLoader {
             const absolutePath = bundle + filePath;
             if (!fs.existsSync(absolutePath)) return;
 
-            const doc = yaml.safeLoad(fs.readFileSync(absolutePath, 'utf8'));
+            const doc = yaml.load(fs.readFileSync(absolutePath, 'utf8'));
             configs = merge(configs, doc);
         });
         return configs;

package/oro-webpack-config.js

@@ -19,7 +19,7 @@ const ThemeConfigFactory = require('./theme-config-factory');
 const path = require('path');
 const prepareModulesMap = require('./plugin/map/prepare-modules-map');
 const resolve = require('enhanced-resolve');
-const webpackMerge = require('webpack-merge');
+const {merge: webpackMerge} = require('webpack-merge');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const WebpackRTLPlugin = require('webpack-rtl-plugin');
 

package/package.json

@@ -1,46 +1,45 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "4.2.1-dev3",
+  "version": "4.2.1-dev4",
   "author": "Oro, Inc (https://www.oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",
   "main": "oro-webpack-config.js",
   "dependencies": {
-    "@babel/core": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.10.4",
-    "@babel/preset-env": "^7.10.4",
-    "autoprefixer": "9.6.1",
-    "babel-loader": "^8.1.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
+    "autoprefixer": "^9.8.8",
+    "babel-loader": "^8.2.3",
     "css-loader": "^3.6.0",
-    "deepmerge": "3.3.0",
+    "deepmerge": "4.2.2",
     "exports-loader": "^0.7.0",
     "expose-loader": "^0.7.5",
     "extract-loader": "3.1.0",
     "file-loader": "^4.3.0",
     "font-awesome": "4.7.0",
     "happypack": "^5.0.1",
-    "html-webpack-plugin": "^3.2.0",
     "imports-loader": "^0.8.0",
     "inject-loader": "^4.0.1",
-    "js-yaml": "3.13.1",
+    "js-yaml": "4.1.0",
     "mini-css-extract-plugin": "0.7.0",
     "minimist": "^1.2.3",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "path": "0.12.7",
     "postcss-loader": "3.0.0",
-    "printf": "^0.6.0",
+    "printf": "^0.6.1",
     "sass-loader": "7.1.0",
     "style-loader": "^0.23.1",
     "terser": "4.1.2",
     "text-loader": "0.0.1",
-    "underscore": "^1.10.2",
+    "underscore": "1.13.*",
     "url-loader": "2.0.1",
-    "webpack": "^4.43.0",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "4.2.1",
+    "webpack": "^4.46.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.5.0",
+    "webpack-merge": "5.8.0",
     "webpack-rtl-plugin": "^2.0.0",
     "wildcard": "^2.0.0"
   }