theLAZYmd
diff --git a/‎.eslintrc.json‎
Lines changed: 1 addition & 0 deletions b/‎.eslintrc.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.gitmodules‎
Lines changed: 0 additions & 3 deletions b/‎.gitmodules‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎.npmignore‎
Lines changed: 2 additions & 0 deletions b/‎.npmignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.travis.yml‎
Lines changed: 3 additions & 1 deletion b/‎.travis.yml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/general/updating.md‎
Lines changed: 4 additions & 0 deletions b/‎docs/general/updating.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎docs/general/welcome.md‎
Lines changed: 3 additions & 3 deletions b/‎docs/general/welcome.md‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎docs/topics/web.md‎
Lines changed: 1 addition & 1 deletion b/‎docs/topics/web.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎package.json‎
Lines changed: 38 additions & 10 deletions b/‎package.json‎
Lines changed: 38 additions & 10 deletions
diff --git a/‎src/client/Client.js‎
Lines changed: 11 additions & 5 deletions b/‎src/client/Client.js‎
Lines changed: 11 additions & 5 deletions
@@ -77,6 +77,7 @@
     "no-undef-init": "error",
 
     "callback-return": "error",
+    "getter-return": "off",
     "handle-callback-err": "error",
     "no-mixed-requires": "error",
     "no-new-require": "error",
 
@@ -24,3 +24,5 @@ webpack/
 webpack.config.js
 .github/
 test/
+tsconfig.json
+tslint.json
@@ -1,7 +1,9 @@
 language: node_js
 node_js:
   - "6"
-  - "7"
+  - "8"
+  - "10"
+  - "12"
 cache:
   directories:
     - node_modules
 
