@oroinc/oro-webpack-config-builder 6.1.0-lts15 → 7.0.1

package/loader/inject-loader/package.json

@@ -2,54 +2,11 @@
   "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"
-  ]
+  "private": true
 }

package/oro-webpack-config.js

@@ -31,6 +31,8 @@ const ErrorHandler = require('./error-handler');
 const SVGSprite = require('./svg-sprite');
 const TerserPlugin = require('terser-webpack-plugin');
 const jsToSCSS = require('./js-to-scss');
+const oroPostcssCleanup = require('./postcss/oro-postcss-cleanup');
+const cleanupPostcssConfig = require('./postcss/cleanup-postcss-config');
 require('resolve-url-loader');
 require('lezer-loader');
 
@@ -565,7 +567,10 @@ class ConfigBuilder {
                                 sourceMap: true,
                                 postcssOptions: {
                                     plugins: [
-                                        require('autoprefixer')
+                                        require('autoprefixer'),
+                                        this._isProduction
+                                            ? oroPostcssCleanup(cleanupPostcssConfig)
+                                            : null
                                     ]
                                 }
                             }
@@ -612,7 +617,6 @@ class ConfigBuilder {
 
     _initialize(args, env) {
         const entryPointFileWriter = new EntryPointFileWriter(this._publicPath);
-
         this._isProduction = args.mode === 'production';
         this._symfonyEnv = env.symfony;
         this._appConfig = AppConfigLoader.getConfig(this._cachePath, this._symfonyEnv);

package/package.json

@@ -1,55 +1,57 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "6.1.0-lts15",
+  "version": "7.0.1",
   "author": "Oro, Inc. (https://oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",
   "main": "oro-webpack-config.js",
   "dependencies": {
-    "@babel/core": "~7.23.3",
-    "@babel/plugin-transform-runtime": "~7.21.0",
-    "@babel/preset-env": "~7.21.2",
-    "@swc/core": "^1.11.8",
-    "autoprefixer": "~10.4.13",
-    "babel-loader": "~9.1.0",
+    "@babel/core": "~7.23.9",
+    "@babel/plugin-transform-runtime": "~7.21.4",
+    "@babel/preset-env": "~7.21.5",
+    "@swc/core": "^1.15.11",
+    "autoprefixer": "~10.4.24",
+    "babel-loader": "~9.1.3",
     "bindings": "~1.5.0",
-    "css-loader": "^6.8.1",
-    "css-minimizer-webpack-plugin": "~5.0.0",
+    "colorette": "^2.0.20",
+    "css-loader": "^6.11.0",
+    "css-minimizer-webpack-plugin": "~5.0.1",
     "deepmerge": "~4.3.1",
+    "enhanced-resolve": "^5.18.4",
+    "esbuild-loader": "^4.4.2",
     "exports-loader": "~4.0.0",
     "expose-loader": "~4.1.0",
-    "esbuild-loader": "^4.3.0",
     "file-loader": "~6.2.0",
-    "html-webpack-plugin": "~5.5.0",
+    "html-webpack-plugin": "~5.5.4",
     "imports-loader": "~4.0.1",
-    "js-yaml": "~4.1.0",
+    "js-yaml": "~4.1.1",
     "lezer-loader": "^0.3.0",
-    "mini-css-extract-plugin": "~2.7.1",
-    "minimist": "~1.2.7",
+    "mini-css-extract-plugin": "~2.7.7",
+    "minimist": "~1.2.8",
     "nan": "~2.17.0",
     "path": "0.12.7",
-    "postcss": "<8.4.33",
+    "postcss": "^8.4.32",
     "postcss-loader": "~7.3.4",
-    "printf": "~0.6.0",
+    "printf": "~0.6.1",
     "resolve-url-loader": "^5.0.0",
-    "rtlcss-webpack-plugin": "~4.0.6",
-    "sass": "~1.85.0",
-    "sass-loader": "~13.2.0",
-    "schema-utils": "^4.0.0",
-    "style-loader": "~3.3.1",
-    "svgo": "^3.0.2",
+    "rtlcss-webpack-plugin": "~4.0.7",
+    "sass": "~1.85.1",
+    "sass-loader": "~13.2.2",
+    "schema-utils": "^4.3.3",
+    "style-loader": "~3.3.4",
+    "svgo": "^3.3.2",
     "svgstore": "^3.0.1",
-    "terser": "~5.39.0",
-    "terser-webpack-plugin": "^5.3.13",
+    "terser": "~5.39.2",
+    "terser-webpack-plugin": "^5.3.16",
     "text-loader": "0.0.1",
-    "underscore": "1.13.*",
+    "underscore": "1.13.7",
     "url-loader": "~4.1.1",
     "webpack": "~5.98.0",
     "webpack-bundle-analyzer": "~4.10.2",
-    "webpack-cli": "~6.0.0",
-    "webpack-dev-server": "^5.2.0",
+    "webpack-cli": "~6.0.1",
+    "webpack-dev-server": "^5.2.3",
     "webpack-merge": "~5.8.0",
-    "webpack-subresource-integrity": "^5.2.0-rc.1",
-    "wildcard": "~2.0.0"
+    "webpack-subresource-integrity": "5.2.0-rc.1",
+    "wildcard": "~2.0.1"
   }
 }

package/plugin/integrity/integrity-file-plugin.js

@@ -28,11 +28,11 @@ class IntegrityFilePlugin {
                             ];
                         })
                     );
+                    const jsonData = JSON.stringify(integrityData, null, 2);
+                    const outputPath = path.join(this.publicPath, compiler.options.output.publicPath, this.fileName);
 
-                    compilation.emitAsset(
-                        this.fileName,
-                        new sources.RawSource(JSON.stringify(integrityData, null, 2))
-                    );
+                    await fs.writeFile(outputPath, jsonData, 'utf8');
+                    compilation.emitAsset(outputPath, new sources.RawSource(jsonData));
                 }
             );
         });

package/postcss/cleanup-postcss-config.js

@@ -0,0 +1,12 @@
+module.exports = {
+    declarations: {
+        cursor: {
+            task: 'remove',
+            whenValueEquals: 'hand'
+        },
+        filter: {
+            task: 'remove',
+            whenValueEquals: 'gray'
+        }
+    }
+};

package/postcss/oro-postcss-cleanup.js

@@ -0,0 +1,29 @@
+module.exports = ({declarations = {}} = {}) => {
+    const props = Object.keys(declarations);
+
+    return {
+        postcssPlugin: 'oro-postcss-cleanup',
+
+        Declaration(decl, {result}) {
+            for (let i = 0; i < props.length; i++) {
+                const prop = props[i];
+                if (decl.prop === prop) {
+                    declarationParserHelper({declConfig: declarations[prop], decl: decl, result: result});
+                    break;
+                }
+            }
+        }
+    };
+
+    function declarationParserHelper({declConfig, decl, result}) {
+        if (typeof declConfig === 'object' && declConfig.task === 'remove') {
+            if (declConfig.whenValueEquals !== undefined && declConfig.whenValueEquals === decl.value) {
+                decl.remove();
+            }
+        } else if (declConfig.task) {
+            result.warn(`Unknown task: [${declConfig.task}]`, { node: decl });
+        }
+    }
+};
+
+module.exports.postcss = true;

package/validation/errors/theme-scheme-error.js

@@ -4,7 +4,7 @@ class SvgIconsSchemaError extends BaseError {
     /**
      * @example
      * Invalid Theme config: the "theme.yml" files in the "default" theme do not match the API schema.
-     * has an unknown property 'label'.
+     * has an unknown property 'rest'.
      * at default/theme.yml
      *
      * @example