ship patched envify, fixes #18 (#22)

* Include patched envify

* Add test

* Update minify-stream.

Author: goto-bus-stop

index.js

@@ -4,7 +4,7 @@ var packFlatStream = require('browser-pack-flat')
 var commonShake = require('common-shakeify')
 var unassertify = require('unassertify')
 var uglify = require('minify-stream')
-var envify = require('envify/custom')
+var envify = require('./private_modules/envify/custom')
 var uglifyify = require('uglifyify')
 
 function makeUglifyOptions (debug) {

package.json

@@ -7,16 +7,22 @@
     "url": "https://github.com/browserify/tinyify/issues"
   },
   "dependencies": {
+    "acorn-node": "^1.8.2",
     "browser-pack-flat": "^3.0.9",
     "bundle-collapser": "^1.3.0",
     "common-shakeify": "^0.6.0",
-    "envify": "^4.1.0",
-    "minify-stream": "^1.1.0",
+    "dash-ast": "^1.0.0",
+    "minify-stream": "^1.2.1",
+    "multisplice": "^1.0.0",
+    "through2": "^3.0.1",
     "uglifyify": "^5.0.0",
     "unassertify": "^2.1.1"
   },
   "devDependencies": {
-    "standard": "^14.3.1"
+    "browserify": "^16.5.0",
+    "from2-string": "^1.1.0",
+    "standard": "^14.3.1",
+    "tape": "^4.11.0"
   },
   "homepage": "https://github.com/browserify/tinyify",
   "keywords": [
@@ -33,6 +39,11 @@
     "url": "https://github.com/browserify/tinyify.git"
   },
   "scripts": {
-    "test": "standard"
+    "test": "standard && node test"
+  },
+  "standard": {
+    "ignore": [
+      "private_modules/**"
+    ]
   }
 }

private_modules/envify/.editorconfig

@@ -0,0 +1,2 @@
+[*]
+indent_size = 2

private_modules/envify/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+node_modules

private_modules/envify/.npmignore

@@ -0,0 +1,2 @@
+test.js
+.travis.yml

private_modules/envify/.travis.yml

@@ -0,0 +1,10 @@
+language: node_js
+node_js:
+  - '0.10'
+  - '0.12'
+  - '4'
+  - '6'
+  - '8'
+  - '10'
+  - '11'
+  - '12'

private_modules/envify/README.md

