rollup or webpack still to decide

AWS-Amazon-inc · Feb 10, 2020 · 8e9ffee · 8e9ffee
1 parent f7fd004
commit 8e9ffee
Show file tree

Hide file tree

Showing 10 changed files with 4,856 additions and 1,102 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,14 +1,9 @@
 {
   "presets": [
-    [
-      "env",
-      {
-        "modules": false
-      }
-    ]
+    ["@babel/env", {"modules": false}]
   ],
   "plugins": [
-    "transform-object-rest-spread"
+    "@babel/plugin-transform-spread"
   ],
   "env": {
     "test": {

diff --git a/README.md b/README.md
@@ -3,6 +3,11 @@
 ### Getting Started
 
 
+```npm i @myetherwallet/mewconnect-web-client```
+
+
+
+
 ### Get the code
 The example requires both MEWconnect-web-client (this repo) and MEWconnect-Signal-Server (MEWconnect-hanshake-server)
 ```

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "homepage": "https://github.com/myetherwallet/MEWconnect-web-client",
   "version": "2.0.0-beta.23",
   "main": "./dist/index.js",
+  "module": "./src/index.js",
   "scripts": {
     "start": "node ./example/peer_server/www.js",
     "test:jest": "npx jest --detectOpenHandles --forceExit --runInBand",
@@ -21,35 +22,43 @@
     "pre-commit": "npm run lint"
   },
   "dependencies": {
-    "browser-or-node": "^1.1.0",
+    "browser-or-node": "^1.2.1",
     "debug": "^4.0.1",
     "detect-browser": "^3.0.1",
-    "eccrypto": "^1.0.3",
+    "eccrypto": "^1.1.3",
     "ethereumjs-util": "^5.2.0",
-    "events": "^3.0.0",
+    "events": "^3.1.0",
     "isomorphic-ws": "^4.0.1",
     "logging": "^3.2.0",
     "mocha": "^5.2.0",
     "promise-ws": "^1.0.0-1",
     "qrcode": "^1.4.4",
-    "query-string": "^6.8.1",
-    "secp256k1": "^3.5.2",
-    "simple-peer": "^9.6.0",
-    "socket.io-client": "^2.1.1",
+    "query-string": "^6.10.1",
+    "secp256k1": "^3.8.0",
+    "simple-peer": "^9.6.2",
+    "socket.io-client": "^2.3.0",
     "webrtc-adapter": "^6.4.3",
     "wrtc": "^0.2.0",
-    "ws": "^7.1.1"
+    "ws": "^7.2.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-external-helpers": "^7.8.3",
+    "@babel/plugin-transform-async-to-generator": "^7.8.3",
+    "@babel/plugin-transform-regenerator": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/plugin-transform-spread": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@rollup/plugin-commonjs": "^11.0.2",
     "@rollup/plugin-image": "^2.0.4",
     "@rollup/plugin-node-resolve": "^7.1.1",
     "@vue/cli-plugin-babel": "3.4.0",
     "@vue/cli-plugin-eslint": "3.4.0",
     "@vue/eslint-config-prettier": "^4.0.1",
-    "axios": "^0.19.1",
+    "axios": "^0.19.2",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "*",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^25.1.0",
     "babel-loader": "^7.1.5",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
@@ -62,31 +71,34 @@
     "chai": "^4.2.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.4.2",
-    "eslint": "^5.6.0",
-    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint": "^5.16.0",
+    "eslint-config-airbnb-base": "^13.2.0",
     "eslint-config-prettier": "^3.0.1",
-    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-security": "^1.4.0",
     "ethereumjs-common": "^1.5.0",
     "ethereumjs-tx": "^2.1.2",
     "ethjs-unit": "^0.1.6",
     "file-loader": "^5.0.2",
     "jest": "^23.6.0",
     "nyc": "^13.0.1",
-    "opn": "^5.4.0",
+    "opn": "^5.5.0",
     "opn-cli": "^3.1.0",
     "platform": "^1.3.5",
     "regenerator-runtime": "^0.12.1",
-    "rimraf": "^2.6.2",
+    "rimraf": "^2.7.1",
     "rollup": "^0.66.0",
-    "rollup-plugin-babel": "^3.0.7",
-    "rollup-plugin-commonjs": "^9.1.8",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-json": "^3.1.0",
     "rollup-plugin-node-builtins": "^2.1.2",
+    "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-node-resolve": "^3.4.0",
     "store": "^2.0.12",
     "style-loader": "^1.1.3",
-    "uuid": "^3.3.2",
+    "svg-inline-loader": "^0.8.0",
+    "url-loader": "^3.0.0",
+    "uuid": "^3.4.0",
     "web3": "1.2.4",
     "web3-core-helpers": "1.2.4",
     "web3-core-method": "1.2.4",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,19 +1,42 @@
 import babel from 'rollup-plugin-babel'
 import json from 'rollup-plugin-json'
 import image from '@rollup/plugin-image';
+import commonjs from '@rollup/plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import nodePolyfills from 'rollup-plugin-node-polyfills';
 
 export default {
 
   input: 'src/index.js',
   output: {
     file: 'dist/index.js',
-    format: 'cjs'
+    format: 'cjs',
+    globals: {
+      "@babel/runtime/regenerator": "regeneratorRuntime"
+    }
   },
   plugins: [
+    commonjs(),
     json(),
     image(),
+    nodePolyfills(),
+    resolve({
+      modulesOnly: true
+    }),
     babel({
-      plugins: ['external-helpers'],
+      "babelrc": false,
+      "runtimeHelpers": true,
+      "plugins": [
+        "@babel/plugin-transform-async-to-generator",
+        "@babel/plugin-transform-regenerator",
+        ["@babel/plugin-transform-runtime", {
+          "helpers": true,
+          "regenerator": true
+        }]
+      ],
+      "presets": [
+        "@babel/preset-env"
+      ],
       exclude: 'node_modules/**',
     })
   ]

diff --git a/src/connectClient/popUpCreator.js b/src/connectClient/popUpCreator.js
@@ -1,5 +1,5 @@
 import QrCode from 'qrcode';
-import logo from '../connectProvider/logo.svg';
+import logo from '../connectProvider/logoImage';
 import cssStyles from './popupStyles'
 import { noticetext } from '../connectProvider/popupStyles';
 
@@ -19,6 +19,7 @@ export default class PopUpCreator {
     this.walletLinkUrl = linkUrl || 'connect-MEWconnect';
     this.sessionId = '';
     this.sessionId = false;
+    this.logo = logo;
     // this.createWindowNotifier();
   }
 
@@ -157,7 +158,7 @@ export default class PopUpCreator {
             <div class="bottom-container">
             
             <h5 class="bottom-container-text">Powered by</h5>
-             <img src="${logo}"/>
+             <img src="${this.logo}"/>
            </div>
           </div>
         </body>

diff --git a/src/connectProvider/logoImage.js b/src/connectProvider/logoImage.js
diff --git a/src/connectProvider/popUpHandler.js b/src/connectProvider/popUpHandler.js
@@ -10,7 +10,7 @@ const IPCMessageType = {
   WEB3_RESPONSE: 'WEB3_RESPONSE',
   LOCAL_STORAGE_BLOCKED: 'LOCAL_STORAGE_BLOCKED'
 };
-import logo from './logo.svg';
+import logo from './logoImage';
 import { popUpStyles, noticetext, innerHTML } from './popupStyles';
 import cssStyles from './windowStyles';
 

diff --git a/src/index.js b/src/index.js
@@ -10,6 +10,7 @@
 import MewConnectClient from './connectClient/index';
 import MewConnectProvider from './connectProvider/index';
 
+console.log("Something2"); // todo remove dev item
 export default {
   Initiator: MewConnectClient.Initiator,
   Crypto: MewConnectClient.Crypto,

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,31 +2,29 @@ const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 module.exports = {
-  'mode': 'development',
+  mode: 'production',
   'entry': './src/index.js',
-  'output': {
-    path: path.resolve(__dirname, 'dist'),
-    'filename': 'index.js',
-    // library: 'someLibName',
-    // libraryTarget: 'umd',
-    libraryTarget: 'commonjs',
+  output: {
+    path: path.resolve(__dirname, './dist'),
+    filename: 'index.js',
+    libraryTarget: 'umd',
     globalObject: 'this',
-    libraryExport: 'default',
-    library: 'MEWconnect'
+    // libraryExport: 'default',
+    library: 'webpackNumbers'
   },
   'module': {
     'rules': [
       {
         'test': /\.js$/,
         'exclude': /node_modules/,
-        // 'use': {
-        //   'loader': 'babel-loader',
-        //   'options': {
-        //     'presets': [
-        //       'env'
-        //     ]
-        //   }
-        // }
+        'use': {
+          'loader': 'babel-loader',
+          'options': {
+            'presets': [
+              'env'
+            ]
+          }
+        }
       },
       {
         'test': /\.css$/,
@@ -36,10 +34,8 @@ module.exports = {
         ]
       },
       {
-        'test': /\.(png|svg|jpg|gif)$/,
-        use: [
-          'file-loader'
-        ]
+        test: /\.svg$/,
+        loader: 'svg-inline-loader'
       }
     ]
   },
@@ -48,16 +44,16 @@ module.exports = {
   ],
   externals: [
 
-  ],
-  optimization: {
-    splitChunks: {
-      cacheGroups: {
-        commons: {
-          test: /[\\/]node_modules[\\/]/,
-          name: 'vendors',
-          chunks: 'initial'
-        }
-      }
-    }
-  }
+  ]
+  // optimization: {
+  //   splitChunks: {
+  //     cacheGroups: {
+  //       commons: {
+  //         test: /[\\/]node_modules[\\/]/,
+  //         name: 'vendors',
+  //         chunks: 'initial'
+  //       }
+  //     }
+  //   }
+  // }
 };