Commit graph

689 commits

Author SHA1 Message Date
David Baker
5310b4c14b js-sdk & react-sdk rc.1 2018-12-06 11:20:00 +00:00
David Baker
7247e97ff0 Update to electron 3.0.10 2018-12-05 15:55:20 +00:00
David Baker
1dfaf70562
Revert "Revert "Run lint on travis builds and use modern node versions"" 2018-11-22 18:25:55 +00:00
David Baker
f701e2601a
Revert "Run lint on travis builds and use modern node versions" 2018-11-22 18:17:09 +00:00
David Baker
a7a5679bfa
Merge pull request #7490 from aaronraimist/lint
Run lint on travis builds and use modern node versions
2018-11-22 18:01:04 +00:00
David Baker
d483fb0605 v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
d9434c7af5 Bump js-sdk & react-sdk 2018-11-22 16:56:13 +00:00
David Baker
bbb128b672
Merge branch 'develop' into lint 2018-11-22 11:23:02 +00:00
David Baker
e604dfe9e8 v0.17.6 2018-11-19 15:24:34 +00:00
David Baker
2a594414e7 released js-sdk / react-sdk 2018-11-19 15:21:12 +00:00
David Baker
a570ee53a8 v0.17.6-rc.2 2018-11-15 15:40:54 +00:00
David Baker
d287abcd68 Update js-sdk to 0.14 & react-sdk to rc.2
rc.1 used js-sdk 0.13 which did not use the new Olm API.
2018-11-15 15:37:20 +00:00
David Baker
79fd38a899 v0.17.6-rc.1 2018-11-15 12:23:06 +00:00
David Baker
8f37c22917 releaesed js-sdk & react-sdk rc.1 2018-11-15 12:20:42 +00:00
David Baker
cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker
4a217d9e9f v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
7dd163ac85 bump react-sdk 2018-11-13 18:52:16 +00:00
David Baker
061838bdab Merge branch 'master' into develop 2018-11-13 18:19:10 +00:00
David Baker
24846a1d64 v0.17.4 2018-11-13 18:11:12 +00:00
David Baker
f8ab754af4 bump react-sdk 2018-11-13 18:09:10 +00:00
J. Ryan Stinnett
e9f4594eb9 Allow Webpack dev server to listen to all interfaces
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 20:55:51 +01:00
Travis Ralston
36cc5de0e7 Remove the request-only stuff we don't need anymore
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
2018-10-31 13:05:36 -06:00
David Baker
ca305399c3 npm update 2018-10-29 14:30:35 +00:00
David Baker
79c7f331c9 develop js & react sdk deps 2018-10-29 14:28:13 +00:00
David Baker
409c48efcb Merge branch 'master' into develop 2018-10-29 14:27:46 +00:00
David Baker
29f3ff155a v0.17.3 2018-10-29 14:22:55 +00:00
David Baker
f05646c5a1 released js-sdk & react-sdk 2018-10-29 14:20:12 +00:00
Aaron Raimist
a4ed1afeb5
Update babel-eslint to 8.1.1
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:07:35 -05:00
Travis Ralston
d3805f7545 Regenerate package-lock.json and upgrade eslint again 2018-10-26 20:12:43 -06:00
Travis Ralston
70891f41a5 Merge branch 'develop' into lint 2018-10-26 19:56:33 -06:00
Travis Ralston
f9fa338960 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:22:13 -06:00
Travis Ralston
ad7ac26ff3 Upgrade babel-eslint and regenerate package-lock.json 2018-10-25 16:10:27 -06:00
Travis Ralston
10efaaa078 Merge branch 'develop' into lint 2018-10-25 16:06:02 -06:00
J. Ryan Stinnett
9732d10f24 Update chokidar to transitively get newer fsevents
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-10-25 23:04:25 +02:00
David Baker
9b80aa76ce
Merge pull request #7385 from vector-im/dbkr/wasm
Support WebAssembly version of Olm
2018-10-25 15:58:24 +01:00
David Baker
bc935012da Update to Olm 3 2018-10-25 15:44:22 +01:00
Travis Ralston
e4025f1aff Mock fs, tls, and net to support request in the browser
fs is mocked using memfs, which needs to be installed at all 3 layers because webpack is silly
2018-10-24 16:59:14 -06:00
David Baker
e2b55315a6 v0.17.3-rc.1 2018-10-24 11:31:59 +01:00
David Baker
f7138c0516 react-sdk & js-sdk rc.1 2018-10-24 11:27:01 +01:00
David Baker
d080a204a3 electron 3.0.5 2018-10-24 11:12:51 +01:00
Aaron Raimist
b7622d8551
Use babel-eslint 7.2.3 instead
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 23:00:02 -05:00
Aaron Raimist
c470e2dcfb
Actually I'll just fix the errors myself and get rid of lintwithexclusions
I seemingly need babel-eslint version 8 for VectorHomePage.js but might as well just upgrade to version 10

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 21:04:55 -05:00
Aaron Raimist
fe11ae73db
Run lintwithexclusions on travis builds
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 20:59:07 -05:00
Bruno Windels
ca1dec8e13 Merge branch 'master' into develop 2018-10-19 17:07:29 +02:00
Bruno Windels
f5eff7d349 v0.17.2 2018-10-19 16:54:27 +02:00
Bruno Windels
62f664c592 update matrix-react-sdk to 0.14.1 2018-10-19 16:45:39 +02:00
David Baker
47493fa7d9 Merge branch 'master' into develop 2018-10-18 18:43:58 +01:00
David Baker
a7ea51fc3e v0.17.1 2018-10-18 18:39:58 +01:00
David Baker
2202ff1ccd update deps 2018-10-16 11:12:13 +01:00
David Baker
41540842eb v0.17.0 2018-10-16 11:00:39 +01:00
David Baker
4afb5caa4e Released js-sdk & react-sdk 2018-10-16 10:58:29 +01:00
David Baker
a0e067510c Update to latest electron builder
Tested auto update on both windows (ia32) and mac, seems to work!
2018-10-16 09:39:30 +01:00
David Baker
5ad9d2094a v0.17.0-rc.1 2018-10-11 16:03:53 +01:00
David Baker
ba51c0721e js-sdk & react-sdk rc.1 2018-10-11 15:42:30 +01:00
David Baker
845b40d815 Bump electron version to 3 2018-10-11 12:06:30 +01:00
Matthew Hodgson
5c184e501d dep on dev sdks 2018-10-10 17:35:06 +01:00
Marcel
ad5be455bb
Fix reskindex on matrix-react-side not being called if using build script 2018-10-03 02:00:35 +02:00
Bruno Windels
0a4e3379f9 Merge branch 'master' into develop 2018-10-01 17:03:54 +02:00
Bruno Windels
712d020dfa v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels
b9688acdf5 bump both SDKs to latest version 2018-10-01 16:16:25 +02:00
David Baker
67a762aeaf Actually update package.json 2018-09-28 11:02:14 +01:00
David Baker
28f1140588 Merge remote-tracking branch 'origin/develop' into dbkr/update_deps_2
Updates a bunch more deps now we've updated webpack
2018-09-28 10:58:22 +01:00
Bruno Windels
57cdd26d4d v0.16.5-rc.1 2018-09-27 14:50:38 +01:00
Bruno Windels
2356524d1c bump matrix-js-sdk and matrix-react-sdk 2018-09-27 13:55:06 +01:00
David Baker
2166213400 Update a bunch of deps
To try & get deps without vulns in them.

Exceptions are:
 * electron builder: which is nontrivial to update
 * webpack-dev-server: probably needs newer webpack
 * moderizr: no new version released yet
2018-09-26 12:37:40 +01:00
Matthew Hodgson
c4f6158f46 pin karma-webpack to 4.0.0-beta.0 to fix perf regression
so karma-webpack 3.0.5 is 4x slower than 4.0.0-beta.0 for webpacking for unknown reasons.
However, 4.0.0-rc.1 and 4.0.0-rc.2 fail with a different error. So: pinned for now
2018-09-26 03:12:08 +01:00
Matthew Hodgson
7e33ea351d upgrade karma & babel to latest 2018-09-26 02:27:22 +01:00
Matthew Hodgson
b7843a5d46 find versions of webpack, webpack-cli, and karma-webpack which work together atm 2018-09-26 01:18:53 +01:00
Matthew Hodgson
41e03333a7 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:17:49 +01:00
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