@oroinc/oro-webpack-config-builder 5.1.0-alpha45 → 5.1.0-alpha47

package/loader/inject-loader/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Justin Morris
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/loader/inject-loader/README.md

@@ -0,0 +1,54 @@
+<div align="center">
+  <h3>💉📦<br><br><code>inject-loader</code></h3>
+  <h4>A Webpack loader for injecting code into modules via their dependencies</h4>
+  <a href="https://travis-ci.org/plasticine/inject-loader"><img src="https://img.shields.io/travis/plasticine/inject-loader/master.svg?style=flat-square" alt="build status" /></a> <a href="https://www.npmjs.com/package/inject-loader"><img src="https://img.shields.io/npm/v/inject-loader.svg?style=flat-square" alt="npm version" /></a> <a href="https://www.npmjs.com/package/inject-loader"><img src="https://img.shields.io/npm/dm/inject-loader.svg?style=flat-square" alt="npm downloads" /></a>
+</div>
+
+***
+
+### Why
+
+This is particularly useful for writing tests where mocking things inside your module-under-test is sometimes necessary before execution.
+
+`inject-loader` was inspired by, and builds upon ideas introduced in [jauco/webpack-injectable](https://github.com/jauco/webpack-injectable).
+
+### Usage
+
+[Documentation: Using loaders](http://webpack.github.io/docs/using-loaders.html)
+
+Use the inject loader by adding the `inject-loader!` [inline loader](https://webpack.js.org/concepts/loaders/#inline) when you use `require`, this will return a function that can used in test code to modify the injected module.
+
+By default all `require` statements in an injected module will be altered to be replaced with an injector, though if a replacement it not specified the default values will be used.
+
+### Examples
+
+Given some code in a module like this:
+
+```javascript
+// MyStore.js
+
+var Dispatcher = require('lib/dispatcher');
+var EventEmitter = require('events').EventEmitter;
+var handleAction = require('lib/handle_action');
+
+Dispatcher.register(handleAction, 'MyStore');
+```
+
+You can manipulate it’s dependencies when you come to write tests as follows:
+
+```javascript
+// If no flags are provided when using the loader then
+// all require statements will be wrapped in an injector
+MyModuleInjector = require('inject-loader!MyStore')
+MyModule = MyModuleInjector({
+  'lib/dispatcher': DispatcherMock,
+  'events': EventsMock,
+  'lib/handle_action': HandleActionMock
+})
+```
+
+There are a few examples of complete test setups for both Webpack 1, 2, 3 & 4 in the [`example`](./example) folder.
+
+## License
+
+MIT (http://www.opensource.org/licenses/mit-license.php)

package/loader/inject-loader/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "inject-loader",
+  "version": "4.0.1",
+  "description": "A Webpack loader for injecting code into modules via their dependencies",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "webpack --config config/webpack.config.js",
+    "build:test": "webpack --config config/webpack.test.config.js",
+    "build:release": "yarn run build && mkdir -p ./dist && cp -f ./tmp/index.js ./dist/index.js && cp -f ./tmp/index.js.map ./dist/index.js.map",
+    "pretest:unit": "yarn build && yarn build:test",
+    "test:unit": "mocha tmp/testBundle.js --require source-map-support/register",
+    "test:integration": "./script/integration_test",
+    "test": "flow && yarn test:unit && yarn test:integration",
+    "precommit": "pretty-quick --staged"
+  },
+  "files": [
+    "*.md",
+    "dist"
+  ],
+  "author": "Justin Morris <desk@pixelbloom.com> (http://pixelbloom.com)",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:plasticine/inject-loader.git"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "babel-core": "~6"
+  },
+  "devDependencies": {
+    "babel-loader": "^7.1.4",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-flow-strip-types": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
+    "flow-bin": "^0.69.0",
+    "husky": "^0.14.3",
+    "mocha": "^5.0.5",
+    "prettier": "^1.11.1",
+    "pretty-quick": "^1.4.1",
+    "source-map-support": "^0.5.4",
+    "webpack": "^4.35.0",
+    "webpack-cli": "^3.3.5"
+  },
+  "peerDependencies": {
+    "webpack": "^1 || ^2 || ^3 || ^4"
+  },
+  "keywords": [
+    "webpack",
+    "testing",
+    "loader",
+    "webpack-loader",
+    "inject",
+    "mock",
+    "mocking"
+  ]
+}

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

@@ -8,7 +8,7 @@ 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') {

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

@@ -38,34 +38,24 @@ class ModulesConfigLoader {
 
     /**
      * @param {Array} bundles Array of ordered symfony bundle paths
-     * @param {string|Array} themesLocation Path inside the bundle, where to find the theme
+     * @param {string} 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;
-        if (!Array.isArray(themesLocation)) {
-            themesLocation = [themesLocation];
-        }
-
-        const themes = {};
-        const self = this;
-        themesLocation.forEach(themesLocation => {
-            self._collectThemes(themes, themesLocation, themeInfoFileName);
-        });
-
-        this._themes = themes;
+        this._themes = this._getThemes(themesLocation, themeInfoFileName);
         this._processedFiles = [];
     }
 
     /**
-     * Collects list of themes with their parents into given storage(themes param)
-     *
-     * @param {Object} themes
+     * Return list of themes with their parents
      * @param {string} themesLocation
      * @param {string} themeInfoFileName
+     * @returns {Object.<string|null>}
      * @private
      */
-    _collectThemes(themes, themesLocation, themeInfoFileName) {
+    _getThemes(themesLocation, themeInfoFileName) {
+        const themes = {};
         this._bundles.forEach(bundle => {
             const source = bundle + themesLocation;
 
@@ -83,6 +73,8 @@ class ModulesConfigLoader {
                 themes[name] = merge(themes[name] || {}, theme, {arrayMerge});
             });
         });
+
+        return themes;
     }
 
     /**

package/oro-webpack-config.js

@@ -10,6 +10,7 @@ const LayoutModulesConfigLoader = require('./modules-config/layout-modules-confi
 const LayoutStyleLoader = require('./style/layout-style-loader');
 const MapModulesPlugin = require('./plugin/map/map-modules-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const HappyPack = require('happypack');
 const ModulesConfigLoader = require('./modules-config/modules-config-loader');
 const DynamicImportsFileWriter = require('./writer/dynamic-imports-file-writer');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
@@ -31,7 +32,6 @@ require('resolve-url-loader');
 
 class ConfigBuilder {
     constructor() {
-        this._projectPath = '';
         this._enableLayoutThemes = false;
         this._defaultLayoutThemes = null;
         this.emitter = new EventEmitter();
@@ -186,13 +186,6 @@ 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 +324,6 @@ class ConfigBuilder {
                         }, {
                             loader: 'sass-loader',
                             options: {
-                                implementation: require("sass"),
                                 sassOptions: {
                                     includePaths: [
                                         path.join(this.resolvedPublicPath, '/bundles')
@@ -379,7 +371,19 @@ class ConfigBuilder {
             webpackConfig.plugins.push(new BundleAnalyzerPlugin());
         }
 
-        if (!env.skipJS && env.withBabel) {
+        if (!env.skipJS && !env.skipBabel) {
+            const happyPackOptions = {
+                id: 'babel',
+                loaders: [
+                    {
+                        loader: 'babel-loader',
+                        options: this._babelConfig
+                    }
+                ]
+            };
+
+            webpackConfig.plugins.push(new HappyPack(happyPackOptions));
+
             webpackConfig.module.rules.push({
                 test: /\.js$/,
                 exclude: [
@@ -387,10 +391,7 @@ class ConfigBuilder {
                     /[\/\\]node_modules[\/\\]/,
                     /[\/\\]bundles[\/\\].+[\/\\]lib[\/\\]?/
                 ],
-                use: {
-                    loader: 'babel-loader',
-                    options: this._babelConfig
-                }
+                use: 'happypack/loader?id=babel'
             });
         }
 
@@ -432,14 +433,9 @@ 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',
-                    'config/oro/jsmodules.yml'
-                ]
-            );            validation.jsmodulesValidator.checkFullSchema(
+            const jsModulesConfig = this._themeConfigFactory.loadConfig(buildName,
+                ['Resources/config/oro/jsmodules.yml', 'Resources/config/jsmodules.yml']);
+            validation.jsmodulesValidator.checkFullSchema(
                 jsModulesConfig,
                 this._themeConfigFactory?._configLoader.processedFiles,
                 buildName
@@ -477,7 +473,6 @@ class ConfigBuilder {
             modules: [
                 resolvedBuildPath,
                 this.resolvedPublicPath,
-                path.join(this.resolvedProjectPath, '/assets'),
                 path.join(this.resolvedPublicPath, '/bundles'),
                 path.join(this.resolvedPublicPath, '/js'),
                 this.resolvedNodeModulesPath
@@ -542,11 +537,10 @@ 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/', '/public/themes/admin/'],
+            '/Resources/public/themes/',
             'settings.yml'
         );
         this._adminThemes = this._modulesConfigLoader.themeNames.map(themeName => 'admin.' + themeName);
@@ -560,7 +554,7 @@ class ConfigBuilder {
 
         this._layoutModulesConfigLoader = new LayoutModulesConfigLoader(
             this._appConfig.paths,
-            ['/Resources/views/layouts/', '/templates/layouts/'],
+            '/Resources/views/layouts/',
             'theme.yml'
         );
         this._layoutStyleLoader = new LayoutStyleLoader(this._layoutModulesConfigLoader, entryPointFileWriter);

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "5.1.0-alpha45",
+  "version": "5.1.0-alpha47",
   "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.20.5",
-    "@babel/plugin-transform-runtime": "~7.19.6",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-runtime": "^7.19.6",
     "@babel/preset-env": "~7.20.2",
-    "autoprefixer": "~10.4.13",
-    "babel-loader": "~9.1.0",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "~8.2.3",
     "bindings": "~1.5.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "~4.2.2",
@@ -18,29 +18,30 @@
     "exports-loader": "~4.0.0",
     "expose-loader": "~4.0.0",
     "file-loader": "~6.2.0",
+    "happypack": "~5.0.1",
     "html-webpack-plugin": "~5.5.0",
-    "imports-loader": "~4.0.1",
+    "imports-loader": "~4.0.0",
     "js-yaml": "~4.1.0",
-    "mini-css-extract-plugin": "~2.7.1",
-    "minimist": "~1.2.7",
-    "nan": "~2.17.0",
+    "mini-css-extract-plugin": "^2.7.1",
+    "minimist": "^1.2.7",
+    "nan": "^2.17.0",
     "path": "0.12.7",
     "postcss": "~8.4.19",
-    "postcss-loader": "~7.0.2",
+    "postcss-loader": "^7.0.2",
     "printf": "~0.6.0",
     "resolve-url-loader": "^5.0.0",
     "rtlcss-webpack-plugin": "~4.0.6",
-    "sass": "~1.56.1",
+    "sass": "^1.57.1",
     "sass-loader": "~13.2.0",
     "schema-utils": "^4.0.0",
     "style-loader": "~3.3.1",
-    "terser": "~5.16.1",
+    "terser": "^5.16.1",
     "text-loader": "0.0.1",
-    "underscore": "1.13.*",
-    "url-loader": "~4.1.1",
-    "webpack": "~5.75.0",
-    "webpack-bundle-analyzer": "~4.7.0",
-    "webpack-cli": "~5.0.0",
+    "underscore": "^1.13.6",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.75.0",
+    "webpack-bundle-analyzer": "^4.7.0",
+    "webpack-cli": "~4.9.1",
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "~5.8.0",
     "wildcard": "~2.0.0"

package/style/admin-style-loader.js

@@ -9,9 +9,8 @@ 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, appRootExtraConfig, extraThemeConfig);
+        const themeConfig = merge(baseThemeConfig, extraThemeConfig);
 
         return {
             themeConfig,

package/style/style-loader.js

@@ -49,7 +49,6 @@ class StyleLoader {
 
             inputs = this._overrideInputs(inputs);
             inputs = this._sortInputs(inputs);
-            inputs = this._applyInputsBasePathPrefix(inputs);
 
             if (settings.rtlSupport) {
                 writingOptions.ignoreRTLInputs = _.difference(inputs, this._matchInputs(rtlMasks, inputs));
@@ -59,7 +58,7 @@ class StyleLoader {
             const filePath = path.join(buildPath, output);
             entryPoints[entryPointName] = [
                 ...entries,
-                this._entryPointFileWriter.write('./../../', inputs, filePath, writingOptions)
+                this._entryPointFileWriter.write('./../../../', inputs, filePath, writingOptions)
             ];
         }
         return entryPoints;
@@ -154,7 +153,6 @@ class StyleLoader {
      * @protected
      */
     _matchInputs(masks, inputs) {
-        masks = this._applyInputsBasePathPrefix(masks);
         masks = masks.map(mask => wildcard(mask));
 
         const whiteListedInputs = masks.reduce((include, mask) => {
@@ -164,26 +162,6 @@ class StyleLoader {
 
         return _.unique(whiteListedInputs);
     }
-
-    /**
-     * Considering base path as application's root.
-     * Bundles based *.scss sources go with '../' prefix.
-     *
-     * @param {string[]} inputs
-     * @private
-     */
-    _applyInputsBasePathPrefix(inputs) {
-        const processedInputs = [];
-
-        inputs.forEach(input => {
-            if (input.indexOf('bundles') === 0) {
-                input = '../' + input;
-            }
-            processedInputs.push(input);
-        });
-
-        return processedInputs;
-    }
 }
 
 module.exports = StyleLoader;

package/validation/assets-validator.js

@@ -82,11 +82,10 @@ module.exports = Object.assign({}, schemaValidator, {
                     input = newPath;
                 }
 
-                const fullBasePath = path.resolve(input);
                 const fullPath = path.resolve(this._publicPath + input);
                 // skip the path to global node modules,
                 // e.g. '~bootstrap/scss/bootstrap'
-                if (!input.startsWith('~') && !fs.existsSync(fullPath) && !fs.existsSync(fullBasePath)) {
+                if (!input.startsWith('~') && !fs.existsSync(fullPath)) {
                     files.push(input);
                 }
             });