@@ -44,7 +44,7 @@ For production bots, using node-opus should be considered a necessity, especiall
 - One of the following packages can be installed for faster voice packet encryption and decryption:
     - [sodium](https://www.npmjs.com/package/sodium) (`npm install sodium`)
     - [libsodium.js](https://www.npmjs.com/package/libsodium-wrappers) (`npm install libsodium-wrappers`)
-- [uws](https://www.npmjs.com/package/uws) for a much faster WebSocket connection (`npm install uws`)
+- [uws](https://www.npmjs.com/package/@discordjs/uws) for a much faster WebSocket connection (`npm install @discordjs/uws`)
 
 ## Example usage
 ```js
 
@@ -1,3 +1,7 @@
+# Version 11.5.0
+v11.5.0 backports new features from the in-development v12, and fixes bugs in the v11.4.x releases.
+See [the changelog](https://github.com/discordjs/discord.js/releases/tag/11.5.0) for a full list of changes, including information about deprecations.
+
 # Version 11.4.0
 v11.4.0 backports many new features such as Rich Presence and bugfixes from v11.3.0.
 See [the changelog](https://github.com/discordjs/discord.js/releases/tag/11.4.0) for a full list of changes, including information about deprecations.
 
@@ -18,8 +18,8 @@
 </div>
 
 # Welcome!
-Welcome to the discord.js v11.4 documentation.
-The v11.4 release contains bugfixes from v11.3 and backports features such as Rich Presence.
+Welcome to the discord.js v11.5 documentation.
+The v11.5 release contains bugfixes from v11.4 and backports features from the in-development v12.
 
 v12 is still very much a work-in-progress, as we're aiming to make it the best it can possibly be before releasing.
 If you are fond of living life on the bleeding-edge, check out the master branch.
@@ -52,7 +52,7 @@ For production bots, using node-opus should be considered a necessity, especiall
 - One of the following packages can be installed for faster voice packet encryption and decryption:
     - [sodium](https://www.npmjs.com/package/sodium) (`npm install sodium`)
     - [libsodium.js](https://www.npmjs.com/package/libsodium-wrappers) (`npm install libsodium-wrappers`)
-- [uws](https://www.npmjs.com/package/uws) for a much faster WebSocket connection (`npm install uws`)
+- [uws](https://www.npmjs.com/package/@discordjs/uws) for a much faster WebSocket connection (`npm install @discordjs/uws`)
 
 ## Example usage
 ```js
 
@@ -23,7 +23,7 @@ The usage of the API isn't any different from using it in Node.js.
 
 ## Example
 ```html
-<script type="text/javascript" src="discord.11.4.1.min.js"></script>
+<script type="text/javascript" src="discord.11.5.0.min.js"></script>
 <script type="text/javascript">
   const client = new Discord.Client();
 
 
@@ -1,6 +1,6 @@
 {
   "name": "discord.js",
-  "version": "11.4.1",
+  "version": "11.5.1",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index",
   "types": "./typings/index.d.ts",
@@ -10,6 +10,7 @@
     "docs:test": "docgen --source src --custom docs/index.yml",
     "lint": "eslint src",
     "lint:fix": "eslint --fix src",
+    "lint:typings": "tslint typings/index.d.ts typings/discord.js-test.ts",
     "webpack": "parallel-webpack"
   },
   "repository": {
@@ -36,31 +37,58 @@
     "prism-media": "^0.0.3",
     "snekfetch": "^3.6.4",
     "tweetnacl": "^1.0.0",
-    "ws": "^4.0.0"
+    "ws": "^6.0.0"
   },
   "peerDependencies": {
-    "bufferutil": "^3.0.3",
+    "@discordjs/uws": "^10.149.0",
+    "bufferutil": "^4.0.0",
     "erlpack": "discordapp/erlpack",
+    "libsodium-wrappers": "^0.7.3",
     "node-opus": "^0.2.7",
     "opusscript": "^0.0.6",
-    "sodium": "^2.0.3",
-    "libsodium-wrappers": "^0.7.3",
-    "uws": "^9.14.0"
+    "sodium": "^2.0.3"
+  },
+  "peerDependenciesMeta": {
+    "bufferutil": {
+      "optional": true
+    },
+    "erlpack": {
+      "optional": true
+    },
+    "node-opus": {
+      "optional": true
+    },
+    "opusscript": {
+      "optional": true
+    },
+    "sodium": {
+      "optional": true
+    },
+    "libsodium-wrappers": {
+      "optional": true
+    },
+    "uws": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@types/node": "^9.4.6",
     "discord.js-docgen": "discordjs/docgen",
-    "eslint": "^4.18.0",
-    "parallel-webpack": "^2.2.0",
-    "uglifyjs-webpack-plugin": "^1.2.0",
-    "webpack": "^3.11.0"
+    "eslint": "^5.4.0",
+    "parallel-webpack": "^2.3.0",
+    "tslint": "^3.15.1",
+    "tslint-config-typings": "^0.2.4",
+    "typescript": "^3.0.1",
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "webpack": "^4.17.0"
   },
   "engines": {
     "node": ">=6.0.0"
   },
   "browser": {
     "ws": false,
     "uws": false,
+    "@discordjs/uws": false,
     "erlpack": false,
     "prism-media": false,
     "opusscript": false,
 
@@ -116,6 +116,7 @@ class Client extends EventEmitter {
      * Presences that have been received for the client user's friends, mapped by user IDs
      * <warn>This is only filled when using a user account.</warn>
      * @type {Collection<Snowflake, Presence>}
+     * @deprecated
      */
     this.presences = new Collection();
 
@@ -186,11 +187,11 @@ class Client extends EventEmitter {
 
   /**
    * Current status of the client's connection to Discord
-   * @type {?number}
+   * @type {Status}
    * @readonly
    */
   get status() {
-    return this.ws.connection.status;
+    return this.ws.connection ? this.ws.connection.status : Constants.Status.IDLE;
   }
 
   /**
@@ -296,6 +297,7 @@ class Client extends EventEmitter {
    * <info>This can be done automatically every 30 seconds by enabling {@link ClientOptions#sync}.</info>
    * <warn>This is only available when using a user account.</warn>
    * @param {Guild[]|Collection<Snowflake, Guild>} [guilds=this.guilds] An array or collection of guilds to sync
+   * @deprecated
    */
   syncGuilds(guilds = this.guilds) {
     if (this.user.bot) return;
@@ -323,7 +325,7 @@ class Client extends EventEmitter {
    * @returns {Promise<Invite>}
    * @example
    * client.fetchInvite('https://discord.gg/bRCvFy9')
-   *   .then(invite => console.log(`Obtained invite with code: ${invite.code}`)
+   *   .then(invite => console.log(`Obtained invite with code: ${invite.code}`))
    *   .catch(console.error);
    */
   fetchInvite(invite) {
@@ -395,8 +397,9 @@ class Client extends EventEmitter {
    * <warn>Bots can only fetch their own profile.</warn>
    * @param {Snowflake} [id='@me'] ID of application to fetch
    * @returns {Promise<OAuth2Application>}
+   * @example
    * client.fetchApplication()
-   *   .then(application => console.log(`Obtained application with name: ${application.name}`)
+   *   .then(application => console.log(`Obtained application with name: ${application.name}`))
    *   .catch(console.error);
    */
   fetchApplication(id = '@me') {
@@ -509,7 +512,7 @@ class Client extends EventEmitter {
    * @param {ClientOptions} [options=this.options] Options to validate
    * @private
    */
-  _validateOptions(options = this.options) {
+  _validateOptions(options = this.options) { // eslint-disable-line complexity
     if (typeof options.shardCount !== 'number' || isNaN(options.shardCount)) {
       throw new TypeError('The shardCount option must be a number.');
     }
@@ -540,6 +543,9 @@ class Client extends EventEmitter {
       throw new TypeError('The restWsBridgeTimeout option must be a number.');
     }
     if (!(options.disabledEvents instanceof Array)) throw new TypeError('The disabledEvents option must be an Array.');
+    if (typeof options.retryLimit !== 'number' || isNaN(options.retryLimit)) {
+      throw new TypeError('The retryLimit  options must be a number.');
+    }
   }
 }