gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,041 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

670 Commits

Author SHA1 Message Date
Matthew Hodgson c57c653535 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:15:56 +01:00
Travis Ralston 91304e70a1 Swap out the complicated canary stuff for serial execution 
Fixes https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 15:49:14 -06:00
Travis Ralston 27c23058dc Alter build process to rely on canaries only 
With the react-sdk and js-sdk having their `npm start`s split out (as per https://github.com/matrix-org/matrix-react-sdk/pull/2175 and https://github.com/matrix-org/matrix-js-sdk/pull/742) we can trigger an initial build ourselves and start the watcher afterwards. This canary approach has a very slight speed increase over serially running all the commands as the watcher can be started as early as possible.

This all can be improved and potentially eliminated with a bit more planning, however: https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 11:20:58 -06:00
Travis Ralston 2b037ee146 Prevent races by blocking on SDK builds 
If we don't block on SDK builds, then the riot-web build fails due to half-built dependencies. This needs to be done at two levels: the js-sdk because it is used by both the react-sdk and riot-web, and at the react-sdk because riot-web needs it. This means our build process is synchronous for js -> react -> riot, at least for the initial build. 

This does increase the startup time, particularly because the file watch timer is at 5 seconds. The timer is used to detect a storm of file changes in the underlying SDKs and give the build process some room to compile larger files if needed. 

The file watcher is accompanied by a "canary signal file" to prevent the build-blocking script from unblocking too early. Both the js and react SDKs build when `npm install` is run, so we ensure that we only listen for the `npm start` build for each SDK.

This is all done at the riot level instead of at the individual SDK levels (where we could use a canary file to signal up the stack) because:
* babel (used by the js-sdk) doesn't really provide an "end up build" signal
* webpack is a bit of a nightmare to get it to behave at times
* this blocking approach is really only applicable to riot-web, although may be useful to some other projects.

Hopefully that all makes sense.
 2018-09-24 17:12:42 -06:00
Travis Ralston 67e9606d55 Reduce the number of terminals required to build riot-web to 1 
A step towards a real solution for https://github.com/vector-im/riot-web/issues/7305

This approach makes use of `npm link` to remove the use of symlinks in the build process. The build process has also been altered to invoke the build process of each underlying SDK (react, js). This means that one can now `npm link` and `npm start` and have a working environment. 

At the same time, parallelshell was dropped due to lack of maintenance from the maintainer.
 2018-09-17 17:50:03 -06:00
David Baker 2b18aa7d79 Merge branch 'release-v0.16.4' 2018-09-10 11:47:09 +01:00
David Baker 0f9c8235e1 v0.16.4 2018-09-10 11:43:23 +01:00
David Baker ce4c71ccfb Released js-sdk & react-sdk 2018-09-10 11:41:45 +01:00
David Baker d6406b48fd v0.16.4-rc.1 2018-09-07 14:42:52 +01:00
David Baker 09130582ad js-sdk & react-sdk rc.1 2018-09-07 14:38:16 +01:00
Matthew Hodgson 588369d297 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 
thanks @ZerataX! :)
 2018-09-04 20:32:06 +01:00
