Merge branch 'release/1.0.7'

Author: thetutlage

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="1.0.7"></a>
+## [1.0.7](https://github.com/adonisjs/adonis-websocket-client/compare/v1.0.6...v1.0.7) (2018-03-21)
+
+
+### Features
+
+* **Connection:** auto detect url when not defined ([4f958e4](https://github.com/adonisjs/adonis-websocket-client/commit/4f958e4))
+
+
+
 <a name="1.0.6"></a>
 ## [1.0.6](https://github.com/adonisjs/adonis-websocket-client/compare/v1.0.5...v1.0.6) (2018-03-18)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/websocket-client",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Websocket client for AdonisJs",
   "main": "dist/Ws.es.js",
   "module": "dist/Ws.es.js",
@@ -31,6 +31,7 @@
     "babel-core": "^6.26.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-transform-object-assign": "^6.22.0",
+    "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "chalk": "^2.3.2",

package.json

@@ -2,6 +2,22 @@ const pkg = require('./package')
 const basePlugins = require('./rollup.plugins.js')
 
 const pluginBabel = require('rollup-plugin-babel')({
+  ignore: /node_modules\/(!emittery).*/,
+  plugins: ['external-helpers', 'transform-object-assign', 'transform-regenerator'],
+  presets: [
+    [
+      'env',
+      {
+        modules: false,
+        targets: {
+          browsers: ['last 4 versions', 'safari >= 7', 'ie 11']
+        }
+      }
+    ]
+  ]
+})
+
+const pluginBabelEs = require('rollup-plugin-babel')({
   ignore: /node_modules\/(!emittery).*/,
   plugins: ['external-helpers', 'transform-object-assign'],
   presets: [
@@ -79,7 +95,7 @@ function esBuild () {
       file: pkg.module,
       format: 'es'
     },
-    plugins: basePlugins.concat([pluginBabel])
+    plugins: basePlugins.concat([pluginBabelEs])
   }
 }
 

rollup.config.js

@@ -16,6 +16,14 @@ import debug from '../Debug/index.js'
 import Socket from '../Socket/index.js'
 import JsonEncoder from '../JsonEncoder/index.js'
 
+/**
+ * Returns the ws protocol based upon HTTP or HTTPS
+ *
+ * @returns {String}
+ *
+ */
+const wsProtocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
+
 /**
  * Connection class is used to make a TCP/Socket connection
  * with the server. It relies on Native Websocket browser
@@ -30,6 +38,8 @@ export default class Connection extends Emitter {
   constructor (url, options) {
     super()
 
+    url = url ? url : `${wsProtocol}://${window.location.hostname}`
+
     /**
      * Connection options
      *