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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -32,7 +32,6 @@ const SVGSprite = require('./svg-sprite');
32
32
  const TerserPlugin = require('terser-webpack-plugin');
33
33
  const jsToSCSS = require('./js-to-scss');
34
34
  require('resolve-url-loader');
35
- require('lezer-loader');
36
35
 
37
36
  class ConfigBuilder {
38
37
  constructor() {
@@ -212,6 +211,13 @@ class ConfigBuilder {
212
211
  return this._resolvedNodeModulesPath;
213
212
  }
214
213
 
214
+ get localResolvedNodeModulesPath() {
215
+ if (this._localResolvedNodeModulesPath === undefined) {
216
+ this._localResolvedNodeModulesPath = path.resolve(__dirname, 'node_modules');
217
+ }
218
+ return this._localResolvedNodeModulesPath;
219
+ }
220
+
215
221
  get assetVersion() {
216
222
  if (this._assetVersion === undefined) {
217
223
  const filePath = path.join(this.resolvedPublicPath, '/build/build_version.txt');
@@ -316,7 +322,8 @@ class ConfigBuilder {
316
322
  this.resolvedPublicPath,
317
323
  path.join(__dirname, './loader'),
318
324
  path.join(this.resolvedPublicPath, '/bundles'),
319
- this.resolvedNodeModulesPath
325
+ this.resolvedNodeModulesPath,
326
+ this.localResolvedNodeModulesPath
320
327
  ]
321
328
  },
322
329
  module: {
@@ -334,10 +341,6 @@ class ConfigBuilder {
334
341
  publicPath: '../../_static/',
335
342
  name: this._getVersionedPath('[path][name].[ext]', this.assetVersion)
336
343
  }
337
- },
338
- {
339
- test: /\.grammar$/,
340
- use: 'lezer-loader'
341
344
  }
342
345
  ]
343
346
  },
@@ -491,7 +494,8 @@ class ConfigBuilder {
491
494
  path.join(this.resolvedProjectPath, '/assets'),
492
495
  path.join(this.resolvedPublicPath, '/bundles'),
493
496
  path.join(this.resolvedPublicPath, '/js'),
494
- this.resolvedNodeModulesPath
497
+ this.resolvedNodeModulesPath,
498
+ this.localResolvedNodeModulesPath
495
499
  ],
496
500
  alias: jsBuildConfig.aliases,
497
501
  cacheWithContext: true,
@@ -600,7 +604,6 @@ class ConfigBuilder {
600
604
 
601
605
  _initialize(args, env) {
602
606
  const entryPointFileWriter = new EntryPointFileWriter(this._publicPath);
603
-
604
607
  this._isProduction = args.mode === 'production';
605
608
  this._symfonyEnv = env.symfony;
606
609
  this._appConfig = AppConfigLoader.getConfig(this._cachePath, this._symfonyEnv);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oroinc/oro-webpack-config-builder",
3
- "version": "6.1.0-lts10",
3
+ "version": "6.1.0-lts11",
4
4
  "author": "Oro, Inc. (https://oroinc.com)",
5
5
  "license": "MIT",
6
6
  "description": "An integration of OroPlatform based applications with the Webpack.",
@@ -13,17 +13,18 @@
13
13
  "autoprefixer": "~10.4.13",
14
14
  "babel-loader": "~9.1.0",
15
15
  "bindings": "~1.5.0",
16
+ "colorette": "^2.0.20",
16
17
  "css-loader": "^6.8.1",
17
18
  "css-minimizer-webpack-plugin": "~5.0.0",
18
19
  "deepmerge": "~4.3.1",
20
+ "enhanced-resolve": "^5.18.1",
21
+ "esbuild-loader": "^4.3.0",
19
22
  "exports-loader": "~4.0.0",
20
23
  "expose-loader": "~4.1.0",
21
- "esbuild-loader": "^4.3.0",
22
24
  "file-loader": "~6.2.0",
23
25
  "html-webpack-plugin": "~5.5.0",
24
26
  "imports-loader": "~4.0.1",
25
27
  "js-yaml": "~4.1.0",
26
- "lezer-loader": "^0.3.0",
27
28
  "mini-css-extract-plugin": "~2.7.1",
28
29
  "minimist": "~1.2.7",
29
30
  "nan": "~2.17.0",