David Baker d00ca02c25 v0.16.3 2018-09-03 14:34:06 +01:00
David Baker 6231cf3496 Released js-sdk & react-sdk 2018-09-03 14:28:34 +01:00
David Baker 5170635a1f v0.16.3-rc.2 2018-08-31 13:52:58 +01:00
David Baker 2b91595aa9 js-sdk & react-sdk rc.2 2018-08-31 13:50:12 +01:00
David Baker 7cfda97b82 v0.16.3-rc.1 2018-08-30 14:40:22 +01:00
David Baker 447c133d82 js-sdk & react-sdk rc.1 2018-08-30 14:38:15 +01:00
David Baker e54865b7ec electron 2.0.8 2018-08-30 11:38:20 +01:00
David Baker cdcdab82eb v0.16.2 2018-08-23 15:34:00 +01:00
David Baker 49523ba8d1 New react-sdk for new server notices format 2018-08-23 15:31:26 +01:00
David Baker dd8ed7cc77 v0.16.1 2018-08-20 14:00:47 +01:00
David Baker 2a0cc21dfe Released js-sdk & react-sdk 2018-08-20 13:58:00 +01:00
David Baker 472e55cea5 v0.16.1-rc.1 2018-08-16 15:47:50 +01:00
David Baker 1a73284b0c js-sdk & react-sdk rc.1 2018-08-16 15:43:17 +01:00
David Baker 37e848eee9 Bump electron version 2018-08-16 15:09:57 +01:00
David Baker a79e9b4fd6 Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:22:07 +01:00
David Baker 8a18488b1e Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 11:00:35 +01:00
David Baker 764797e211 v0.16.0 2018-07-30 12:19:27 +01:00
David Baker 88745a9f36 Released js-sdk & react-sdk 2018-07-30 12:13:29 +01:00
David Baker 8bd832b449 v0.16.0-rc.2 2018-07-24 19:42:11 +01:00
David Baker 8e5b67d7c9 react-sdk rc.2 2018-07-24 19:40:31 +01:00
David Baker f5a257ca79 v0.16.0-rc.1 2018-07-24 18:35:02 +01:00
David Baker 96b624e941 js-sdk & react-sdk rc.1 2018-07-24 18:33:04 +01:00
David Baker 25c0656106 Update to electron 2.0.5 2018-07-24 18:28:48 +01:00
David Baker 7e03b25030 v0.15.7 2018-07-09 13:20:29 +01:00
David Baker 73be5005c2 Released react-sdk & js-sdk 2018-07-09 13:16:42 +01:00
David Baker c36b42af71 v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker 75e9489db5 js-sdk rc.1 & react-sdk rc.2 2018-07-06 15:58:39 +01:00
David Baker 0de36d331f v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker 6ada5e5b26 react-sdk rc.1 2018-07-04 11:26:33 +01:00
David Baker aee6b28469 Bump electron version 2018-07-04 11:18:30 +01:00
David Baker 768e206c4a v0.15.6 2018-06-29 12:02:51 +01:00
David Baker e193b65bc7 Released js-sdk & react-sdk 2018-06-29 11:54:01 +01:00
David Baker fb43e49954 v0.15.6-rc.2 2018-06-22 18:15:34 +01:00
David Baker 79cf34b72e react-sdk rc.2 2018-06-22 18:12:41 +01:00
David Baker ee6fc5859c v0.15.6-rc.1 2018-06-21 10:20:26 +01:00
David Baker f9e7af6e90 js & react sdk rc.1 2018-06-21 10:09:01 +01:00
David Baker 9dd37ac9e2 v0.15.5 2018-06-12 14:36:10 +01:00
David Baker 79bc81317d Released react-sdk & js-sdk 2018-06-12 14:30:44 +01:00
David Baker 33a2e068f6 v0.15.5-rc.1 2018-06-06 16:11:58 +01:00
David Baker 1ed2935eb6 react-sdk & js-sdk rc.1 2018-06-06 16:08:47 +01:00
David Baker a4b58f4d83 v0.15.4 2018-05-25 15:25:10 +01:00
David Baker 57c79c7133 released react-sdk & js-sdk 2018-05-25 15:22:39 +01:00
David Baker 93ea9d7c36 v0.15.4-rc.1 2018-05-24 18:28:44 +01:00
David Baker cd9821f87e Merge branch 'develop' into release-v0.15.4 2018-05-24 18:26:02 +01:00
David Baker 10881587e9 electron 2.0.2 2018-05-24 18:25:35 +01:00
David Baker 1bfe4513ac js-sdk & react-sdk RCs 2018-05-24 18:24:20 +01:00
David Baker ec62b5f03c v0.15.3 2018-05-18 12:38:59 +01:00
David Baker b1f0f33204 Update to electron 2.0.1 
It does have a security fix
 2018-05-18 12:24:12 +01:00
