Merge pull request PatrickJS#63 from raszpi/webpack-require-fix

PatrickJS · PatrickJS · commit 49fefbb59eff · 2016-03-07T13:48:57.000-08:00
require check added, fixes PatrickJS#62
diff --git a/angular-websocket.js b/angular-websocket.js
@@ -346,7 +346,7 @@
       }
 
       // CommonJS
-      if (typeof exports === 'object' && require) {
+      if (typeof exports === 'object' && typeof require === 'function') {
         try {
           ws = require('ws');
           Socket = (ws.Client || ws.client || ws);
diff --git a/dist/angular-websocket.js b/dist/angular-websocket.js
@@ -346,7 +346,7 @@
       }
 
       // CommonJS
-      if (typeof exports === 'object' && require) {
+      if (typeof exports === 'object' && typeof require === 'function') {
         try {
           ws = require('ws');
           Socket = (ws.Client || ws.client || ws);

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`// CommonJS`
`349`		`- if (typeof exports === 'object' && require) {`
	`349`	`+ if (typeof exports === 'object' && typeof require === 'function') {`
`350`	`350`	`try {`
`351`	`351`	`ws = require('ws');`
`352`	`352`	`Socket = (ws.Client \|\| ws.client \|\| ws);`