Use full library for JSON modules and runtime dependency for static m…

…odules, fixes protocolbuffers#621
adellahlou · Jan 5, 2017 · c9a61e5 · c9a61e5
1 parent 8ec2579
commit c9a61e5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/cli/targets/static-module.js b/cli/targets/static-module.js
@@ -19,7 +19,7 @@ function static_module_target(root, options, callback) {
         if (err)
             return callback(err);
         try {
-            output = util.wrap(output, options);
+            output = util.wrap(output, protobuf.util.merge({ dependency: "protobufjs/runtime" }, options));
         } catch (e) {
             callback(e);
             return;

diff --git a/cli/util.js b/cli/util.js
@@ -110,6 +110,7 @@ exports.wrap = function(OUTPUT, options) {
         wrap = fs.readFileSync(path.resolve(process.cwd(), name)).toString("utf8");
     }
     wrap = wrap.replace(/%ROOT%/g, JSON.stringify(options.root || "default"));
+    wrap = wrap.replace(/%DEPENDENCY%/g, JSON.stringify(options.dependency || "protobufjs"));
     wrap = wrap.replace(/( *)%OUTPUT%/, function($0, $1) {
         return $1.length ? OUTPUT.replace(/^/mg, $1) : OUTPUT;
     });

diff --git a/cli/wrappers/commonjs.js b/cli/wrappers/commonjs.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var $protobuf = require("protobufjs/runtime");
+var $protobuf = require(%DEPENDENCY%);
 
 %OUTPUT%
 

diff --git a/cli/wrappers/default.js b/cli/wrappers/default.js
@@ -4,7 +4,7 @@
         define(["protobuf"], factory);
 
     /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports)
-        module.exports = factory(require("protobufjs/runtime"));
+        module.exports = factory(require(%DEPENDENCY%));
 
 })(this, function($protobuf) {
     "use strict";

diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "vinyl-buffer": "^1.0.0",
     "vinyl-fs": "^2.4.4",
     "vinyl-source-stream": "^1.1.0",
-    "zuul": "^3.11.1",
+    "zuul": "dcodeIO/zuul",
     "zuul-ngrok": "^4.0.0"
   },
   "cliDependencies": [