[fix] Remove any reference to the global variable

Related: socketio/socket.io-client#1166
sunrise30 · Nov 28, 2018 · 69214b1 · 69214b1
1 parent 14abdb1
commit 69214b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,7 +3,8 @@
   "parser": "babel-eslint",
   "env": {
     // Note: mocha env is defined inside test/.eslintrc.json
-    "node": true
+    "node": true,
+    "browser": true
   },
   "rules": {
     "yoda": 0,

diff --git a/lib/url.js b/lib/url.js
@@ -25,7 +25,7 @@ function url (uri, loc) {
   var obj = uri;
 
   // default to window.location
-  loc = loc || global.location;
+  loc = loc || (typeof location !== 'undefined' && location);
   if (null == uri) uri = loc.protocol + '//' + loc.host;
 
   // relative path support

diff --git a/support/webpack.config.dev.js b/support/webpack.config.dev.js
@@ -10,16 +10,16 @@ module.exports = {
   externals: {
     global: glob()
   },
+  node: {
+    Buffer: false
+  },
   devtool: 'source-map',
   module: {
     loaders: [{
       test: /\.js$/,
       exclude: /(node_modules|bower_components)/,
       loader: 'babel-loader',
       query: { presets: ['es2015'] }
-    }, {
-      test: /\json3.js/,
-      loader: 'imports?define=>false'
     }]
   }
 };

diff --git a/support/webpack.config.slim.dev.js b/support/webpack.config.slim.dev.js
@@ -10,8 +10,10 @@ module.exports = {
     filename: 'socket.io.slim.dev.js'
   },
   externals: {
-    global: glob(),
-    json3: 'JSON'
+    global: glob()
+  },
+  node: {
+    Buffer: false
   },
   devtool: 'source-map',
   plugins: [
@@ -23,9 +25,6 @@ module.exports = {
       exclude: /(node_modules|bower_components)/,
       loader: 'babel-loader',
       query: { presets: ['es2015'] }
-    }, {
-      test: /\json3.js/,
-      loader: 'imports?define=>false'
     }, {
       test: /\.js$/,
       loader: 'strip-loader?strip[]=debug'