Other: Bundler provides useful stuff to uglify and a global var witho…

…ut extra bloat
protobufjs · Jan 17, 2017 · 168e448 · 168e448
1 parent 32e0529
commit 168e448
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 77 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,9 +8,9 @@
         "Float32Array": true,
         "Float64Array": true,
         "define": true,
+        "global": true,
         "XMLHttpRequest": true,
-        "Promise": true,
-        "dcodeIO": true
+        "Promise": true
     },
     "parserOptions": {
         "ecmaVersion": 5

diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.js.map b/dist/noparse/protobuf.js.map
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/noparse/protobuf.min.js.map b/dist/noparse/protobuf.min.js.map
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.js.map b/dist/runtime/protobuf.js.map
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/dist/runtime/protobuf.min.js.map b/dist/runtime/protobuf.min.js.map
diff --git a/package.json b/package.json
@@ -61,6 +61,7 @@
     "@types/node": "7.0.0",
     "benchmark": "^2.1.3",
     "browserify": "^13.3.0",
+    "browserify-wrap": "^1.0.2",
     "bundle-collapser": "^1.2.1",
     "chalk": "^1.1.3",
     "escodegen": "^1.8.1",

diff --git a/runtime/index.js b/runtime/index.js
@@ -1,7 +1,7 @@
 // This file exports just the bare minimum required to work with statically generated code.
 // Can be used as a drop-in replacement for the full library as it has the same general structure.
 "use strict";
-var protobuf = exports;
+var protobuf = global.protobuf = exports;
 
 protobuf.Writer       = require("../src/writer");
 protobuf.BufferWriter = require("../src/writer_buffer");
@@ -15,13 +15,6 @@ function configure() {
     protobuf.Reader._configure();
 }
 
-if (typeof window !== "undefined" && window)
-    window.protobuf = protobuf;
-else if (typeof self !== "undefined" && self)
-    self.protobuf = protobuf;
-else
-    this.protobuf = protobuf; // eslint-disable-line no-invalid-this
-
 if (typeof define === "function" && define.amd)
     define(["long"], function(Long) {
         if (Long) {

diff --git a/scripts/bundle.js b/scripts/bundle.js
@@ -43,6 +43,12 @@ function bundle(options) {
     if (options.exclude)
         options.exclude.forEach(bundler.exclude, bundler);
     return bundler
+    .plugin(require("browserify-wrap"), {
+        // + global object for convenience
+        // + undefined var and global strict-mode for uglify
+        prefix: "!function(global,undefined){\"use strict\";",
+        suffix: "}(typeof window===\"object\"&&window||typeof self===\"object\"&&self||this);"
+    })
     .plugin(require("bundle-collapser/plugin"))
     .bundle()
     .pipe(source(options.compress ? "protobuf.min.js" : "protobuf.js"))
@@ -53,6 +59,10 @@ function bundle(options) {
                     mangleProperties: {
                         regex: /^_/
                     },
+                    mangle: {
+                        eval: true,
+                        toplevel: false
+                    },
                     compress: {
                         unused: true,
                         keep_fargs: false,

diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,5 @@
 "use strict";
-var protobuf = exports;
+var protobuf = global.protobuf = exports;
 
 /**
  * A node-style callback as used by {@link load} and {@link Root#load}.
@@ -127,14 +127,6 @@ function configure() {
     protobuf.Reader._configure();
 }
 
-/* istanbul ignore next */
-if (typeof window !== "undefined" && window)
-    window.protobuf = protobuf;
-else if (typeof self !== "undefined" && self)
-    self.protobuf = protobuf;
-else
-    this.protobuf = protobuf; // eslint-disable-line no-invalid-this
-
 /* istanbul ignore next */
 if (typeof define === "function" && define.amd)
     define(["long"], function(Long) {

diff --git a/src/util/runtime.js b/src/util/runtime.js
@@ -24,7 +24,7 @@ util.emptyObject = Object.freeze ? Object.freeze({}) : /* istanbul ignore next *
  * @memberof util
  * @type {boolean}
  */
-util.isNode = typeof process !== "undefined" && Boolean(process.versions && process.versions.node);
+util.isNode = Boolean(global.process && global.process.versions && global.process.versions.node);
 
 /**
  * Tests if the specified value is an integer.
@@ -112,7 +112,7 @@ util.LongBits = require("./longbits");
  * Long.js's Long class if available.
  * @type {?function(new: Long)}
  */
-util.Long = typeof dcodeIO !== "undefined" && /* istanbul ignore next */ dcodeIO && /* istanbul ignore next */ dcodeIO.Long || util.inquire("long");
+util.Long = /* istanbul ignore next */ global.dcodeIO && /* istanbul ignore next */ global.dcodeIO.Long || util.inquire("long");
 
 /**
  * Converts a number or long to an 8 characters long hash string.