Rip out the remainder of Bluebird

.babelrc

@@ -13,7 +13,6 @@
  ],
  "transform-class-properties",
  "transform-object-rest-spread",
- "transform-async-to-bluebird",
  "transform-runtime",
  "add-module-exports",
  "syntax-dynamic-import"

package.json

@@ -60,7 +60,6 @@
  "dependencies": {
  "babel-plugin-syntax-dynamic-import": "^6.18.0",
  "babel-runtime": "^6.26.0",
- "bluebird": "^3.5.0",
  "blueimp-canvas-to-blob": "^3.5.0",
  "browser-encrypt-attachment": "^0.3.0",
  "browser-request": "^0.3.3",
@@ -120,7 +119,6 @@
  "babel-eslint": "^10.0.1",
  "babel-loader": "^7.1.5",
  "babel-plugin-add-module-exports": "^0.2.1",
- "babel-plugin-transform-async-to-bluebird": "^1.1.1",
  "babel-plugin-transform-builtin-extend": "^1.1.2",
  "babel-plugin-transform-class-properties": "^6.24.1",
  "babel-plugin-transform-object-rest-spread": "^6.26.0",

src/ContentMessages.js

@@ -17,7 +17,6 @@ limitations under the License.
 
 'use strict';
 
-import Promise from 'bluebird';
 import extend from './extend';
 import dis from './dispatcher';
 import MatrixClientPeg from './MatrixClientPeg';

src/Lifecycle.js

@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import Matrix from 'matrix-js-sdk';
 
 import MatrixClientPeg from './MatrixClientPeg';
@@ -525,7 +524,7 @@ export function logout() {
  console.log("Failed to call logout API: token will not be invalidated");
  onLoggedOut();
  },
- ).done();
+ );
 }
 
 export function softLogout() {
@@ -614,7 +613,7 @@ export function onLoggedOut() {
  // that can occur when components try to use a null client.
  dis.dispatch({action: 'on_logged_out'}, true);
  stopMatrixClient();
- _clearStorage().done();
+ _clearStorage();
 }
 
 /**

src/Modal.js

@@ -23,7 +23,6 @@ import Analytics from './Analytics';
 import sdk from './index';
 import dis from './dispatcher';
 import { _t } from './languageHandler';
-import Promise from "bluebird";
 import {defer} from "./utils/promise";
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";

src/Notifier.js

@@ -198,7 +198,7 @@ const Notifier = {
 
  if (enable) {
  // Attempt to get permission from user
- plaf.requestNotificationPermission().done((result) => {
+ plaf.requestNotificationPermission().then((result) => {
  if (result !== 'granted') {
  // The permission request was dismissed or denied
  // TODO: Support alternative branding in messaging

src/Resend.js

@@ -35,7 +35,7 @@ module.exports = {
  },
  resend: function(event) {
  const room = MatrixClientPeg.get().getRoom(event.getRoomId());
- MatrixClientPeg.get().resendEvent(event, room).done(function(res) {
+ MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
  dis.dispatch({
  action: 'message_sent',
  event: event,

src/RoomNotifs.js

@@ -17,7 +17,6 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
-import Promise from 'bluebird';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
 export const ALL_MESSAGES = 'all_messages';

src/Rooms.js

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import Promise from 'bluebird';
 
 /**
  * Given a room object, return the alias we should use for it,

src/ScalarAuthClient.js

@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import url from 'url';
-import Promise from 'bluebird';
 import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 const request = require('browser-request');

src/ScalarMessaging.js

@@ -279,7 +279,7 @@ function inviteUser(event, roomId, userId) {
  }
  }
 
- client.invite(roomId, userId).done(function() {
+ client.invite(roomId, userId).then(function() {
  sendResponse(event, {
  success: true,
  });
@@ -398,7 +398,7 @@ function setPlumbingState(event, roomId, status) {
  sendError(event, _t('You need to be logged in.'));
  return;
  }
- client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).done(() => {
+ client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).then(() => {
  sendResponse(event, {
  success: true,
  });
@@ -414,7 +414,7 @@ function setBotOptions(event, roomId, userId) {
  sendError(event, _t('You need to be logged in.'));
  return;
  }
- client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).done(() => {
+ client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).then(() => {
  sendResponse(event, {
  success: true,
  });
@@ -444,7 +444,7 @@ function setBotPower(event, roomId, userId, level) {
  },
  );
 
- client.setPowerLevel(roomId, userId, level, powerEvent).done(() => {
+ client.setPowerLevel(roomId, userId, level, powerEvent).then(() => {
  sendResponse(event, {
  success: true,
  });

src/SlashCommands.js

@@ -28,7 +28,6 @@ import { linkifyAndSanitizeHtml } from './HtmlUtils';
 import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import WidgetUtils from "./utils/WidgetUtils";
 import {textToHtmlRainbow} from "./utils/colour";
-import Promise from "bluebird";
 import { getAddressType } from './UserAddress';
 import { abbreviateUrl } from './utils/UrlUtils';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/IdentityServerUtils';

src/Terms.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import classNames from 'classnames';
 
 import MatrixClientPeg from './MatrixClientPeg';

src/ToWidgetPostMessageApi.js

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from "bluebird";
-
 // const OUTBOUND_API_NAME = 'toWidget';
 
 // Initiate requests using the "toWidget" postMessage API and handle responses

src/VectorConferenceHandler.js

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import {createNewMatrixCall, Room} from "matrix-js-sdk";
 import CallHandler from './CallHandler';
 import MatrixClientPeg from "./MatrixClientPeg";

src/autocomplete/Autocompleter.js

@@ -26,7 +26,6 @@ import RoomProvider from './RoomProvider';
 import UserProvider from './UserProvider';
 import EmojiProvider from './EmojiProvider';
 import NotifProvider from './NotifProvider';
-import Promise from 'bluebird';
 import {timeout} from "../utils/promise";
 
 export type SelectionRange = {

src/components/structures/GroupView.js

@@ -19,7 +19,6 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import sdk from '../../index';
 import dis from '../../dispatcher';
@@ -637,7 +636,7 @@ export default createReactClass({
  title: _t('Error'),
  description: _t('Failed to upload image'),
  });
- }).done();
+ });
  },
 
  _onJoinableChange: function(ev) {
@@ -676,7 +675,7 @@ export default createReactClass({
  this.setState({
  avatarChanged: false,
  });
- }).done();
+ });
  },
 
  _saveGroup: async function() {

src/components/structures/InteractiveAuth.js

@@ -121,7 +121,7 @@ export default createReactClass({
  this.setState({
  errorText: msg,
  });
- }).done();
+ });
 
  this._intervalId = null;
  if (this.props.poll) {

src/components/structures/MatrixChat.js

@@ -17,8 +17,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
@@ -542,7 +540,7 @@ export default createReactClass({
  const Loader = sdk.getComponent("elements.Spinner");
  const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
- MatrixClientPeg.get().leave(payload.room_id).done(() => {
+ MatrixClientPeg.get().leave(payload.room_id).then(() => {
  modal.close();
  if (this.state.currentRoomId === payload.room_id) {
  dis.dispatch({action: 'view_next_room'});
@@ -863,7 +861,7 @@ export default createReactClass({
  waitFor = this.firstSyncPromise.promise;
  }
 
- waitFor.done(() => {
+ waitFor.then(() => {
  let presentedId = roomInfo.room_alias || roomInfo.room_id;
  const room = MatrixClientPeg.get().getRoom(roomInfo.room_id);
  if (room) {
@@ -980,7 +978,7 @@ export default createReactClass({
 
  const [shouldCreate, createOpts] = await modal.finished;
  if (shouldCreate) {
- createRoom({createOpts}).done();
+ createRoom({createOpts});
  }
  },
 
@@ -1756,7 +1754,7 @@ export default createReactClass({
  return;
  }
 
- cli.sendEvent(roomId, event.getType(), event.getContent()).done(() => {
+ cli.sendEvent(roomId, event.getType(), event.getContent()).then(() => {
  dis.dispatch({action: 'message_sent'});
  }, (err) => {
  dis.dispatch({action: 'message_send_failed'});

src/components/structures/MyGroups.js

@@ -47,7 +47,7 @@ export default createReactClass({
  },
 
  _fetch: function() {
- this.context.matrixClient.getJoinedGroups().done((result) => {
+ this.context.matrixClient.getJoinedGroups().then((result) => {
  this.setState({groups: result.groups, error: null});
  }, (err) => {
  if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {

src/components/structures/RoomDirectory.js

@@ -27,7 +27,6 @@ const dis = require('../../dispatcher');
 
 import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
@@ -89,7 +88,7 @@ module.exports = createReactClass({
  this.setState({protocolsLoading: false});
  return;
  }
- MatrixClientPeg.get().getThirdpartyProtocols().done((response) => {
+ MatrixClientPeg.get().getThirdpartyProtocols().then((response) => {
  this.protocols = response;
  this.setState({protocolsLoading: false});
  }, (err) => {
@@ -135,7 +134,7 @@ module.exports = createReactClass({
  publicRooms: [],
  loading: true,
  });
- this.getMoreRooms().done();
+ this.getMoreRooms();
  },
 
  getMoreRooms: function() {
@@ -246,7 +245,7 @@ module.exports = createReactClass({
  if (!alias) return;
  step = _t('delete the alias.');
  return MatrixClientPeg.get().deleteAlias(alias);
- }).done(() => {
+ }).then(() => {
  modal.close();
  this.refreshRoomList();
  }, (err) => {
@@ -348,7 +347,7 @@ module.exports = createReactClass({
  });
  return;
  }
- MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
+ MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).then((resp) => {
  if (resp.length > 0 && resp[0].alias) {
  this.showRoomAlias(resp[0].alias, true);
  } else {

src/components/structures/RoomView.js

@@ -27,7 +27,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import classNames from 'classnames';
 import {Room} from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
@@ -1101,7 +1100,7 @@ module.exports = createReactClass({
  }
 
  ContentMessages.sharedInstance().sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
- .done(undefined, (error) => {
+ .then(undefined, (error) => {
  if (error.name === "UnknownDeviceError") {
  // Let the staus bar handle this
  return;
@@ -1145,7 +1144,7 @@ module.exports = createReactClass({
  filter: filter,
  term: term,
  });
- this._handleSearchResult(searchPromise).done();
+ this._handleSearchResult(searchPromise);
  },
 
  _handleSearchResult: function(searchPromise) {
@@ -1316,7 +1315,7 @@ module.exports = createReactClass({
  },
 
  onForgetClick: function() {
- MatrixClientPeg.get().forget(this.state.room.roomId).done(function() {
+ MatrixClientPeg.get().forget(this.state.room.roomId).then(function() {
  dis.dispatch({ action: 'view_next_room' });
  }, function(err) {
  const errCode = err.errcode || _t("unknown error code");
@@ -1333,7 +1332,7 @@ module.exports = createReactClass({
  this.setState({
  rejecting: true,
  });
- MatrixClientPeg.get().leave(this.state.roomId).done(function() {
+ MatrixClientPeg.get().leave(this.state.roomId).then(function() {
  dis.dispatch({ action: 'view_next_room' });
  self.setState({
  rejecting: false,

src/components/structures/ScrollPanel.js

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import { KeyCode } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";

src/components/structures/TimelinePanel.js

@@ -23,7 +23,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 
 const Matrix = require("matrix-js-sdk");
 const EventTimeline = Matrix.EventTimeline;
@@ -462,7 +461,7 @@ const TimelinePanel = createReactClass({
  // timeline window.
  //
  // see https://github.com/vector-im/vector-web/issues/1035
- this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).done(() => {
+ this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
  if (this.unmounted) { return; }
 
  const { events, liveEvents } = this._getEvents();

src/components/structures/auth/ForgotPassword.js

@@ -105,7 +105,7 @@ module.exports = createReactClass({
  phase: PHASE_SENDING_EMAIL,
  });
  this.reset = new PasswordReset(this.props.serverConfig.hsUrl, this.props.serverConfig.isUrl);
- this.reset.resetPassword(email, password).done(() => {
+ this.reset.resetPassword(email, password).then(() => {
  this.setState({
  phase: PHASE_EMAIL_SENT,
  });