David Baker b128431128 v0.15.2 2018-05-17 17:10:17 +01:00
David Baker b90017ff15 react-sdk v0.12.5 2018-05-17 17:06:24 +01:00
David Baker 4e6c2fdd1c v0.15.1 2018-05-16 16:16:23 +01:00
David Baker f759bfb1f6 Bump to Electron 2.0.0(!) 2018-05-16 15:30:42 +01:00
David Baker 0a4614247f v0.15.0 2018-05-16 11:56:07 +01:00
David Baker c4ecf40d1c Released react-sdk 2018-05-16 11:54:29 +01:00
David Baker 02ab1fded2 v0.15.0-rc.6 2018-05-15 18:08:52 +01:00
David Baker ecfefd6b21 react-sdk rc.6 2018-05-15 18:06:11 +01:00
Luke Barnard 50e430d8dc v0.15.0-rc.5 2018-05-15 16:01:39 +01:00
Luke Barnard 7eb14ad12c Bump react-sdk version to 0.12.4-rc.5 2018-05-15 15:54:07 +01:00
Luke Barnard e5641fe71c v0.15.0-rc.4 2018-05-14 18:31:07 +01:00
Luke Barnard be5aa59e39 Bump react-sdk dep to 0.12.4-rc.4 2018-05-14 18:20:28 +01:00
Luke Barnard 9b2fa966f1 v0.15.0-rc.3 2018-05-11 18:31:34 +01:00
Luke Barnard 030fc041be Bump react-sdk dep to 12.4-rc.3 (for instant sticker picker) 2018-05-11 18:28:40 +01:00
David Baker 8f4953c182
Merge branch 'develop' into webpack4 2018-05-11 16:27:50 +01:00
Luke Barnard c2fccb7e14 v0.15.0-rc.2 2018-05-09 17:39:57 +01:00
Luke Barnard 82a27d7fa3 Bump react-sdk version to 0.12.4-rc.2 2018-05-09 17:31:31 +01:00
Luke Barnard 2ea7ad6d7b v0.15.0-rc.1 2018-05-09 15:31:25 +01:00
Luke Barnard fb0bbf31c4 v0.14.3-rc.1 2018-05-09 13:52:27 +01:00
Luke Barnard 0e00677851 Bump react-sdk dep to 12.4-rc.1 2018-05-09 13:48:06 +01:00
David Baker d6a226e6bd
Put webpack-dev-server in development mode 
https://github.com/webpack/webpack-dev-server/issues/1327
 2018-05-04 18:37:29 +01:00
David Baker 76d4a4f3fe v0.14.2 2018-04-30 13:44:23 +01:00
David Baker ff8f617fc6 Released react-sdk & js-sdk 2018-04-30 13:42:38 +01:00
MTRNord d69084f31e
Fix builld:dev build by using raw-loader instead css-raw-loader 2018-04-27 12:02:00 +02:00
MTRNord 02a185f2fe
Update Webpack to version 4 2018-04-27 11:32:59 +02:00
David Baker 137665685d v0.14.2-rc.3 2018-04-26 15:38:18 +01:00
David Baker 1eb82d97ae Fix dependencies to the same versions as react-sdk 
Otherwise Things Get Weird, eg. headers in the left panel end up in
the wrong place because the gemini scrollbar CSS has changed
between versions.
 2018-04-26 15:25:20 +01:00
David Baker b8f7025f2a v0.14.2-rc.2 2018-04-26 11:46:38 +01:00
David Baker 18ba570c74 Bump react-sdk version 2018-04-26 11:33:44 +01:00
David Baker 5923417654 v0.14.2-rc.1 2018-04-25 17:39:56 +01:00
David Baker 981bd94615 Change CSS dependencies to not hardcoded paths 
Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
 2018-04-25 17:33:18 +01:00
David Baker 8d4d16bde1 Bump react-sdk version 2018-04-25 16:35:13 +01:00
David Baker ee9f781adc js-sdk & react-sdk RCs 2018-04-25 15:37:24 +01:00
David Baker 83c20f5d5d Bump electron version to 1.8.4 2018-04-25 15:00:39 +01:00
Matthew Hodgson df3fb83da3 move deps to sdk for stuff now in the sdk 2018-04-18 10:53:17 +01:00
David Baker c8a3471135 Merge branch 'master' into develop 2018-04-12 13:07:09 +01:00
David Baker 740b221769 v0.14.1 2018-04-12 13:02:27 +01:00
David Baker c631858ab3 Bump js-sdk & react-sdk 2018-04-12 12:57:04 +01:00
Luke Barnard 8644a5ead9 Merge branch 'master' into develop 2018-04-11 12:04:58 +01:00
Luke Barnard eaeb495349 v0.14.0 2018-04-11 12:01:45 +01:00
Luke Barnard 5fc37032ad Bump js-sdk to 0.10.0, react-sdk to 0.12.1 2018-04-11 11:42:56 +01:00
Luke Barnard 74454567bc v0.14.0-rc.6 2018-04-09 17:16:37 +01:00
Luke Barnard 8eaabceb0c Bump react version number 2018-04-09 17:09:11 +01:00
Luke Barnard ec2adc4516 v0.14.0-rc.5 2018-04-09 15:46:35 +01:00
Luke Barnard 60079d4206 Bump matrix-js-sdk, matrix-react-sdk versions 2018-04-09 15:36:43 +01:00
Luke Barnard e739d1b850 Bump source-map-loader version to avoid bug /w inline base64 maps 2018-04-09 13:50:43 +01:00
David Baker 220b553a97 v0.14.0-rc.4 2018-03-22 13:29:01 +00:00
David Baker 047d37b417 Bump react-sdk version 2018-03-22 13:25:30 +00:00
David Baker 96b56fd901 v0.14.0-rc.3 2018-03-20 17:42:23 +00:00
David Baker f3a5a31ccf Bump react-sdk version 2018-03-20 17:39:31 +00:00
David Baker 99b20e49c3 v0.14.0-rc.2 2018-03-19 15:02:10 +00:00
David Baker ae44efcebf Bump react-sdk version 2018-03-19 15:00:09 +00:00
David Baker d7c0e3ddc9 v0.14.0-rc.1 2018-03-19 12:21:05 +00:00
David Baker 4af53fabbc Bump js-sdk & react-sdk 2018-03-19 12:17:53 +00:00
David Baker 0e2a911b57 Bump electron version 2018-03-16 16:16:50 +00:00
David Baker 1d2f5bafda Merge branch 'master' into develop 2018-02-09 12:46:28 +00:00
David Baker 9e614a54da v0.13.5 2018-02-09 12:43:45 +00:00
David Baker b20dea58c6 Bump react-sdk version 2018-02-09 12:36:19 +00:00
lukebarnard 883ee4ec75 Remove react-dnd 2018-01-19 13:35:11 +00:00
lukebarnard 3481283af8 Swap RoomList to react-beautiful-dnd 
Includes themeing

