From d256194255782d914cc0104e0644df8bdb7bde2f Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Mon, 1 Oct 2018 20:21:13 -0500 Subject: [PATCH 1/6] Document how to turn off Piwik and bug reports (#6738) --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8267992c75..90d6aa063f 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,8 @@ For a good example, see https://riot.im/develop/config.json 1. `integrations_rest_url`: URL to the REST interface for the integrations server. 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server. 1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a - https://github.com/matrix-org/rageshake server) + https://github.com/matrix-org/rageshake server). Bug reports can be disabled by leaving the + `bug_report_endpoint_url` out of your config file. 1. `roomDirectory`: config for the public room directory. This section is optional. 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop down list. Optional. @@ -147,11 +148,11 @@ For a good example, see https://riot.im/develop/config.json anything else since it is used to isolate the privileges of file attachments to this domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from https://github.com/matrix-org/usercontent/blob/master/v1.html -1. `piwik`: an object containing the following properties: - 1. `url`: The URL of the Piwik instance to use for collecting Analytics - 1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics - 1. `whitelistedISUrls`: a list of IS URLs to not redact from the Analytics - 1. `siteId`: The Piwik Site ID to use when sending Analytics to the Piwik server configured above +1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config option out of your config file. If you want to enable analytics, set `piwik` to be an object containing the following properties: + 1. `url`: The URL of the Piwik instance to use for collecting analytics + 1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics + 1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics + 1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above 1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities with referral tracking; please ignore it. 1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour From ad5be455bb34428383059539ca0eb7a7257e06cc Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 3 Oct 2018 02:00:35 +0200 Subject: [PATCH 2/6] Fix reskindex on matrix-react-side not being called if using build script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17e34f3f6a..7144a665cb 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "build:bundle": "cross-env NODE_ENV=production webpack-cli -p --progress --bail --mode production", "build:bundle:dev": "webpack-cli --progress --bail --mode development", "build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64", - "build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run start:init", + "build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run build", "build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init", "build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle", "build:dev": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle:dev", From eabcc9261dc2307d7844fe200de28b0501767417 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 2 Oct 2018 22:58:40 -0500 Subject: [PATCH 3/6] Add text saying that bug reports aren't automatic Signed-off-by: Aaron Raimist --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 90d6aa063f..6d55c56957 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ to build. npm install npm run build ``` - Or just use https://riot.im/develop - the continuous integration release of the + Or just use https://riot.im/develop - the continuous integration release of the develop branch. (Note that we don't reference the develop versions in git directly due to https://github.com/npm/npm/issues/3055.) 1. Install the prerequisites: `npm install`. @@ -134,7 +134,8 @@ For a good example, see https://riot.im/develop/config.json 1. `integrations_rest_url`: URL to the REST interface for the integrations server. 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server. 1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a - https://github.com/matrix-org/rageshake server). Bug reports can be disabled by leaving the + https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks + "Send Logs" within the application. Bug reports can be disabled by leaving the `bug_report_endpoint_url` out of your config file. 1. `roomDirectory`: config for the public room directory. This section is optional. 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop @@ -148,7 +149,9 @@ For a good example, see https://riot.im/develop/config.json anything else since it is used to isolate the privileges of file attachments to this domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from https://github.com/matrix-org/usercontent/blob/master/v1.html -1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config option out of your config file. If you want to enable analytics, set `piwik` to be an object containing the following properties: +1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config + option out of your config file. If you want to enable analytics, set `piwik` to be an object + containing the following properties: 1. `url`: The URL of the Piwik instance to use for collecting analytics 1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics 1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics From a356264801c26b9104f208fa4831e5675b22904f Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 4 Oct 2018 10:49:28 +0100 Subject: [PATCH 4/6] Fix double-closed tags --- src/vector/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/index.html b/src/vector/index.html index dad179a7ba..4ba65c3e06 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -81,6 +81,6 @@ -
+
From bccccb2758b92cf9a52116244b01464080d64acd Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 5 Oct 2018 12:15:29 +0100 Subject: [PATCH 5/6] Silence bluebird warnings --- src/vector/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vector/index.js b/src/vector/index.js index 1d873f2081..fffdac1b05 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -60,6 +60,10 @@ import CallHandler from 'matrix-react-sdk/lib/CallHandler'; import {getVectorConfig} from './getconfig'; +// Disable warnings for now: we use deprecated bluebird functions +// and need to migrate, but they spam the console with warnings. +Promise.config({warnings: false}); + let lastLocationHashSet = null; function initRageshake() { From 4e6f48df034a882629d7611c80387be3f6b72806 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 5 Oct 2018 13:56:37 +0100 Subject: [PATCH 6/6] Disable webpack-dev-server auto reload As per comment --- webpack.config.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index 2dd0eb054d..8f7b2ea7b9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -163,6 +163,12 @@ module.exports = { // don't fill the console up with a mahoosive list of modules chunks: false, }, + + // hot mdule replacement doesn't work (I think we'd need react-hot-reload?) + // so webpack-dev-server reloads the page on every update which is quite + // tedious in Riot since that can take a while. + hot: false, + inline: false, }, };