Merge pull request #371 from goto-bus-stop/chore/flat-dist

bundle: Add tinyify

bin/build-js.js

@@ -2,11 +2,9 @@ var path = require('path')
 var fs = require('fs')
 var chalk = require('chalk')
 var mkdirp = require('mkdirp')
-// var glob = require('glob')
 var babelify = require('babelify')
-// var yoyoify = require('yo-yoify')
+var tinyify = require('tinyify')
 var browserify = require('browserify')
-// var exec = require('child_process').exec
 var exorcist = require('exorcist')
 
 var distPath = './dist'
@@ -22,34 +20,24 @@ function buildUppyBundle (minify) {
 
   var b = browserify(src, { debug: true, standalone: 'Uppy' })
   if (minify) {
-    b.plugin('minifyify', {
-      map: bundleFile + '.map',
-      output: path.join(distPath, bundleFile + '.map')
-    })
+    b.plugin(tinyify)
   }
-  // b.transform(yoyoify)
   b.transform(babelify)
   b.on('error', handleErr)
 
   return new Promise(function (resolve, reject) {
-    if (minify) {
-      b.bundle()
+    b.bundle()
+      .pipe(exorcist(path.join(distPath, bundleFile + '.map')))
       .pipe(fs.createWriteStream(path.join(distPath, bundleFile), 'utf8'))
       .on('error', handleErr)
       .on('finish', function () {
-        console.info(chalk.green('✓ Built Minified Bundle:'), chalk.magenta(bundleFile))
+        if (minify) {
+          console.info(chalk.green('✓ Built Minified Bundle:'), chalk.magenta(bundleFile))
+        } else {
+          console.info(chalk.green('✓ Built Bundle:'), chalk.magenta(bundleFile))
+        }
         resolve()
       })
-    } else {
-      b.bundle()
-      .pipe(exorcist(path.join(distPath, 'uppy.js.map')))
-      .pipe(fs.createWriteStream(path.join(distPath, bundleFile), 'utf8'))
-      .on('error', handleErr)
-      .on('finish', function () {
-        console.info(chalk.green('✓ Built Bundle:'), chalk.magenta(bundleFile))
-        resolve()
-      })
-    }
   })
 }
 

bin/disc.js

@@ -3,18 +3,26 @@ const path = require('path')
 const { PassThrough } = require('stream')
 const browserify = require('browserify')
 const babelify = require('babelify')
-const minifyify = require('minifyify')
+const minify = require('minify-stream')
 const disc = require('disc')
 
 const outputPath = path.join(__dirname, '../website/src/disc.html')
 
+function minifyify () {
+  return minify({
+    sourceMap: false,
+    toplevel: true,
+    compress: { unsafe: true }
+  })
+}
+
 const bundler = browserify(path.join(__dirname, '../src/index.js'), {
   fullPaths: true,
   standalone: 'Uppy'
 })
 
-bundler.plugin(minifyify, { map: false })
 bundler.transform(babelify)
+bundler.transform(minifyify, { global: true })
 
 bundler.bundle()
   .pipe(disc())

package.json

@@ -60,7 +60,7 @@
     "isomorphic-fetch": "2.2.1",
     "jest": "^20.0.4",
     "lint-staged": "2.0.2",
-    "minifyify": "7.3.3",
+    "minify-stream": "^1.1.0",
     "mkdirp": "0.5.1",
     "multi-glob": "1.0.1",
     "next-update": "1.2.2",
@@ -75,6 +75,7 @@
     "sass": "0.5.0",
     "selenium-webdriver": "2.53.3",
     "tape": "^4.8.0",
+    "tinyify": "^1.0.0",
     "uppy-server": "0.0.7",
     "watchify": "3.7.0"
   },