diff --git a/src/transaction.js b/src/transaction.js
index 3b33213..2142ad0 100644
--- a/src/transaction.js
+++ b/src/transaction.js
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 // Code is Apache-2.0 and docs are CC-BY-4.0
 
-import { Buffer } from 'buffer'
 import stableStringify from 'json-stable-stringify'
 import clone from 'clone'
 import base58 from 'bs58'
diff --git a/webpack.common.js b/webpack.common.js
index a7194e1..c9dec12 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -6,7 +6,8 @@
 
 'use strict'
 
-const { paths } = require('./webpack.parts.js')
+const { ProvidePlugin } = require('webpack')
+const { paths } = require('./webpack.parts')
 
 module.exports = {
     entry: paths.entry,
@@ -24,10 +25,18 @@ module.exports = {
     },
     optimization: {
         minimize: true,
-        noEmitOnErrors: true
+        emitOnErrors: false
     },
     resolve: {
         extensions: ['.js'],
         modules: ['node_modules'],
+        fallback: {
+            buffer: require.resolve('buffer/'),
+        }
     },
+    plugins: [
+        new ProvidePlugin({
+            Buffer: ['buffer', 'Buffer']
+        })
+    ]
 }
diff --git a/webpack.config.js b/webpack.config.js
index 8136429..cbf731f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,9 +8,9 @@
 
 const PRODUCTION = process.env.NODE_ENV === 'production'
 
-const common = require('./webpack.common.js')
+const common = require('./webpack.common')
 
-const { outputs } = require('./webpack.parts.js')
+const { outputs } = require('./webpack.parts')
 
 // '[libraryTarget]': [file extension]
 const OUTPUT_MAPPING = {
diff --git a/webpack.development.js b/webpack.development.js
index e4249a6..7136244 100644
--- a/webpack.development.js
+++ b/webpack.development.js
@@ -14,11 +14,9 @@ module.exports = {
         minimizer: [
             new TerserPlugin({
                 test: /vendor/,
-                sourceMap: false
             }),
             new TerserPlugin({
                 test: /^((?!(vendor)).)*.js$/,
-                sourceMap: false
             })
         ],
         splitChunks: {
diff --git a/webpack.parts.js b/webpack.parts.js
index eb292d8..8a3e2d7 100644
--- a/webpack.parts.js
+++ b/webpack.parts.js
@@ -9,8 +9,8 @@
 const path = require('path')
 const { merge } = require('webpack-merge')
 
-const development = require('./webpack.development.js')
-const production = require('./webpack.production.js')
+const development = require('./webpack.development')
+const production = require('./webpack.production')
 
 const AddVendorsPlugin = require('./plugins/add-vendors-plugin')