release: v2.2.0-beta.6

.eslintrc.js

@@ -4,6 +4,7 @@ module.exports = {
     ROUTER_MODE: 'readonly',
     NODE_ENV: 'readonly'
   },
+  ignorePatterns: ['dist/**/*.js'],
   root: true,
   env: {
     node: true,

CHANGELOG.md

@@ -1,3 +1,6 @@
+- ### Release 2.2.0-beta.6
+- update rollup and more cleanup
+
 - ### Release 2.2.0-beta.4
 - cleanup and rollup updates
 

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: [['@babel/preset-env', { targets: { node: 'current' } }]]
+  presets: ['@babel/preset-env']
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@myetherwallet/mewconnect-web-client",
   "homepage": "https://github.com/myetherwallet/MEWconnect-web-client",
-  "version": "2.2.0-beta.4",
+  "version": "2.2.0-beta.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "test": "npm run test:jest",
     "buildBrowserTest": "webpack --config tests/browser/webpack.config.js",
     "buildBrowserTest:watch": "webpack --config tests/browser/webpack.config.js -w",
-    "build": "npm run lint && rimraf dist/ && npx rollup -c && babel dist/cjs --out-dir dist/cjs && babel dist/esm --out-dir dist/esm",
+    "build": "npm run lint && rimraf dist/ && npx rollup -c",
     "build:dev": "rimraf dist/ && npx rollup -c",
     "lint": "npx eslint --fix 'src/**.js'",
     "update:mainlist": "node src/connectProvider/fetchLists/fetchMainLists.js",
@@ -25,13 +25,16 @@
     "pre-commit": "npm run lint"
   },
   "dependencies": {
+    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "bignumber.js": "^9.0.0",
     "browser-or-node": "^1.2.1",
     "core-js": "^3.4.4",
     "debug": "^4.0.1",
     "detect-browser": "^3.0.1",
     "eccrypto": "^1.1.3",
+    "eth-sig-util": "^3.0.1",
     "ethereumjs-common": "^1.5.0",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-utils": "^5.2.5",
@@ -102,9 +105,5 @@
     "url-loader": "^3.0.0",
     "vue-template-compiler": "^2.6.10",
     "yorkie": "^2.0.0"
-  },
-  "optionalDependencies": {
-    "eth-sig-util": "^3.0.1",
-    "ethereumjs-util": "^5.2.1"
   }
 }

rollup.config.js

@@ -1,5 +1,7 @@
 import json from '@rollup/plugin-json';
 import image from '@rollup/plugin-image';
+import { babel } from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
 export default {
   input: 'src/index.js',
   output: [
@@ -9,5 +11,12 @@ export default {
     },
     { format: 'cjs', dir: 'dist/cjs/' }
   ],
-  plugins: [json(), image()]
+  plugins: [
+    json(),
+    image(),
+    commonjs({
+      include: /node_modules/
+    }),
+    babel()
+  ]
 };

src/connectClient/MewConnectCrypto.js

@@ -1,5 +1,5 @@
 import eccrypto from 'eccrypto';
-import ethUtils from 'ethereumjs-util';
+import ethUtils from 'ethereumjs-utils';
 import crypto from 'crypto';
 import secp256k1 from 'secp256k1';
 

src/connectProvider/web3Provider/MEWconnect/index.js

@@ -8,7 +8,7 @@ import {
   getBufferFromHex,
   calculateChainIdFromV
 } from '../utils';
-import { hashPersonalMessage } from 'ethereumjs-util';
+import { hashPersonalMessage } from 'ethereumjs-utils';
 import errorHandler from './errorHandler';
 import commonGenerator from '../helpers/commonGenerator';
 import Misc from '../helpers/misc';

src/connectProvider/web3Provider/WalletInterface.js

@@ -16,7 +16,7 @@ import {
   privateToPublic,
   isHexString,
   toBuffer as utilsToBuffer
-} from 'ethereumjs-util';
+} from 'ethereumjs-utils';
 import { toChecksumAddress } from './helpers/addressUtils';
 
 const toBuffer = v => {

src/connectProvider/web3Provider/helpers/misc.js

@@ -1,7 +1,7 @@
 import { isAddress } from './addressUtils';
 import url from 'url';
 import utils from 'web3-utils';
-import { isHexString, toBuffer as utilsToBuffer } from 'ethereumjs-util';
+import { isHexString, toBuffer as utilsToBuffer } from 'ethereumjs-utils';
 import { uint, address, string, bytes, bool } from './solidityTypes';
 
 const toBuffer = v => {

src/connectProvider/web3Provider/helpers/webWorkerTimer/index.js

@@ -141,7 +141,7 @@ const getTimer = () => {
     const url = URL.createObjectURL(
       new Blob([workerCode()], { type: 'text/javascript' })
     );
-    worker = new Worker(url);
+    const worker = new Worker(url);
     worker.onmessage = Timer.onmessage;
     return Timer;
   }

src/connectProvider/web3Provider/utils.js

@@ -1,4 +1,4 @@
-import { bufferToInt } from 'ethereumjs-util';
+import { bufferToInt } from 'ethereumjs-utils';
 
 const getBufferFromHex = hex => {
   hex = sanitizeHex(hex);

src/connectProvider/web3Provider/web3-provider/methods/eth_decrypt.js

@@ -3,7 +3,7 @@ import { toError, toPayload } from '../jsonrpc';
 import EventNames from '../events';
 import debugLogger from 'debug';
 import { isHexStrict } from 'web3-utils';
-import { bufferToHex } from 'ethereumjs-util';
+import { bufferToHex } from 'ethereumjs-utils';
 const debug = debugLogger('MEWconnectWeb3');
 const debugErrors = debugLogger('MEWconnectError');
 

src/connectProvider/web3Provider/web3-provider/methods/personal_ecRecover.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import misc from '../../helpers/misc';
 import { toError, toPayload } from '../jsonrpc';
-import utils from 'ethereumjs-util';
+import utils from 'ethereumjs-utils';
 
 export default async ({ payload }, res, next) => {
   if (payload.method !== 'personal_ecRecover') return next();