Commit graph

228 commits

Author SHA1 Message Date
Alasdair Smith
45e7482335 Install chai-expect and chai-friendly eslint plugins 2018-02-28 11:45:10 +00:00
Alasdair Smith
f11f208772 Revert "Revert "Upgrade to mocha 5.0.1"" 2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c Revert "Upgrade to mocha 5.0.1" 2018-02-27 12:25:42 +00:00
Alasdair Smith
4c2790a71b Merge pull request #366 from sharelatex/as-upgrade-mocha
Upgrade to mocha 5.0.1
2018-02-27 11:06:34 +00:00
Alasdair Smith
864bf771a4 Merge pull request #362 from sharelatex/as-linting
Linting new ES code
2018-02-27 11:06:11 +00:00
Brian Gough
38cb2885d8 Merge pull request #364 from sharelatex/bg-support-debug-mode
add support for debugging
2018-02-26 11:34:29 +00:00
Alasdair Smith
22b8c114a2 Upgrade mocha to latest 2018-02-23 17:00:29 +00:00
Alasdair Smith
325f91ed2e Add scripts for running linting 2018-02-23 11:41:21 +00:00
Brian Gough
d364bfc353 add support for debugging 2018-02-23 11:36:08 +00:00
Alasdair Smith
45bcbf9eb1 Install eslint & standard 2018-02-23 11:25:01 +00:00
Alasdair Smith
6b0b96a357 Install karma-webpack 2018-02-23 11:06:12 +00:00
Alasdair Smith
8fa343bc94 Uninstall unused karma-tap-reporter dependency 2018-02-22 14:04:39 +00:00
Alasdair Smith
27bfb1f02d Install karma-mocha-reporter 2018-02-22 14:02:14 +00:00
Alasdair Smith
24ec7b77ab Convert frontend test runs to use Docker/karma 2018-02-20 14:01:50 +00:00
Alasdair Smith
289500082a Install karma & it's dependencies 2018-02-20 14:00:57 +00:00
Shane Kilkelly
9a7b3c2b23 Merge pull request #320 from sharelatex/sk-retry-analytics-requests
Add a retry to analytics requests
2018-02-13 09:38:56 +00:00
Shane Kilkelly
0efc8136cb Use requestretry node package 2018-02-12 15:16:21 +00:00
Alasdair Smith
d8e87997c1 Install codemirror 2018-02-09 10:02:36 +00:00
Alasdair Smith
ed5f31b248 Update grunt-contrib-less to latest version
Note that this also updates less to 2.7.

This change is required so that variables can be injected by the Less
compiler. This is useful for allowing feature flags.
2018-02-05 15:52:56 +00:00
Alasdair Smith
ec8637ead1 Add back webpack script 2018-01-31 17:26:29 +00:00
Alasdair Smith
e01615c174 Install webpack & babel 2018-01-31 17:24:19 +00:00
Alasdair Smith
c156187bab Remove unused contentful dependency
This package is unused, and was causing problems with installing babel. Because
it dependended on an older version of babel, and was interpreted by npm first
(as it is a regular dep), the older version of babel would be "hoisted" to the
top level of node_modules

Then when latest versions of babel are installed they would be interpreted second
and thus would nest their dependencies within their own node_modules, filling the
disk with unnecessary copies of core-js.

