@oroinc/oro-webpack-config-builder 5.1.0-alpha28 → 5.1.0-alpha31

package/messages.js

@@ -0,0 +1,29 @@
+const doc = "Please, find more information in the documentation ";
+const CSSError = "Failed assembly styles.\n";
+const CSSDoc = "https://doc.oroinc.com/backend/bundles/platform/AssetBundle/#load-scss-or-css-files-from-the-bundle";
+const JSError = `Failed assembly JS.\n`;
+const JSDoc = "https://doc.oroinc.com/backend/bundles/platform/AssetBundle/#create-jsmodules-yml-configuration";
+const JSExtraBuildDoc = "https://doc.oroinc.com/master/frontend/storefront/how-to/how-to-create-extra-js-build-for-landing-page";
+
+module.exports = {
+    assetsMissedOutput(group, theme) {
+        const error = `The "output" for "${group}" entry point in "${theme}" theme is not defined.\n`;
+
+        return `${CSSError}${error}${doc}${CSSDoc}`;
+    },
+    assetsMissedInput(group, theme) {
+        const error = `The "output" for "${group}" entry point in "${theme}" theme is not defined.\n`;
+
+        return `${CSSError}${error}${doc}${CSSDoc}`
+    },
+    jsModulesError(theme) {
+        const error = `Failed assembly JS for the "${theme}" theme.\n`;
+
+        return `${error}${doc}${JSDoc}`
+    },
+    jsExtraModulesError(parts) {
+        const error = `Sections ["${parts.join('", "')}"] are not allowed in extra js build definition\n`;
+
+        return `${JSError}${error}${doc}${JSExtraBuildDoc}`;
+    }
+};

package/oro-webpack-config.js

