Merge pull request #61 from carlobeltrame/master

Treat the environment during webpack build as browser rather than node
mock-server · Oct 30, 2020 · 32531f4 · 32531f4
2 parents 57c8ed2 + da1fa15
commit 32531f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/mockServerClient.js b/mockServerClient.js
@@ -10,6 +10,10 @@ var mockServerClient;
 (function () {
     "use strict";
 
+    runningInNode = function () {
+        return (typeof require !== 'undefined') && require('browser-or-node').isNode
+    }
+
     /**
      * Start the client communicating at the specified host and port
      * for example:
@@ -24,7 +28,7 @@ var mockServerClient;
      */
     mockServerClient = function (host, port, contextPath, tls, caCertPemFilePath) {
 
-        var makeRequest = (typeof require !== 'undefined' ? require('./sendRequest').sendRequest(tls, caCertPemFilePath) : function (host, port, path, jsonBody, resolveCallback) {
+        var makeRequest = (runningInNode() ? require('./sendRequest').sendRequest(tls, caCertPemFilePath) : function (host, port, path, jsonBody, resolveCallback) {
             var body = (typeof jsonBody === "string" ? jsonBody : JSON.stringify(jsonBody || ""));
             var url = (tls ? 'https' : 'http') + '://' + host + ':' + port + path;
 
@@ -171,7 +175,7 @@ var mockServerClient;
             };
         };
 
-        var WebSocketClient = (typeof require !== 'undefined' ? require('./webSocketClient').webSocketClient(tls, caCertPemFilePath) : function (host, port, contextPath) {
+        var WebSocketClient = (runningInNode() ? require('./webSocketClient').webSocketClient(tls, caCertPemFilePath) : function (host, port, contextPath) {
             var clientId;
             var clientIdHandler;
             var requestHandler;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "gruntplugin"
   ],
   "dependencies": {
+    "browser-or-node": "^1.3.0",
     "grunt-ts": "^6.0.0-beta.22",
     "q": "~2.0",
     "websocket": "^1.0.30"