Attempted fix for #298 by abstracting require calls through a couple …

…of layers
protobufjs · Jul 10, 2015 · 0e61d62 · 0e61d62
1 parent 4887203
commit 0e61d62
Show file tree

Hide file tree

Showing 38 changed files with 721 additions and 525 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "protobuf",
     "description": "Protocol Buffers for JavaScript. Finally.",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "main": "dist/ProtoBuf.js",
     "license": "Apache-2.0",
     "homepage": "http://dcode.io/",

diff --git a/dist/ProtoBuf-light.js b/dist/ProtoBuf-light.js
@@ -24,11 +24,11 @@
     /* AMD */ if (typeof define === 'function' && define["amd"])
         define(["ByteBuffer"], factory);
     /* CommonJS */ else if (typeof require === "function" && typeof module === "object" && module && module["exports"])
-        module["exports"] = factory(require("bytebuffer"));
+        module["exports"] = factory(require("bytebuffer"), require);
     /* Global */ else
         (global["dcodeIO"] = global["dcodeIO"] || {})["ProtoBuf"] = factory(global["dcodeIO"]["ByteBuffer"]);
 
-})(this, function(ByteBuffer) {
+})(this, function(ByteBuffer, nodeRequire) {
     "use strict";
 
     /**
@@ -57,7 +57,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "4.0.0";
+    ProtoBuf.VERSION = "4.0.1";
 
     /**
      * Wire types.
@@ -314,8 +314,7 @@
             // redundant modules.
             // * Works for browserify because node-process does not implement toString
             //   https://github.com/defunctzombie/node-process
-            typeof process === 'object' &&
-            process+'' === '[object process]'
+            typeof process === 'object' && process+'' === '[object process]'
         );
 
         /**
@@ -357,15 +356,15 @@
                 callback = null;
             if (Util.IS_NODE) {
                 if (callback) {
-                    require("fs").readFile(path, function(err, data) {
+                    Util.require("fs").readFile(path, function(err, data) {
                         if (err)
                             callback(null);
                         else
                             callback(""+data);
                     });
                 } else
                     try {
-                        return require("fs").readFileSync(path);
+                        return Util.require("fs").readFileSync(path);
                     } catch (e) {
                         return null;
                     }
@@ -395,6 +394,18 @@
             }
         };
 
+        /**
+         * Requires a node module.
+         * @function
+         * @param {string} path
+         * @returns {*}
+         * @throws Error If node require is not supported
+         * @expose
+         */
+        Util.require = Util.IS_NODE
+            ? function(path) { return nodeRequire(path); }
+            : function(path) { throw Error("node require is not supported by this platform")};
+
         /**
          * Converts a string to camel case.
          * @param {string} str
@@ -3700,7 +3711,7 @@
         BuilderPrototype["import"] = function(json, filename) {
             if (typeof filename === 'string') {
                 if (ProtoBuf.Util.IS_NODE)
-                    filename = require("path")['resolve'](filename);
+                    filename = ProtoBuf.Util.require("path")['resolve'](filename);
                 if (this.files[filename] === true) {
                     this.reset();
                     return this; // Skip duplicate imports
@@ -3709,7 +3720,7 @@
             } else if (typeof filename === 'object') { // Assume object with root, filename.
                 var root = filename.root
                 if (ProtoBuf.Util.IS_NODE)
-                    root = require("path")['resolve'](root);
+                    root = ProtoBuf.Util.require("path")['resolve'](root);
                 var delim = '/';
                 if (root.indexOf("\\") >= 0 || filename.file.indexOf("\\") >= 0) delim = '\\';
                 var fname = [root, filename.file].join(delim);

diff --git a/dist/ProtoBuf-light.min.js b/dist/ProtoBuf-light.min.js
diff --git a/dist/ProtoBuf-light.min.js.gz b/dist/ProtoBuf-light.min.js.gz
diff --git a/dist/ProtoBuf-light.min.map b/dist/ProtoBuf-light.min.map
diff --git a/dist/ProtoBuf.js b/dist/ProtoBuf.js
@@ -24,11 +24,11 @@
     /* AMD */ if (typeof define === 'function' && define["amd"])
         define(["ByteBuffer"], factory);
     /* CommonJS */ else if (typeof require === "function" && typeof module === "object" && module && module["exports"])
-        module["exports"] = factory(require("bytebuffer"));
+        module["exports"] = factory(require("bytebuffer"), require);
     /* Global */ else
         (global["dcodeIO"] = global["dcodeIO"] || {})["ProtoBuf"] = factory(global["dcodeIO"]["ByteBuffer"]);
 
-})(this, function(ByteBuffer) {
+})(this, function(ByteBuffer, nodeRequire) {
     "use strict";
 
     /**
@@ -57,7 +57,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "4.0.0";
+    ProtoBuf.VERSION = "4.0.1";
 
     /**
      * Wire types.
@@ -314,8 +314,7 @@
             // redundant modules.
             // * Works for browserify because node-process does not implement toString
             //   https://github.com/defunctzombie/node-process
-            typeof process === 'object' &&
-            process+'' === '[object process]'
+            typeof process === 'object' && process+'' === '[object process]'
         );
 
         /**
@@ -357,15 +356,15 @@
                 callback = null;
             if (Util.IS_NODE) {
                 if (callback) {
-                    require("fs").readFile(path, function(err, data) {
+                    Util.require("fs").readFile(path, function(err, data) {
                         if (err)
                             callback(null);
                         else
                             callback(""+data);
                     });
                 } else
                     try {
-                        return require("fs").readFileSync(path);
+                        return Util.require("fs").readFileSync(path);
                     } catch (e) {
                         return null;
                     }
@@ -395,6 +394,18 @@
             }
         };
 
+        /**
+         * Requires a node module.
+         * @function
+         * @param {string} path
+         * @returns {*}
+         * @throws Error If node require is not supported
+         * @expose
+         */
+        Util.require = Util.IS_NODE
+            ? function(path) { return nodeRequire(path); }
+            : function(path) { throw Error("node require is not supported by this platform")};
+
         /**
          * Converts a string to camel case.
          * @param {string} str
@@ -4695,7 +4706,7 @@
         BuilderPrototype["import"] = function(json, filename) {
             if (typeof filename === 'string') {
                 if (ProtoBuf.Util.IS_NODE)
-                    filename = require("path")['resolve'](filename);
+                    filename = ProtoBuf.Util.require("path")['resolve'](filename);
                 if (this.files[filename] === true) {
                     this.reset();
                     return this; // Skip duplicate imports
@@ -4704,7 +4715,7 @@
             } else if (typeof filename === 'object') { // Assume object with root, filename.
                 var root = filename.root
                 if (ProtoBuf.Util.IS_NODE)
-                    root = require("path")['resolve'](root);
+                    root = ProtoBuf.Util.require("path")['resolve'](root);
                 var delim = '/';
                 if (root.indexOf("\\") >= 0 || filename.file.indexOf("\\") >= 0) delim = '\\';
                 var fname = [root, filename.file].join(delim);