See matrix-org/matrix-react-sdk#1711
 2018-01-18 17:54:39 +00:00
Michael Telatynski 627ebb848d
Change author 2018-01-08 21:32:25 +00:00
David Baker 5635614549 v0.13.4 2018-01-03 16:13:24 +00:00
Luke Barnard b73f0c7b90 v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard c685546e9a Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:27:49 +00:00
Richard van der Hoff 5fff46fdac v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff 2e9f309415 Bump to react-sdk 0.11.2 2017-11-28 11:16:13 +00:00
David Baker aad2069a51 v0.13.1 2017-11-17 16:09:48 +00:00
David Baker 538e1d2446 Released js-sdk & react-sdk 2017-11-17 16:05:01 +00:00
Luke Barnard 629a18ebef v0.13.0 2017-11-15 11:09:31 +00:00
Luke Barnard 02c2e1a14c Bump js/react SDKs to releases 0.9.0 & 0.11.0 2017-11-15 11:03:20 +00:00
Luke Barnard ad0cb6f0a8 v0.13.0-rc.3 2017-11-14 14:22:29 +00:00
Luke Barnard e1c762dcaa Bump react-sdk version to 0.11.0-rc.3 2017-11-14 14:20:21 +00:00
Luke Barnard ef9f2f7ce6 v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard 150fa43735 Bump react-sdk dep 2017-11-10 16:51:05 +00:00
Luke Barnard 5c9dd17d21 v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard 1008ede4d1 Bump matrix-react/js-sdk deps 2017-11-10 13:42:31 +00:00
Richard Lewis 63bcca1c7d Merge pull request #4881 from vector-im/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:20 +01:00
David Baker 00f902cab1 Add script to prune unused translations 2017-10-19 12:11:53 +01:00
David Baker 4e31aea402 Switch to gen-i18n script 2017-10-19 10:53:02 +01:00
Richard Lewis 568cd0aac6 Update parallelshell to ^3.02 2017-10-19 10:12:00 +01:00
Michael Telatynski 6ccacfee46
bump version to prevent eslint errors 
got bumped in react-sdk, missed here

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-17 14:44:41 +01:00
David Baker bf56a00d60 v0.12.7 2017-10-16 14:56:52 +01:00
David Baker bfae8e98a1 Released js-sdk & react-sdk 2017-10-16 14:52:00 +01:00
David Baker f5397acfa1 v0.12.7-rc.3 2017-10-13 16:36:57 +01:00
David Baker f555f2036e react-sdk rc.3 2017-10-13 16:35:41 +01:00
David Baker 3b2650e5ea Merge remote-tracking branch 'origin/develop' into release-v0.12.7 2017-10-13 16:33:55 +01:00
David Baker b727944b11 Bump electron version 2017-10-13 16:27:01 +01:00
David Baker adceda7588 v0.12.7-rc.2 2017-10-13 15:06:18 +01:00
David Baker b3da206a92 react-sdk rc.2 2017-10-13 15:03:43 +01:00
David Baker f8554ca2f2 v0.12.7-rc.1 2017-10-13 11:15:41 +01:00
David Baker 64cfc9b717 js & react sdk rc.1 2017-10-13 11:13:54 +01:00