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

package/loader/inject-loader/index.js

@@ -0,0 +1,70 @@
+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/loader/inject-loader/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["webpack:///webpack/bootstrap 393a9525777b8b817cc3","webpack:///external \"babel-core\"","webpack:///src/index.js","webpack:///src/injectify.js","webpack:///src/wrapper_template.js"],"sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 1);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 393a9525777b8b817cc3","module.exports = require(\"babel-core\");\n\n\n//////////////////\n// WEBPACK FOOTER\n// external \"babel-core\"\n// module id = 0\n// module chunks = 0","// @flow\n\nimport injectify from './injectify.js';\n\nexport default function injectifyLoader(source, inputSourceMap) {\n  if (this.cacheable) {\n    this.cacheable();\n  }\n\n  const { code, map } = injectify(this, source, inputSourceMap);\n  this.callback(null, code, map);\n}\n\n\n\n// WEBPACK FOOTER //\n// src/index.js","// @flow\n\nimport { transform, traverse, types as t, transformFromAst } from 'babel-core';\nimport wrapperTemplate from './wrapper_template.js';\n\nfunction processRequireCall(path) {\n  const dependencyString = path.node.arguments[0].value;\n  path.replaceWith(\n    t.expressionStatement(\n      t.conditionalExpression(\n        t.callExpression(\n          t.memberExpression(\n            t.identifier('__injections'),\n            t.identifier('hasOwnProperty'),\n            false,\n          ),\n          [\n            t.stringLiteral(dependencyString),\n          ],\n        ),\n        t.memberExpression(\n          t.identifier('__injections'),\n          t.stringLiteral(dependencyString),\n          true,\n        ),\n        path.node,\n      ),\n    ),\n  );\n\n  return dependencyString;\n}\n\nexport default function injectify(context, source, inputSourceMap) {\n  const { ast } = transform(source, {\n    babelrc: false,\n    code: false,\n    compact: false,\n    filename: context.resourcePath,\n  });\n\n  const dependencies = [];\n  traverse(ast, {\n    CallExpression(path) {\n      if (t.isIdentifier(path.node.callee, { name: 'require' })) {\n        dependencies.push(processRequireCall(path));\n        path.skip();\n      }\n    },\n  });\n\n  if (dependencies.length === 0) {\n    context.emitWarning('The module you are trying to inject into doesn\\'t have any dependencies. ' +\n      'Are you sure you want to do this?');\n  }\n\n  const dependenciesArrayAst = t.arrayExpression(\n    dependencies.map(dependency => t.stringLiteral(dependency)),\n  );\n  const wrapperModuleAst = t.file(t.program([\n    wrapperTemplate({ SOURCE: ast, DEPENDENCIES: dependenciesArrayAst }),\n  ]));\n\n  return transformFromAst(wrapperModuleAst, source, {\n    sourceMaps: context.sourceMap,\n    sourceFileName: context.resourcePath,\n    inputSourceMap,\n    babelrc: false,\n    compact: false,\n    filename: context.resourcePath,\n  });\n}\n\n\n\n// WEBPACK FOOTER //\n// src/injectify.js","// @flow\n\nimport { template } from 'babel-core';\n\nexport default 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('Some of the injections you passed in are invalid.\\\\n' +\n          'Valid injection targets for this module are:\\\\n' + validDependenciesString + '\\\\n' +\n          'The following injections were passed in:\\\\n' + injectedDependenciesString + '\\\\n' +\n          'The following injections are invalid:\\\\n' + invalidDependenciesString + '\\\\n'\n        );\n      }\n    })();\n\n    var module = { exports: {} };\n    var exports = module.exports;\n\n    (function () {\n      SOURCE\n    })();\n\n    return module.exports;\n  }\n`);\n\n\n\n// WEBPACK FOOTER //\n// src/wrapper_template.js"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;AC7DA;;;;;;;;;;;;;;;;;;;ACIA;AACA;AAHA;AACA;;;;;AACA;AACA;AACA;AACA;AACA;AAJA;AAAA;AAAA;AACA;AAKA;AACA;AACA;;;;;;;;;;;;;ACqBA;AACA;AAhCA;AACA;AAAA;AACA;;;;;AAJA;AACA;AAIA;AACA;AACA;AACA;AAsBA;AACA;AACA;AACA;AAAA;AAEA;AACA;AACA;AACA;AAJA;AADA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AANA;AACA;AAQA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAEA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AANA;AAQA;;;;;;;;;;;;;;ACrEA;AACA;AACA;AACA;;;;A","sourceRoot":""}

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-alpha29",
+  "version": "5.1.0-alpha32",
   "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.10",
+    "@babel/plugin-transform-runtime": "~7.16.10",
+    "@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-minimizer-webpack-plugin": "~3.4.1",
+    "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.5.2",
+    "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.4.5",
+    "postcss-loader": "~6.2.0",
+    "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",
+    "style-loader": "~3.3.1",
+    "terser": "~5.10.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.66.0",
+    "webpack-bundle-analyzer": "~4.5.0",
+    "webpack-cli": "~4.9.1",
+    "webpack-dev-server": "^4.7.3",
+    "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 {