@oroinc/oro-webpack-config-builder 5.1.0-alpha32 → 5.1.0-alpha35

package/error-handler.js

@@ -0,0 +1,95 @@
+const BaseError = require('./validation/errors/base-error');
+const {isVerboseMode} = require('./utils');
+const {red, yellow, green, bgRed} = require('colorette');
+
+const emptyLine = length => new Array(length).fill(' ').join('');
+const multiline = (color, msg) => {
+    msg = ` ${msg}`;
+    msg = msg + emptyLine(120 - msg.length);
+
+    return `\n${color(emptyLine(msg.length))}\n${color(msg)}\n${color(emptyLine(msg.length))}`;
+};
+
+class ErrorHandler {
+    constructor() {
+        this.failedThemes = [];
+
+        process.on('beforeExit', code => {
+            this.onProcess();
+        });
+    }
+
+    /**
+     * Show a message about failed themes
+     */
+    onProcess() {
+        if (this.failedThemes.length) {
+            let msg = '[ERROR] Assets build';
+
+            if (this.failedThemes.length === 1) {
+                msg = `${msg} for "${this.failedThemes[0]}" theme failed.`;
+            } else {
+                msg = `${msg} for "${this.failedThemes.join(', ')}" themes failed.`;
+            }
+            console.error(multiline(bgRed, msg));
+            process.exit(1);
+        }
+    }
+
+    /**
+     * Executes when the Webpack Compiler will complete a compilation
+     * In case of empty Webpack Config this method will not run
+     *
+     * @param {Object} stats
+     */
+    onBuildComplete(stats) {
+        const failed = stats?.compilation?.errors.length !== 0;
+
+        if (failed) {
+            console.error(multiline(bgRed, '[ERROR] Assets build failed.'));
+            process.exit(1);
+        }
+    }
+
+    /**
+     * @param {Array|string} errors
+     * @param {string} [failedTheme]
+     */
+    displayError(errors, failedTheme) {
+        if (typeof failedTheme === 'string') {
+            this.failedThemes.push(failedTheme);
+        }
+
+        if (typeof errors === 'string') {
+            errors = [errors];
+        }
+
+        const errorMessage = errors.map(err => {
+            const highlightPrefix = str => {
+                const prefix = str.substring(0, str.search(':'));
+                return red(prefix) + str.substring(str.search(':'));
+            };
+
+            if (err instanceof BaseError) {
+                err.message = `${err.message}\n${green(err.extra)}`;
+            }
+
+            let msg = err.message;
+
+            if (isVerboseMode()) {
+                msg = highlightPrefix(err.stack);
+            } else {
+                const command = yellow('php bin/console oro:assets:build --env=dev --verbose');
+                const info = `${green(`Run the command ${command} to see more information`)}`;
+
+                msg = highlightPrefix(`${err.name}: ${msg}\n${info}`);
+            }
+
+            return `${msg}\n`;
+        });
+
+        console.error(errorMessage.join('\n'));
+    }
+}
+
+module.exports = ErrorHandler;

package/loader/inject-loader/index.js

