Removed __dirname requires; Closure isn't working

calebsander · calebsander · commit 286d88af64c1 · 2017-04-10T02:30:23.000-04:00
diff --git a/compile.js b/compile.js
@@ -3,7 +3,7 @@
 const browserify = require('browserify')
 const closure = require('google-closure-compiler-js').compile
 const fs = require('fs')
-const ReplaceStream = require(__dirname + '/lib/replace-stream.js')
+const ReplaceStream = require('./lib/replace-stream')
 const Simultaneity = require('simultaneity')
 
 const uploadB = browserify()
diff --git a/compiled/download.js b/compiled/download.js
diff --git a/compiled/upload-download.js b/compiled/upload-download.js
diff --git a/compiled/upload.js b/compiled/upload.js
diff --git a/config.js b/config.js
@@ -1,6 +1,3 @@
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
 const base64 = require('base64-js')
 
 const VERSION = 11
diff --git a/constructor-registry.js b/constructor-registry.js
@@ -1,6 +1,3 @@
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
 const registeredConstructors = new Map
 module.exports = {
 	/** @function
diff --git a/index.js b/index.js
@@ -26,10 +26,10 @@
 
 //Copy version string, io functions, and types into package exports
 for (const moduleName of ['io', 'recursive-registry', 'structure-types']) {
-	const sbModule = require(__dirname + '/' + moduleName + '.js')
+	const sbModule = require('./' + moduleName)
 	for (const attribute in sbModule) exports[attribute] = sbModule[attribute] //eslint-disable-line guard-for-in
 }
-exports.r = require(__dirname + '/read.js') //add r. to read functions because type() and value() would be confusing
+exports.r = require('./read') //add r. to read functions because type() and value() would be confusing
 delete exports.MILLIS_PER_DAY
 delete exports.MILLIS_PER_MINUTE
 delete exports.REPEATED_TYPE
diff --git a/io.js b/io.js
@@ -1,17 +1,14 @@
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
 //This file contains functions for performing I/O;
 //specifically, reads and writes of types and values and HTTP responses
 
 const accepts = require('accepts')
-const assert = require(__dirname + '/lib/assert.js')
-const BufferStream = require(__dirname + '/lib/buffer-stream.js')
-const GrowableBuffer = require(__dirname + '/lib/growable-buffer.js')
+const assert = require('./lib/assert')
+const BufferStream = require('./lib/buffer-stream')
+const GrowableBuffer = require('./lib/growable-buffer')
 const http = require('http')
-const r = require(__dirname + '/read.js')
+const r = require('./read')
 const stream = require('stream')
-const t = require(__dirname + '/structure-types.js')
+const t = require('./structure-types')
 const zlib = require('zlib')
 
 function toArrayBuffer(buffer) {
diff --git a/lib/buffer-stream.js b/lib/buffer-stream.js
@@ -1,5 +1,5 @@
-const assert = require(__dirname + '/assert.js')
-const GrowableBuffer = require(__dirname + '/growable-buffer.js')
+const assert = require('./assert')
+const GrowableBuffer = require('./growable-buffer')
 const stream = require('stream')
 
 /**
diff --git a/lib/buffer-string.js b/lib/buffer-string.js
@@ -1,6 +1,6 @@
 /*eslint-disable no-mixed-operators*/
-const assert = require(__dirname + '/assert.js')
-const GrowableBuffer = require(__dirname + '/growable-buffer.js')
+const assert = require('./assert')
+const GrowableBuffer = require('./growable-buffer')
 
 //Arbitrarily set; fairly low to be safe
 const MAX_ARGUMENTS_LENGTH = 0x1000
diff --git a/lib/flex-int.js b/lib/flex-int.js
@@ -1,4 +1,4 @@
-const assert = require(__dirname + '/assert.js')
+const assert = require('./assert')
 
 function possibleValueCount(bytes) {
 	const usableBits = 7 * bytes
diff --git a/lib/growable-buffer.js b/lib/growable-buffer.js
@@ -1,4 +1,4 @@
-const assert = require(__dirname + '/assert.js')
+const assert = require('./assert')
 
 const INITIAL_LENGTH = 10
 
diff --git a/lib/replace-stream.js b/lib/replace-stream.js
@@ -1,4 +1,4 @@
-const assert = require(__dirname + '/assert.js')
+const assert = require('./assert')
 const stream = require('stream')
 
 //Transforms an input into an output by doing simple replacements
diff --git a/package.json b/package.json
@@ -4,19 +4,19 @@
 	"description": "A library for more efficient data transfers by separating the structure from the values and storing each as binary data",
 	"main": "index.js",
 	"dependencies": {
-		"accepts": "1.3.x",
-		"base64-js": "1.2.x",
-		"sha256": "0.2.x"
+		"accepts": "^1.3.3",
+		"base64-js": "^1.2.0",
+		"sha256": "^0.2.0"
 	},
 	"devDependencies": {
-		"babel-cli": "6.18.x",
-		"babel-plugin-istanbul": "3.1.x",
-		"babel-preset-es2015": "6.18.x",
-		"browserify": "13.3.x",
-		"coveralls": "2.11.x",
-		"google-closure-compiler-js": "20161201.0.1",
-		"nyc": "10.1.x",
-		"simultaneity": "1.1.x"
+		"babel-cli": "^6.24.1",
+		"babel-plugin-istanbul": "^4.1.1",
+		"babel-preset-es2015": "^6.24.1",
+		"browserify": "^14.3.0",
+		"coveralls": "^2.13.0",
+		"google-closure-compiler-js": "^20170218.0.0",
+		"nyc": "^10.2.0",
+		"simultaneity": "^1.1.0"
 	},
 	"directories": {
 		"test": "test"
diff --git a/read.js b/read.js
@@ -1,16 +1,13 @@
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
 //This file contains functions for reading types and values from bytes
 
-const assert = require(__dirname + '/lib/assert.js')
-const bitMath = require(__dirname + '/lib/bit-math.js')
-const bufferString = require(__dirname + '/lib/buffer-string.js')
-const constructorRegistry = require(__dirname + '/constructor-registry.js')
-const flexInt = require(__dirname + '/lib/flex-int.js')
-const recursiveRegistry = require(__dirname + '/recursive-registry.js')
-const strint = require(__dirname + '/lib/strint.js')
-const t = require(__dirname + '/structure-types.js')
+const assert = require('./lib/assert')
+const bitMath = require('./lib/bit-math')
+const bufferString = require('./lib/buffer-string')
+const constructorRegistry = require('./constructor-registry')
+const flexInt = require('./lib/flex-int')
+const recursiveRegistry = require('./recursive-registry')
+const strint = require('./lib/strint')
+const t = require('./structure-types')
 const util = require('util')
 
 const NOT_LONG_ENOUGH = 'Buffer is not long enough'
diff --git a/recursive-registry.js b/recursive-registry.js
@@ -1,8 +1,5 @@
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
-const assert = require(__dirname + '/lib/assert.js')
-const t = require(__dirname + '/structure-types.js')
+const assert = require('./lib/assert')
+const t = require('./structure-types')
 
 //A map of names of recursive types to their types
 const registeredTypes = new Map
diff --git a/structure-types.js b/structure-types.js
@@ -1,25 +1,22 @@
 /*eslint-disable valid-jsdoc*/ //since root parameters shouldn't be documented
 
-//For use with browserify
-if (__dirname === '/') __dirname = ''
-
 //This file contains definitions for all the types
 //and their writing to bytes methods
 
-const assert = require(__dirname + '/lib/assert.js')
+const assert = require('./lib/assert')
 const base64 = require('base64-js')
-const bufferString = require(__dirname + '/lib/buffer-string.js')
-const config = require(__dirname + '/config.js')
-const flexInt = require(__dirname + '/lib/flex-int.js')
+const bufferString = require('./lib/buffer-string')
+const config = require('./config')
+const flexInt = require('./lib/flex-int')
 const sha256 = require('sha256')
-const GrowableBuffer = require(__dirname + '/lib/growable-buffer.js')
+const GrowableBuffer = require('./lib/growable-buffer')
 let recursiveRegistry
 function loadRecursiveRegistry() { //lazy require to avoid mutual dependence
-	if (!recursiveRegistry) recursiveRegistry = require(__dirname + '/recursive-registry.js')
+	if (!recursiveRegistry) recursiveRegistry = require('./recursive-registry')
 }
-const strint = require(__dirname + '/lib/strint.js')
+const strint = require('./lib/strint')
 const util = require('util')
-const {dividedByEight, modEight} = require(__dirname + '/lib/bit-math.js')
+const {dividedByEight, modEight} = require('./lib/bit-math')
 
 //Map of write buffers to maps of names to ids
 const recursiveIDs = new WeakMap
