Merge pull request #202 from blocknative/test/rollup-build

Merge in build changes to work with Rollup.js builds

Author: lnbc1QWFyb24

package.json

@@ -31,7 +31,6 @@
     "babel-plugin-external-helpers": "^6.18.0",
     "rimraf": "^3.0.0",
     "rollup": "^1.27.5",
-    "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-img": "^1.1.0",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",

rollup.config.js

@@ -2,7 +2,6 @@ import svelte from 'rollup-plugin-svelte'
 import resolve from 'rollup-plugin-node-resolve'
 import json from '@rollup/plugin-json'
 import image from 'rollup-plugin-img'
-import commonjs from 'rollup-plugin-commonjs'
 import typescript from 'rollup-plugin-typescript2'
 
 import {
@@ -25,7 +24,7 @@ export default {
   input: 'src/onboard.ts',
   output: [
     {
-      format: 'es',
+      format: 'esm',
       dir: 'dist/esm/'
     },
     { format: 'cjs', dir: 'dist/cjs/' }
@@ -42,7 +41,6 @@ export default {
         importee === 'svelte' || importee.startsWith('svelte/'),
       preferBuiltins: true
     }),
-    commonjs(),
     typescript({
       clean: true,
       useTsconfigDeclarationDir: true
@@ -68,6 +66,8 @@ export default {
     'util',
     'assert',
     'buffer',
-    'stream'
+    'stream',
+    'web3-provider-engine/subproviders/hooked-wallet',
+    'web3-provider-engine/subproviders/rpc'
   ]
 }

src/modules/select/wallets/ledger.ts

@@ -6,6 +6,15 @@ import {
 } from '../../../interfaces'
 import ledgerIcon from '../wallet-icons/icon-ledger'
 
+import Web3ProviderEngine from 'web3-provider-engine'
+import RpcSource from 'web3-provider-engine/subproviders/rpc'
+import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wallet'
+import TransportU2F from '@ledgerhq/hw-transport-u2f'
+import Eth from '@ledgerhq/hw-app-eth'
+import { Transaction } from 'ethereumjs-tx'
+
+const EthereumTx = Transaction
+
 function ledger(options: LedgerOptions & CommonWalletOptions): WalletModule {
   const { rpcUrl, networkId, preferred, label, iconSrc, svg } = options
 
@@ -64,19 +73,6 @@ async function ledgerProvider(options: {
   BigNumber: any
   networkName: (id: number) => string
 }) {
-  const Web3ProviderEngine = (await import('web3-provider-engine')).default
-  const RpcSource = (await import('web3-provider-engine/subproviders/rpc'))
-    .default
-
-  const HookedWalletSubprovider = (
-    await import('web3-provider-engine/subproviders/hooked-wallet')
-  ).default
-
-  const TransportU2F = (await import('@ledgerhq/hw-transport-u2f')).default
-  const Eth = (await import('@ledgerhq/hw-app-eth')).default
-
-  const EthereumTx = (await import('ethereumjs-tx')).Transaction
-
   const { networkId, rpcUrl, BigNumber, networkName } = options
   const basePath = networkIdToDerivationPath(networkId)
 

src/modules/select/wallets/trezor.ts

@@ -6,6 +6,14 @@ import {
 } from '../../../interfaces'
 import trezorIcon from '../wallet-icons/icon-trezor'
 
+import Web3ProviderEngine from 'web3-provider-engine'
+import RpcSource from 'web3-provider-engine/subproviders/rpc'
+import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wallet'
+import * as TrezorConnectLibrary from 'trezor-connect'
+import EthereumTx from 'ethereumjs-tx'
+
+const { default: TrezorConnect, DEVICE_EVENT, DEVICE } = TrezorConnectLibrary
+
 function trezor(options: TrezorOptions & CommonWalletOptions): WalletModule {
   const {
     rpcUrl,
@@ -77,18 +85,6 @@ async function trezorProvider(options: {
   BigNumber: any
   networkName: (id: number) => string
 }) {
-  const Web3ProviderEngine = (await import('web3-provider-engine')).default
-  const RpcSource = (await import('web3-provider-engine/subproviders/rpc'))
-    .default
-
-  const HookedWalletSubprovider = (
-    await import('web3-provider-engine/subproviders/hooked-wallet')
-  ).default
-
-  const TrezorConnectLibrary = await import('trezor-connect')
-  const { default: TrezorConnect, DEVICE_EVENT, DEVICE } = TrezorConnectLibrary
-  const EthereumTx = (await import('ethereumjs-tx')).Transaction
-
   const { networkId, email, appUrl, rpcUrl, BigNumber, networkName } = options
   const basePath = networkIdToDerivationPath(networkId)