@oroinc/oro-webpack-config-builder 5.1.0-lts013 → 5.1.0-lts015

package/oro-webpack-config.js

@@ -9,8 +9,6 @@ const EntryPointFileWriter = require('./writer/scss-entry-point-file-writer');
 const LayoutModulesConfigLoader = require('./modules-config/layout-modules-config-loader');
 const LayoutStyleLoader = require('./style/layout-style-loader');
 const MapModulesPlugin = require('./plugin/map/map-modules-plugin');
-const IntegrityFilePlugin = require('./plugin/integrity/integrity-file-plugin');
-const {SubresourceIntegrityPlugin} = require('webpack-subresource-integrity');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const ModulesConfigLoader = require('./modules-config/modules-config-loader');
 const DynamicImportsFileWriter = require('./writer/dynamic-imports-file-writer');
@@ -282,8 +280,7 @@ class ConfigBuilder {
             output: {
                 filename: '[name].js',
                 // Because we use third party libraries 'chunkFilename' should include only [name]
-                chunkFilename: this._getVersionedPath('chunk/[name].js', this.assetVersion),
-                crossOriginLoading: "anonymous"
+                chunkFilename: this._getVersionedPath('chunk/[name].js', this.assetVersion)
             },
             devtool: !env.skipSourcemap && 'inline-cheap-module-source-map',
             mode: 'development',
@@ -350,10 +347,11 @@ class ConfigBuilder {
                             options: {
                                 implementation: require("sass"),
                                 sassOptions: {
-                                    includePaths: [
-                                        path.join(this.resolvedPublicPath, '/bundles')
+                                    loadPaths: [
+                                        path.join(this.resolvedPublicPath, '/bundles'),
+                                        path.join(this.resolvedProjectPath, '/assets')
                                     ],
-                                    outputStyle: 'expanded'
+                                    style: 'expanded'
                                 },
                                 sourceMap: true
                             }
@@ -386,10 +384,6 @@ class ConfigBuilder {
                 new webpack.optimize.MinChunkSizePlugin({
                     minChunkSize: 30000 // Minimum number of characters
                 }),
-                new SubresourceIntegrityPlugin(),
-                new IntegrityFilePlugin({
-                    publicPath: this.resolvedPublicPath
-                }),
                 new AfterWebpackLogsPlugin(
                     stats => this.emitter.emit('build:complete', stats)
                 ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oroinc/oro-webpack-config-builder",
-  "version": "5.1.0-lts013",
+  "version": "5.1.0-lts015",
   "author": "Oro, Inc (https://www.oroinc.com)",
   "license": "MIT",
   "description": "An integration of OroPlatform based applications with the Webpack.",
@@ -32,8 +32,8 @@
     "printf": "~0.6.0",
     "resolve-url-loader": "^5.0.0",
     "rtlcss-webpack-plugin": "~4.0.6",
-    "sass": "~1.62.0",
-    "sass-loader": "~13.2.0",
+    "sass": "1.98.0",
+    "sass-loader": "16.0.7",
     "schema-utils": "^4.0.0",
     "style-loader": "~3.3.1",
     "terser": "~5.17.1",
@@ -46,7 +46,6 @@
     "webpack-cli": "~5.0.0",
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "~5.8.0",
-    "webpack-subresource-integrity": "^5.2.0-rc.1",
     "wildcard": "~2.0.0"
   }
 }

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

@@ -1,42 +0,0 @@
-const { createHash } = require('crypto');
-const { Compilation, sources } = require('webpack');
-const fs = require('fs').promises;
-const path = require('path');
-
-class IntegrityFilePlugin {
-    constructor({fileName = 'integrity.json', publicPath = '', algorithm = 'sha384'} = {}) {
-        this.fileName = fileName;
-        this.publicPath = publicPath;
-        this.algorithm = algorithm;
-    }
-
-    apply(compiler) {
-        compiler.hooks.thisCompilation.tap('IntegrityFilePlugin', (compilation) => {
-            compilation.hooks.processAssets.tapPromise(
-                { name: 'SubresourceIntegrityPlugin', stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER },
-                async () => {
-                    const integrityData = Object.fromEntries(
-                        Object.entries(compilation.assets)
-                            .filter(([assetName]) => assetName.endsWith('.css') || assetName.endsWith('.js'))
-                            .map(([assetName, asset]) => {
-                            const hash = createHash(this.algorithm).update(asset.source()).digest('base64');
-                            const assetNormalized = assetName.split('?')[0];
-
-                            return [
-                                path.join(compiler.options.output.publicPath || '', assetNormalized),
-                                `${this.algorithm}-${hash}`
-                            ];
-                        })
-                    );
-                    const jsonData = JSON.stringify(integrityData, null, 2);
-                    const outputPath = path.join(this.publicPath, compiler.options.output.publicPath, this.fileName);
-
-                    await fs.writeFile(outputPath, jsonData, 'utf8');
-                    compilation.emitAsset(outputPath, new sources.RawSource(jsonData));
-                }
-            );
-        });
-    }
-}
-
-module.exports = IntegrityFilePlugin;