@@ -0,0 +1,145 @@
+# envify  [![Build Status](https://secure.travis-ci.org/hughsk/envify.png?branch=master)](http://travis-ci.org/hughsk/envify) [![stable](http://hughsk.github.io/stability-badges/dist/stable.svg)](http://github.com/hughsk/stability-badges) #
+
+Selectively replace Node-style environment variables with plain strings.
+Available as a standalone CLI tool and a
+[Browserify](http://browserify.org) v2 transform.
+
+Works best in combination with [uglifyify](http://github.com/hughsk/uglifyify).
+
+## Installation ##
+
+If you're using the module with Browserify:
+
+``` bash
+npm install envify browserify
+```
+
+Or, for the CLI:
+
+``` bash
+sudo npm install -g envify
+```
+
+## Usage ##
+
+envify will replace your environment variable checks with ordinary strings -
+only the variables you use will be included, so you don't have to worry about,
+say, `AWS_SECRET_KEY` leaking through either. Take this example script:
+
+``` javascript
+if (process.env.NODE_ENV === "development") {
+  console.log('development only')
+}
+```
+
+After running it through envify with `NODE_ENV` set to `production`, you'll
+get this:
+
+``` javascript
+if ("production" === "development") {
+  console.log('development only')
+}
+```
+
+By running this through a good minifier (e.g.
+[UglifyJS2](https://github.com/mishoo/UglifyJS)), the above code would be
+stripped out completely.
+
+However, if you bundled the same script with `NODE_ENV` set to `development`:
+
+``` javascript
+if ("development" === "development") {
+  console.log('development only')
+}
+```
+
+The `if` statement will evaluate to `true`, so the code won't be removed.
+
+## CLI Usage ##
+
+With browserify:
+
+``` bash
+browserify index.js -t envify > bundle.js
+```
+
+Or standalone:
+
+``` bash
+envify index.js > bundle.js
+```
+
+You can also specify additional custom environment variables using
+browserify's [subarg](http://github.com/substack/subarg) syntax, which is
+available in versions 3.25.0 and above:
+
+``` bash
+browserify index.js -t [ envify --NODE_ENV development ] > bundle.js
+browserify index.js -t [ envify --NODE_ENV production  ] > bundle.js
+```
+
+## Module Usage ##
+
+**require('envify')**
+
+Returns a transform stream that updates based on the Node process'
+`process.env` object.
+
+**require('envify/custom')([environment])**
+
+If you want to stay away from your environment variables, you can supply
+your own object to use in its place:
+
+``` javascript
+var browserify = require('browserify')
+  , envify = require('envify/custom')
+  , fs = require('fs')
+
+var b = browserify('main.js')
+  , output = fs.createWriteStream('bundle.js')
+
+b.transform(envify({
+  NODE_ENV: 'development'
+}))
+b.bundle().pipe(output)
+```
+
+## Purging `process.env` ##
+
+By default, environment variables that are not defined will be left untouched.
+This is because in some cases, you might want to run an envify transform over
+your source more than once, and removing these values would make that
+impossible.
+
+However, if any references to `process.env` are remaining after transforming
+your source with envify, browserify will automatically insert its shim for
+Node's process object, which will increase the size of your bundle. This weighs
+in at around 2KB, so if you're trying to be conservative with your bundle size
+you can "purge" these remaining variables such that any missing ones are simply
+replaced with undefined.
+
+To do so through the command-line, simply use the subarg syntax and include
+`purge` after `envify`, e.g.:
+
+``` bash
+browserify index.js -t [ envify purge --NODE_ENV development ]
+```
+
+Or if you're using the module API, you can pass `_: "purge"` into your
+arguments like so:
+
+``` javascript
+b.transform(envify({
+    _: 'purge'
+  , NODE_ENV: 'development'
+}))
+```
+
+## Contributors ##
+
+* [hughsk](http://github.com/hughsk)
+* [benjamn](http://github.com/benjamn)
+* [zag2art](http://github.com/zag2art)
+* [bjoerge](http://github.com/bjoerge)
+* [andreypopp](http://github.com/andreypopp)
+* [jupl](http://github.com/jupl)

private_modules/envify/bin/envify

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+var envify = require('../')
+  , fs = require('fs')
+
+if (process.argv[2]) {
+  fs.createReadStream(process.argv[2], { encoding: 'utf8' })
+    .pipe(envify(process.argv[2]))
+    .pipe(process.stdout)
+} else {
+  process.stdin.resume()
+  process.stdin
+    .pipe(envify(__filename))
+    .pipe(process.stdout)
+}
+
+

private_modules/envify/custom.js

@@ -0,0 +1,106 @@
+var acorn = require('acorn-node')
+  , dash = require('dash-ast')
+  , msplice = require('multisplice')
+  , through = require('through2')
+
+var processEnvPattern = /\bprocess\.env\b/
+
+function equalNodes(a, b) {
+  if (a.type !== b.type) return false
+  switch (a.type) {
+    case 'Literal': return a.value === b.value
+    case 'Identifier': return a.name === b.name
+    case 'MemberExpression': return a.computed === b.computed && equalNodes(a.object, b.object) && equalNodes(a.property, b.property)
+  }
+  return false
+}
+
+module.exports = function(rootEnv) {
+  rootEnv = rootEnv || process.env || {}
+
+  return function envify(file, argv) {
+    if (/\.json$/.test(file)) return through()
+
+    var buffer = []
+    argv = argv || {}
+
+    return through(write, flush)
+
+    function write(data, enc, cb) {
+      buffer.push(data)
+      cb()
+    }
+
+    function transform(source, envs) {
+      var args  = [].concat(envs[0]._ || []).concat(envs[1]._ || [])
+      var purge = args.indexOf('purge') !== -1
+      var replacements = []
+
+      function match(node) {
+        return (
+          node.type === 'MemberExpression'
+          && node.object.type === 'MemberExpression'
+          && node.object.computed === false
+          && node.object.object.type === 'Identifier'
+          && node.object.object.name === 'process'
+          && node.object.property.type === 'Identifier'
+          && node.object.property.name === 'env'
+          && (node.computed ? node.property.type === 'Literal' : node.property.type === 'Identifier')
+        )
+      }
+
+      var ast = acorn.parse(source)
+
+      dash(ast, { leave: function(node) {
+        if (match(node)) {
+          var key = node.property.name || node.property.value
+          for (var i = 0; i < envs.length; i++) {
+            var value = envs[i][key]
+            if (value !== undefined) {
+              replacements.push({ node: node, value: JSON.stringify(value) })
+              return
+            }
+          }
+          if (purge) {
+            replacements.push({ node: node, value: 'undefined' })
+          }
+        } else if (node.type === 'AssignmentExpression') {
+          for (var i = 0; i < replacements.length; ++i) {
+            if (equalNodes(replacements[i].node, node.left)) {
+              replacements.splice(i, 1)
+            }
+          }
+        }
+      } })
+
+      var splicer = msplice(source)
+      if (replacements.length > 0) {
+        replacements.sort(function (a, b) {
+          return b.start - a.start
+        })
+        for (var i = 0; i < replacements.length; i++) {
+          var r = replacements[i]
+          splicer.splice(r.node.start, r.node.end, r.value)
+        }
+      }
+
+      return splicer.toString()
+    }
+
+    function flush(cb) {
+      var source = buffer.join('')
+
+      if (processEnvPattern.test(source)) {
+        try {
+          source = transform(source, [argv, rootEnv])
+        } catch(err) {
+          return this.emit('error', err)
+        }
+      }
+
+      this.push(source)
+      this.push(null)
+      cb()
+    }
+  }
+}

private_modules/envify/index.js

@@ -0,0 +1 @@
+module.exports = require('./custom')(process.env)