3ec4b25793
It turns out that the assertion made in https://github.com/vector-im/riot-web/pull/4565 about `async` functions returning bluebird promises was only correct when babel used an inline version of the `asyncToGenerator` helper; in react-sdk we are using `babel-transform-runtime` which means that we use a separate `babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js) Promise. This meant that we were still in the situation where some methods returned native Promises, and some bluebird ones, which is exactly the situation I wanted to resolve by switching to bluebird in the first place: in short, unless/until we get rid of all code which assumes Promises have a `done` method etc, we need to make sure that everything returns a bluebird promise. (Aside: there was debate over whether in the long term we should be trying to wean ourselves off bluebird promises by assuming all promises are native. The conclusion was that the complexity hit involved in doing so outweighed any benefit of a potential future migration away from bluebird).
180 lines
6 KiB
JSON
180 lines
6 KiB
JSON
{
|
|
"name": "riot-web",
|
|
"productName": "Riot",
|
|
"main": "electron_app/src/electron-main.js",
|
|
"version": "0.11.4",
|
|
"description": "A feature-rich client for Matrix.org",
|
|
"author": "Vector Creations Ltd.",
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/vector-im/riot-web"
|
|
},
|
|
"license": "Apache-2.0",
|
|
"files": [
|
|
"AUTHORS.rst",
|
|
"CONTRIBUTING.rst",
|
|
"deploy",
|
|
"docs",
|
|
"karma.conf.js",
|
|
"lib",
|
|
"release.sh",
|
|
"scripts",
|
|
"src",
|
|
"test",
|
|
"webpack.config.js"
|
|
],
|
|
"style": "bundle.css",
|
|
"matrix-react-parent": "matrix-react-sdk",
|
|
"scripts": {
|
|
"reskindex": "reskindex -h src/header",
|
|
"reskindex:watch": "reskindex -h src/header -w",
|
|
"build:res": "node scripts/copy-res.js",
|
|
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
|
|
"build:compile": "npm run reskindex && babel --source-maps -d lib src",
|
|
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
|
|
"build:bundle:dev": "webpack --optimize-occurence-order --progress",
|
|
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
|
|
"build": "npm run reskindex && npm run build:res && npm run build:bundle",
|
|
"build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
|
|
"dist": "scripts/package.sh",
|
|
"install:electron": "install-app-deps",
|
|
"electron": "npm run install:electron && electron .",
|
|
"start:res": "node scripts/copy-res.js -w",
|
|
"start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
|
|
"start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
|
|
"start": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
|
|
"start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
|
|
"lint": "eslint src/",
|
|
"lintall": "eslint src/ test/",
|
|
"clean": "rimraf lib webapp electron_app/dist",
|
|
"prepublish": "npm run build:compile",
|
|
"test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
|
|
"test-multi": "karma start"
|
|
},
|
|
"dependencies": {
|
|
"babel-polyfill": "^6.5.0",
|
|
"babel-runtime": "^6.11.6",
|
|
"bluebird": "^3.5.0",
|
|
"browser-request": "^0.3.3",
|
|
"classnames": "^2.1.2",
|
|
"draft-js": "^0.8.1",
|
|
"extract-text-webpack-plugin": "^0.9.1",
|
|
"favico.js": "^0.3.10",
|
|
"filesize": "3.5.6",
|
|
"flux": "2.1.1",
|
|
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
|
|
"gfm.css": "^1.1.1",
|
|
"highlight.js": "^9.0.0",
|
|
"linkifyjs": "^2.1.3",
|
|
"matrix-js-sdk": "0.7.13",
|
|
"matrix-react-sdk": "0.9.7",
|
|
"modernizr": "^3.1.0",
|
|
"pako": "^1.0.5",
|
|
"react": "^15.4.0",
|
|
"react-dnd": "^2.1.4",
|
|
"react-dnd-html5-backend": "^2.1.2",
|
|
"react-dom": "^15.4.0",
|
|
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
|
|
"sanitize-html": "^1.11.1",
|
|
"text-encoding-utf-8": "^1.0.1",
|
|
"ua-parser-js": "^0.7.10",
|
|
"url": "^0.11.0",
|
|
"velocity-vector": "vector-im/velocity#059e3b2"
|
|
},
|
|
"devDependencies": {
|
|
"autoprefixer": "^6.6.0",
|
|
"babel-cli": "^6.5.2",
|
|
"babel-core": "^6.14.0",
|
|
"babel-eslint": "^6.1.0",
|
|
"babel-loader": "^6.2.5",
|
|
"babel-plugin-add-module-exports": "^0.2.1",
|
|
"babel-plugin-transform-async-to-bluebird": "^1.1.1",
|
|
"babel-plugin-transform-class-properties": "^6.16.0",
|
|
"babel-plugin-transform-object-rest-spread": "^6.16.0",
|
|
"babel-plugin-transform-runtime": "^6.15.0",
|
|
"babel-preset-es2015": "^6.16.0",
|
|
"babel-preset-es2016": "^6.16.0",
|
|
"babel-preset-es2017": "^6.16.0",
|
|
"babel-preset-react": "^6.16.0",
|
|
"babel-preset-stage-2": "^6.17.0",
|
|
"chokidar": "^1.6.1",
|
|
"cpx": "^1.3.2",
|
|
"cross-env": "^4.0.0",
|
|
"css-raw-loader": "^0.1.1",
|
|
"electron-builder": "^11.2.4",
|
|
"electron-builder-squirrel-windows": "^11.2.1",
|
|
"electron-devtools-installer": "^2.2.0",
|
|
"emojione": "^2.2.7",
|
|
"eslint": "^3.14.0",
|
|
"eslint-config-google": "^0.7.1",
|
|
"eslint-plugin-babel": "^4.1.1",
|
|
"eslint-plugin-flowtype": "^2.30.0",
|
|
"eslint-plugin-react": "^6.9.0",
|
|
"expect": "^1.16.0",
|
|
"fs-extra": "^0.30.0",
|
|
"html-webpack-plugin": "^2.24.0",
|
|
"json-loader": "^0.5.3",
|
|
"karma": "^0.13.22",
|
|
"karma-chrome-launcher": "^0.2.3",
|
|
"karma-cli": "^0.1.2",
|
|
"karma-junit-reporter": "^0.4.1",
|
|
"karma-mocha": "^0.2.2",
|
|
"karma-webpack": "^1.7.0",
|
|
"matrix-mock-request": "^1.0.0",
|
|
"matrix-react-test-utils": "^0.2.0",
|
|
"minimist": "^1.2.0",
|
|
"mkdirp": "^0.5.1",
|
|
"mocha": "^2.4.5",
|
|
"parallelshell": "^1.2.0",
|
|
"postcss-extend": "^1.0.5",
|
|
"postcss-import": "^9.0.0",
|
|
"postcss-loader": "^1.2.2",
|
|
"postcss-mixins": "^5.4.1",
|
|
"postcss-nested": "^1.0.0",
|
|
"postcss-scss": "^0.4.0",
|
|
"postcss-simple-vars": "^3.0.0",
|
|
"postcss-strip-inline-comments": "^0.1.5",
|
|
"react-addons-perf": "^15.4.0",
|
|
"react-addons-test-utils": "^15.4.0",
|
|
"rimraf": "^2.4.3",
|
|
"source-map-loader": "^0.1.5",
|
|
"webpack": "^1.12.14",
|
|
"webpack-dev-server": "^1.16.2"
|
|
},
|
|
"optionalDependencies": {
|
|
"olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
|
|
},
|
|
"build": {
|
|
"appId": "im.riot.app",
|
|
"category": "Network",
|
|
"electronVersion": "1.6.8",
|
|
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
|
|
"asar": false,
|
|
"dereference": true,
|
|
"//files": "We bundle everything, so we only need to include webapp/",
|
|
"files": [
|
|
"node_modules/**",
|
|
"src/**",
|
|
"img/**"
|
|
],
|
|
"extraResources": [
|
|
"webapp/**/*"
|
|
],
|
|
"linux": {
|
|
"target": "deb",
|
|
"category": "Network;InstantMessaging;Chat",
|
|
"maintainer": "support@riot.im",
|
|
"desktop": {
|
|
"StartupWMClass": "riot"
|
|
}
|
|
},
|
|
"win": {
|
|
"target": "squirrel"
|
|
},
|
|
"directories": {
|
|
"buildResources": "electron_app/build",
|
|
"output": "electron_app/dist",
|
|
"app": "electron_app"
|
|
}
|
|
}
|
|
}
|