Removing the unnecessary dep solves these problems
2018-01-31 12:30:39 +00:00
James Allen
98c620a99b Revert "Install webpack and babel"
This reverts commit 5cfd0ac2d21be5ea0049ced4e522c7a57ddae0c1.
2018-01-22 17:52:39 +00:00
Alasdair Smith
4a0628d801 Remove unnecessary test script 2018-01-15 16:23:10 +00:00
Alasdair Smith
4642d55b7b Add basic example script 2018-01-15 16:23:10 +00:00
Alasdair Smith
9fbd7f2818 Install webpack and babel 2018-01-15 16:23:10 +00:00
James Allen
662122bb1c CI and local dev environment improvements
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
2018-01-15 09:36:41 +00:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
James Allen
d7a26e27e5 Run front end tests in CI 2017-12-19 13:58:47 +00:00
James Allen
8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
Henry Oswald
bd7e2d956d add mandrill as email option 2017-12-11 11:05:04 +00:00
James Allen
e62ec77161 Merge pull request #180 from sharelatex/ja-quiet-npm
Run npm with -q flag for less verbose test output
2017-12-01 08:32:46 +00:00
Hayden Faulds
e916fc906a add mkdirp dev dependency 2017-11-30 13:15:39 +00:00
James Allen
870e87ebe1 Run npm with -q flag for less verbose test output 2017-11-30 11:00:28 +00:00
James Allen
50b3045548 Tidy up docker-compose and makefile 2017-11-29 13:49:36 +00:00
James Allen
4c504ad8eb Remove debugging command 2017-11-27 17:10:58 +00:00
James Allen
5e0fc24c1a Allow modules to specific their own acceptance tests 2017-11-27 17:10:58 +00:00
James Allen
d9d7c96958 Get module unit tests running inside Docker as well as main tests 2017-11-27 17:10:58 +00:00
James Allen
fbf8cc2d03 Run acceptance tests via docker compose 2017-11-27 17:10:58 +00:00
Brian Gough
41819db7c5 remove unnecessary redis package 2017-10-30 15:41:32 +00:00
Brian Gough
e474344204 remove unnecessary ioredis package 2017-10-30 15:41:09 +00:00
Brian Gough
ebd28a8353 upgrade ioredis vis redis sharelatex 2017-10-30 15:40:56 +00:00
Brian Gough
d6d76f132e replace unzip with yauzl 2017-10-16 14:15:38 +01:00
James Allen
38b8450cee Add jsonwebtoken package 2017-10-03 10:29:49 +01:00
James Allen
1502da85cf Set up acceptance tests to run in docker container 2017-09-27 10:37:20 +02:00
Shane Kilkelly
54070c7734 pin chai 2017-09-12 11:21:34 +01:00
Tim Alby
d6834ff417 add security headers using Helmet
- use all Helmet's default headers except `X-DNS-Prefetch-Control`
- use `Referrer-Policy`
- use cache headers when:
  - a user is logged in, OR
  - a project is displayed
