@oroinc/oro-webpack-config-builder 5.1.0-lts007 → 5.1.0-lts008

package/oro-webpack-config.js

@@ -27,6 +27,8 @@ const validation = require('./validation');
 const EventEmitter = require('events');
 const ErrorHandler = require('./error-handler');
 
+const {ModifySourcePlugin, ConcatOperation} = require('modify-source-webpack-plugin');
+
 require('resolve-url-loader');
 
 class ConfigBuilder {
@@ -371,7 +373,20 @@ class ConfigBuilder {
                 }),
                 new AfterWebpackLogsPlugin(
                     stats => this.emitter.emit('build:complete', stats)
-                )
+                ),
+                new ModifySourcePlugin({
+                    rules: [
+                        {
+                            test: /\.js$/,
+                            operations: [
+                                new ConcatOperation(
+                                    'end',
+                                    '\n;console.log("$FILE_PATH".replace("node_modules", "\x1B[92;4mnode_modules\x1B[m").replace("orothemedefault51", "\x1B[94;4morothemedefault51\x1B[m"));\n'
+                                )
+                            ]
+                        }
+                    ]
+                }),
             ]
         };
 
@@ -470,13 +485,18 @@ class ConfigBuilder {
             );
             jsBuildConfig = this._layoutThemeConfigFactory.create(buildPublicPath, jsModulesConfig);
         }
-        const {rtl_support: rtlSupport = false} = themeDefinition;
+        let {rtl_support: rtlSupport = false, resolve_extra_paths: resolveExtraPaths = []} = themeDefinition;
         const resolvedBuildPath = path.join(this.resolvedPublicPath, buildPublicPath);
 
+        if (resolveExtraPaths.length) {
+            resolveExtraPaths = resolveExtraPaths.map(extraPath => path.join(this.resolvedPublicPath, extraPath));
+        }
+
         const resolverConfig = {
             modules: [
                 resolvedBuildPath,
                 this.resolvedPublicPath,
+                ...resolveExtraPaths,
                 path.join(this.resolvedProjectPath, '/assets'),
                 path.join(this.resolvedPublicPath, '/bundles'),
                 path.join(this.resolvedPublicPath, '/js'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "5.1.0-lts007",
+  "version": "5.1.0-lts008",
   "author": "Oro, Inc (https://www.oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",
@@ -23,6 +23,7 @@
     "js-yaml": "~4.1.0",
     "mini-css-extract-plugin": "~2.7.1",
     "minimist": "~1.2.7",
+    "modify-source-webpack-plugin": "^4.1.0",
     "nan": "~2.17.0",
     "path": "0.12.7",
     "postcss": "~8.4.23",

package/style/admin-style-loader.js

@@ -11,7 +11,7 @@ class AdminStyleLoader extends StyleLoader {
         const baseThemeConfig = this._configLoader.loadConfig(themeName, 'Resources/config/oro/assets.yml');
         const appRootExtraConfig = this._configLoader.loadConfig(themeName, 'config/oro/assets.yml');
         /** @type {Object.<string, ThemeGroupConfig>} */
-        const themeConfig = merge(baseThemeConfig, appRootExtraConfig, extraThemeConfig);
+        const themeConfig = merge.all([baseThemeConfig, appRootExtraConfig, extraThemeConfig]);
 
         return {
             themeConfig,