@@ -1,70 +1 @@
-module.exports = function (e) {
-    var n = {};
-
-    function t(i) {
-        if (n[i]) return n[i].exports;
-        var r = n[i] = {i: i, l: !1, exports: {}};
-        return e[i].call(r.exports, r, r.exports, t), r.l = !0, r.exports
-    }
-
-    return t.m = e, t.c = n, t.d = function (e, n, i) {
-        t.o(e, n) || Object.defineProperty(e, n, {configurable: !1, enumerable: !0, get: i})
-    }, t.r = function (e) {
-        Object.defineProperty(e, "__esModule", {value: !0})
-    }, t.n = function (e) {
-        var n = e && e.__esModule ? function () {
-            return e.default
-        } : function () {
-            return e
-        };
-        return t.d(n, "a", n), n
-    }, t.o = function (e, n) {
-        return Object.prototype.hasOwnProperty.call(e, n)
-    }, t.p = "", t.w = {}, t(t.s = 3)
-}([function (e, n) {
-    e.exports = require("babel-core")
-}, function (e, n, t) {
-    "use strict";
-    Object.defineProperty(n, "__esModule", {value: !0});
-    var i = t(0);
-    n.default = (0, i.template)("\n  module.exports = function __injector(__injections) {\n    __injections = __injections || {};\n\n    (function __validateInjection() {\n      var validDependencies = DEPENDENCIES;\n      var injectedDependencies = Object.keys(__injections);\n      var invalidInjectedDependencies = injectedDependencies.filter(function (dependency) {\n        return validDependencies.indexOf(dependency) === -1;\n      });\n\n      if (invalidInjectedDependencies.length > 0) {\n        var validDependenciesString = ' - ' + validDependencies.join('\\n - ');\n        var injectedDependenciesString = ' - ' + injectedDependencies.join('\\n - ');\n        var invalidDependenciesString = ' - ' + invalidInjectedDependencies.join('\\n - ');\n\n        throw new Error('Injection Error in ' + SOURCE_PATH + '\\n\\n' +\n          'The following injections are invalid:\\n' + invalidDependenciesString + '\\n\\n' +\n          'The following injections were passed in:\\n' + injectedDependenciesString + '\\n\\n' +\n          'Valid injection targets for this module are:\\n' + validDependenciesString + '\\n'\n        );\n      }\n    })();\n\n    __injector.sourcePath = SOURCE_PATH;\n    __injector.validDependencies = DEPENDENCIES;\n\n    var module = { exports: {} };\n    var exports = module.exports;\n\n    (function () {\n      SOURCE\n    })();\n\n    return module.exports;\n  }\n"), e.exports = n.default
-}, function (e, n, t) {
-    "use strict";
-    Object.defineProperty(n, "__esModule", {value: !0}), n.default = function (e, n, t) {
-        var i = (0, r.transform)(n, {babelrc: !1, code: !1, compact: !1, filename: e.resourcePath}).ast, o = [];
-        (0, r.traverse)(i, {
-            CallExpression: function (e) {
-                r.types.isIdentifier(e.node.callee, {name: "require"}) && (o.push(function (e) {
-                    var n = e.node.arguments[0].value;
-                    return e.replaceWith(r.types.expressionStatement(r.types.conditionalExpression(r.types.callExpression(r.types.memberExpression(r.types.identifier("__injections"), r.types.identifier("hasOwnProperty"), !1), [r.types.stringLiteral(n)]), r.types.memberExpression(r.types.identifier("__injections"), r.types.stringLiteral(n), !0), e.node))), n
-                }(e)), e.skip())
-            }
-        }), 0 === o.length && e.emitWarning("The module you are trying to inject into doesn't have any dependencies. Are you sure you want to do this?");
-        var a = r.types.file(r.types.program([(0, s.default)({
-            SOURCE: i,
-            SOURCE_PATH: r.types.stringLiteral(e.resourcePath),
-            DEPENDENCIES: r.types.arrayExpression(o.map(function (e) {
-                return r.types.stringLiteral(e)
-            }))
-        })]));
-        return (0, r.transformFromAst)(a, n, {
-            sourceMaps: e.sourceMap,
-            sourceFileName: e.resourcePath,
-            inputSourceMap: t,
-            babelrc: !1,
-            compact: !1,
-            filename: e.resourcePath
-        })
-    };
-    var i, r = t(0), o = t(1), s = (i = o) && i.__esModule ? i : {default: i};
-    e.exports = n.default
-}, function (e, n, t) {
-    "use strict";
-    Object.defineProperty(n, "__esModule", {value: !0}), n.default = function (e, n) {
-        this.cacheable && this.cacheable();
-        var t = (0, o.default)(this, e, n), i = t.code, r = t.map;
-        this.callback(null, i, r)
-    };
-    var i, r = t(2), o = (i = r) && i.__esModule ? i : {default: i};
-    e.exports = n.default
-}]);
+module.exports=function(e){var n={};function t(i){if(n[i])return n[i].exports;var r=n[i]={i:i,l:!1,exports:{}};return e[i].call(r.exports,r,r.exports,t),r.l=!0,r.exports}return t.m=e,t.c=n,t.d=function(e,n,i){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:i})},t.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.w={},t(t.s=3)}([function(e,n){e.exports=require("babel-core")},function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i=t(0);n.default=(0,i.template)("\n  module.exports = function __injector(__injections) {\n    __injections = __injections || {};\n\n    (function __validateInjection() {\n      var validDependencies = DEPENDENCIES;\n      var injectedDependencies = Object.keys(__injections);\n      var invalidInjectedDependencies = injectedDependencies.filter(function (dependency) {\n        return validDependencies.indexOf(dependency) === -1;\n      });\n\n      if (invalidInjectedDependencies.length > 0) {\n        var validDependenciesString = ' - ' + validDependencies.join('\\n - ');\n        var injectedDependenciesString = ' - ' + injectedDependencies.join('\\n - ');\n        var invalidDependenciesString = ' - ' + invalidInjectedDependencies.join('\\n - ');\n\n        throw new Error('Injection Error in ' + SOURCE_PATH + '\\n\\n' +\n          'The following injections are invalid:\\n' + invalidDependenciesString + '\\n\\n' +\n          'The following injections were passed in:\\n' + injectedDependenciesString + '\\n\\n' +\n          'Valid injection targets for this module are:\\n' + validDependenciesString + '\\n'\n        );\n      }\n    })();\n\n    __injector.sourcePath = SOURCE_PATH;\n    __injector.validDependencies = DEPENDENCIES;\n\n    var module = { exports: {} };\n    var exports = module.exports;\n\n    (function () {\n      SOURCE\n    })();\n\n    return module.exports;\n  }\n"),e.exports=n.default},function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=function(e,n,t){var i=(0,r.transform)(n,{babelrc:!1,code:!1,compact:!1,filename:e.resourcePath}).ast,o=[];(0,r.traverse)(i,{CallExpression:function(e){r.types.isIdentifier(e.node.callee,{name:"require"})&&(o.push(function(e){var n=e.node.arguments[0].value;return e.replaceWith(r.types.expressionStatement(r.types.conditionalExpression(r.types.callExpression(r.types.memberExpression(r.types.identifier("__injections"),r.types.identifier("hasOwnProperty"),!1),[r.types.stringLiteral(n)]),r.types.memberExpression(r.types.identifier("__injections"),r.types.stringLiteral(n),!0),e.node))),n}(e)),e.skip())}}),0===o.length&&e.emitWarning("The module you are trying to inject into doesn't have any dependencies. Are you sure you want to do this?");var a=r.types.file(r.types.program([(0,s.default)({SOURCE:i,SOURCE_PATH:r.types.stringLiteral(e.resourcePath),DEPENDENCIES:r.types.arrayExpression(o.map(function(e){return r.types.stringLiteral(e)}))})]));return(0,r.transformFromAst)(a,n,{sourceMaps:e.sourceMap,sourceFileName:e.resourcePath,inputSourceMap:t,babelrc:!1,compact:!1,filename:e.resourcePath})};var i,r=t(0),o=t(1),s=(i=o)&&i.__esModule?i:{default:i};e.exports=n.default},function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=function(e,n){this.cacheable&&this.cacheable();var t=(0,o.default)(this,e,n),i=t.code,r=t.map;this.callback(null,i,r)};var i,r=t(2),o=(i=r)&&i.__esModule?i:{default:i};e.exports=n.default}]);

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