2017-09-12 11:17:59 +02:00
James Allen
b4254f06ef Update Project schema for overleaf imports 2017-08-21 17:49:08 +02:00
James Allen
eac0ce8353 Initial spike of Overleaf based logins 2017-08-08 14:00:21 +02:00
Paulo Reis
2fcbafa72d Add HTML encoder lib. 2017-07-28 17:30:57 +01:00
Joe Green
10683cbd8c upgraded mongoose package 2017-07-27 10:58:20 +01:00
James Allen
e19f5a1a5e Update redis-sharelatex and shrinkwrap 2017-05-09 17:18:04 +01:00
James Allen
3f51911513 Update to latest redis-sharelatex 2017-05-04 15:25:58 +01:00
Shane Kilkelly
bb65da88fe Merge branch 'master' into node-6.9 2017-04-05 10:15:51 +01:00
Shane Kilkelly
60b298d9ee upgrade to latest metrics 2017-03-31 14:43:19 +01:00
Shane Kilkelly
ca3497b6f6 Update metrics version to 1.7.0 2017-03-21 13:46:42 +00:00
Shane Kilkelly
98d7dc6f88 Make work on both 0.10 and 6.9 2017-02-27 13:54:57 +00:00
Shane Kilkelly
8d7c39ff42 Merge branch 'master' into node-6.9 2017-02-27 11:25:39 +00:00
Shane Kilkelly
bd997fc574 pin sinon js to 1.17, version 2 betas cause breakage 2017-02-27 11:01:25 +00:00
James Allen
2df8479db3 Move translations back to devDependencies so it's not missed by shrinkwrap 2017-02-21 15:25:28 +01:00
James Allen
f180b25850 Convert track changes text to translation strings 2017-02-17 16:28:53 +01:00
Shane Kilkelly
621a07aff2 Merge branch 'master' into node-6.9 2017-02-14 11:01:14 +00:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Shane Kilkelly
3ed85dad42 Merge branch 'master' into sk-upgrade-uuid 2017-01-30 11:09:50 +00:00
James Allen
32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes
Fix style issues in IE 10
2017-01-25 15:55:15 +01:00
Shane Kilkelly
abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +00:00
Shane Kilkelly
1ef1912cf8 Point to fork of rolling-rate-limiter that supports ioredis 2017-01-13 15:21:05 +00:00
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Henry Oswald
bcf9a17fb3 Merge branch 'master' into node-4.2 2016-12-20 15:23:02 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Henry Oswald
d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Henry Oswald
47ed17aab3 remove unneeded package and comma in jade 2016-11-14 10:50:49 +00:00
Henry Oswald
5a13ee1077 use anlaytis api
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
2016-11-11 17:03:09 +00:00
Shane Kilkelly
8726a8fb4d Add passport-saml dependency 2016-11-11 09:09:00 +00:00
Shane Kilkelly
bfa0e7cf89 WIP: start moving web sessions to cluster 2016-11-08 15:32:36 +00:00
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +00:00
James Allen
49fecc9ef4 Use v1.6.0 of metrics 2016-10-24 10:51:20 +01:00
Henry Oswald
7b83a941ee Merge branch 'master' into node-4.2 2016-10-19 13:04:26 +01:00
Shane Kilkelly
e4f4325150 Basic passport integration 2016-09-02 16:17:37 +01:00
James Allen
93cd511211 Send events to custom DB backend 2016-08-10 16:42:56 +01:00
Henry Oswald
23cb6a9419 Merge branch 'master' into node-4.2 2016-07-28 13:54:06 +01:00
Paulo Reis
8eae4e4044 Revert "Use custom shrinkwrap to ignore the translations package."
This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
2016-07-12 13:42:46 +01:00
Paulo Reis
112a64ce84 Use custom shrinkwrap to ignore the translations package. 2016-07-12 13:37:26 +01:00
Henry Oswald
a9f3a29b72 moved translations to dev dependency so its not included in shrinkwrap. 2016-07-12 10:17:58 +01:00
Henry Oswald
85936a1391 moved css min to exec, import was not working via grunt 2016-07-10 11:04:51 +01:00
Henry Oswald
7cb266d904 removed imagemin 2016-06-30 14:59:05 +01:00
Brian Gough
afc89d8d27 added missing package grunt-execute 2016-06-28 10:42:36 +01:00
Henry Oswald
d35a48e683 minfiy css as well 2016-06-18 21:49:32 +01:00
Henry Oswald
1d26be30a9 added grunt imagemin used to compress images 2016-06-18 16:50:56 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +01:00
Henry Oswald
79929eae73 Merge branch 'clsichecks' 2016-06-06 14:34:22 +01:00
Henry Oswald
2339cda318 added contentful uni pages as fallback 2016-06-06 09:28:53 +01:00
Henry Oswald
bc59b15bd8 mark grunt at 0.4.1. in package.json 2016-06-02 15:24:10 +01:00
Henry Oswald
1dd4ea176a Merge branch 'master' into node-4.2 2016-06-02 15:20:57 +01:00
Henry Oswald
734b5613a5 fix package.json 2016-06-02 15:20:18 +01:00
Henry Oswald
8529cb50b6 rolled back underscore and added lodash in 2016-06-02 13:18:07 +01:00
Henry Oswald
66ad587c9c bump underscore to 1.8.3 2016-06-01 16:46:11 +01:00