From 5eecc768a389b9f839edd5a4a6f14809e5e2618b Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Tue, 29 Mar 2022 16:40:07 +0100 Subject: [PATCH 1/6] Docs: Require creation of config.json as part of Getting Started (#21590) * Require creation of config.json Change the language from "If desired" to "Configure" to ensure people do not miss this step, as skipping this step will show the error "Invalid configuration: no default server specified." * Update README.md Rollback unintentioned bullet point `3` change --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 919d58a1a5..ec8a9f5a80 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ released version of Element: 1. Untar the tarball on your web server 1. Move (or symlink) the `element-x.x.x` directory to an appropriate name 1. Configure the correct caching headers in your webserver (see below) -1. If desired, copy `config.sample.json` to `config.json` and edit it - as desired. See the [configuration docs](docs/config.md) for details. +1. Configure the app by copying `config.sample.json` to `config.json` and + modifying it. See the [configuration docs](docs/config.md) for details. 1. Enter the URL into your browser and log into Element! Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located From a8e914ad9f69f890d29309fead802315e2ab4cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20M=C3=A4der?= Date: Wed, 30 Mar 2022 14:41:23 +0200 Subject: [PATCH 2/6] Fix show_labs_settings config.md typo (#21600) * Fix typo show_labs_settings * Document latex_maths_delims developer option --- docs/config.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/config.md b/docs/config.md index 6d01fc1dea..833754e107 100644 --- a/docs/config.md +++ b/docs/config.md @@ -61,7 +61,7 @@ To force a labs flag on or off, use the following: } ``` -If you'd like the user to be able to self-select which labs flags they can turn on, add `"show_labs_flags": true` to +If you'd like the user to be able to self-select which labs flags they can turn on, add `"show_labs_settings": true` to your config. This will turn on the tab in user settings. **Note**: Feature support varies release-by-release. Check the [labs flag documentation](./labs.md) frequently if enabling @@ -541,4 +541,4 @@ The following are undocumented or intended for developer use only. 1. `fallback_hs_url` 2. `sync_timeline_limit` 3. `dangerously_allow_unsafe_and_insecure_passwords` -4. `latex_maths_delims` +4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled. From f029b68ad4b1536236291948ca85150247949239 Mon Sep 17 00:00:00 2001 From: Shreeya <82967080+ttheshreeyasingh@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:22:15 +0530 Subject: [PATCH 3/6] Updated 'Setting up a dev environment' in README.md (#21597) --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ec8a9f5a80..75049acdae 100644 --- a/README.md +++ b/README.md @@ -305,11 +305,19 @@ yarn install popd ``` -Finally, build and start Element itself: +Clone the repo and switch to the `element-web` directory: ```bash git clone https://github.com/vector-im/element-web.git cd element-web +``` + +Configure the app by copying `config.sample.json` to `config.json` and +modifying it. See the [configuration docs](docs/config.md) for details. + +Finally, build and start Element itself: + +```bash yarn link matrix-js-sdk yarn link matrix-react-sdk yarn install @@ -330,9 +338,6 @@ Wait a few seconds for the initial build to finish; you should see something lik and rebuilds source files when they change. This development server also disables caching, so do NOT use it in production. -Configure the app by copying `config.sample.json` to `config.json` and -modifying it. See the [configuration docs](docs/config.md) for details. - Open in your browser to see your newly built Element. **Note**: The build script uses inotify by default on Linux to monitor directories From 5077157282d1c543eb8eaab962b8e96c8eb68842 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 30 Mar 2022 11:57:26 -0400 Subject: [PATCH 4/6] Remove React HMR (#21607) --- package.json | 2 -- webpack.config.js | 5 ----- yarn.lock | 48 +---------------------------------------------- 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/package.json b/package.json index 97b3ac6c89..3bd2a2ba11 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,6 @@ "@babel/preset-typescript": "^7.12.7", "@babel/register": "^7.12.10", "@babel/runtime": "^7.12.5", - "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@principalstudio/html-webpack-inject-preload": "^1.2.7", "@sentry/webpack-plugin": "^1.18.1", "@svgr/webpack": "^5.5.0", @@ -146,7 +145,6 @@ "postcss-simple-vars": "^5.0.2", "postcss-strip-inline-comments": "^0.1.5", "raw-loader": "^4.0.2", - "react-refresh": "^0.10.0", "rimraf": "^3.0.2", "shell-escape": "^0.2.0", "simple-proxy-agent": "^1.1.0", diff --git a/webpack.config.js b/webpack.config.js index ad64899c94..0fd747a61d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const TerserPlugin = require('terser-webpack-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload'); -const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); const SentryCliPlugin = require("@sentry/webpack-plugin"); dotenv.config(); @@ -242,9 +241,6 @@ module.exports = (env, argv) => { loader: 'babel-loader', options: { cacheDirectory: true, - plugins: [ - useHMR && require.resolve('react-refresh/babel'), - ].filter(Boolean), }, }, { @@ -624,7 +620,6 @@ module.exports = (env, argv) => { new HtmlWebpackInjectPreload({ files: [{ match: /.*Inter.*\.woff2$/ }], }), - useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }), // upload to sentry if sentry env is present process.env.SENTRY_DSN && diff --git a/yarn.lock b/yarn.lock index 901e436ebd..dc1d04d87d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1551,18 +1551,6 @@ dependencies: "@octokit/openapi-types" "^11.2.0" -"@pmmmwh/react-refresh-webpack-plugin@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766" - integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ== - dependencies: - ansi-html "^0.0.7" - error-stack-parser "^2.0.6" - html-entities "^1.2.1" - native-url "^0.2.6" - schema-utils "^2.6.5" - source-map "^0.7.3" - "@principalstudio/html-webpack-inject-preload@^1.2.7": version "1.2.7" resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8" @@ -2453,11 +2441,6 @@ ansi-html-community@0.0.8: resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== -ansi-html@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -4758,13 +4741,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== - dependencies: - stackframe "^1.1.1" - es-abstract@^1.17.2, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" @@ -6267,7 +6243,7 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@^1.2.1, html-entities@^1.3.1, html-entities@^1.4.0: +html-entities@^1.3.1, html-entities@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== @@ -8749,13 +8725,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-url@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae" - integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA== - dependencies: - querystring "^0.2.0" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -10559,11 +10528,6 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= -querystring@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" - integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== - querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -10711,11 +10675,6 @@ react-redux@^7.2.0: prop-types "^15.7.2" react-is "^17.0.2" -react-refresh@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3" - integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ== - react-transition-group@^4.4.1: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" @@ -11756,11 +11715,6 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== - static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" From 8ce9488bb527fb1cab9cecd02198cfbf5b3201dd Mon Sep 17 00:00:00 2001 From: Kat Gerasimova Date: Thu, 31 Mar 2022 16:55:10 +0100 Subject: [PATCH 5/6] Add automation for "A-New-Search-Experience" label (#21622) Add A-New-Search-Experience label for automation to Delight board and to add Z-Labs label. This label is currently down as A-Spotlight-Search, but I will rename it. --- .github/workflows/triage-labelled.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index b57cf96eb8..041052e49c 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -1,4 +1,4 @@ -name: Move labelled issues to correct boards and columns +name: Move labelled issues to correct projects on: issues: @@ -11,6 +11,7 @@ jobs: if: > contains(github.event.issue.labels.*.name, 'A-Maths') || contains(github.event.issue.labels.*.name, 'A-Message-Pinning') || + contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') || contains(github.event.issue.labels.*.name, 'A-Threads') || contains(github.event.issue.labels.*.name, 'A-Location-Sharing') || contains(github.event.issue.labels.*.name, 'Z-IA') || @@ -99,6 +100,7 @@ jobs: name: Delight issues to project board runs-on: ubuntu-latest if: > + contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') || contains(github.event.issue.labels.*.name, 'A-Spaces') || contains(github.event.issue.labels.*.name, 'A-Space-Settings') || contains(github.event.issue.labels.*.name, 'A-Subspaces') || From 58cca0a77ac9483c82e9bef3ad36377a74bb09e0 Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 31 Mar 2022 18:01:49 -0400 Subject: [PATCH 6/6] Update name of video rooms label (#21629) --- .github/workflows/triage-labelled.yml | 2 +- .github/workflows/triage-unlabelled.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index 041052e49c..d95cccc730 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -18,7 +18,7 @@ jobs: contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || contains(github.event.issue.labels.*.name, 'A-Tags') || - contains(github.event.issue.labels.*.name, 'A-Voice-Rooms') + contains(github.event.issue.labels.*.name, 'A-Video-Rooms') steps: - uses: actions/github-script@v5 with: diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml index 2fbbfbd9b5..74ae5c2268 100644 --- a/.github/workflows/triage-unlabelled.yml +++ b/.github/workflows/triage-unlabelled.yml @@ -48,7 +48,7 @@ jobs: contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || contains(github.event.issue.labels.*.name, 'A-Tags') || - contains(github.event.issue.labels.*.name, 'A-Voice-Rooms')) && + contains(github.event.issue.labels.*.name, 'A-Video-Rooms')) && contains(github.event.issue.labels.*.name, 'Z-Labs') steps: - uses: actions/github-script@v5