f4e21c3fc7
Remove electron_app as we now have riot-desktop repo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-06 11:32:13 +01:00
0620da4351
Add webpack stats which will be used by CI and stored to artifacts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-23 12:07:26 +00:00
28ffca1f84
Ignore /electron_app/pub
2019-05-24 11:34:03 +01:00
1a1f2254e5
Remove karma junit output
...
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
2019-05-03 11:40:53 +01:00
660a160c8e
Ignore package-lock.json in case of confused npm users
2019-03-13 15:49:07 +00:00
ef090846e2
Deduplicate log ignore
2019-03-13 15:46:01 +00:00
aae5ca0763
Ignore *.log files, such as from npm or Yarn
2019-03-13 14:44:01 +00: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
dcde74bc09
Revert "Remove package-lock.json for now"
2018-08-02 10:02:09 +01:00
10ed13acc0
Add package-lock to .gitignore
2018-08-01 15:08:12 +01:00
2c84cb6702
Ignore local config files.
2018-04-03 15:24:46 +01:00
fe3f0be920
Ignore local config.
2018-03-07 12:03:28 +00:00
fb69ac33a0
update gitignore to allow .idea directory to exist in subdirs
2017-08-05 15:50:47 -05:00
2f71dc9fe5
Merge branch 'develop' into forward_message
2017-05-28 02:37:10 +01:00
eaeac1230f
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2017-05-19 01:15:31 +01:00
39b6c7c65d
ignore electron_app subdirs properly, missed these too :L
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-17 09:53:33 +01:00
8927afca03
re-add electron node modules to gitignore
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:27 +01:00
6d94f35c33
Automatically update component-index
...
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.
-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
2017-05-11 10:37:13 +01:00
a09f890619
Merge package.json, match version in electron/package.json
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:03:28 +01:00
7676fd960e
Merge branch 'develop' into forward_message
2017-04-30 12:35:52 +01:00
4dd6ee681d
fix /config.json in .gitignore
2017-04-25 00:14:24 +01:00
2eb715002f
Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message
...
Conflicts:
.gitignore
2017-04-24 18:38:52 +01:00
77ce58b59d
add .idea to .gitignore so I don't accidentally push my IDE config
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:46:49 +01:00
3fb54029d7
Fix packaged functionality
...
Improve dependency management for Electron main process deps
Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder
Does not affect standard webapp whatsoever
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-13 13:39:15 +01:00
ab1b377a1d
add config.json to .gitignore
2017-04-10 14:11:26 -03:00
229693dd71
gitignore .npmrc
...
(We now require a .npmrc in the riot-web dir to use the right
account when releasing)
2016-12-08 11:41:31 +00:00
3d813e68e9
gitignore electron/pub
2016-12-05 14:20:26 +00:00
c8a6be1454
Update gitignore
2016-11-08 16:14:57 +00:00
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
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
622ab27254
gitignore dist
2016-11-01 15:35:41 +00:00
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
53e5894759
Merge branch 'develop' into rav/webpack_olm
2016-10-26 15:13:57 +01:00
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
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
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
43e3662e60
Merge pull request #1935 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
b06c9f037e
gitignore copied olm.js
2016-08-10 00:09:26 +01:00
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
d2391f999e
Adding back in .DS_Store, but to ignore in any directory
2016-07-14 10:42:39 +01:00
e1779ca8bc
Deleteing .DS_Store files before adding to gitignore
2016-07-14 10:41:41 +01:00
65371c9a39
Adding ignoring of mac .DS_Store files to all directories
2016-07-14 10:32:30 +01:00
b7f1a3db57
gitignore config.json now it isn't versioned
2016-06-09 18:51:25 +01:00
322af6513d
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 17:20:06 +01:00
69ce3c43cf
Revert "Merge branch 'develop' into rav/karma"
...
The karma tests don't pass yet, and aren't ready to land on develop.
This reverts commit 438453e61a50f94eb040
2016-04-13 17:17:45 +01:00
429d110212
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 10:15:04 +01:00
93f8fcbacc
Add 'package' script to build a webapp bundle for straight unzipping on a production server.
2016-02-10 15:35:06 +00:00
7ff5e42f3e
Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.
2015-12-01 18:05:43 +00:00
Michael Telatynski