@oroinc/oro-webpack-config-builder 6.1.0-lts09 → 6.1.0-lts11

package/oro-webpack-config.js

@@ -32,7 +32,6 @@ const SVGSprite = require('./svg-sprite');
 const TerserPlugin = require('terser-webpack-plugin');
 const jsToSCSS = require('./js-to-scss');
 require('resolve-url-loader');
-require('lezer-loader');
 
 class ConfigBuilder {
     constructor() {
@@ -212,6 +211,13 @@ class ConfigBuilder {
         return this._resolvedNodeModulesPath;
     }
 
+    get localResolvedNodeModulesPath() {
+        if (this._localResolvedNodeModulesPath === undefined) {
+            this._localResolvedNodeModulesPath = path.resolve(__dirname, 'node_modules');
+        }
+        return this._localResolvedNodeModulesPath;
+    }
+
     get assetVersion() {
         if (this._assetVersion === undefined) {
             const filePath = path.join(this.resolvedPublicPath, '/build/build_version.txt');
@@ -286,7 +292,7 @@ class ConfigBuilder {
                 filename: '[name].js',
                 // Because we use third party libraries 'chunkFilename' should include only [name]
                 chunkFilename: this._getVersionedPath('chunk/[name].js', this.assetVersion),
-                crossOriginLoading: "anonymous"
+                crossOriginLoading: 'anonymous'
             },
             devtool: !env.skipSourcemap && 'inline-cheap-module-source-map',
             mode: 'development',
@@ -316,7 +322,8 @@ class ConfigBuilder {
                     this.resolvedPublicPath,
                     path.join(__dirname, './loader'),
                     path.join(this.resolvedPublicPath, '/bundles'),
-                    this.resolvedNodeModulesPath
+                    this.resolvedNodeModulesPath,
+                    this.localResolvedNodeModulesPath
                 ]
             },
             module: {
@@ -325,7 +332,7 @@ class ConfigBuilder {
                 ],
                 rules: [
                     {
-                        test: /\.(eot|ttf|woff|woff2|cur|ico|svg|png|jpg|gif)$/,
+                        test: /\.(eot|ttf|woff|woff2|cur|ico|svg|png|jpg|gif|webp)$/,
                         loader: 'url-loader',
                         options: {
                             limit: 1,
@@ -334,10 +341,6 @@ class ConfigBuilder {
                             publicPath: '../../_static/',
                             name: this._getVersionedPath('[path][name].[ext]', this.assetVersion)
                         }
-                    },
-                    {
-                        test: /\.grammar$/,
-                        use: 'lezer-loader'
                     }
                 ]
             },
@@ -491,7 +494,8 @@ class ConfigBuilder {
                 path.join(this.resolvedProjectPath, '/assets'),
                 path.join(this.resolvedPublicPath, '/bundles'),
                 path.join(this.resolvedPublicPath, '/js'),
-                this.resolvedNodeModulesPath
+                this.resolvedNodeModulesPath,
+                this.localResolvedNodeModulesPath
             ],
             alias: jsBuildConfig.aliases,
             cacheWithContext: true,
@@ -600,7 +604,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,6 +1,6 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "6.1.0-lts09",
+  "version": "6.1.0-lts11",
   "author": "Oro, Inc. (https://oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",
@@ -13,17 +13,18 @@
     "autoprefixer": "~10.4.13",
     "babel-loader": "~9.1.0",
     "bindings": "~1.5.0",
+    "colorette": "^2.0.20",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "~5.0.0",
     "deepmerge": "~4.3.1",
+    "enhanced-resolve": "^5.18.1",
+    "esbuild-loader": "^4.3.0",
     "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",
     "imports-loader": "~4.0.1",
     "js-yaml": "~4.1.0",
-    "lezer-loader": "^0.3.0",
     "mini-css-extract-plugin": "~2.7.1",
     "minimist": "~1.2.7",
     "nan": "~2.17.0",

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