Improve non require shim approach

README.md

@@ -5,7 +5,6 @@
 
 #### TODO
 
-* investigate a better solution for the browserify web shim
 * release to npm
 
 ------------

build.sh

@@ -1,8 +1,14 @@
 #!/usr/bin/env bash
 
+rm dist/build.js
+
 ./node_modules/.bin/browserify src/index.js \
   --standalone Module \
   --external backbone \
   --external backbone.marionette \
   --external underscore \
-  -o dist/build.js
+  | ./node_modules/.bin/global-lookup-shim \
+  --global-shim underscore:_ \
+  --global-shim backbone:Backbone \
+  --global-shim backbone.marionette:Marionette \
+  > dist/build.js

package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "backbone": "^1.1.2",
     "backbone.marionette": "^2.3.2",
-    "underscore": "^1.7.0"
+    "underscore": "^1.7.0",
+    "global-lookup-shim": "~0.1.0"
   }
 }

src/callbacks.js

@@ -1,5 +1,5 @@
-var _ = (window && window._) || require('underscore'),
-Backbone = (window && window.Backbone) || require('backbone');
+var _ = require('underscore'),
+Backbone = require('backbone');
 
 // Callbacks
 // ---------

src/module.js

@@ -1,8 +1,7 @@
-var _ = (window && window._) || require('underscore'),
-Backbone = (window && window.Backbone) || require('backbone'),
+var _ = require('underscore'),
+Backbone = require('backbone'),
 Callbacks = require('./callbacks'),
-Marionette = (window && window.Backbone && window.Backbone.Marionette) || require('backbone.marionette');
-
+Marionette = require('backbone.marionette');
 /* jshint maxparams: 9 */
 
 // Module

src/shim.js

@@ -1,5 +1,5 @@
 var Module = require('./module'),
-_ = (window && window._) || require('underscore');
+_ = require('underscore');
 
 module.exports = function(Mn) {
   Mn.Application.prototype.module = function(moduleNames, moduleDefinition) {

test/module.spec.js

@@ -1,5 +1,3 @@
-global.window = null;
-
 var sinon = require('sinon');
 var sinonChai = require('sinon-chai');
 var chaiJq = require('chai-jq');

test/module.stop.spec.js

@@ -1,5 +1,3 @@
-global.window = null;
-
 var sinon = require('sinon');
 var sinonChai = require('sinon-chai');
 var chaiJq = require('chai-jq');

test/shim.spec.js

@@ -1,5 +1,3 @@
-global.window = null;
-
 var shim = require('../src');
 var chai  = require('chai');
 expect = chai.expect;