From 1cf939a7ce89d9992ec3fee3d3a726b38df3950b Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Mon, 2 Jan 2023 12:09:11 +0100
Subject: [PATCH] SSDM-13270 : Admin UI - update libraries - fix webpack builds
---
openbis_ng_ui/webpack.config.grid.js | 15 ++++++++++++---
openbis_ng_ui/webpack.config.js | 13 ++++++++++---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/openbis_ng_ui/webpack.config.grid.js b/openbis_ng_ui/webpack.config.grid.js
index c3d2d8a0588..08e328edb60 100644
--- a/openbis_ng_ui/webpack.config.grid.js
+++ b/openbis_ng_ui/webpack.config.grid.js
@@ -1,4 +1,5 @@
/* eslint-disable */
+const Webpack = require('webpack')
const path = require('path')
module.exports = {
@@ -18,9 +19,7 @@ module.exports = {
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
- use: {
- loader: 'babel-loader'
- }
+ use: ['babel-loader']
},
{
test: /\.(css)$/,
@@ -41,9 +40,19 @@ module.exports = {
'@src': path.resolve(__dirname, 'src/'),
'@srcTest': path.resolve(__dirname, 'srcTest/'),
'@srcV3': path.resolve(__dirname, 'srcV3/')
+ },
+ fallback: {
+ stream: require.resolve('stream-browserify'),
+ buffer: require.resolve('buffer')
}
},
+ plugins: [
+ new Webpack.ProvidePlugin({
+ Buffer: ['buffer', 'Buffer']
+ })
+ ],
+
externals: {
react: 'React',
'react-dom': 'ReactDOM'
diff --git a/openbis_ng_ui/webpack.config.js b/openbis_ng_ui/webpack.config.js
index 5706bc5530b..4cd5ad89e4b 100644
--- a/openbis_ng_ui/webpack.config.js
+++ b/openbis_ng_ui/webpack.config.js
@@ -1,4 +1,5 @@
/* eslint-disable */
+const Webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const path = require('path')
@@ -10,15 +11,14 @@ module.exports = {
},
mode: 'production',
+ devtool: 'source-map',
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
- use: {
- loader: 'babel-loader'
- }
+ use: ['babel-loader']
},
{
test: /\.(css)$/,
@@ -39,6 +39,10 @@ module.exports = {
'@src': path.resolve(__dirname, 'src/'),
'@srcTest': path.resolve(__dirname, 'srcTest/'),
'@srcV3': path.resolve(__dirname, 'srcV3/')
+ },
+ fallback: {
+ stream: require.resolve('stream-browserify'),
+ buffer: require.resolve('buffer')
}
},
@@ -47,6 +51,9 @@ module.exports = {
inject: 'body',
filename: './index.html',
template: './index.html'
+ }),
+ new Webpack.ProvidePlugin({
+ Buffer: ['buffer', 'Buffer']
})
]
}
--
GitLab