github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-26 17:12:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename webpack prod compile to minify_es and run as part of minify step

Browse source 
Fixes issue where webpack prod files were wiped after running minify on CI
This commit is contained in:
Alasdair Smith 2018-03-15 11:29:36 +00:00
parent 7e990dc67e
commit 4d79c68f41
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/Makefile
View file

@ -96,14 +96,16 @@ $(CSS_FILES): $(LESS_FILES)
minify: $(CSS_FILES) $(JS_FILES)
$(GRUNT) compile:minify
$(MAKE) minify_es
minify_es:
npm -q run webpack:production
css: $(CSS_FILES)
compile: $(JS_FILES) css public/js/libs/sharejs.js public/js/main.js public/js/ide.js
@$(MAKE) compile_modules
compile_es:
npm -q run webpack:production
compile_full:
$(COFFEE) -c -p app.coffee > app.js
$(COFFEE) -o app/js -c app/coffee
@ -116,7 +118,6 @@ compile_full:
$(MAKE) $(CSS_FILES)
$(MAKE) compile_modules_full
$(MAKE) compile # ide.js, main.js, share.js, and anything missed
$(MAKE) compile_es
compile_modules: $(MODULE_MAKEFILES)
@set -e; \