Skip to content

Commit 95385a4

Browse files
committed
Merge remote-tracking branch 'origin/develop' into newRequestModel
2 parents 975b010 + 77e5f4f commit 95385a4

File tree

5 files changed

+12
-37
lines changed

5 files changed

+12
-37
lines changed

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,18 @@ kuzzle
100100

101101
### Javascript
102102

103-
You can install this SDK with [Bower](http://bower.io/).
104-
```
105-
bower install kuzzle-sdk --save
103+
Clone this github repository and run ``npm run build``. A ``dist`` directory will be created, containing a browser version of this SDK.
104+
105+
106+
```html
107+
<script type="text/javascript" src="dist/kuzzle.js"></script>
106108
```
107109

110+
If you want to support older browser versions, you may load `socket.io` before Kuzzle, making the SDK compatible with browsers without websocket support:
111+
108112
```html
109-
<!-- Don't forget to include socketio before kuzzle -->
110-
<script type="text/javascript" src="bower_components/socket.io-client/socket.io.js"></script>
111-
<script type="text/javascript" src="bower_components/kuzzle-sdk/dist/kuzzle.min.js"></script>
113+
<!-- Don't forget to include socketio before kuzzle SDK -->
114+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.6.0/socket.io.min.js"></script>
112115
```
113116

114117
#### <a name="basic-usage-js"></a> Basic usage
@@ -137,10 +140,6 @@ kuzzle
137140
});
138141
```
139142

140-
## Building manually
141-
142-
Clone this github repository and run ``npm run build``. A ``dist`` directory will be created, containing a plain browserified version of this SDK, and a minified version.
143-
144143
## Migrating from SDK v1.x
145144

146145
* Kuzzle constructor has been changed. Instead of an URL, you have to provide a resolvable server name, or an IP address. If you need to specify a port different than the provided default values, you can do so using these two new options: `wsPort` (WebSocket port) and `ioPort` (Socket.IO port)

bower.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

dist/kuzzle.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/kuzzle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ module.exports = {
2121
setImmediate: false
2222
},
2323
module: {
24-
noParse: [/ws/, /crypto/, /buffer/, /node-uuid/],
2524
loaders: [
2625
{
2726
test: /\.js$/,

0 commit comments

Comments
 (0)