Commit Graph

263 Commits

Author SHA1 Message Date
David Baker
9f51e2c407 Auto-update & build process with NSIS for windows
Amalgamate the electron build packaging into one script.
Use update_base_url so we can compute the actual URL in the
script for windows (because we need to put it in the build) and
at runtime for mac os.
2016-12-01 19:33:42 +00:00
David Baker
e3290c1117 Switch to new auto-update & add linux build
* Remove squirrel hooks (the installing & uninstalling is now
   done by the, er, installer)
 * Switch to electron-auto-update
 * Shorten initial update delay because we no longer need to wait
   for squirrel to release a lock file
 * Change update URLs because windows is now one installer for
   both 32 & 64 bit.
 * Update electron-builder to 10 where NSIS is now the default
   target for Windows.
 * Add linux to the target list, building a deb.
 * Remove sqirrel-specific installation spinner
 * Remove redundant !**/*  from files
2016-12-01 11:35:26 +00:00
David Baker
4988f0603f Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-11-30 18:13:14 +00:00
David Baker
55062c7ec5 Update to electron 1.4.8
Which uses a new enough build of chromium that it accepts our SSL
certs.
2016-11-28 16:37:43 +00:00
David Baker
c7635a362f Don't copy config, check update url 2016-11-25 20:08:45 +00:00
David Baker
a870ea2389 Add electron config
Which has the update URL in it
2016-11-24 17:24:11 +00:00
Richard van der Hoff
10650d2cd1 Unpin js-sdk and react-sdk 2016-11-22 22:14:05 +00:00
Matthew Hodgson
5cd4f88b8c v0.9.0 2016-11-19 02:04:32 +02:00
Richard van der Hoff
5d02c72687 Bump to react 15.4
Add dependencies on react 15.4. Some of the things we pull in from
matrix-react-sdk won't work properly against 15.2 / 15.0.
2016-11-17 10:34:12 +00:00
David Baker
68a3505091 Fix packaging
* Package images & config in bundle:dev
 * Don't include two vector- prefixes
2016-11-11 18:18:51 +00:00
David Baker
5b7f629996 Build to the 'webapp' directory instead
People may have config files in vector/ so it would be nonideal
if we started overwriting them / blowing them away.
2016-11-08 15:46:21 +00:00
David Baker
d150ee0d05 Missed a -w 2016-11-08 15:30:19 +00:00
David Baker
1e2cd9c2d1 Build all of the vector dir in the build process
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
2016-11-08 14:30:12 +00:00
David Baker
6681205337 Slight grab-bag of fixes for electron on Windows
* Implement the squirrel install / uninstall hooks (so we have
   a start menu entry / desktop shortcut)
 * Wait longer before checking for update
 * Set the window icon
 * Add a 'file' menu
 * Bump electron-builder
 * Add the icon url for the control panel entry
2016-11-07 11:41:41 +00:00
David Baker
6da1a1077d 0.8.4 has been released 2016-11-04 13:03:11 +00:00
David Baker
527c390152 Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 15:35:45 +00:00
Richard van der Hoff
ff462580b0 Use webpack-dev-server instead of http-server
Advantages:
 * blocks while a rebuild is in progress so you're less likely to reload the
   old version

 * serves from memory rather than disk, so we no longer need to turn off the
   cachebuster to avoid filling the disk with bundles. Empirically, seems to
   last a plausible amount of time without OOMing; there's no real reason to
   believe it would use any more memory than webpack itself.

 * That in turn means we no longer need the hack to stop chrome caching old
   sourcemaps (because the sourcemap now has a cachebuster in its name).

 * one fewer process for parallelshell to (fail to) manage.

 * in future, we could consider the fancy hot-reload functionality.
2016-11-03 15:08:55 +00:00
David Baker
caa3cb7d89 Electron support
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
2016-11-02 18:49:28 +00:00
David Baker
a714edbf2b Implement Platforms
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
David Baker
03caaeef07 Back to develop js-sdk & react-sdk 2016-11-02 11:47:30 +00:00
David Baker
91793a7a8e v0.8.4-rc.2 2016-11-02 11:40:04 +00:00
David Baker
4fb273284d v0.8.4-rc.1 2016-11-02 11:17:36 +00:00
David Baker
890751951c Released js-sdk & react-sdk 2016-11-02 11:11:40 +00:00
David Baker
f17e851435 Rename the package script/output dir to 'dist'
To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
2016-11-01 15:22:06 +00:00
Richard van der Hoff
b174d49f9d Merge pull request #2515 from vector-im/rav/cache_busting
Put a cachebuster in the names of CSS and JS files
2016-10-26 16:58:27 +01:00
Richard van der Hoff
c19538d6ce Merge branch 'develop' into rav/cache_busting 2016-10-26 16:50:45 +01:00
Richard van der Hoff
3adf5fe3fd Merge pull request #2517 from vector-im/rav/upgrade_olm
Bump to olm 2.0.0
2016-10-26 16:50:22 +01:00
Richard van der Hoff
de1f7861d6 Bump to olm 2.0.0 2016-10-26 16:20:42 +01:00
Richard van der Hoff
5a58c8bda4 Don't include the world in the published packages
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
2016-10-26 15:35:54 +01:00
Richard van der Hoff
6396c60645 Put a cachebuster in the names of CSS and JS files
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
Richard van der Hoff
53e5894759 Merge branch 'develop' into rav/webpack_olm 2016-10-26 15:13:57 +01:00
Richard van der Hoff
e1919c5ea3 Don't include two copies of the CSS in the tarball
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
Richard van der Hoff
fcf683c8a7 Use webpack to copy olm.js
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
2016-10-26 14:29:21 +01:00
David Baker
e02e0219a7 Add plugin that makes babel 6 not break everything 2016-10-17 16:28:14 +01:00
David Baker
d04201d069 Replace stage & es2017 with specific plugins
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-17 16:28:14 +01:00
David Baker
82de2ca4ec Remove transform-runtime
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:28:14 +01:00
David Baker
f20b2593bc move babelcheck.js to scripts/ 2016-10-17 16:28:14 +01:00
David Baker
8e0b61ca35 Reminder to restore links + stage2, not stage 0 2016-10-17 16:28:13 +01:00
David Baker
61a543a694 Add babelcheck.js
As per 4bea0c0818
2016-10-17 16:28:13 +01:00
David Baker
5608e97719 Remove babel-polyfill
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-17 16:28:13 +01:00
Aviral Dasgupta
d6f27add66 Upgrade to babel6 and enable some presets. 2016-10-17 16:28:13 +01:00
David Baker
ea09a25563 Revert "Switch to babel 6" 2016-10-14 18:50:22 +01:00
David Baker
40ac80a3e9 Replace stage & es2017 with specific plugins
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-14 18:03:22 +01:00
David Baker
5f747e1a90 Remove transform-runtime
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:57:10 +01:00
David Baker
e6caf9ece4 move babelcheck.js to scripts/ 2016-10-13 09:50:40 +01:00
David Baker
5ff915476a Reminder to restore links + stage2, not stage 0 2016-10-12 18:08:52 +01:00
David Baker
e5d2ebc57c Add babelcheck.js
As per 4bea0c0818
2016-10-12 17:46:11 +01:00
David Baker
64815b1b0b Remove babel-polyfill
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-12 17:23:01 +01:00
David Baker
59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +01:00
David Baker
9245ab01f1 js-sdk & react-sdk develop 2016-10-12 11:52:18 +01:00
David Baker
59fe9279d1 0.8.3 2016-10-12 11:49:58 +01:00
David Baker
bca22f26c5 js-sdk & react-sdk release versions 2016-10-12 11:49:21 +01:00
David Baker
cd7adfed0a Back to develop react & js sdk 2016-10-05 16:59:25 +01:00
David Baker
902bf3a0a6 0.8.2 2016-10-05 16:55:45 +01:00
David Baker
fb2c2ed09a Use released version of react-sdk & js-sdk 2016-10-05 16:54:24 +01:00
David Baker
52cae92dd7 Update to linkify 2.1.3
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:28:28 +01:00
Aviral Dasgupta
9174b32ef1 Upgrade to babel6 and enable some presets. 2016-10-02 17:28:24 +05:30
David Baker
f4a6a3c4b2 Update linkify version
Fixes https://github.com/vector-im/vector-web/issues/2357
In addition, https://github.com/matrix-org/matrix-react-sdk/pull/500 will make sure failures like this are obvious.
2016-09-27 10:40:02 +01:00
David Baker
99b0f9eb7c Back to develop 2016-09-21 17:33:27 +01:00
David Baker
5248bdd974 0.8.1 2016-09-21 17:30:41 +01:00
David Baker
2639d10f97 Pin to released js-sdk & react-sdk 2016-09-21 17:29:44 +01:00
David Baker
cc5c636fa5 Back to develop versions 2016-09-21 12:03:59 +01:00
David Baker
c4a2df75eb 0.8.0 2016-09-21 12:02:41 +01:00
David Baker
3eed711b34 Use released versions 2016-09-21 12:01:59 +01:00
Mark Haines
f6fb1561d7 Update the version of olm to 1.3.0 2016-09-15 11:33:37 +01:00
Aviral Dasgupta
d65b791b2b bump draft-js to 0.8.1 (as with matrix-react-sdk) 2016-09-12 18:31:22 +05:30
Richard van der Hoff
31dd49ffd7 Bump to olm 1.2.0 2016-09-06 22:33:21 +01:00
Matthew Hodgson
0494dff545 Merge branch 'master' into develop 2016-09-02 17:23:02 +01:00
Matthew Hodgson
e63e6e7016 0.7.5-r3 2016-09-02 17:21:30 +01:00
Matthew Hodgson
dec62ab92c bump react-sdk 2016-09-02 17:20:23 +01:00
Richard van der Hoff
6c8a492637 Bump to olm 1.1.0
Olm 1.0.0 made broken OlmAccounts.
2016-09-02 12:01:27 +01:00
Matthew Hodgson
9709a38250 merge master 2016-09-01 22:38:40 +01:00
Matthew Hodgson
06ca94c1e6 0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson
a20962ac14 bump to react-sdk v0.6.5-r1 2016-09-01 22:28:39 +01:00
Richard van der Hoff
a2694113d3 Merge pull request #2009 from vector-im/rav/enable_react_checks
Turn react consistency checks back on in develop builds
2016-08-30 14:57:49 +01:00
Matthew Hodgson
c7eba0f292 repin deps to dev 2016-08-30 13:52:35 +01:00
Matthew Hodgson
5f233d75f2 0.7.5-r1 2016-08-28 18:09:20 +01:00
Matthew Hodgson
45c013f2f2 0.7.5 2016-08-28 18:07:33 +01:00
Matthew Hodgson
ef8f9ecbf3 pin matrix-js-sdk and matrix-react-sdk deps for release 2016-08-28 17:36:57 +01:00
Matthew Hodgson
abca5faf78 pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010 2016-08-25 18:30:35 +01:00
Richard van der Hoff
21ffe22375 Turn react consistency checks back on in develop builds
The react checks are useful on /develop, to catch programming errors earlier,
and the original reason for turning them off (so that we could meaningfully
compare performance between /develop and /beta) is no longer so
relevant.

This reverts commit b5f029d10e.
2016-08-25 17:06:12 +01:00
Richard van der Hoff
4c9ade5ecb Use cpx to copy olm.js, and add watcher
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.

We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
2016-08-15 12:16:08 +01:00
Richard van der Hoff
1d435890af Unpin react-sdk and js-sdk 2016-08-15 12:15:24 +01:00
Richard van der Hoff
8a2b2daad7 Revert "Unpin react-sdk and js-sdk"
I messed this up and removed staticfiles.js by accident

This reverts commit 21334cab28.
2016-08-15 12:13:58 +01:00
Richard van der Hoff
21334cab28 Unpin react-sdk and js-sdk 2016-08-15 12:11:35 +01:00
David Baker
0afdf5d8e4 Merge pull request #1959 from vector-im/rav/device_display_name
Make up a device display name
2016-08-12 11:48:12 +01:00
Richard van der Hoff
3a819a29b7 Make up a device display name
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
David Baker
9d77fab18f 0.7.4-r1 2016-08-12 10:11:40 +01:00
David Baker
5512fd4220 Bump to matrix-react-sdk 0.6.4-r1 2016-08-12 10:09:53 +01:00
David Baker
25d8a7999f 0.7.4 2016-08-11 17:47:17 +01:00
David Baker
2b671fcafc js-sdk & react sdk released 2016-08-11 17:45:10 +01:00
Aviral Dasgupta
19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
Aviral Dasgupta
bd9f5d3e06 Various fixes and improvements to emojification.
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
Richard van der Hoff
51b74251f9 Exclude olm from the webpack
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
2016-08-02 12:44:23 +01:00
Richard van der Hoff
4b33164ab6 Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:41:27 +01:00
Richard van der Hoff
53fe372a0c Bump to react 15.2.1
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:47:09 +01:00
Richard van der Hoff
4cb04d1e40 Bump to latest react-gemini-scrollbar
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:46:38 +01:00
Richard van der Hoff
3e53879adc Bump to olm 1.0.0
Fixes https://github.com/vector-im/vector-web/issues/1719
2016-07-11 14:53:51 +01:00
Richard van der Hoff
4c6fa740f3 package.json: add olm as optionalDependency
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
2016-06-20 15:10:19 +01:00
Aviral Dasgupta
b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30