version 0.8.5 (#257)

* Run babel only over non-es5 node modules (#256) * Transpile only non-es5 node_modules * - Manually specify es6 node_modules - Switch from terser to uglify * Fix typo * fix bad merge commit from master * update to version 0.8.5 * yarn reinstall for new lock file
blocknative · Jun 4, 2019 · 9cc8e2b · 9cc8e2b
1 parent 9da44d3
commit 9cc8e2b
Show file tree

Hide file tree

Showing 5 changed files with 180 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -43,16 +43,16 @@ yarn add bnc-assist
 #### Script Tag
 
 The library uses [semantic versioning](https://semver.org/spec/v2.0.0.html).
-The current version is 0.8.4.
+The current version is 0.8.5.
 There are minified and non-minified versions.
 Put this script at the top of your `<head>`
 
 ```html
-<script src="https://assist.blocknative.com/0-8-4/assist.js"></script>
+<script src="https://assist.blocknative.com/0-8-5/assist.js"></script>
 
 <!-- OR... -->
 
-<script src="https://assist.blocknative.com/0-8-4/assist.min.js"></script>
+<script src="https://assist.blocknative.com/0-8-5/assist.min.js"></script>
 ```
 
 ### Initialize the Library

diff --git a/babel.config.js b/babel.config.js
@@ -27,12 +27,12 @@ module.exports = {
       }
     ],
     ['@babel/plugin-proposal-object-rest-spread'],
-    ['inline-import-data-uri', {
-      'extensions': [
-        '.png',
-        '.jpg'
-      ]
-    }]
+    [
+      'inline-import-data-uri',
+      {
+        extensions: ['.png', '.jpg']
+      }
+    ]
   ],
   env: {
     test: {

diff --git a/build.js b/build.js
@@ -1,11 +1,12 @@
 /* eslint import/no-extraneous-dependencies: 0 */
 
+const { execSync } = require('child_process')
 const rollup = require('rollup')
 const babel = require('rollup-plugin-babel')
 const { eslint } = require('rollup-plugin-eslint')
 const resolve = require('rollup-plugin-node-resolve')
 const commonjs = require('rollup-plugin-commonjs')
-const { terser } = require('rollup-plugin-terser')
+const { uglify } = require('rollup-plugin-uglify')
 const string = require('rollup-plugin-string')
 const json = require('rollup-plugin-json')
 const builtins = require('rollup-plugin-node-builtins')
@@ -39,9 +40,19 @@ const defaultPlugins = [
   builtins()
 ]
 
+function transpileEs5NodeModules() {
+  // specify any non-es5 modules here
+  const nonEs5Modules = ['ow', 'punycode']
+  nonEs5Modules.forEach(m =>
+    execSync(
+      `node_modules/.bin/babel node_modules/${m} --out-dir node_modules/${m} --presets=@babel/preset-env`
+    )
+  )
+}
+
 const inputOptions = min => ({
   input: 'src/js/index.js',
-  plugins: min ? [...defaultPlugins, terser()] : defaultPlugins
+  plugins: min ? [...defaultPlugins, uglify()] : defaultPlugins
 })
 
 const outputOptions = min => ({
@@ -56,6 +67,9 @@ const outputOptions = min => ({
 })
 
 async function build() {
+  // transpile non-es5 node_modules
+  transpileEs5NodeModules()
+
   // create a regular bundle
   const bundle = await rollup.rollup(inputOptions())
   await bundle.write(outputOptions())

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-assist",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "Blocknative Assist js library for Dapp developers",
   "main": "lib/assist.min.js",
   "scripts": {
@@ -40,6 +40,7 @@
     "web3-core-promievent": "^1.0.0-beta.48"
   },
   "devDependencies": {
+    "@babel/cli": "^7.4.4",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.4.3",
     "@babel/plugin-transform-runtime": "^7.1.0",
@@ -78,7 +79,7 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^3.4.0",
     "rollup-plugin-string": "^2.0.2",
-    "rollup-plugin-terser": "^5.0.0",
+    "rollup-plugin-uglify": "^6.0.2",
     "truffle-contract": "^4.0.15",
     "web3": "^1.0.0-beta.37"
   },