Commit graph

27 commits

Author SHA1 Message Date
James Allen
20347da44d Ignore public/brand 2018-02-15 14:54:58 +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
James Allen
98ff097981 Merge pull request #219 from sharelatex/as-ignore-require
Ignore content-addressible compiled require js
2017-12-19 15:00:50 +00:00
James Allen
8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
Alasdair Smith
fdd861e824 Ignore content-addressible compiled require js 2017-12-19 10:02:15 +00:00
Henry Oswald
4955fb373b ignore hashed requirejs path 2017-12-15 10:10:13 +00:00
Henry Oswald
507503fe89 remove old .gitignore paths 2017-12-14 11:36:33 +00:00
Henry Oswald
288af6772a write hashes for all files we fingerprint 2017-12-14 10:59:46 +00:00
Henry Oswald
80e6a660be wip, this does not work minified yet
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
James Allen
49057a5ab7 Only mount coffee and needed files into Docker so js isn't written back to local system 2017-11-27 17:10:58 +00:00
James Allen
62de9d8946 Move test/UnitTests -> unit/test 2017-11-27 17:10:22 +00:00
Paulo Reis
cbb79e04ce Ignore CSS source maps. 2017-10-25 10:13:42 +01:00
James Allen
5c8442a86f Allow configureable brand prefix with overleaf styles 2017-08-07 17:01:59 +02:00
Paulo Reis
7e7bfa866d Ignore map files in git. 2017-06-26 16:15:28 +01:00
Brian Gough
fc5f7b5df5 don't ignore files under js/ace directory in git 2016-10-06 14:19:10 +01:00
James Allen
e1fa77dd72 Add beginnings of acceptance tests 2016-03-08 15:59:04 +00:00
Henry Oswald
94b26e71a4 ignore test script 2015-05-26 15:25:24 +01:00
James Allen
0d299b308e Ignore generated sharejs.js lib 2015-02-03 12:58:26 +00:00
Brian Gough
5ffdcc2bbb make git ignore for 'modules' specific to top-level directory
to prevent match with public/coffee/modules/
2014-12-12 13:27:20 +00:00
Brian Gough
57b09e1d60 started making pdf viewer conditional - work in progress 2014-11-28 16:59:39 +00:00
James Allen
becb294c5c Create basic module loading system 2014-09-08 14:19:24 +01:00
James Allen
d9d1499dae Ignore external pages 2014-07-08 13:36:08 +01:00
James Allen
a64b9eb82e Create and style external pages 2014-06-20 17:17:24 +01:00
James Allen
43684fda3a Move to bootstrap 3 (site barely functional) 2014-06-04 16:14:35 +01:00
James Allen
26b0f4658f Ignore external directory 2014-04-03 11:45:30 +01:00
James Allen
4ec7deb7d6 Move plans.css to brand folder 2014-02-14 11:36:06 +00:00
James Allen
8715690ce9 Intial open source comment 2014-02-12 10:23:40 +00:00