@@ -8,13 +8,17 @@ class LayoutModulesConfigLoader extends ModulesConfigLoader {
      */
     loadConfig(theme, filePath) {
         let themeConfig = super.loadConfig(theme, path.join('Resources/views/layouts/', theme, filePath));
+        themeConfig = merge(themeConfig, super.loadConfig(theme, path.join('templates/layouts/', theme, filePath)));
         // recursive process parent theme
         const {parent: parentTheme} = this.themes[theme];
         if (typeof parentTheme === 'string') {
+            const processedFiles = this.processedFiles;
             const parentThemeConfig = this.loadConfig(parentTheme, filePath);
+
             themeConfig = merge(parentThemeConfig, themeConfig);
+            // processedFiles from parent theme is added to processedFiles of current theme
+            this._processedFiles = [...processedFiles, ...this.processedFiles];
         }
-
         return themeConfig;
     }
 
@@ -40,7 +44,7 @@ class LayoutModulesConfigLoader extends ModulesConfigLoader {
      * @return {string[]}
      */
     extraJSBuildNames(theme) {
-        const {extra_js_builds:  extraJSBuilds = []} = this._themes[theme] || {}
+        const {extra_js_builds: extraJSBuilds = []} = this._themes[theme] || {};
         return [...extraJSBuilds.map(suffix => `${theme}-${suffix}`)];
     }
 
@@ -66,7 +70,7 @@ class LayoutModulesConfigLoader extends ModulesConfigLoader {
         const result = [];
         if (marches) {
             const [, theme, suffix] = marches;
-            const {extra_js_builds:  extraJSBuilds = []} = this._themes[theme] || {}
+            const {extra_js_builds: extraJSBuilds = []} = this._themes[theme] || {};
             if (extraJSBuilds.includes(suffix)) {
                 result.push(marches[1], marches[2]);
             } else {

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

@@ -2,6 +2,7 @@ const path = require('path');
 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)));
@@ -28,25 +29,43 @@ class ModulesConfigLoader {
         return this.themeNames;
     }
 
+    /**
+     * @returns {Array}
+     */
+    get processedFiles() {
+        return [...this._processedFiles];
+    }
+
     /**
      * @param {Array} bundles Array of ordered symfony bundle paths
-     * @param {string} themesLocation Path inside the bundle, where to find the theme
+     * @param {string|Array} themesLocation Path inside the bundle, where to find the theme
      * @param {string} themeInfoFileName Yaml File name with theme info
      */
     constructor(bundles, themesLocation, themeInfoFileName) {
         this._bundles = bundles;
-        this._themes = this._getThemes(themesLocation, themeInfoFileName);
+        if (!Array.isArray(themesLocation)) {
+            themesLocation = [themesLocation];
+        }
+
+        const themes = {};
+        const self = this;
+        themesLocation.forEach(themesLocation => {
+            self._collectThemes(themes, themesLocation, themeInfoFileName);
+        });
+
+        this._themes = themes;
+        this._processedFiles = [];
     }
 
     /**
-     * Return list of themes with their parents
+     * Collects list of themes with their parents into given storage(themes param)
+     *
+     * @param {Object} themes
      * @param {string} themesLocation
      * @param {string} themeInfoFileName
-     * @returns {Object.<string|null>}
      * @private
      */
-    _getThemes(themesLocation, themeInfoFileName) {
-        const themes = {};
+    _collectThemes(themes, themesLocation, themeInfoFileName) {
         this._bundles.forEach(bundle => {
             const source = bundle + themesLocation;
 
@@ -64,8 +83,6 @@ class ModulesConfigLoader {
                 themes[name] = merge(themes[name] || {}, theme, {arrayMerge});
             });
         });
-
-        return themes;
     }
 
     /**
@@ -76,6 +93,8 @@ class ModulesConfigLoader {
     loadConfig(theme, filePath) {
         let configs = {};
         const filePaths = [].concat(filePath);
+
+        this._processedFiles = [];
         this._bundles.forEach(bundle => {
             let absolutePath;
 
@@ -88,10 +107,16 @@ class ModulesConfigLoader {
             }
 
             if (absolutePath) {
-                const doc = yaml.load(fs.readFileSync(absolutePath, 'utf8'));
+                const rawDoc = fs.readFileSync(absolutePath, 'utf8');
+                const doc = yaml.load(rawDoc);
+
+                this._processedFiles.push(absolutePath);
+
+                validation.checkSchema(absolutePath, doc, theme);
                 configs = merge(configs, doc);
             }
         });
+
         return configs;
     }
 }

package/oro-webpack-config.js

@@ -3,6 +3,7 @@ const printf = require('printf');
 const AppConfigLoader = require('./app-config-loader');
 const AppModulesFileWriter = require('./writer/app-modules-file-writer');
 const CleanupStatsPlugin = require('./plugin/stats/cleanup-stats-plugin');
+const AfterWebpackLogsPlugin = require('./plugin/logs/after-webpack-logs-plugin');
 const ConfigsFileWriter = require('./writer/configs-file-writer');
 const EntryPointFileWriter = require('./writer/scss-entry-point-file-writer');
 const LayoutModulesConfigLoader = require('./modules-config/layout-modules-config-loader');
@@ -23,33 +24,45 @@ const resolve = require('enhanced-resolve');
 const {merge: webpackMerge} = require('webpack-merge');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const RtlCssWebpackPlugin = require('rtlcss-webpack-plugin');
-const {red: colorRed} = require('colorette');
+const validation = require('./validation');
+const EventEmitter = require('events');
+const ErrorHandler = require('./error-handler');
+
 require('resolve-url-loader');
 
 class ConfigBuilder {
     constructor() {
-        this._publicPath = 'public/';
-        this._adminTheme = 'admin.oro';
+        this._projectPath = '';
         this._enableLayoutThemes = false;
         this._defaultLayoutThemes = null;
-        this._versionFormat = '%s?v=%s';
-        this._babelConfig = {
+        this.emitter = new EventEmitter();
+        this.errorHandler = new ErrorHandler();
+        this.addListeners();
+        this.setPublicPath('public/');
+        this.setAdminTheme('admin.oro');
+        this.setVersionFormat('%s?v=%s');
+        this.setBabelConfig({
             sourceType: 'unambiguous',
             presets: [
                 [
                     '@babel/preset-env', {
-                    useBuiltIns: 'usage',
-                    corejs: {
-                        version: 3,
-                        proposals: true
+                        useBuiltIns: 'usage',
+                        corejs: {
+                            version: 3,
+                            proposals: true
+                        }
                     }
-                }
                 ]
             ],
             plugins: [
                 '@babel/plugin-transform-runtime'
             ]
-        };
+        });
+    }
+
+    addListeners() {
+        this.emitter.on('publicPath:updated', path => validation.setPublicPath(path));
+        this.emitter.on('build:complete', stats => this.errorHandler.onBuildComplete(stats));
     }
 
     /**
@@ -59,6 +72,7 @@ class ConfigBuilder {
      */
     setPublicPath(publicPath) {
         this._publicPath = publicPath;
+        this.emitter.emit('publicPath:updated', publicPath);
         return this;
     }
 
@@ -80,6 +94,7 @@ class ConfigBuilder {
      */
     setVersionFormat(versionFormat) {
         this._versionFormat = versionFormat;
+        this.emitter.emit('versionFormat:updated', versionFormat);
         return this;
     }
 
@@ -96,6 +111,7 @@ class ConfigBuilder {
         }
 
         this._adminTheme = adminTheme;
+        this.emitter.emit('adminTheme:updated', adminTheme);
         return this;
     }
 
@@ -105,8 +121,10 @@ class ConfigBuilder {
     enableLayoutThemes(themes) {
         if (themes) {
             this._defaultLayoutThemes = themes;
+            this.emitter.emit('defaultLayoutThemes:updated', themes);
         }
         this._enableLayoutThemes = true;
+        this.emitter.emit('enableLayoutThemes:updated', true);
         return this;
     }
 
@@ -117,6 +135,7 @@ class ConfigBuilder {
      */
     setBabelConfig(babelConfig) {
         this._babelConfig = babelConfig;
+        this.emitter.emit('babelConfig:updated', babelConfig);
         return this;
     }
 
@@ -132,19 +151,30 @@ class ConfigBuilder {
             try {
                 commonConfig = this._getCommonWebpackConfig(args, env);
             } catch (e) {
-                console.error(colorRed(`Error: ${e.message}`));
+                this.errorHandler.displayError(e);
                 process.exit(1);
             }
 
             const webpackConfigs = [];
             const requestedBuildNames = env.theme ? env.theme.split(',') : [];
             const buildNames = this._getBuildNames(requestedBuildNames);
+
+            const buildErrors = [];
+            validation.jsmodulesValidator.emitter.on('error', error => buildErrors.push(error));
+            validation.assetsValidation.emitter.on('error', error => buildErrors.push(error));
             buildNames.forEach(buildName => {
                 let buildConfig;
+                // flush all collected errors from previews builds
+                buildErrors.splice(0, buildErrors.length);
+
                 try {
                     buildConfig = this._getThemeWebpackConfig(buildName, args, env);
-                } catch (e) {
-                    console.error(colorRed(`Error: ${e.message}`));
+                } catch (error) {
+                    buildErrors.push(error);
+                }
+
+                if (buildErrors.length) {
+                    this.errorHandler.displayError(buildErrors, buildName);
                     return;
                 }
 
@@ -157,6 +187,13 @@ class ConfigBuilder {
         };
     }
 
+    get resolvedProjectPath() {
+        if (this._resolvedProjectPath == undefined) {
+            this._resolvedProjectPath = path.resolve(this._projectPath);
+        }
+        return this._resolvedProjectPath;
+    }
+
     get resolvedPublicPath() {
         if (this._resolvedPublicPath === undefined) {
             this._resolvedPublicPath = path.resolve(this._publicPath);
@@ -331,7 +368,10 @@ class ConfigBuilder {
                 }),
                 new webpack.optimize.MinChunkSizePlugin({
                     minChunkSize: 30000 // Minimum number of characters
-                })
+                }),
+                new AfterWebpackLogsPlugin(
+                    stats => this.emitter.emit('build:complete', stats)
+                )
             ]
         };
 
@@ -401,8 +441,18 @@ class ConfigBuilder {
         if (this._isAdminTheme(buildName)) {
             themeDefinition = this._modulesConfigLoader.themes[buildName.split('.')[1]];
             buildPublicPath = '/build/admin/';
-            const jsModulesConfig = this._themeConfigFactory.loadConfig(buildName,
-                ['Resources/config/oro/jsmodules.yml', 'Resources/config/jsmodules.yml']);
+            const jsModulesConfig = this._themeConfigFactory.loadConfig(
+                buildName,
+                [
+                    'Resources/config/oro/jsmodules.yml',
+                    'Resources/config/jsmodules.yml',
+                    'config/oro/jsmodules.yml'
+                ]
+            );            validation.jsmodulesValidator.checkFullSchema(
+                jsModulesConfig,
+                this._themeConfigFactory?._configLoader.processedFiles,
+                buildName
+            );
             jsBuildConfig = this._themeConfigFactory.create(buildPublicPath, jsModulesConfig);
         } else if (this._layoutModulesConfigLoader.isExtraJSBuild(buildName)) {
             const [theme, suffix] = this._layoutModulesConfigLoader.splitBuildName(buildName);
@@ -412,11 +462,21 @@ class ConfigBuilder {
             const baseConfig = this._layoutThemeConfigFactory.loadConfig(theme, 'config/jsmodules.yml');
             const extraConfig = this._layoutThemeConfigFactory.loadConfig(theme, `config/jsmodules-${suffix}.yml`);
             const jsModulesConfig = this._layoutThemeConfigFactory.extendConfig(baseConfig, extraConfig);
+            validation.jsmodulesValidator.checkFullSchema(
+                jsModulesConfig,
+                this._layoutThemeConfigFactory?._configLoader.processedFiles,
+                buildName
+            );
             jsBuildConfig = this._layoutThemeConfigFactory.create(buildPublicPath, jsModulesConfig);
         } else {
             themeDefinition = this._layoutModulesConfigLoader.themes[buildName];
             buildPublicPath = `/build/${buildName}/`;
             const jsModulesConfig = this._layoutThemeConfigFactory.loadConfig(buildName, 'config/jsmodules.yml');
+            validation.jsmodulesValidator.checkFullSchema(
+                jsModulesConfig,
+                this._layoutThemeConfigFactory?._configLoader.processedFiles,
+                buildName
+            );
             jsBuildConfig = this._layoutThemeConfigFactory.create(buildPublicPath, jsModulesConfig);
         }
         const {rtl_support: rtlSupport = false} = themeDefinition;
@@ -426,6 +486,7 @@ class ConfigBuilder {
             modules: [
                 resolvedBuildPath,
                 this.resolvedPublicPath,
+                path.join(this.resolvedProjectPath, '/assets'),
                 path.join(this.resolvedPublicPath, '/bundles'),
                 path.join(this.resolvedPublicPath, '/js'),
                 this.resolvedNodeModulesPath
@@ -481,7 +542,7 @@ class ConfigBuilder {
                     ...prepareModulesShim(resolver, jsBuildConfig.shim)
                 ]
             }
-        }
+        };
     }
 
     _initialize(args, env) {
@@ -490,10 +551,11 @@ class ConfigBuilder {
         this._isProduction = args.mode === 'production';
         this._symfonyEnv = env.symfony;
         this._appConfig = AppConfigLoader.getConfig(this._cachePath, this._symfonyEnv);
+        this._appConfig.paths.push(this.resolvedProjectPath);
 
         this._modulesConfigLoader = new ModulesConfigLoader(
             this._appConfig.paths,
-            '/Resources/public/themes/',
+            ['/Resources/public/themes/', '/public/themes/admin/'],
             'settings.yml'
         );
         this._adminThemes = this._modulesConfigLoader.themeNames.map(themeName => 'admin.' + themeName);
@@ -507,7 +569,7 @@ class ConfigBuilder {
 
         this._layoutModulesConfigLoader = new LayoutModulesConfigLoader(
             this._appConfig.paths,
-            '/Resources/views/layouts/',
+            ['/Resources/views/layouts/', '/templates/layouts/'],
             'theme.yml'
         );
         this._layoutStyleLoader = new LayoutStyleLoader(this._layoutModulesConfigLoader, entryPointFileWriter);
@@ -520,7 +582,7 @@ class ConfigBuilder {
     }
 
     _getVersionedPath(name, assetVersion) {
-        if(!assetVersion) {
+        if (!assetVersion) {
             return name;
         }
         return printf(this._versionFormat, name, assetVersion);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "5.1.0-alpha32",
+  "version": "5.1.0-alpha35",
   "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.16.10",
-    "@babel/plugin-transform-runtime": "~7.16.10",
+    "@babel/core": "~7.17.9",
+    "@babel/plugin-transform-runtime": "~7.17.0",
     "@babel/preset-env": "~7.16.11",
     "autoprefixer": "~10.4.0",
     "babel-loader": "~8.2.3",
     "bindings": "~1.5.0",
-    "css-loader": "~6.5.1",
+    "css-loader": "~6.7.1",
     "css-minimizer-webpack-plugin": "~3.4.1",
     "deepmerge": "~4.2.2",
     "exports-loader": "~3.1.0",
@@ -23,7 +23,7 @@
     "html-webpack-plugin": "~5.5.0",
     "imports-loader": "~3.1.1",
     "js-yaml": "~4.1.0",
-    "mini-css-extract-plugin": "~2.5.2",
+    "mini-css-extract-plugin": "~2.6.0",
     "minimist": "~1.2.3",
     "nan": "~2.15.0",
     "path": "0.12.7",
@@ -32,14 +32,15 @@
     "printf": "~0.6.0",
     "resolve-url-loader": "^5.0.0",
     "rtlcss-webpack-plugin": "~4.0.6",
-    "sass": "~1.49.0",
-    "sass-loader": "~12.4.0",
+    "sass": "~1.50.0",
+    "sass-loader": "~12.6.0",
+    "schema-utils": "^4.0.0",
     "style-loader": "~3.3.1",
-    "terser": "~5.10.0",
+    "terser": "~5.12.1",
     "text-loader": "0.0.1",
     "underscore": "~1.13.1",
     "url-loader": "~4.1.1",
-    "webpack": "~5.66.0",
+    "webpack": "~5.72.0",
     "webpack-bundle-analyzer": "~4.5.0",
     "webpack-cli": "~4.9.1",
     "webpack-dev-server": "^4.7.3",

package/plugin/logs/after-webpack-logs-plugin.js

@@ -0,0 +1,25 @@
+const {once} = require('underscore');
+
+class AfterWebpackLogsPlugin {
+    /**
+     * @param {function} afterLogsCb
+     */
+    constructor(afterLogsCb) {
+        if (typeof afterLogsCb !== 'function') {
+            throw new Error('The "afterLogsCb" arg should be a function');
+        }
+        this._afterLogsCb = once(afterLogsCb);
+    }
+
+    apply(compiler) {
+        compiler.hooks.done.tap('AfterWebpackLogsPlugin', stats => {
+            const compilerStats = stats;
+            stats.compilation.hooks.statsPrinter.tap('AfterWebpackLogsPlugin', stats => {
+                // Making logs to be after all webpack logs in the console
+                setImmediate(() => this._afterLogsCb(compilerStats));
+            });
+        });
+    }
+}
+
+module.exports = AfterWebpackLogsPlugin;

package/style/admin-style-loader.js

@@ -9,8 +9,9 @@ class AdminStyleLoader extends StyleLoader {
         const {rtl_support: rtlSupport = false, styles: extraThemeConfig} =
             this._configLoader.loadConfig(themeName, 'Resources/public/themes/' + themeName + '/settings.yml');
         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, extraThemeConfig);
+        const themeConfig = merge(baseThemeConfig, appRootExtraConfig, extraThemeConfig);
 
         return {
             themeConfig,