@@ -23,6 +23,7 @@ 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');
 require('resolve-url-loader');
 
 class ConfigBuilder {
@@ -127,12 +128,26 @@ class ConfigBuilder {
         return (env = {}, args = {}) => {
             this._initialize(args, env);
 
-            const commonConfig = this._getCommonWebpackConfig(args, env);
+            let commonConfig = {};
+            try {
+                commonConfig = this._getCommonWebpackConfig(args, env);
+            } catch (e) {
+                console.error(colorRed(`Error: ${e.message}`));
+                process.exit(1);
+            }
+
             const webpackConfigs = [];
             const requestedBuildNames = env.theme ? env.theme.split(',') : [];
             const buildNames = this._getBuildNames(requestedBuildNames);
             buildNames.forEach(buildName => {
-                const buildConfig = this._getThemeWebpackConfig(buildName, args, env);
+                let buildConfig;
+                try {
+                    buildConfig = this._getThemeWebpackConfig(buildName, args, env);
+                } catch (e) {
+                    console.error(colorRed(`Error: ${e.message}`));
+                    return;
+                }
+
                 if (buildConfig) {
                     webpackConfigs.push(webpackMerge(buildConfig, commonConfig));
                 }

package/package.json

@@ -1,49 +1,49 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "5.1.0-alpha28",
+  "version": "5.1.0-alpha31",
   "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.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "autoprefixer": "^10.4.0",
-    "babel-loader": "^8.2.3",
-    "bindings": "^1.5.0",
-    "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.1.3",
-    "deepmerge": "^4.2.2",
-    "exports-loader": "^3.1.0",
-    "expose-loader": "^3.1.0",
-    "extract-loader": "^5.1.0",
-    "file-loader": "^6.2.0",
-    "happypack": "^5.0.1",
-    "html-webpack-plugin": "^5.5.0",
-    "imports-loader": "^3.1.1",
-    "js-yaml": "^4.1.0",
-    "mini-css-extract-plugin": "^2.4.4",
-    "minimist": "^1.2.3",
-    "nan": "^2.15.0",
+    "@babel/core": "~7.16.0",
+    "@babel/plugin-transform-runtime": "~7.16.0",
+    "@babel/preset-env": "~7.16.0",
+    "autoprefixer": "~10.4.0",
+    "babel-loader": "~8.2.3",
+    "bindings": "~1.5.0",
+    "css-loader": "~6.5.1",
+    "css-minimizer-webpack-plugin": "~3.1.3",
+    "deepmerge": "~4.2.2",
+    "exports-loader": "~3.1.0",
+    "expose-loader": "~3.1.0",
+    "extract-loader": "~5.1.0",
+    "file-loader": "~6.2.0",
+    "happypack": "~5.0.1",
+    "html-webpack-plugin": "~5.5.0",
+    "imports-loader": "~3.1.1",
+    "js-yaml": "~4.1.0",
+    "mini-css-extract-plugin": "~2.4.4",
+    "minimist": "~1.2.3",
+    "nan": "~2.15.0",
     "path": "0.12.7",
-    "postcss": "^8.3.11",
-    "postcss-loader": "^6.2.0",
-    "printf": "^0.6.0",
-    "resolve-url-loader": "^4.0.0",
-    "rtlcss-webpack-plugin": "^4.0.6",
-    "sass": "^1.43.4",
-    "sass-loader": "^12.3.0",
-    "style-loader": "^3.3.1",
-    "terser": "^5.9.0",
+    "postcss": "~8.3.11",
+    "postcss-loader": "~6.2.0",
+    "printf": "~0.6.0",
+    "resolve-url-loader": "~4.0.0",
+    "rtlcss-webpack-plugin": "~4.0.6",
+    "sass": "~1.43.4",
+    "sass-loader": "~12.3.0",
+    "style-loader": "~3.3.1",
+    "terser": "~5.9.0",
     "text-loader": "0.0.1",
-    "underscore": "^1.13.1",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.63.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.4.0",
-    "webpack-merge": "^5.8.0",
-    "wildcard": "^2.0.0"
+    "underscore": "~1.13.1",
+    "url-loader": "~4.1.1",
+    "webpack": "~5.63.0",
+    "webpack-bundle-analyzer": "~4.5.0",
+    "webpack-cli": "~4.9.1",
+    "webpack-dev-server": "~4.4.0",
+    "webpack-merge": "~5.8.0",
+    "wildcard": "~2.0.0"
   }
 }

package/style/style-loader.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const wildcard = require('wildcard');
 const _ = require('underscore');
+const messages = require('../messages')
 
 /**
  * @typedef ThemeGroupConfig
@@ -33,8 +34,13 @@ class StyleLoader {
         const writingOptions = {};
         for (const [group, config] of Object.entries(themeConfig)) {
             let {inputs, entries = [], output, auto_rtl_inputs: rtlMasks = []} = config;
-            if (output === undefined) {
-                throw new Error('"output" for "' + group + '" group in theme "' + theme + '" is not defined');
+
+            if (output === void 0) {
+                throw new Error(messages.assetsMissedOutput(group, theme));
+            }
+
+            if (inputs === void 0) {
+                throw new Error(messages.assetsMissedInput(group, theme));
             }
 
             inputs = this._overrideInputs(inputs);

package/theme-config-factory.js

@@ -1,3 +1,5 @@
+const messages = require('./messages');
+
 class ThemeConfigFactory {
     /**
      * @param {ModulesConfigLoader} configLoader
@@ -17,7 +19,11 @@ class ThemeConfigFactory {
      * @return {Object} Merged Configs loaded from all the bundles Yaml files matched by filePath
      */
     loadConfig(theme, configFilepath) {
-        return this._configLoader.loadConfig(theme, configFilepath);
+        try {
+            return this._configLoader.loadConfig(theme, configFilepath)
+        } catch (e) {
+            throw new Error(messages.jsModulesError(theme));
+        }
     }
 
     extendConfig(baseConfig, extraConfig) {
@@ -37,7 +43,7 @@ class ThemeConfigFactory {
 
         const beyondKeys = Object.keys(rest);
         if (beyondKeys.length) {
-            throw new Error(`Sections ["${beyondKeys.join('", "')}"] are not allowed in extra js build definition`);
+            throw new Error( messages.jsExtraModulesError(beyondKeys));
         }
 
         return {