41e03333a7
Merge branch 'develop' into matthew/webpack4
2018-09-26 00:17:49 +01:00
c57c653535
Merge branch 'develop' into matthew/webpack4
2018-09-26 00:15:56 +01:00
8793ad9f4f
Merge remote-tracking branch 'origin/develop' into develop
2018-09-25 22:54:39 +00:00
07b56426ad
Translated using Weblate (Italian)
...
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2018-09-25 22:54:39 +00:00
43f9f2a0f2
Translated using Weblate (Catalan)
...
Currently translated at 97.2% (36 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
2018-09-25 22:54:38 +00:00
d01824f711
Translated using Weblate (Arabic)
...
Currently translated at 81.0% (30 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
2018-09-25 22:54:38 +00:00
841c8fd41d
Merge pull request #7355 from vector-im/travis/build-process
...
Reduce the number of terminals required to build riot-web to 1
2018-09-25 23:54:34 +01:00
4041f3db5c
Send standard output/input from npm-sub.js to the parent proc
2018-09-25 15:54:38 -06:00
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
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
8d7cec2a94
Add some comments to describe the build process
2018-09-24 17:57:18 -06:00
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
c6da122e41
Fix npm link in the build script
2018-09-17 17:57:27 -06:00
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
1b8f1f5610
Translated using Weblate (Romanian)
...
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ro/
2018-09-11 21:09:43 +00:00
4c6bb8846b
Merge remote-tracking branch 'origin/develop' into develop
2018-09-10 10:48:57 +00:00
11a1915e61
Translated using Weblate (Esperanto)
...
Currently translated at 97.2% (36 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2018-09-10 10:48:55 +00:00
e58ac74aa2
Merge branch 'master' into develop
2018-09-10 11:48:19 +01:00
2b18aa7d79
Merge branch 'release-v0.16.4'
2018-09-10 11:47:09 +01:00
0f9c8235e1
v0.16.4
2018-09-10 11:43:23 +01:00
8b0ae88987
Prepare changelog for v0.16.4
2018-09-10 11:43:23 +01:00
d8aaae6d42
v0.16.4
2018-09-10 11:42:20 +01:00
ce4c71ccfb
Released js-sdk & react-sdk
2018-09-10 11:41:45 +01:00
5ef141913b
remove ancient layering warning
2018-09-09 18:35:31 +01:00
d27db5a1c7
downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
...
thanks @ZerataX! :)
2018-09-09 10:48:03 +01:00
c2bd6e6da1
point deps at #develop to unbreak npm i
2018-09-09 10:25:33 +01:00
d6406b48fd
v0.16.4-rc.1
2018-09-07 14:42:52 +01:00
d5b42d99f2
Prepare changelog for v0.16.4-rc.1
2018-09-07 14:42:51 +01:00
42bac1620e
v0.16.4-rc.1
2018-09-07 14:39:20 +01:00
09130582ad
js-sdk & react-sdk rc.1
2018-09-07 14:38:16 +01:00
73239f5535
Merge pull request #7296 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2018-09-07 14:07:30 +01:00
22abe5a815
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 14:48:11 +00:00
736450e184
Merge pull request #7288 from vector-im/bwindels/fixmobileguideloadedonriot
...
Fix config not loading & mobileguide script being loaded in riot
2018-09-05 15:48:04 +01:00
d10fda36af
fix config not loading correctly anymore
2018-09-05 16:38:00 +02:00
8639b2858b
dont load the mobileguide script in riot
2018-09-05 16:07:44 +02:00
f47a9f93a5
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 10:31:06 +00:00
52bbd8c764
Merge pull request #7272 from vector-im/dbkr/mobileguide
...
Instructions for installing mobile apps
2018-09-05 11:31:00 +01:00
8ef2eec504
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 10:21:41 +00:00
1c5f16c332
Merge pull request #7265 from vector-im/dbkr/make_index_js_less_of_a_dogs_dinner
...
Tidy up index.js
2018-09-05 12:21:35 +02:00
588369d297
downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
...
thanks @ZerataX! :)
2018-09-04 20:32:06 +01:00
e23195fd86
Conditionally show custom server bit
2018-09-04 10:08:52 +01:00
1b0cafd956
Merge pull request #7274 from gusttt/patch-1
...
Small typo in release notes v0.16.3
2018-09-04 09:50:39 +01:00
81a624146b
Small typo in release notes v0.16.3
...
Fixes #7273
2018-09-04 08:16:29 +02:00
9c8ef4240c
Instructions for installing mobile apps
...
Replace the native js dialog with a page telling you how to
download the apps and how to set your HS URL.
2018-09-03 20:38:30 +01:00
b59edf2690
Merge remote-tracking branch 'origin/develop' into develop
2018-09-03 13:39:35 +00:00
daa3e1351b
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2018-09-03 13:39:34 +00:00
d00ca02c25
v0.16.3
2018-09-03 14:34:06 +01:00
207106ea46
Prepare changelog for v0.16.3
2018-09-03 14:34:05 +01:00
c150d97eaf
v0.16.3
2018-09-03 14:29:48 +01:00
6231cf3496
Released js-sdk & react-sdk
2018-09-03 14:28:34 +01:00
Matthew Hodgson