Merge pull request #42 from thefrontside/ww/mocha-shim

Disable requiring mocha directly in browser environments

packages/mocha/package.json

@@ -6,6 +6,9 @@
   "repository": "https://github.com/thefrontside/bigtest/tree/master/packages/mocha",
   "main": "dist/index.js",
   "module": "src/index.js",
+  "browser": {
+    "mocha": false
+  },
   "scripts": {
     "build": "rollup --config",
     "test": "mocha --opts ./tests/mocha.opts ./tests",

packages/mocha/src/index.js

@@ -1,4 +1,4 @@
-import * as mocha from 'mocha';
+import * as mocha from './mocha';
 import Convergence from '@bigtest/convergence';
 
 /**
@@ -194,26 +194,25 @@ function afterEach(teardown) {
   return mocha.afterEach(handleRunnable(teardown));
 }
 
+// destructure this for exporting
+let { describe } = mocha;
+
 // export our convergent it, wrapped hooks, and their aliases
 export {
   it,
   before,
   beforeEach,
   after,
   afterEach,
+  describe,
   // TDD interface aliases
   it as test,
+  describe as context,
   // BDD interface aliases
   it as specify,
   before as suiteSetup,
   beforeEach as setup,
   after as suiteTeardown,
-  afterEach as teardown
+  afterEach as teardown,
+  describe as suite
 };
-
-// export other mocha functions used for testing
-export {
-  describe,
-  context,
-  suite
-} from 'mocha';

packages/mocha/src/mocha.js

@@ -0,0 +1,32 @@
+// This file exports any globally defined mocha functions, otherwise
+// it exports them from the mocha module directly.
+//
+// In a browser environment, mocha is usually included before the
+// tests and has defined it's functions within the global context.
+// Requiring mocha directly is currently disabled in browser
+// environments via the `browser` field in this package's
+// `package.json` file. This is because the mocha entrypoint has not
+// yet been optimized to work with browser bundles without first
+// disabling certain node modules.
+//
+// @see https://github.com/mochajs/mocha/issues/2448
+
+import * as mocha from 'mocha';
+
+let {
+  describe = global.describe,
+  before = global.before,
+  beforeEach = global.beforeEach,
+  after = global.before,
+  afterEach = global.afterEach,
+  it = global.it
+} = mocha;
+
+export {
+  describe,
+  before,
+  beforeEach,
+  after,
+  afterEach,
+  it
+};